Browse Source

NCCommunication update

marinofaggiana 5 years ago
parent
commit
45380735a2

+ 1 - 0
File Provider Extension/FileProviderExtension+Actions.swift

@@ -33,6 +33,7 @@ extension FileProviderExtension {
             return
             return
         }
         }
         
         
+        let directoryName = NCUtility.sharedInstance.createFileName(directoryName, serverUrl: tableDirectory.serverUrl, account: fileProviderData.sharedInstance.account)
         let serverUrlFileName = tableDirectory.serverUrl + "/" + directoryName
         let serverUrlFileName = tableDirectory.serverUrl + "/" + directoryName
         
         
         NCCommunication.sharedInstance.createFolder(serverUrlFileName, account: fileProviderData.sharedInstance.account) { (account, ocId, date, errorCode, errorDescription) in
         NCCommunication.sharedInstance.createFolder(serverUrlFileName, account: fileProviderData.sharedInstance.account) { (account, ocId, date, errorCode, errorDescription) in

+ 16 - 1
File Provider Extension/FileProviderExtension+NetworkingDelegate.swift

@@ -3,7 +3,22 @@
 //  File Provider Extension
 //  File Provider Extension
 //
 //
 //  Created by Marino Faggiana on 02/11/2019.
 //  Created by Marino Faggiana on 02/11/2019.
-//  Copyright © 2019 TWS. All rights reserved.
+//  Copyright © 2018 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 //
 
 
 import FileProvider
 import FileProvider

+ 1 - 0
iOSClient/Main/CCMain.m

@@ -1744,6 +1744,7 @@
 - (void)createFolder:(NSString *)fileNameFolder serverUrl:(NSString *)serverUrl
 - (void)createFolder:(NSString *)fileNameFolder serverUrl:(NSString *)serverUrl
 {
 {
     fileNameFolder = [CCUtility removeForbiddenCharactersServer:fileNameFolder];
     fileNameFolder = [CCUtility removeForbiddenCharactersServer:fileNameFolder];
+    fileNameFolder = [[NCUtility sharedInstance] createFileName:fileNameFolder serverUrl:self.serverUrl account:appDelegate.activeAccount];
     if (![fileNameFolder length]) return;
     if (![fileNameFolder length]) return;
     NSString *ocIdTemp = [[NSUUID UUID] UUIDString];
     NSString *ocIdTemp = [[NSUUID UUID] UUIDString];
     
     

+ 15 - 4
iOSClient/Utility/NCUtility.swift

@@ -52,11 +52,14 @@ class NCUtility: NSObject {
                     
                     
                     var name = NSString(string: resultFileName).deletingPathExtension
                     var name = NSString(string: resultFileName).deletingPathExtension
                     let ext = NSString(string: resultFileName).pathExtension
                     let ext = NSString(string: resultFileName).pathExtension
-                    
                     let characters = Array(name)
                     let characters = Array(name)
                     
                     
                     if characters.count < 2 {
                     if characters.count < 2 {
-                        resultFileName = name + " " + "1" + "." + ext
+                        if ext == "" {
+                            resultFileName = name + " " + "1"
+                        } else {
+                            resultFileName = name + " " + "1" + "." + ext
+                        }
                     } else {
                     } else {
                         let space = characters[characters.count-2]
                         let space = characters[characters.count-2]
                         let numChar = characters[characters.count-1]
                         let numChar = characters[characters.count-1]
@@ -64,9 +67,17 @@ class NCUtility: NSObject {
                         if (space == " " && num != nil) {
                         if (space == " " && num != nil) {
                             name = String(name.dropLast())
                             name = String(name.dropLast())
                             num = num! + 1
                             num = num! + 1
-                            resultFileName = name + "\(num!)" + "." + ext
+                            if ext == "" {
+                                resultFileName = name + "\(num!)"
+                            } else {
+                                resultFileName = name + "\(num!)" + "." + ext
+                            }
                         } else {
                         } else {
-                            resultFileName = name + " " + "1" + "." + ext
+                            if ext == "" {
+                                resultFileName = name + " " + "1"
+                            } else {
+                                resultFileName = name + " " + "1" + "." + ext
+                            }
                         }
                         }
                     }
                     }