clear code

iOSClient/FileSystem/NCDatabase.swift

@@ -169,48 +169,6 @@ class tableMetadata: Object {
     }
 }
 
-/*
-class tableMetadataNet: Object {
-    
-    dynamic var account = ""
-    dynamic var action = ""
-    dynamic var assetLocalIdentifier = ""
-    dynamic var cryptated : Bool = false
-    dynamic var date = NSDate()
-    dynamic var delegate: Any? = nil
-    dynamic var directory: Bool = false
-    dynamic var directoryID = ""
-    dynamic var directoryIDTo = ""
-    dynamic var downloadData: Bool = false
-    dynamic var downloadPlist: Bool = false
-    dynamic var errorCode: Int = 0
-    dynamic var errorRetry: Int = 0
-    dynamic var etag = ""
-    dynamic var expirationTime = ""
-    dynamic var fileName = ""
-    dynamic var fileNameTo = ""
-    dynamic var fileNameLocal = ""
-    dynamic var fileNamePrint = ""
-    dynamic var metadata: tableMetadata? = nil
-    dynamic var password = ""
-    dynamic var pathFolder = ""
-    dynamic var priority: Int = 0
-    dynamic var queue: OperationQueue? = nil
-    dynamic var rev = ""
-    dynamic var serverUrl = ""
-    dynamic var serverUrlTo = ""
-    dynamic var selector = ""
-    dynamic var selectorPost = ""
-    dynamic var session = ""
-    dynamic var sessionID = ""
-    dynamic var share = ""
-    dynamic var shareeType: Int = 0
-    dynamic var sharePermission: Int = 0
-    dynamic var size : Double = 0
-    dynamic var taskStatus: Int = 0
-}
-*/
-
 class tableShare: Object {
     
     dynamic var account = ""

iOSClient/FileSystem/NCManageDatabase.swift

@@ -1122,13 +1122,19 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table Metadata
 
-    func addMetadata(_ metadata: tableMetadata) {
+    func addMetadata(_ metadata: tableMetadata, activeUrl: String) {
 
+        let cameraFolderName = self.getAccountCameraUploadFolderName()
+        let cameraFolderPath = self.getAccountCameraUploadFolderPath(activeUrl)
+        let direcory = CCCoreData.getServerUrl(fromDirectoryID: metadata.directoryID, activeAccount: metadata.account)
+        
+        let metadataWithIcon = CCUtility.insertTypeFileIconName(metadata, directory: direcory, cameraFolderName: cameraFolderName, cameraFolderPath: cameraFolderPath)
+        
         let realm = try! Realm()
         
         try! realm.write {
             
-            realm.add(metadata)
+            realm.add(metadataWithIcon!)
         }
     }
     
@@ -1161,12 +1167,18 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func updateMetadata(_ metadata: tableMetadata) {
+    func updateMetadata(_ metadata: tableMetadata, activeUrl: String) {
         
+        let cameraFolderName = self.getAccountCameraUploadFolderName()
+        let cameraFolderPath = self.getAccountCameraUploadFolderPath(activeUrl)
+        let direcory = CCCoreData.getServerUrl(fromDirectoryID: metadata.directoryID, activeAccount: metadata.account)
+        
+        let metadataWithIcon = CCUtility.insertTypeFileIconName(metadata, directory: direcory, cameraFolderName: cameraFolderName, cameraFolderPath: cameraFolderPath)
+
         let realm = try! Realm()
         
         try! realm.write {
-            realm.add(metadata, update: true)
+            realm.add(metadataWithIcon!, update: true)
         }
     }
     

iOSClient/Utility/CCUtility.h

@@ -169,7 +169,7 @@
 
 + (tableMetadata *)trasformedOCFileToCCMetadata:(OCFileDto *)itemDto fileNamePrint:(NSString *)fileNamePrint serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath activeAccount:(NSString *)activeAccount directoryUser:(NSString *)directoryUser;
 
-+ (void)insertTypeFileIconName:(tableMetadata *)metadata directory:(NSString *)directory cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath;
++ (tableMetadata *)insertTypeFileIconName:(tableMetadata *)metadata directory:(NSString *)directory cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath;
 + (void)insertInformationPlist:(tableMetadata *)metadata directoryUser:(NSString *)directoryUser;
 + (tableMetadata *)insertFileSystemInMetadata:(NSString *)fileName directory:(NSString *)directory activeAccount:(NSString *)activeAccount cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath;
 

iOSClient/Utility/CCUtility.m

@@ -829,7 +829,7 @@
     return metadata;
 }
 
-+ (void)insertTypeFileIconName:(tableMetadata *)metadata directory:(NSString *)directory cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath
++ (tableMetadata *)insertTypeFileIconName:(tableMetadata *)metadata directory:(NSString *)directory cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath
 {
     if ([metadata.type isEqualToString: k_metadataType_template]) {
         
@@ -854,7 +854,7 @@
         if (metadata.errorPasscode) {
             metadata.typeFile = k_metadataTypeFile_unknown;
             metadata.iconName = @"plist";
-            return;
+            return metadata;
         }
         // Type compress
         if (UTTypeConformsTo(fileUTI, kUTTypeZipArchive) && [(__bridge NSString *)fileUTI containsString:@"org.openxmlformats"] == NO && [(__bridge NSString *)fileUTI containsString:@"oasis"] == NO) {
@@ -931,6 +931,8 @@
         if([metadata.fileName isEqualToString:cameraFolderName] && [directory isEqualToString:cameraFolderPath])
             metadata.iconName = @"folderphotocamera";
     }
+    
+    return metadata;
 }
 
 + (void)insertInformationPlist:(tableMetadata *)metadata directoryUser:(NSString *)directoryUser