clean old code

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
nextcloud · Sep 17, 2024 · 4a8a1a8 · 4a8a1a8
1 parent 7c5ba88
commit 4a8a1a8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 27 deletions.
diff --git a/iOSClient/Media/NCMedia+CollectionViewDataSource.swift b/iOSClient/Media/NCMedia+CollectionViewDataSource.swift
@@ -110,7 +110,7 @@ extension NCMedia: UICollectionViewDataSource {
 
         cell.date = metadata.date as Date
         cell.ocId = metadata.ocId
-        cell.account = metadata.account
+        cell.account = self.session.account
 
         if metadata.isVideo {
            cell.imageStatus.image = playImage

diff --git a/iOSClient/Media/NCMediaDataSource.swift b/iOSClient/Media/NCMediaDataSource.swift
@@ -194,46 +194,34 @@ extension NCMedia {
 
 public class NCMediaDataSource: NSObject {
     public class Metadata: NSObject {
-        let account: String
         let date: Date
         let etag: String
-        let etagResource: String
         let fileId: String
         let imageSize: CGSize
         let isImage: Bool
-        let isNotFlaggedAsLivePhotoByServer: Bool
         let isLivePhoto: Bool
         let isVideo: Bool
         let ocId: String
         let serverUrl: String
-        let user: String
 
-        init(account: String,
-             date: Date,
+        init(date: Date,
              etag: String,
              fileId: String,
-             etagResource: String,
              imageSize: CGSize,
              isImage: Bool,
-             isNotFlaggedAsLivePhotoByServer: Bool,
              isLivePhoto: Bool,
              isVideo: Bool,
              ocId: String,
-             serverUrl: String,
-             user: String) {
-            self.account = account
+             serverUrl: String) {
             self.date = date
             self.etag = etag
             self.fileId = fileId
-            self.etagResource = etagResource
             self.imageSize = imageSize
             self.isImage = isImage
-            self.isNotFlaggedAsLivePhotoByServer = isNotFlaggedAsLivePhotoByServer
             self.isLivePhoto = isLivePhoto
             self.isVideo = isVideo
             self.ocId = ocId
             self.serverUrl = serverUrl
-            self.user = user
         }
     }
 
@@ -252,19 +240,15 @@ public class NCMediaDataSource: NSObject {
     }
 
     internal func appendMetadata(_ metadata: tableMetadata) {
-        self.metadatas.append(Metadata(account: metadata.account,
-                                       date: metadata.date as Date,
+        self.metadatas.append(Metadata(date: metadata.date as Date,
                                        etag: metadata.etag,
                                        fileId: metadata.fileId,
-                                       etagResource: metadata.etagResource,
                                        imageSize: CGSize(width: metadata.width, height: metadata.height),
                                        isImage: metadata.classFile == NKCommon.TypeClassFile.image.rawValue,
-                                       isNotFlaggedAsLivePhotoByServer: !metadata.isFlaggedAsLivePhotoByServer,
                                        isLivePhoto: !metadata.livePhotoFile.isEmpty,
                                        isVideo: metadata.classFile == NKCommon.TypeClassFile.video.rawValue,
                                        ocId: metadata.ocId,
-                                       serverUrl: metadata.serverUrl,
-                                       user: metadata.urlBase))
+                                       serverUrl: metadata.serverUrl))
     }
 
     // MARK: -

diff --git a/iOSClient/Media/NCMediaDownloadThumbnail.swift b/iOSClient/Media/NCMediaDownloadThumbnail.swift
@@ -43,24 +43,23 @@ class NCMediaDownloadThumbnail: ConcurrentOperation {
     }
 
     override func start() {
-        guard !isCancelled else { return self.finish() }
+        guard !isCancelled, let tableMetadata = NCManageDatabase.shared.getMetadataFromOcId(self.metadata.ocId), let media = self.media else { return self.finish() }
         var etagResource: String?
 
         if utilityFileSystem.fileProviderStorageImageExists(metadata.ocId, etag: metadata.etag) {
-            etagResource = metadata.etagResource
+            etagResource = tableMetadata.etagResource
         }
 
         NextcloudKit.shared.downloadPreview(fileId: metadata.fileId,
                                             etag: etagResource,
-                                            account: metadata.account,
+                                            account: media.session.account,
                                             options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { _, data, _, _, etag, error in
             if error == .success, let data, let collectionView = self.collectionView {
 
                 self.media?.filesExists.append(self.metadata.ocId)
                 NCManageDatabase.shared.setMetadataEtagResource(ocId: self.metadata.ocId, etagResource: etag)
-                if let metadata = NCManageDatabase.shared.getMetadataFromOcId(self.metadata.ocId) {
-                    NCUtility().createImage(metadata: metadata, data: data)
-                }
+                NCUtility().createImage(metadata: tableMetadata, data: data)
+
                 let image = self.media?.getImage(metadata: self.metadata, width: self.width)
 
                 DispatchQueue.main.async {