Selaa lähdekoodia

add FileID on tableQueueUpload

Marino Faggiana 7 vuotta sitten
vanhempi
commit
2eeb7b9a9c

+ 1 - 0
PickerFileProvider/FileProvider.swift

@@ -1036,6 +1036,7 @@ class FileProvider: NSFileProviderExtension, CCNetworkingDelegate {
             
             metadataNet.account = account
             metadataNet.assetLocalIdentifier = k_assetLocalIdentifierFileProviderStorage + metadata.fileID
+            metadataNet.fileID = k_uploadSessionID + directoryParent.directoryID + fileName
             metadataNet.fileName = fileName
             metadataNet.path = importDocumentURL!.path + "/" + metadata.fileNameView
             metadataNet.selector = selectorUploadFile

+ 1 - 0
iOSClient/Database/NCDatabase.swift

@@ -262,6 +262,7 @@ class tableQueueUpload: Object {
     @objc dynamic var assetLocalIdentifier = ""
     @objc dynamic var date = NSDate()
     @objc dynamic var errorCode: Int = 0
+    @objc dynamic var fileID: String?
     @objc dynamic var fileName = ""
     @objc dynamic var lock: Bool = false
     @objc dynamic var path: String?

+ 14 - 1
iOSClient/Database/NCManageDatabase.swift

@@ -57,7 +57,7 @@ class NCManageDatabase: NSObject {
         let config = Realm.Configuration(
         
             fileURL: dirGroup?.appendingPathComponent("\(appDatabaseNextcloud)/\(k_databaseDefault)"),
-            schemaVersion: 21,
+            schemaVersion: 22,
             
             // 10 : Version 2.18.0
             // 11 : Version 2.18.2
@@ -71,6 +71,7 @@ class NCManageDatabase: NSObject {
             // 19 : Version 2.20.7
             // 20 : Version 2.21.0
             // 21 : Version 2.21.3
+            // 22 : Version 2.21.5
             
             migrationBlock: { migration, oldSchemaVersion in
                 // We haven’t migrated anything yet, so oldSchemaVersion == 0
@@ -2238,6 +2239,9 @@ class NCManageDatabase: NSObject {
                         addObject.account = tableAccount.account
                         addObject.assetLocalIdentifier = metadataNet.assetLocalIdentifier
                         addObject.errorCode = metadataNet.errorCode
+                        if metadataNet.fileID != nil {
+                            addObject.fileID = metadataNet.fileID
+                        }
                         addObject.fileName = metadataNet.fileName
                         addObject.path = metadataNet.path
                         addObject.selector = metadataNet.selector
@@ -2282,6 +2286,9 @@ class NCManageDatabase: NSObject {
                         addObject.account = tableAccount.account
                         addObject.assetLocalIdentifier = metadataNet.assetLocalIdentifier
                         addObject.errorCode = metadataNet.errorCode
+                        if metadataNet.fileID != nil {
+                            addObject.fileID = metadataNet.fileID
+                        }
                         addObject.fileName = metadataNet.fileName
                         addObject.path = metadataNet.path
                         addObject.selector = metadataNet.selector
@@ -2331,6 +2338,9 @@ class NCManageDatabase: NSObject {
         metadataNet.assetLocalIdentifier = result!.assetLocalIdentifier
         metadataNet.directoryID = self.getDirectoryID(result!.serverUrl)
         metadataNet.errorCode = result!.errorCode
+        if result!.fileID != nil {
+            metadataNet.fileID = result!.fileID
+        }
         metadataNet.fileName = result!.fileName
         metadataNet.path = result!.path
         metadataNet.selector = result!.selector
@@ -2407,6 +2417,9 @@ class NCManageDatabase: NSObject {
         metadataNet.assetLocalIdentifier = result!.assetLocalIdentifier
         metadataNet.errorCode = result!.errorCode
         metadataNet.directoryID = self.getDirectoryID(result!.serverUrl)
+        if result!.fileID != nil {
+            metadataNet.fileID = result!.fileID
+        }
         metadataNet.fileName = result!.fileName
         metadataNet.path = result!.path
         metadataNet.selector = result!.selector