Browse Source

convert db

Marino Faggiana 8 years ago
parent
commit
e622f38b2f
2 changed files with 42 additions and 4 deletions
  1. 2 2
      iOSClient/AppDelegate.m
  2. 40 2
      iOSClient/FileSystem/NCManageDatabase.swift

+ 2 - 2
iOSClient/AppDelegate.m

@@ -1630,8 +1630,8 @@
         // Migrate Account Table From CoreData to Realm
         
         NSArray *listAccount = [CCCoreData getAllAccount];
-        for (TableAccount account in listAccount)
-            [[NCManageDatabase sharedInstance] addAccount:<#(NSString * _Nonnull)#> url:<#(NSString * _Nonnull)#> user:<#(NSString * _Nonnull)#> password:<#(NSString * _Nonnull)#>]
+        for (TableAccount *account in listAccount)
+            [[NCManageDatabase sharedInstance] addTableAccountOldDB:account];
 
     }
 }

+ 40 - 2
iOSClient/FileSystem/NCManageDatabase.swift

@@ -122,8 +122,46 @@ class NCManageDatabase: NSObject {
                 
                 let addAccount = tableAccount()
                 
-                
-                
+                addAccount.account = table.account!
+                if table.active == 1 {
+                    addAccount.active = true
+                }
+                addAccount.address = table.address!
+                if table.cameraUpload == 1 {
+                    addAccount.cameraUpload = true
+                }
+                if table.cameraUploadBackground == 1 {
+                    addAccount.cameraUploadBackground = true
+                }
+                if table.cameraUploadCreateSubfolder == 1 {
+                    addAccount.cameraUploadCreateSubfolder = true
+                }
+                if table.cameraUploadDatePhoto != nil {
+                    addAccount.cameraUploadDatePhoto = table.cameraUploadDatePhoto! as NSDate
+                }
+                if table.cameraUploadDateVideo != nil {
+                    addAccount.cameraUploadDateVideo = table.cameraUploadDateVideo! as NSDate
+                }
+                addAccount.cameraUploadFolderName = table.cameraUploadFolderName!
+                addAccount.cameraUploadFolderPath = table.cameraUploadFolderPath!
+                if table.cameraUploadFull == 1 {
+                    addAccount.cameraUploadFull = true
+                }
+                if table.cameraUploadPhoto == 1 {
+                    addAccount.cameraUploadPhoto = true
+                }
+                if table.cameraUploadVideo == 1 {
+                    addAccount.cameraUploadVideo = true
+                }
+                if table.cameraUploadWWAnPhoto == 1 {
+                    addAccount.cameraUploadWWAnPhoto = true
+                }
+                if table.cameraUploadWWAnVideo == 1 {
+                    addAccount.cameraUploadWWAnVideo = true
+                }
+                addAccount.password = table.password!
+                addAccount.url = table.url!
+                addAccount.user = table.user!
                 
                 realm.add(addAccount)
             }