update table LocalFile

iOSClient/Actions/CCActions.swift

@@ -291,7 +291,7 @@ class CCActions: NSObject {
             
         } else {
             
-            CCCoreData.renameLocalFile(withEtag: metadataNet.fileID, fileNameTo: metadataNet.fileNameTo, fileNamePrintTo: metadataNet.fileNameTo, activeAccount: appDelegate.activeAccount)
+            NCManageDatabase.sharedInstance.setLocalFile(fileID: metadataNet.fileID, date: nil, exifDate: nil, exifLatitude: nil, exifLongitude: nil, fileName: metadataNet.fileNameTo, fileNamePrint:  metadataNet.fileNameTo)            
         }
         
         metadataNet.delegate?.renameSuccess(metadataNet)

iOSClient/Favorites/CCSynchronize.m

@@ -342,7 +342,7 @@
     // File not present, remove it
     if (errorCode == 404 && [recordAccount.account isEqualToString:metadataNet.account]) {
         
-        [CCCoreData deleteLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (fileID == %@)", metadataNet.account, metadataNet.fileID]];
+        [[NCManageDatabase sharedInstance] deleteLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadataNet.fileID]];
         [[NCManageDatabase sharedInstance] deleteMetadata:[NSPredicate predicateWithFormat:@"fileID == %@", metadataNet.account, metadataNet.fileID]];
         
         NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadataNet.directoryID];

iOSClient/FileSystem/CCCoreData.h

@@ -112,7 +112,7 @@
 */
 
 // ===== LocalFile =====
-
+/*
 + (void)addLocalFile:(tableMetadata *)metadata activeAccount:(NSString *)activeAccount;
 + (void)deleteLocalFileWithPredicate:(NSPredicate *)predicate;
 
@@ -123,7 +123,7 @@
 + (NSArray *)getTableLocalFileWithPredicate:(NSPredicate *)predicate;
 
 // ===== Offline LocalFile =====
-/*
+
 + (void)setOfflineLocalEtag:(NSString *)fileID offline:(BOOL)offline activeAccount:(NSString *)activeAccount;
 + (BOOL)isOfflineLocalEtag:(NSString *)fileID activeAccount:(NSString *)activeAccount;
 + (NSArray *)getOfflineLocalFileActiveAccount:(NSString *)activeAccount directoryUser:(NSString *)directoryUser;

iOSClient/FileSystem/NCManageDatabase.swift

@@ -1877,7 +1877,7 @@ class NCManageDatabase: NSObject {
         }
     }
 
-    func renameLocalFile(fileID: String, fileName: String, fileNamePrint: String) {
+    func setLocalFile(fileID: String, date: NSDate?, exifDate: NSDate?, exifLatitude: String?, exifLongitude: String?, fileName: String?, fileNamePrint: String?) {
         
         let tableAccount = self.getAccountActive()
         if tableAccount == nil {
@@ -1892,8 +1892,24 @@ class NCManageDatabase: NSObject {
         
             try! realm.write {
                 
-                results[0].fileName = fileName
-                results[0].fileNamePrint = fileNamePrint
+                if date != nil {
+                    results[0].date = date!
+                }
+                if exifDate != nil {
+                    results[0].exifDate = exifDate!
+                }
+                if exifLatitude != nil {
+                    results[0].exifLatitude = exifLatitude!
+                }
+                if exifLongitude != nil {
+                    results[0].exifLongitude = exifLongitude!
+                }
+                if fileName != nil {
+                    results[0].fileName = fileName!
+                }
+                if fileNamePrint != nil {
+                    results[0].fileNamePrint = fileNamePrint!
+                }
             }
         }
     }
@@ -1919,28 +1935,5 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func setGeoInformationLocal(fileID: String, exifDate: NSDate, exifLatitude: String, exifLongitude: String) {
-        
-        let tableAccount = self.getAccountActive()
-        if tableAccount == nil {
-            return
-        }
-        
-        let realm = try! Realm()
-        
-        let results = realm.objects(tableLocalFile.self).filter("fileID = %@", fileID)
-        
-        if results.count > 0 {
-            
-            try! realm.write {
-                
-                results[0].exifDate = exifDate
-                results[0].exifLatitude = exifLatitude
-                results[0].exifLongitude = exifLongitude
-
-            }
-        }
-    }
-    
     //MARK: -
 }

iOSClient/Main/CCDetail.m

@@ -808,10 +808,10 @@
 
 - (void)setLocationCaptionPhoto:(MWPhoto *)photo fileID:(NSString *)fileID
 {
-    TableLocalFile *localFile;
+    tableLocalFile *localFile;
 
     // read Geocoder
-    localFile = [CCCoreData getLocalFileWithEtag:fileID activeAccount:app.activeAccount];
+    localFile = [[NCManageDatabase sharedInstance] getTableLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
     
     if ([localFile.exifLatitude doubleValue] != 0 || [localFile.exifLongitude doubleValue] != 0) {
         
@@ -826,7 +826,7 @@
         
         [CCExifGeo setGeocoderEtag:fileID exifDate:localFile.exifDate latitude:localFile.exifLatitude longitude:localFile.exifLongitude];
         
-        localFile = [CCCoreData getLocalFileWithEtag:fileID activeAccount:app.activeAccount];
+        localFile = [[NCManageDatabase sharedInstance] getTableLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
         
         if ([localFile.exifLatitude floatValue] != 0 || [localFile.exifLongitude floatValue] != 0) {
                         

iOSClient/Main/CCMain.m

@@ -3194,8 +3194,8 @@
 - (void)removeLocalFile:(tableMetadata *)metadata
 {
     NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:_metadata.directoryID];
-
-    [CCCoreData deleteLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (fileID == %@)", app.activeAccount, metadata.fileID]];
+    
+    [[NCManageDatabase sharedInstance] deleteLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadata.fileID]];
     
     [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileID] error:nil];
     
@@ -4099,7 +4099,7 @@
             titoloLock = [NSString stringWithFormat:NSLocalizedString(@"_protect_passcode_", nil)];
     }
     
-    TableLocalFile *recordLocalFile = [CCCoreData getLocalFileWithEtag:_metadata.fileID activeAccount:app.activeAccount];
+    tableLocalFile *localFile = [[NCManageDatabase sharedInstance] getTableLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", _metadata.fileID]];
 
     /******************************************* AHKActionSheet *******************************************/
     
@@ -4387,7 +4387,7 @@
                                     [self moveOpenWindow:[[NSArray alloc] initWithObjects:indexPath, nil]];
                                 }];
         
-        if (recordLocalFile || [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, _metadata.fileID]]) {
+        if (localFile || [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, _metadata.fileID]]) {
         
             [actionSheet addButtonWithTitle:NSLocalizedString(@"_remove_local_file_", nil)
                                       image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"actionSheetRemoveLocal"] color:[NCBrandColor sharedInstance].brand]
@@ -4972,7 +4972,7 @@
             lunghezzaFile = @" ";
         }
         
-        TableLocalFile *recordLocalFile = [CCCoreData getLocalFileWithEtag:metadata.fileID activeAccount:app.activeAccount];
+        tableLocalFile *localFile = [[NCManageDatabase sharedInstance] getTableLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadata.fileID]];
         
         NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
         [dateFormatter setDateStyle:NSDateFormatterShortStyle];
@@ -4982,7 +4982,7 @@
             cell.labelInfoFile.text = [NSString stringWithFormat:@"%@", dataFile];
         
         if ([metadata.type isEqualToString: k_metadataType_file] && [dataFile isEqualToString:@" "] == NO && [lunghezzaFile isEqualToString:@" "] == NO) {
-            if (recordLocalFile && [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileID]])
+            if (localFile && [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileID]])
                 cell.labelInfoFile.text = [NSString stringWithFormat:@"%@ • %@", dataFile, lunghezzaFile];
             else
                 cell.labelInfoFile.text = [NSString stringWithFormat:@"%@ ◦ %@", dataFile, lunghezzaFile];

iOSClient/Networking/CCNetworking.m

@@ -491,7 +491,10 @@
         if (result) return;
         
         // File exists ?
-        if ([CCCoreData getLocalFileWithEtag:metadata.fileID activeAccount:_activeAccount] && [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, metadata.fileID]]) {
+        
+        tableLocalFile *localfile = [[NCManageDatabase sharedInstance] getTableLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadata.fileID]];
+        
+        if (localfile != nil && [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, metadata.fileID]]) {
             
             [[NCManageDatabase sharedInstance] setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier:k_taskIdentifierDone sessionTaskIdentifierPlist:k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadata.fileID]];
                 
@@ -1421,7 +1424,7 @@
         
         // Local
         if (metadata.directory == NO)
-            [CCCoreData addLocalFile:metadata activeAccount:_activeAccount];
+            [[NCManageDatabase sharedInstance] addLocalFileWithMetadata:metadata];
         
         // EXIF
         if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image])

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -207,7 +207,7 @@
     
     for (NSString *fileID in fileIDsForKey) {
     
-        TableLocalFile *localFile = [CCCoreData getLocalFileWithEtag:fileID activeAccount:app.activeAccount];
+        tableLocalFile *localFile = [[NCManageDatabase sharedInstance] getTableLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
     
         if ([localFile.exifLatitude floatValue] > 0 || [localFile.exifLongitude floatValue] > 0) {