@@ -108,7 +108,6 @@ class BackupJob: BaseJob {
108108 return
109109 }
110110
111- var uploadPaths : [ String ] = [ ]
112111 var backupPaths : [ String ] = [ ]
113112 monitors = SafeDictionary < String , Int64 > ( )
114113 totalFileSize = 0
@@ -125,24 +124,21 @@ class BackupJob: BaseJob {
125124 let localFileSize = FileManager . default. fileSize ( localURL. path)
126125 let cloudExists = FileManager . default. fileExists ( atPath: cloudURL. path)
127126
128- if !cloudExists || FileManager . default. fileSize ( cloudURL. path) != localFileSize {
127+ if !cloudExists || FileManager . default. fileSize ( cloudURL. path) != localFileSize || ( !cloudURL . isUploaded && !cloudURL . isUploading ) {
129128 backupPaths. append ( filename)
130129 backupTotalSize += localFileSize
131-
132- uploadPaths. append ( filename)
133- } else if cloudExists {
134- if cloudURL. isUploaded {
135- withoutUploadSize += localFileSize
136- } else {
137- uploadPaths. append ( filename)
138- }
130+ }
131+ if cloudURL. isUploaded {
132+ withoutUploadSize += localFileSize
139133 }
140134 totalFileSize += localFileSize
141135 }
142136
143137 let databaseFileSize = getDatabaseFileSize ( )
144138 let databaseCloudURL = backupUrl. appendingPathComponent ( backupDatabaseName)
145- let isBackupDatabase = !FileManager. default. fileExists ( atPath: databaseCloudURL. path) || FileManager . default. fileSize ( databaseCloudURL. path) != databaseFileSize
139+ let isBackupDatabase = !FileManager. default. fileExists ( atPath: databaseCloudURL. path)
140+ || FileManager . default. fileSize ( databaseCloudURL. path) != databaseFileSize
141+ || ( !databaseCloudURL. isUploaded && !databaseCloudURL. isUploading)
146142
147143 if !isBackupDatabase {
148144 withoutUploadSize += databaseFileSize
0 commit comments