Browse Source

change obj db

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 years ago
parent
commit
9731517f9d

+ 0 - 3
iOSClient/Data/NCManageDatabase+Video.swift

@@ -41,9 +41,6 @@ class tableVideo: Object {
     override static func primaryKey() -> String {
         return "ocId"
     }
-}
-
-extension NCManageDatabase {
 
     func addVideoTime(metadata: tableMetadata, time: CMTime?, durationTime: CMTime?) {
 

+ 2 - 2
iOSClient/Networking/NCNetworking.swift

@@ -1158,7 +1158,7 @@ class NCNetworking: NSObject, NKCommonDelegate {
 
             for metadata in metadatas {
 
-                NCManageDatabase.shared.deleteVideo(metadata: metadata)
+                tableVideo().deleteVideo(metadata: metadata)
                 NCManageDatabase.shared.deleteLocalFile(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
                 NCUtilityFileSystem.shared.deleteFile(filePath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId))
 
@@ -1225,7 +1225,7 @@ class NCNetworking: NSObject, NKCommonDelegate {
                     try FileManager.default.removeItem(atPath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId))
                 } catch { }
 
-                NCManageDatabase.shared.deleteVideo(metadata: metadata)
+                tableVideo().deleteVideo(metadata: metadata)
                 NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
                 NCManageDatabase.shared.deleteLocalFile(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
 

+ 3 - 3
iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift

@@ -125,7 +125,7 @@ class NCPlayer: NSObject {
             player?.isMuted = CCUtility.getAudioMute()
         } else {
             player?.isMuted = CCUtility.getAudioMute()
-            if let time = NCManageDatabase.shared.getVideoTime(metadata: metadata) {
+            if let time = tableVideo().getVideoTime(metadata: metadata) {
                 player?.seek(to: time)
             }
         }
@@ -168,7 +168,7 @@ class NCPlayer: NSObject {
                 case .loaded:
 
                     self.durationTime = self.player?.currentItem?.asset.duration ?? .zero
-                    NCManageDatabase.shared.addVideoTime(metadata: self.metadata, time: nil, durationTime: self.durationTime)
+                    tableVideo().addVideoTime(metadata: self.metadata, time: nil, durationTime: self.durationTime)
 
                     self.videoLayer = AVPlayerLayer(player: self.player)
                     self.videoLayer!.frame = self.imageVideoContainer?.bounds ?? .zero
@@ -375,7 +375,7 @@ class NCPlayer: NSObject {
 
         if metadata.classFile == NKCommon.TypeClassFile.audio.rawValue { return }
 
-        NCManageDatabase.shared.addVideoTime(metadata: metadata, time: time, durationTime: nil)
+        tableVideo().addVideoTime(metadata: metadata, time: time, durationTime: nil)
         generatorImagePreview()
     }
 

+ 1 - 1
iOSClient/Viewer/NCViewerMedia/NCViewerMediaDetailView.swift

@@ -147,7 +147,7 @@ class NCViewerMediaDetailView: UIView {
                 dimValue.text = "\(Int(image.size.width)) x \(Int(image.size.height))"
             }
         } else if metadata.classFile == NKCommon.TypeClassFile.video.rawValue || metadata.classFile == NKCommon.TypeClassFile.audio.rawValue {
-            if let durationTime = NCManageDatabase.shared.getVideoDurationTime(metadata: metadata) {
+            if let durationTime = tableVideo().getVideoDurationTime(metadata: metadata) {
                 self.dimLabel.text = NSLocalizedString("_duration_", comment: "")
                 self.dimValue.text = NCUtility.shared.stringFromTime(durationTime)
             }