瀏覽代碼

fix create file name

Marino Faggiana 6 年之前
父節點
當前提交
d47183107f
共有 2 個文件被更改,包括 42 次插入46 次删除
  1. 42 0
      PickerFileProvider/FileProviderExtension+Actions.swift
  2. 0 46
      PickerFileProvider/FileProviderExtension.swift

+ 42 - 0
PickerFileProvider/FileProviderExtension+Actions.swift

@@ -471,4 +471,46 @@ extension FileProviderExtension {
         }
     }
     
+    func createFileName(_ fileName: String, directoryID: String, serverUrl: String) -> String {
+        
+        let serialQueue = DispatchQueue(label: "queueCreateFileName")
+        var resultFileName = fileName
+        
+        serialQueue.sync {
+            
+            var exitLoop = false
+            
+            while exitLoop == false {
+                
+                if NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileNameView = %@ AND directoryID = %@", providerData.account, resultFileName, directoryID)) != nil {
+                    
+                    var name = NSString(string: resultFileName).deletingPathExtension
+                    let ext = NSString(string: resultFileName).pathExtension
+                    
+                    let characters = Array(name)
+                    
+                    if characters.count < 2 {
+                        resultFileName = name + " " + "1" + "." + ext
+                    } else {
+                        let space = characters[characters.count-2]
+                        let numChar = characters[characters.count-1]
+                        var num = Int(String(numChar))
+                        if (space == " " && num != nil) {
+                            name = String(name.dropLast())
+                            num = num! + 1
+                            resultFileName = name + "\(num!)" + "." + ext
+                        } else {
+                            resultFileName = name + " " + "1" + "." + ext
+                        }
+                    }
+                    
+                } else {
+                    exitLoop = true
+                }
+            }
+        }
+        
+        return resultFileName
+    }
+    
 }

+ 0 - 46
PickerFileProvider/FileProviderExtension.swift

@@ -36,7 +36,6 @@ var fileProviderSignalUpdateWorkingSetItem = [NSFileProviderItemIdentifier:FileP
 var listFavoriteIdentifierRank = [String:NSNumber]()
 
 var currentAnchor: UInt64 = 0
-var fileNamePathImport = [String]()
 
 /* -----------------------------------------------------------------------------------------------------------------------------------------------
                                                             STRUCT item
@@ -648,49 +647,4 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
         
         return errorResult
     }
-    
-    func createFileName(_ fileName: String, directoryID: String, serverUrl: String) -> String {
-    
-        let serialQueue = DispatchQueue(label: "queueCreateFileName")
-        var resultFileName = fileName
-
-        serialQueue.sync {
-            
-            var exitLoop = false
-            
-            while exitLoop == false {
-                
-                if NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileNameView = %@ AND directoryID = %@", providerData.account, resultFileName, directoryID)) != nil || fileNamePathImport.contains(serverUrl+"/"+resultFileName) {
-                    
-                    var name = NSString(string: resultFileName).deletingPathExtension
-                    let ext = NSString(string: resultFileName).pathExtension
-                    
-                    let characters = Array(name)
-                    
-                    if characters.count < 2 {
-                        resultFileName = name + " " + "1" + "." + ext
-                    } else {
-                        let space = characters[characters.count-2]
-                        let numChar = characters[characters.count-1]
-                        var num = Int(String(numChar))
-                        if (space == " " && num != nil) {
-                            name = String(name.dropLast())
-                            num = num! + 1
-                            resultFileName = name + "\(num!)" + "." + ext
-                        } else {
-                            resultFileName = name + " " + "1" + "." + ext
-                        }
-                    }
-                    
-                } else {
-                    exitLoop = true
-                }
-            }
-        
-            // add fileNamePathImport
-            fileNamePathImport.append(serverUrl+"/"+resultFileName)
-        }
-        
-        return resultFileName
-    }
 }