|
@@ -502,5 +502,18 @@ class NCUtility: NSObject {
|
|
|
return nil
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ @objc func getMetadataConflict(account: String, serverUrl: String, fileName: String) -> tableMetadata? {
|
|
|
+
|
|
|
+ // verify exists conflict
|
|
|
+ let fileNameExtension = (fileName as NSString).pathExtension.lowercased()
|
|
|
+ let fileNameWithoutExtension = (fileName as NSString).deletingPathExtension
|
|
|
+ var fileNameConflict = fileName
|
|
|
+
|
|
|
+ if fileNameExtension == "heic" && CCUtility.getFormatCompatibility() {
|
|
|
+ fileNameConflict = fileNameWithoutExtension + ".jpg"
|
|
|
+ }
|
|
|
+ return NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileNameView == %@", account, serverUrl, fileNameConflict))
|
|
|
+ }
|
|
|
}
|
|
|
|