dev table directory

iOSClient/Actions/CCActions.swift

@@ -291,7 +291,7 @@ class CCActions: NSObject {
             let directory = CCUtility.stringAppendServerUrl(metadataNet.serverUrl, addFileName: metadataNet.fileName)
             let directoryTo = CCUtility.stringAppendServerUrl(metadataNet.serverUrl, addFileName: metadataNet.fileNameTo)
 
-            NCManageDatabase.sharedInstance.renameDirectory(directory!, serverUrlTo: directoryTo!)
+            NCManageDatabase.sharedInstance.renameDirectory(serverUrl: directory!, serverUrlTo: directoryTo!)
             
         } else {
             

iOSClient/Favorites/CCSynchronize.m

@@ -189,7 +189,7 @@
     // Folder not present, remove it
     if (errorCode == 404 && [recordAccount.account isEqualToString:metadataNet.account]) {
         
-        [[NCManageDatabase sharedInstance] deleteDirectoryAndSubDirectory:metadataNet.serverUrl];
+        [[NCManageDatabase sharedInstance] deleteDirectoryAndSubDirectoryWithServerUrl:metadataNet.serverUrl];
         [app.activeMain reloadDatasource:metadataNet.serverUrl fileID:nil selector:nil];
     }
 }
@@ -272,7 +272,7 @@
                 if (![tableDirectory.rev isEqualToString:metadata.rev]) {
                     
                     [self readFolderServerUrl:serverUrl directoryID:directoryID selector:metadataNet.selector];
-                    [[NCManageDatabase sharedInstance] updateDirectoryFileID:serverUrl fileID:metadata.rev];
+                    [[NCManageDatabase sharedInstance] updateDirectoryFileIDWithServerUrl:serverUrl fileID:metadata.rev];
                 }
                 
             } else {
@@ -447,7 +447,7 @@
         if (![oldDirectoryID isEqualToString:metadata.directoryID]) {
             serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
             oldDirectoryID = metadata.directoryID;
-            [[NCManageDatabase sharedInstance] clearDateRead:serverUrl directoryID:nil];
+            [[NCManageDatabase sharedInstance] clearDateReadWithServerUrl:serverUrl directoryID:nil];
         }
             
         [[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:serverUrl];

iOSClient/FileSystem/CCCoreData.m

@@ -1302,7 +1302,7 @@
         
         NSString *dirForDelete = [CCUtility stringAppendServerUrl:serverUrl addFileName:metadata.fileNameData];
         
-        [[NCManageDatabase sharedInstance] deleteDirectoryAndSubDirectory:dirForDelete];        
+        [[NCManageDatabase sharedInstance] deleteDirectoryAndSubDirectoryWithServerUrl:dirForDelete];
     }
     
     [self deleteLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, activeAccount]];

iOSClient/FileSystem/NCManageDatabase.swift

@@ -1167,7 +1167,7 @@ class NCManageDatabase: NSObject {
             }
         }
         
-        self.setDateReadDirectory(metadata.directoryID)
+        self.setDateReadDirectory(directoryID: metadata.directoryID)
     }
     
     func deleteMetadata(_ predicate: NSPredicate) {
@@ -1182,7 +1182,7 @@ class NCManageDatabase: NSObject {
         let results = realm.objects(tableMetadata.self).filter(predicate)
         
         for result in results {
-            self.setDateReadDirectory(result.directoryID)
+            self.setDateReadDirectory(directoryID: result.directoryID)
         }
         
         try! realm.write {
@@ -1208,8 +1208,8 @@ class NCManageDatabase: NSObject {
             }
         }
         
-        self.setDateReadDirectory(directoryID)
-        self.setDateReadDirectory(directoryIDTo)
+        self.setDateReadDirectory(directoryID: directoryID)
+        self.setDateReadDirectory(directoryID: directoryIDTo)
     }
     
     func updateMetadata(_ metadata: tableMetadata, activeUrl: String) {
@@ -1226,7 +1226,7 @@ class NCManageDatabase: NSObject {
             realm.add(metadataWithIcon!, update: true)
         }
         
-        self.setDateReadDirectory(metadata.directoryID)
+        self.setDateReadDirectory(directoryID: metadata.directoryID)
     }
     
     func setMetadataSession(_ session: String?, sessionError: String?, sessionSelector: String?, sessionSelectorPost: String?, sessionTaskIdentifier: Int, sessionTaskIdentifierPlist: Int, predicate: NSPredicate) {
@@ -1263,7 +1263,7 @@ class NCManageDatabase: NSObject {
                     result.sessionTaskIdentifierPlist = sessionTaskIdentifierPlist
                 }
                 
-                self.setDateReadDirectory(result.directoryID)
+                self.setDateReadDirectory(directoryID: result.directoryID)
             }
         }
     }
@@ -1285,7 +1285,7 @@ class NCManageDatabase: NSObject {
                 results[0].favorite = favorite
             }
             
-            self.setDateReadDirectory(results[0].directoryID)
+            self.setDateReadDirectory(directoryID: results[0].directoryID)
         }
     }
 
@@ -1511,7 +1511,7 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table Directory
     
-    func addDirectory(_ serverUrl: String, permissions: String) -> String {
+    func addDirectory(serverUrl: String, permissions: String) -> String {
         
         let tableAccount = self.getAccountActive()
         if tableAccount == nil {
@@ -1547,23 +1547,7 @@ class NCManageDatabase: NSObject {
         return directoryID
     }
     
-    func deleteDirectory(_ predicate: NSPredicate) {
-        
-        let tableAccount = self.getAccountActive()
-        if tableAccount == nil {
-            return
-        }
-        
-        let realm = try! Realm()
-        
-        let results = realm.objects(tableDirectory.self).filter(predicate)
-        
-        try! realm.write {
-            realm.delete(results)
-        }
-    }
-    
-    func deleteDirectoryAndSubDirectory(_ serverUrl: String) {
+    func deleteDirectoryAndSubDirectory(serverUrl: String) {
         
         let tableAccount = self.getAccountActive()
         if tableAccount == nil {
@@ -1602,7 +1586,7 @@ class NCManageDatabase: NSObject {
         }
     }
 
-    func renameDirectory(_ serverUrl: String, serverUrlTo: String) {
+    func renameDirectory(serverUrl: String, serverUrlTo: String) {
     
         let tableAccount = self.getAccountActive()
         if tableAccount == nil {
@@ -1620,7 +1604,7 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func updateDirectoryFileID(_ serverUrl: String, fileID: String) {
+    func updateDirectoryFileID(serverUrl: String, fileID: String) {
         
         let tableAccount = self.getAccountActive()
         if tableAccount == nil {
@@ -1640,7 +1624,7 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func clearDateRead(_ serverUrl: String?, directoryID: String?) {
+    func clearDateRead(serverUrl: String?, directoryID: String?) {
         
         let tableAccount = self.getAccountActive()
         if tableAccount == nil {
@@ -1758,7 +1742,7 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func setDateReadDirectory(_ directoryID: String) {
+    func setDateReadDirectory(directoryID: String) {
         
         let tableAccount = self.getAccountActive()
         if tableAccount == nil {

iOSClient/Main/CCMain.m

@@ -1824,13 +1824,13 @@
         
     } else {
         
-        [[NCManageDatabase sharedInstance] updateDirectoryFileID:metadataNet.serverUrl fileID:fileID];
+        [[NCManageDatabase sharedInstance] updateDirectoryFileIDWithServerUrl:metadataNet.serverUrl fileID:fileID];
         
         [[NCManageDatabase sharedInstance] deleteMetadata:[NSPredicate predicateWithFormat:@"account = %@ AND directoryID = %@ AND session = ''", metadataNet.account, metadataNet.directoryID]];
         
         recordsInSessions = [[NCManageDatabase sharedInstance] getMetadatasWithPreficate:[NSPredicate predicateWithFormat:@"account = %@ AND directoryID = %@ AND session != ''", metadataNet.account, metadataNet.directoryID] sorted:nil ascending:NO];
 
-        [[NCManageDatabase sharedInstance] setDateReadDirectory:metadataNet.directoryID];
+        [[NCManageDatabase sharedInstance] setDateReadDirectoryWithDirectoryID:metadataNet.directoryID];
     }
     
     for (tableMetadata *metadata in metadatas) {
@@ -1912,7 +1912,7 @@
         
         if (forced) {
             
-            [[NCManageDatabase sharedInstance] clearDateRead:serverUrl directoryID:nil];
+            [[NCManageDatabase sharedInstance] clearDateReadWithServerUrl:serverUrl directoryID:nil];
             
             _searchFileName = @"";                          // forced reload searchg
         }
@@ -2221,7 +2221,7 @@
         if (metadataNet.directory == YES) {
         
             // delete all dir / subdir
-            [[NCManageDatabase sharedInstance] deleteDirectoryAndSubDirectory:[CCUtility stringAppendServerUrl:metadataNet.serverUrl addFileName:fileName]];
+            [[NCManageDatabase sharedInstance] deleteDirectoryAndSubDirectoryWithServerUrl:[CCUtility stringAppendServerUrl:metadataNet.serverUrl addFileName:fileName]];
             
             // move metadata
             //[CCCoreData moveMetadata:fileName directoryID:directoryID directoryIDTo:directoryIDTo activeAccount:app.activeAccount];
@@ -2229,7 +2229,7 @@
             
             // Add new directory
             NSString *newDirectory = [NSString stringWithFormat:@"%@/%@", serverUrlTo, fileName];
-            (void)[[NCManageDatabase sharedInstance] addDirectory:newDirectory permissions:@""];
+            (void)[[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:newDirectory permissions:@""];
         }
     
         // reload Datasource
@@ -2374,7 +2374,7 @@
     [_hud hideHud];
     
     NSString *newDirectory = [NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName];    
-    (void)[[NCManageDatabase sharedInstance] addDirectory:newDirectory permissions:@""];
+    (void)[[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:newDirectory permissions:@""];
     
     // Load Folder or the Datasource
     if ([metadataNet.selectorPost isEqualToString:selectorReadFolderForced]) {
@@ -4266,7 +4266,7 @@
                                         [[NCManageDatabase sharedInstance] setAccountCameraUploadFolderName:_metadata.fileName];
                                         [[NCManageDatabase sharedInstance] setAccountCameraUploadFolderPath:serverUrl activeUrl:app.activeUrl];
                                         
-                                        [[NCManageDatabase sharedInstance] clearDateRead:oldPath directoryID:nil];
+                                        [[NCManageDatabase sharedInstance] clearDateReadWithServerUrl:oldPath directoryID:nil];
                                         
                                         if (app.activeAccount.length > 0 && app.activePhotosCameraUpload)
                                             [app.activePhotosCameraUpload reloadDatasourceForced];

iOSClient/Move/CCMove.m

@@ -358,7 +358,7 @@
 {
     [_hud hideHud];
     
-    (void)[[NCManageDatabase sharedInstance] addDirectory:[NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName] permissions:@""];
+    (void)[[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:[NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName] permissions:@""];
     
     // Load Folder or the Datasource
     [self readFolder];

iOSClient/Networking/OCNetworking.m

@@ -330,7 +330,7 @@
         NSString *fileIDDirectory = itemDtoDirectory.etag;
         //NSDate *date = [NSDate dateWithTimeIntervalSince1970:itemDtoDirectory.date];
         
-        NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectory:_metadataNet.serverUrl permissions:permissions];
+        NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:_metadataNet.serverUrl permissions:permissions];
         
         NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderName];
         NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderPath:_activeUrl];
@@ -365,7 +365,7 @@
                         NSString *serverUrl = [CCUtility stringAppendServerUrl:_metadataNet.serverUrl addFileName:fileName];
                         
                         dispatch_async(dispatch_get_main_queue(), ^{
-                            (void)[[NCManageDatabase sharedInstance] addDirectory:serverUrl permissions:permissions];
+                            (void)[[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:serverUrl permissions:permissions];
                         });
                     }
                     
@@ -475,7 +475,7 @@
             
             serverUrl = [CCUtility stringAppendServerUrl:[_activeUrl stringByAppendingString:webDAV] addFileName:serverUrl];
             
-            NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectory:serverUrl permissions:itemDto.permissions];
+            NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:serverUrl permissions:itemDto.permissions];
 
             [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser]];
         }
@@ -621,7 +621,7 @@
             
             serverUrl = [CCUtility stringAppendServerUrl:[_activeUrl stringByAppendingString:webDAV] addFileName:serverUrl];
             
-            NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectory:serverUrl permissions:itemDto.permissions];
+            NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:serverUrl permissions:itemDto.permissions];
             
             [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser]];
         }
@@ -743,7 +743,7 @@
         
         [communication createFolder:folderPathName onCommunication:communication withForbiddenCharactersSupported:YES successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
             
-            [[NCManageDatabase sharedInstance] clearDateRead:[CCUtility deletingLastPathComponentFromServerUrl:folderPathName] directoryID:nil];
+            [[NCManageDatabase sharedInstance] clearDateReadWithServerUrl:[CCUtility deletingLastPathComponentFromServerUrl:folderPathName] directoryID:nil];
             
             dispatch_semaphore_signal(semaphore);
             

iOSClient/Settings/CCSettings.m

@@ -414,7 +414,7 @@
             NSArray *directories = [[NCManageDatabase sharedInstance] getTablesDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND (serverUrl = %@ OR serverUrl BEGINSWITH %@)", app.activeAccount, serverUrl, serverUrlBeginWith] sorted:@"serverUrl" ascending:true];
             
             for (tableDirectory *directory in directories)
-                [[NCManageDatabase sharedInstance] clearDateRead:nil directoryID:directory.directoryID];
+                [[NCManageDatabase sharedInstance] clearDateReadWithServerUrl:nil directoryID:directory.directoryID];
         } 
     }