Browse Source

update image viewer

marinofaggiana 4 years ago
parent
commit
dd6300e01b

+ 1 - 0
iOSClient/Data/NCManageDatabase.swift

@@ -1798,6 +1798,7 @@ class NCManageDatabase: NSObject {
                 if let result = realm.objects(tableMetadata.self).filter("ocId == %@", ocId).first {
                     result.fileName = fileNameTo
                     result.fileNameView = fileNameTo
+                    result.fileNameWithoutExt = (fileNameTo as NSString).deletingPathExtension
                 }
             }
         } catch let error {

+ 1 - 0
iOSClient/Main/Menu/NCViewer+Menu.swift

@@ -151,6 +151,7 @@ extension NCViewer {
                     
                     viewController.delegate = NCViewer.shared
                     viewController.hideButtonCreateFolder = false
+                    viewController.items = [metadata]
                     viewController.selectFile = false
                     viewController.includeDirectoryE2EEncryption = false
                     viewController.includeImages = false

+ 3 - 2
iOSClient/Viewer/NCViewer.swift

@@ -214,14 +214,15 @@ extension NCViewer: NCSelectDelegate {
     
     func dismissSelect(serverUrl: String?, metadata: tableMetadata?, type: String, items: [Any], buttonType: String, overwrite: Bool) {
         if let serverUrl = serverUrl {
+            let metadata = items[0] as! tableMetadata
             if buttonType == "done" {
-                NCNetworking.shared.moveMetadata(self.metadata, serverUrlTo: serverUrl, overwrite: overwrite) { (errorCode, errorDescription) in
+                NCNetworking.shared.moveMetadata(metadata, serverUrlTo: serverUrl, overwrite: overwrite) { (errorCode, errorDescription) in
                     if errorCode != 0 {
                         NCContentPresenter.shared.messageNotification("_error_", description: errorDescription, delay: TimeInterval(k_dismissAfterSecond), type: NCContentPresenter.messageType.error, errorCode: errorCode)
                     }
                 }
             } else {
-                NCNetworking.shared.copyMetadata(self.metadata, serverUrlTo: serverUrl, overwrite: overwrite) { (errorCode, errorDescription) in
+                NCNetworking.shared.copyMetadata(metadata, serverUrlTo: serverUrl, overwrite: overwrite) { (errorCode, errorDescription) in
                     if errorCode != 0 {
                         NCContentPresenter.shared.messageNotification("_error_", description: errorDescription, delay: TimeInterval(k_dismissAfterSecond), type: NCContentPresenter.messageType.error, errorCode: errorCode)
                     }

+ 11 - 3
iOSClient/Viewer/NCViewerImage/NCViewerImagePageContainer.swift

@@ -169,7 +169,13 @@ class NCViewerImagePageContainer: UIViewController, UIGestureRecognizerDelegate
         
         if let userInfo = notification.userInfo as NSDictionary? {
             if let metadata = userInfo["metadata"] as? tableMetadata {
-                
+                if let index = metadatas.firstIndex(where: {$0.ocId == metadata.ocId}) {
+                    metadatas[index] = metadata
+                    if index == currentIndex {
+                        navigationItem.title = metadata.fileNameView
+                        currentViewerImageZoom?.metadata = metadata
+                    }
+                }
             }
         }
     }
@@ -178,8 +184,10 @@ class NCViewerImagePageContainer: UIViewController, UIGestureRecognizerDelegate
         if self.view?.window == nil { return }
         
         if let userInfo = notification.userInfo as NSDictionary? {
-            if let metadata = userInfo["metadata"] as? tableMetadata, let metadataNew = userInfo["metadataNew"] as? tableMetadata {
-                
+            if let metadata = userInfo["metadata"] as? tableMetadata {
+                if metadatas.firstIndex(where: {$0.ocId == metadata.ocId}) != nil {
+                    deleteFile(notification)
+                }
             }
         }
     }