marinofaggiana 3 years ago
parent
commit
77f6631196

+ 2 - 1
iOSClient/Data/NCManageDatabase.swift

@@ -116,13 +116,14 @@ class NCManageDatabase: NSObject {
                         }
                         }
                     }
                     }
                     
                     
-                    if oldSchemaVersion < 207 {
+                    if oldSchemaVersion < 209 {
                         migration.deleteData(forType: tableDirectory.className())
                         migration.deleteData(forType: tableDirectory.className())
                         migration.deleteData(forType: tableE2eEncryption.className())
                         migration.deleteData(forType: tableE2eEncryption.className())
                         migration.deleteData(forType: tableE2eEncryptionLock.className())
                         migration.deleteData(forType: tableE2eEncryptionLock.className())
                         migration.deleteData(forType: tableMetadata.className())
                         migration.deleteData(forType: tableMetadata.className())
                         migration.deleteData(forType: tableShare.className())
                         migration.deleteData(forType: tableShare.className())
                         migration.deleteData(forType: tableTrash.className())
                         migration.deleteData(forType: tableTrash.className())
+                        migration.deleteData(forType: tableVideo.className())
                         // Delete OLD avatar image
                         // Delete OLD avatar image
                         if var pathUrl = CCUtility.getDirectoryGroup() {
                         if var pathUrl = CCUtility.getDirectoryGroup() {
                             pathUrl.appendPathComponent(NCGlobal.shared.appUserData)
                             pathUrl.appendPathComponent(NCGlobal.shared.appUserData)

+ 1 - 1
iOSClient/NCGlobal.swift

@@ -79,7 +79,7 @@ class NCGlobal: NSObject {
     // Database Realm
     // Database Realm
     //
     //
     let databaseDefault                             = "nextcloud.realm"
     let databaseDefault                             = "nextcloud.realm"
-    let databaseSchemaVersion: UInt64               = 207
+    let databaseSchemaVersion: UInt64               = 209
     
     
     // Intro selector
     // Intro selector
     //
     //

+ 5 - 9
iOSClient/Viewer/NCViewerImage/NCViewerImageDetailView.swift

@@ -148,21 +148,17 @@ class NCViewerImageDetailView: UIView {
             dateValue.text = dateString
             dateValue.text = dateString
         }
         }
         
         
-        // Dimensions / Durations
+        // Dimension / Duration
         if metadata?.classFile == NCCommunicationCommon.typeClassFile.image.rawValue {
         if metadata?.classFile == NCCommunicationCommon.typeClassFile.image.rawValue {
             if let image = self.image {
             if let image = self.image {
                 dimLabel.text = NSLocalizedString("_dimension_", comment: "")
                 dimLabel.text = NSLocalizedString("_dimension_", comment: "")
                 dimValue.text = "\(Int(image.size.width)) x \(Int(image.size.height))"
                 dimValue.text = "\(Int(image.size.width)) x \(Int(image.size.height))"
             }
             }
         } else if metadata?.classFile == NCCommunicationCommon.typeClassFile.video.rawValue || metadata?.classFile == NCCommunicationCommon.typeClassFile.audio.rawValue  {
         } else if metadata?.classFile == NCCommunicationCommon.typeClassFile.video.rawValue || metadata?.classFile == NCCommunicationCommon.typeClassFile.audio.rawValue  {
-            NCNetworking.shared.getVideoUrl(metadata: metadata!) { url in
-                if let url = url {
-                    let playerVideo = AVPlayer(url: url)
-                    if let duration = playerVideo.currentItem?.asset.duration {
-                        let durationSeconds = CMTimeGetSeconds(duration)
-                        self.dimValue.text = NCUtility.shared.stringFromTimeInterval(interval: durationSeconds)
-                    }
-                }
+            if let ocId = metadata?.ocId, ocId == NCViewerVideo.shared.metadata?.ocId, let duration = NCViewerVideo.shared.player?.currentItem?.asset.duration {
+                let durationSeconds = Double(CMTimeGetSeconds(duration))
+                self.dimLabel.text = NSLocalizedString("_duration_", comment: "")
+                self.dimValue.text = NCUtility.shared.stringFromTimeInterval(interval: durationSeconds)
             }
             }
         }
         }
         
         

+ 1 - 1
iOSClient/Viewer/NCViewerVideo/NCViewerVideo.swift

@@ -35,8 +35,8 @@ class NCViewerVideo: NSObject {
     private var imageView: UIImageView?
     private var imageView: UIImageView?
     private var timeObserver: Any?
     private var timeObserver: Any?
     private var rateObserver: Any?
     private var rateObserver: Any?
-    private var metadata: tableMetadata?
     
     
+    public var metadata: tableMetadata?
     public var videoLayer: AVPlayerLayer?
     public var videoLayer: AVPlayerLayer?
     public var player: AVPlayer?
     public var player: AVPlayer?
     public var viewerVideoToolBar: NCViewerVideoToolBar?
     public var viewerVideoToolBar: NCViewerVideoToolBar?