Browse Source

Change insert db metadataNet

Marino Faggiana 7 years ago
parent
commit
6d9324df9b
2 changed files with 23 additions and 14 deletions
  1. 19 8
      iOSClient/AutoUpload/NCAutoUpload.m
  2. 4 6
      iOSClient/Database/NCManageDatabase.swift

+ 19 - 8
iOSClient/AutoUpload/NCAutoUpload.m

@@ -418,7 +418,8 @@
 {
     NSMutableArray *newItemsPHAssetToUpload = [[NSMutableArray alloc] init];
     tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
-    
+    NSMutableArray *metadatasNet = [NSMutableArray new];
+  
     NSString *autoUploadPath = [[NCManageDatabase sharedInstance] getAccountAutoUploadPath:app.activeUrl];
     BOOL useSubFolder = tableAccount.autoUploadCreateSubfolder;
     
@@ -490,10 +491,20 @@
         metadataNet.session = session;
         metadataNet.taskStatus = k_taskStatusResume;
         
-        if (assetsFull)
-            [self addDatabaseAutoUpload:metadataNet assetDate:assetDate assetMediaType:assetMediaType];
-        else
+        if (assetsFull) {
+            [metadatasNet addObject:metadataNet];
+        } else {
             [self writeAssetToSandbox:metadataNet];
+        }
+    }
+    
+    // Insert all assets (Full) in TableAutoUpload
+    if (assetsFull && [metadatasNet count] > 0) {
+        
+        [[NCManageDatabase sharedInstance] addAutoUploadWithMetadatasNet:metadatasNet];
+          
+        // Update icon badge number
+        [app updateApplicationIconBadgeNumber];
     }
     
     // end loading
@@ -596,12 +607,12 @@
         [[NCManageDatabase sharedInstance] addActivityClient:metadataNet.fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionAutoUpload selector:metadataNet.selector note:[NSString stringWithFormat:@"Add Auto Upload [File already present in Table autoUpload], Asset Data: %@", [NSDateFormatter localizedStringFromDate:assetDate dateStyle:NSDateFormatterMediumStyle timeStyle:NSDateFormatterMediumStyle]] type:k_activityTypeInfo verbose:k_activityVerboseHigh activeUrl:app.activeUrl];
     }
     
+    // Update Camera Auto Upload data
+    if ([metadataNet.selector isEqualToString:selectorUploadAutoUpload])
+        [[NCManageDatabase sharedInstance] setAccountAutoUploadDateAssetType:assetMediaType assetDate:assetDate];
+    
     dispatch_async(dispatch_get_main_queue(), ^{
         
-        // Update Camera Auto Upload data
-        if ([metadataNet.selector isEqualToString:selectorUploadAutoUpload])
-            [[NCManageDatabase sharedInstance] setAccountAutoUploadDateAssetType:assetMediaType assetDate:assetDate];
-        
         // Update icon badge number
         [app updateApplicationIconBadgeNumber];
     });

+ 4 - 6
iOSClient/Database/NCManageDatabase.swift

@@ -516,11 +516,11 @@ class NCManageDatabase: NSObject {
         return true
     }
     
-    func addAutoUpload(metadatasNet: [CCMetadataNet]) -> Bool {
+    func addAutoUpload(metadatasNet: [CCMetadataNet]) {
         
         let tableAccount = self.getAccountActive()
         if tableAccount == nil {
-            return false
+            return
         }
         
         let realm = try! Realm()
@@ -549,11 +549,9 @@ class NCManageDatabase: NSObject {
                 addAutoUpload.session = metadataNet.session
                 addAutoUpload.priority = metadataNet.priority
             
-                realm.add(addAutoUpload, update: true)
+                realm.add(addAutoUpload)
             }
-        }
- 
-        return true
+        } 
     }
     
     func getAutoUpload(selector: String) -> CCMetadataNet? {