marinofaggiana 3 rokov pred
rodič
commit
8e334314d5

+ 1 - 1
iOSClient/Data/NCDatabase.swift

@@ -183,7 +183,7 @@ class tableChunk: Object {
     @objc dynamic var fileName = ""
     @objc dynamic var index = ""
     @objc dynamic var ocId = ""
-    @objc dynamic var totalBytes: Int64 = 0
+    @objc dynamic var size: Int64 = 0
 
     override static func primaryKey() -> String {
         return "index"

+ 1 - 1
iOSClient/Data/NCManageDatabase.swift

@@ -1051,7 +1051,7 @@ class NCManageDatabase: NSObject {
                     object.fileName = fileName
                     object.index = ocId + fileName
                     object.ocId = ocId
-                    object.totalBytes = size
+                    object.size = size
                                         
                     realm.add(object, update: .all)
                 }

+ 1 - 1
iOSClient/NCGlobal.swift

@@ -79,7 +79,7 @@ class NCGlobal: NSObject {
     // Database Realm
     //
     let databaseDefault                             = "nextcloud.realm"
-    let databaseSchemaVersion: UInt64               = 184
+    let databaseSchemaVersion: UInt64               = 186
     
     // Intro selector
     //

+ 5 - 4
iOSClient/Networking/NCNetworkingChunkedUpload.swift

@@ -75,9 +75,9 @@ extension NCNetworking {
                         let serverUrlFileName = chunkFolderPath + "/" + fileName
                         let fileNameChunkLocalPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: fileName)!
                         
-                        var totalBytes: Int64?
+                        var size: Int64?
                         if let tableChunk = NCManageDatabase.shared.getChunk(account: metadata.account, fileName: fileName) {
-                            totalBytes = tableChunk.totalBytes - NCUtilityFileSystem.shared.getFileSize(filePath: fileNameChunkLocalPath)
+                            size = tableChunk.size - NCUtilityFileSystem.shared.getFileSize(filePath: fileNameChunkLocalPath)
                         }
                                                 
                         let semaphore = Semaphore()
@@ -92,8 +92,9 @@ extension NCNetworking {
                            
                         }, progressHandler: { (progress) in
                             
-                            if let totalBytes = totalBytes {
-                                let totalBytesExpected = totalBytes + progress.completedUnitCount
+                            if let size = size {
+                                
+                                let totalBytesExpected = size + progress.completedUnitCount
                                 let totalBytes = metadata.size
                                 let fractionCompleted = Float(totalBytesExpected) / Float(totalBytes)