dev Photos

File Provider Extension/FileProviderExtension+Network.swift

@@ -41,6 +41,9 @@ extension FileProviderExtension {
             // file not found ? delete
             if errorCode == 404 {
                 
+                self.deleteFileSystem(for: metadata, serverUrl: serverUrl, itemIdentifier: itemIdentifier)
+
+                /*
                 NCManageDatabase.sharedInstance.deleteMetadata(predicate: NSPredicate(format: "fileID == %@", metadata.fileID), clearDateReadDirectoryID: nil)
             
                 // remove itemIdentifier on fileProviderSignalDeleteItemIdentifier
@@ -50,6 +53,7 @@ extension FileProviderExtension {
                 }
             
                 self.providerData.signalEnumerator(for: [parentItemIdentifier, .workingSet])
+                */
             }
         })
     }
@@ -70,6 +74,7 @@ extension FileProviderExtension {
         
         NCManageDatabase.sharedInstance.deleteMetadata(predicate: NSPredicate(format: "fileID == %@", metadata.fileID), clearDateReadDirectoryID: nil)
         NCManageDatabase.sharedInstance.deleteLocalFile(predicate: NSPredicate(format: "fileID == %@", metadata.fileID))
+        NCManageDatabase.sharedInstance.deletePhotos(predicate: NSPredicate(format: "fileID == %@", metadata.fileID))
     }
     
     // --------------------------------------------------------------------------------------------

iOSClient/Photos/CCPhotos.m

@@ -34,6 +34,7 @@
     tableMetadata *metadata;
     NSMutableArray *selectedMetadatas;
     NSMutableArray *fileIDHide;
+    NSArray *metadatasSectionDataSource;
     CCSectionDataSourceMetadata *sectionDataSource;
     
     CCHud *hud;
@@ -600,8 +601,8 @@
     
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
-            NSArray *metadatas = [[NCManageDatabase sharedInstance] getTablePhotos];
-            sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:metadatas listProgressMetadata:nil groupByField:@"date" fileIDHide:fileIDHide activeAccount:appDelegate.activeAccount];
+            metadatasSectionDataSource = [[NCManageDatabase sharedInstance] getTablePhotos];
+            sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:metadatasSectionDataSource listProgressMetadata:nil groupByField:@"date" fileIDHide:fileIDHide activeAccount:appDelegate.activeAccount];
         
             dispatch_async(dispatch_get_main_queue(), ^{
                
@@ -848,14 +849,7 @@
         self.detailViewController = segue.destinationViewController;
     }
     
-    NSMutableArray *allRecordsDataSourceImagesVideos = [[NSMutableArray alloc] init];
-    for (NSString *fileID in sectionDataSource.allEtag) {
-        tableMetadata *metadata = [sectionDataSource.allRecordsDataSource objectForKey:fileID];
-        if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video])
-            [allRecordsDataSourceImagesVideos addObject:metadata];
-    }
-    
-    self.detailViewController.dataSourceImagesVideos = allRecordsDataSourceImagesVideos;
+    self.detailViewController.dataSourceImagesVideos = (NSMutableArray *)metadatasSectionDataSource;
     self.detailViewController.metadataDetail = metadata;
     self.detailViewController.dateFilterQuery = metadata.date;