marinofaggiana 5 лет назад
Родитель
Сommit
e6313c06b3
2 измененных файлов с 6 добавлено и 6 удалено
  1. 4 4
      iOSClient/Imagemeter/IMImagemeter.swift
  2. 2 2
      iOSClient/Main/NCMainCommon.swift

+ 4 - 4
iOSClient/Imagemeter/IMImagemeter.swift

@@ -212,9 +212,9 @@ class IMImagemeter: NSObject {
         return instance
         return instance
     }()
     }()
     
     
-    func getBundleDirectory(metadata: tableMetadata) -> (Found: Bool, bundleDirectory: String, immPath: String) {
+    func getBundleDirectory(metadata: tableMetadata) -> (error: Bool, bundleDirectory: String, immPath: String) {
 
 
-        var found = false
+        var error = true
         var bundleDirectory = ""
         var bundleDirectory = ""
         var immPath = ""
         var immPath = ""
         
         
@@ -224,13 +224,13 @@ class IMImagemeter: NSObject {
             archive.forEach({ (entry) in
             archive.forEach({ (entry) in
                 let pathComponents = (entry.path as NSString).pathComponents
                 let pathComponents = (entry.path as NSString).pathComponents
                 if pathComponents.count == 2 && (pathComponents.last! as NSString).pathExtension.lowercased() == "imm" {
                 if pathComponents.count == 2 && (pathComponents.last! as NSString).pathExtension.lowercased() == "imm" {
-                    found = true
+                    error = false
                     bundleDirectory = CCUtility.getDirectoryProviderStorageFileID(metadata.fileID) + "/" + pathComponents.first!
                     bundleDirectory = CCUtility.getDirectoryProviderStorageFileID(metadata.fileID) + "/" + pathComponents.first!
                     immPath = CCUtility.getDirectoryProviderStorageFileID(metadata.fileID) + "/" + entry.path
                     immPath = CCUtility.getDirectoryProviderStorageFileID(metadata.fileID) + "/" + entry.path
                 }
                 }
             })
             })
         }
         }
         
         
-        return(found, bundleDirectory, immPath)
+        return(error, bundleDirectory, immPath)
     }
     }
 }
 }

+ 2 - 2
iOSClient/Main/NCMainCommon.swift

@@ -1233,8 +1233,8 @@ class NCNetworkingMain: NSObject, CCNetworkingDelegate {
                     
                     
                     let bundleDirectory = IMImagemeter.sharedInstance.getBundleDirectory(metadata: metadata)
                     let bundleDirectory = IMImagemeter.sharedInstance.getBundleDirectory(metadata: metadata)
                     
                     
-                    if !bundleDirectory.Found {
-                        appDelegate.messageNotification("_error_", description: "File format imagemeter error. 🤷‍♂️", visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
+                    if bundleDirectory.error {
+                        appDelegate.messageNotification("_error_", description: "Bundle imagemeter error. 🤷‍♂️", visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
                         return
                         return
                     }
                     }