coding

iOSClient/Viewer/NCViewerImage/NCViewerImage.swift

@@ -582,11 +582,11 @@ extension NCViewerImage: NCViewerImageZoomDelegate {
         let ext = CCUtility.getExtension(metadata.fileNameView)
         
         // NO PREVIEW [RETRAY]
-        if viewerImageZoom.noPreview {
-            if let image = getImageMetadata(metadata) {
-                viewerImageZoom.image = image
-            }
-        }
+//        if viewerImageZoom.noPreview {
+//            if let image = getImageMetadata(metadata) {
+//                viewerImageZoom.image = image
+//            }
+//        }
         
         // DOWNLOAD FILE
         if ((metadata.classFile == NCCommunicationCommon.typeClassFile.image.rawValue && CCUtility.getAutomaticDownloadImage()) || (metadata.contentType == "image/heic" &&  metadata.hasPreview == false) || ext == "GIF" || ext == "SVG" || isFolderEncrypted) && metadata.session == "" && !CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) {

iOSClient/Viewer/NCViewerImage/NCViewerImageZoom.swift

@@ -48,7 +48,6 @@ class NCViewerImageZoom: UIViewController {
     var metadata: tableMetadata = tableMetadata()
     var index: Int = 0
     var isShowDetail: Bool = false
-    var noPreview: Bool = false
     var doubleTapGestureRecognizer: UITapGestureRecognizer = UITapGestureRecognizer()
     var imageViewConstraint: CGFloat = 0
                 
@@ -70,18 +69,18 @@ class NCViewerImageZoom: UIViewController {
         
         view.addGestureRecognizer(doubleTapGestureRecognizer)
         
-        if image == nil {
-            var named = "noPreview"
-            if metadata.classFile == NCCommunicationCommon.typeClassFile.audio.rawValue { named = "noPreviewAudio" }
-            if metadata.classFile == NCCommunicationCommon.typeClassFile.video.rawValue { named = "noPreviewVideo" }
-            image = UIImage.init(named: named)!.image(color: .gray, size: view.frame.width)
-            self.noPreview = true
-        }
-        
-        if let image = image {
-            imageView.image = image
-            imageView.frame = CGRect(x: imageView.frame.origin.x, y: imageView.frame.origin.y, width: image.size.width, height: image.size.height)
+        if metadata.classFile == NCCommunicationCommon.typeClassFile.video.rawValue {
+//            image = UIImage.init(named: "noPreviewVideo")!.image(color: .gray, size: view.frame.width)
+        } else if metadata.classFile == NCCommunicationCommon.typeClassFile.audio.rawValue {
+            if image == nil {
+                image = UIImage.init(named: "noPreviewAudio")!.image(color: .gray, size: view.frame.width)
+            }
+        } else {
+            if image == nil {
+                image = UIImage.init(named: "noPreview")!.image(color: .gray, size: view.frame.width)
+            }
         }
+        imageView.image = image
         
         if NCManageDatabase.shared.getMetadataLivePhoto(metadata: metadata) != nil {
             statusViewImage.image = NCUtility.shared.loadImage(named: "livephoto", color: .gray)

iOSClient/Viewer/NCViewerVideo/NCViewerVideo.swift

@@ -65,6 +65,7 @@ class NCViewerVideo: NSObject {
             
             self.player = AVPlayer(url: url)
             self.player?.isMuted = CCUtility.getAudioMute()
+            self.player?.seek(to: .zero)
             self.videoLayer = AVPlayerLayer(player: self.player)
             self.videoLayer!.frame = imageView.bounds
             self.videoLayer!.videoGravity = .resizeAspect
@@ -78,8 +79,7 @@ class NCViewerVideo: NSObject {
                     self.viewerVideoToolBar?.showToolBar()
                 }
             }
-                        
-            self.rateObserver = self.player?.addObserver(self, forKeyPath: "rate", options: [], context: nil)
+            rateObserver = self.player?.addObserver(self, forKeyPath: "rate", options: [], context: nil)
             
             // save durationSeconds on database
             if let duration: CMTime = (player?.currentItem?.asset.duration) {
@@ -87,13 +87,14 @@ class NCViewerVideo: NSObject {
                 NCManageDatabase.shared.addVideoTime(metadata: metadata, time: nil, durationSeconds: durationSeconds)
             }
             
+            // seek to datamebase ti
+            if let time = NCManageDatabase.shared.getVideoTime(metadata: metadata) {
+                self.player?.seek(to: time)
+            }
+            
             viewerVideoToolBar?.setBarPlayer(player: self.player, metadata: metadata, durationSeconds: durationSeconds)
         }
         
-        //NCNetworking.shared.getVideoUrl(metadata: metadata) { url in
-        //            if let url = url {
-        //}
-
         if let url = NCKTVHTTPCache.shared.getVideoURL(metadata: metadata) {
             initPlayer(url: url)
         }