dev table directory

iOSClient/Favorites/CCSynchronize.m

@@ -330,7 +330,7 @@
                 if (![tableDirectory.rev isEqualToString:metadata.rev]) {
                     
                     [self readFolderServerUrl:serverUrl directoryID:directoryID selector:metadataNet.selector];
-                    [CCCoreData updateDirectoryEtagServerUrl:serverUrl fileID:metadata.rev activeAccount:metadataNet.account];
+                    [[NCManageDatabase sharedInstance] updateDirectoryFileID:serverUrl fileID:metadata.rev];
                 }
                 
             } else {

iOSClient/FileSystem/NCManageDatabase.swift

@@ -1620,6 +1620,27 @@ class NCManageDatabase: NSObject {
         }
     }
     
+    func updateDirectoryFileID(_ serverUrl: String, fileID: String) {
+        
+        let tableAccount = self.getAccountActive()
+        if tableAccount == nil {
+            return
+        }
+        
+        let realm = try! Realm()
+        
+        try! realm.write {
+            
+            let results = realm.objects(tableDirectory.self).filter("serverUrl = %@", serverUrl)
+            
+            if results.count > 0 {
+                
+                results[0].rev = fileID
+            }
+        }
+    }
+    
+    
     func clearDateRead(_ serverUrl: String?, directoryID: String?) {
         
         let tableAccount = self.getAccountActive()
@@ -1726,6 +1747,15 @@ class NCManageDatabase: NSObject {
             }
         }
     }
+    
+    func copyTableDirectory(_ table: tableDirectory) -> tableDirectory {
+        
+        let copyTable = tableDirectory.init(value: table)
+        
+        
+        return copyTable
+    }
+
 
 
     //MARK: -

iOSClient/Main/CCMain.m

@@ -1836,7 +1836,7 @@
         
     } else {
         
-        [CCCoreData updateDirectoryEtagServerUrl:metadataNet.serverUrl fileID:fileID activeAccount:metadataNet.account];
+        [[NCManageDatabase sharedInstance] updateDirectoryFileID:metadataNet.serverUrl fileID:fileID];
         
         [[NCManageDatabase sharedInstance] deleteMetadata:[NSPredicate predicateWithFormat:@"account = %@ AND directoryID = %@ AND session = ''", metadataNet.account, metadataNet.directoryID]];
         
@@ -1924,7 +1924,7 @@
         
         if (forced) {
             
-            [CCCoreData clearDateReadAccount:app.activeAccount serverUrl:serverUrl directoryID:nil];
+            [[NCManageDatabase sharedInstance] clearDateRead:serverUrl directoryID:nil];
             
             _searchFileName = @"";                          // forced reload searchg
         }
@@ -1934,9 +1934,23 @@
         return;
     }
     
-    NSString *directoryID = [[NCManageDatabase sharedInstance] getDirectoryID:serverUrl];
+    tableDirectory *directory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPreficate:[NSPredicate predicateWithFormat:@"serverUrl = %@", serverUrl]];
+    NSString *directoryID = directory.directoryID;
+    
+    // Is Directory Out Of Date ?
+    BOOL isDirectoryOutOfDate = false;
+    NSDateComponents *dateComponents = [NSDateComponents new];
+    [dateComponents setWeekday:k_dayForceReadFolder];
+    NSCalendar *calendar = [NSCalendar currentCalendar];
+    
+    NSDate *datePlus = [calendar dateByAddingComponents:dateComponents toDate:directory.dateReadDirectory options:0];
+    NSDate *now = [NSDate date];
+    
+    // usa la Cache se richiesto e se la data è entro X giorni dall'ultima volta che l'hai letta.
+    if ([now compare:datePlus] == NSOrderedDescending)
+        isDirectoryOutOfDate = true;
     
-    if ([CCCoreData isDirectoryOutOfDate:k_dayForceReadFolder directoryID:directoryID activeAccount:app.activeAccount] || forced) {
+    if (isDirectoryOutOfDate || forced) {
         
         if (_refreshControl.isRefreshing == NO)
             [_hud visibleIndeterminateHud];
@@ -4116,8 +4130,7 @@
     
     NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:_metadata.directoryID];
     
-    NSString *titoloCriptaDecripta, *titoloOffline, *titoloLock, *titleOfflineFolder, *titleFavorite;
-    BOOL offlineFolder = NO;
+    NSString *titoloCriptaDecripta, *titoloOffline, *titoloLock, *titleFavorite;
     
     if (_metadata.cryptated) titoloCriptaDecripta = [NSString stringWithFormat:NSLocalizedString(@"_decrypt_", nil)];
     else titoloCriptaDecripta = [NSString stringWithFormat:NSLocalizedString(@"_encrypt_", nil)];
@@ -4125,14 +4138,6 @@
     if ([CCCoreData isOfflineLocalEtag:_metadata.fileID activeAccount:app.activeAccount]) titoloOffline = [NSString stringWithFormat:NSLocalizedString(@"_remove_offline_", nil)];
     else titoloOffline = [NSString stringWithFormat:NSLocalizedString(@"_add_offline_", nil)];
     
-    NSString *offlineServerUrl = [CCUtility stringAppendServerUrl:serverUrl addFileName:_metadata.fileNameData];
-    if (_metadata.directory && [CCCoreData isOfflineDirectoryServerUrl:offlineServerUrl activeAccount:app.activeAccount]) {
-        
-        titleOfflineFolder = [NSString stringWithFormat:NSLocalizedString(@"_remove_offline_", nil)];
-        offlineFolder = YES;
-        
-    } else titleOfflineFolder = [NSString stringWithFormat:NSLocalizedString(@"_add_offline_", nil)];
-    
     if (_metadata.favorite) {
         
         titleFavorite = [NSString stringWithFormat:NSLocalizedString(@"_remove_favorites_", nil)];