Browse Source

build 5 fix autoupload

marinofaggiana 4 years ago
parent
commit
42b2f1f7b8
2 changed files with 9 additions and 6 deletions
  1. 8 6
      iOSClient/AutoUpload/NCAutoUpload.m
  2. 1 0
      iOSClient/Data/NCManageDatabase.swift

+ 8 - 6
iOSClient/AutoUpload/NCAutoUpload.m

@@ -421,7 +421,13 @@
             serverUrl = autoUploadPath;
         
         tableMetadata *metadata = [[NCManageDatabase shared] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@ AND fileNameView == %@", appDelegate.account, serverUrl, fileName]];
-        if (!metadata) {
+        if (metadata) {
+            
+            if ([selector isEqualToString:selectorUploadAutoUpload]) {
+                [[NCManageDatabase shared] addPhotoLibrary:@[asset] account:appDelegate.account];
+            }
+            
+        } else {
         
             /* INSERT METADATA FOR UPLOAD */
             tableMetadata *metadataForUpload = [[NCManageDatabase shared] createMetadataWithAccount:appDelegate.account fileName:fileName ocId:[[NSUUID UUID] UUIDString] serverUrl:serverUrl urlBase:appDelegate.urlBase url:@"" contentType:@"" livePhoto:livePhoto];
@@ -442,11 +448,7 @@
                
                 [[NCManageDatabase shared] addMetadataForAutoUpload:metadataForUpload];
                 [[NCCommunicationCommon shared] writeLog:[NSString stringWithFormat:@"Automatic upload added %@ (%lu bytes) with Identifier %@", metadata.fileNameView, (unsigned long)metadata.size, metadata.assetLocalIdentifier]];
-                        
-                // Add asset in table Photo Library
-                if ([metadata.sessionSelector isEqualToString:selectorUploadAutoUpload]) {
-                    (void)[[NCManageDatabase shared] addPhotoLibrary:@[asset] account:appDelegate.account];
-                }
+                [[NCManageDatabase shared] addPhotoLibrary:@[asset] account:appDelegate.account];
                 
             } else if ([selector isEqualToString:selectorUploadAutoUploadAll]) {
                 

+ 1 - 0
iOSClient/Data/NCManageDatabase.swift

@@ -2366,6 +2366,7 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table Photo Library
     
+    @discardableResult
     @objc func addPhotoLibrary(_ assets: [PHAsset], account: String) -> Bool {
         
         let realm = try! Realm()