move returnFileNamePathFromFileName in CCUtility

Picker/DocumentPickerViewController.swift

@@ -116,9 +116,8 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
     
     func readFolder() {
         
-        let metadataNet = CCMetadataNet()
-        
-        metadataNet.account = activeAccount
+        let metadataNet = CCMetadataNet.init(account: activeAccount)!
+
         metadataNet.action = actionReadFolder
         metadataNet.serverUrl = self.localServerUrl
         metadataNet.selector = selectorReadFolder
@@ -181,6 +180,33 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         
         hud.hideHud()
     }
+    
+    //  MARK: - Download Thumbnail
+
+    func downloadThumbnail(_ metadata : CCMetadata) {
+    
+        let metadataNet = CCMetadataNet.init(account: activeAccount)!
+        
+        metadataNet.action = actionDownloadThumbnail
+        metadataNet.fileID = metadata.fileID
+        
+        //let fileName =
+        
+        
+        
+
+
+        metadataNet.fileNameLocal = metadata.fileID;
+        metadataNet.fileNamePrint = metadata.fileNamePrint;
+        metadataNet.options = "m";
+        metadataNet.selector = selectorDownloadThumbnail;
+        metadataNet.serverUrl = self.localServerUrl
+
+        let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, withTypeCloud: typeCloud, oneByOne: true, activityIndicator: false)
+        networkingOperationQueue.addOperation(ocNetworking)
+        
+        hud.visibleIndeterminateHud()
+    }
 }
 
 // MARK: - UITableViewDelegate
@@ -216,7 +242,7 @@ extension DocumentPickerViewController: UITableViewDataSource {
         let metadata = CCCoreData.insertEntity(in: recordTableMetadata)!
         
         // File Image View
-        let filePath = directoryUser!+"/"+metadata.fileID+".ico"
+        let filePath = directoryUser! + "/" + metadata.fileID + ".ico"
         
         if (FileManager.default.fileExists(atPath: filePath)) {
             

iOSClient/Main/CCMain.m

@@ -1171,7 +1171,7 @@
     /*** NEXTCLOUD OWNCLOUD ***/
     
     if ([metadata.typeCloud isEqualToString:typeCloudOwnCloud] || [metadata.typeCloud isEqualToString:typeCloudNextcloud])
-        metadataNet.fileName = [self returnFileNamePathFromFileName:metadata.fileName serverUrl:_localServerUrl];
+        metadataNet.fileName = [CCUtility returnFileNamePathFromFileName:metadata.fileName serverUrl:_localServerUrl activeUrl:app.activeUrl typeCloud:app.typeCloud];
     
     metadataNet.fileNameLocal = metadata.fileID;
     metadataNet.fileNamePrint = metadata.fileNamePrint;
@@ -2890,7 +2890,7 @@
         
         metadataNet.action = actionShare;
         metadataNet.fileID = metadata.fileID;
-        metadataNet.fileName = [self returnFileNamePathFromFileName:metadata.fileName serverUrl:serverUrl];
+        metadataNet.fileName = [CCUtility returnFileNamePathFromFileName:metadata.fileName serverUrl:serverUrl activeUrl:app.activeUrl typeCloud:app.typeCloud];
         metadataNet.fileNamePrint = metadata.fileNamePrint;
         metadataNet.password = password;
         metadataNet.selector = selectorShare;
@@ -3033,7 +3033,7 @@
     metadataNet.action = actionShareWith;
     metadataNet.fileID = metadata.fileID;
     metadataNet.directoryID = directoryID;
-    metadataNet.fileName = [self returnFileNamePathFromFileName:metadata.fileName serverUrl:serverUrl];
+    metadataNet.fileName = [CCUtility returnFileNamePathFromFileName:metadata.fileName serverUrl:serverUrl activeUrl:app.activeUrl typeCloud:app.typeCloud];
     metadataNet.fileNamePrint = metadata.fileNamePrint;
     metadataNet.serverUrl = serverUrl;
     metadataNet.selector = selectorShare;
@@ -3091,15 +3091,6 @@
     }
 }
 
-- (NSString *)returnFileNamePathFromFileName:(NSString *)metadataFileName serverUrl:(NSString *)serverUrl
-{
-    NSString *fileName = [NSString stringWithFormat:@"%@/%@", [serverUrl stringByReplacingOccurrencesOfString:[CCUtility getHomeServerUrlActiveUrl:app.activeUrl typeCloud:app.typeCloud] withString:@""], metadataFileName];
-    
-    if ([fileName hasPrefix:@"/"]) fileName = [fileName substringFromIndex:1];
-    
-    return fileName;
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Favorite =====
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Utility/CCUtility.h

@@ -145,11 +145,14 @@
 + (void)removeAllFileID_UPLOAD_ActiveUser:(NSString *)activeUser activeUrl:(NSString *)activeUrl;
 
 + (NSString *)deletingLastPathComponentFromServerUrl:(NSString *)serverUrl;
++ (NSString *)returnFileNamePathFromFileName:(NSString *)metadataFileName serverUrl:(NSString *)serverUrl activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud;
 
 + (void)sendMailEncryptPass:(NSString *)recipient validateEmail:(BOOL)validateEmail form:(id)form;
 
 + (NSString *)localizableBrand:(NSString *)localize table:(NSString *)table;
 
+
+
 // ===== CCMetadata =====
 
 #ifdef CC

iOSClient/Utility/CCUtility.m

@@ -634,6 +634,15 @@
     return [pather substringToIndex: [pather length] - 1];
 }
 
++ (NSString *)returnFileNamePathFromFileName:(NSString *)metadataFileName serverUrl:(NSString *)serverUrl activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud
+{
+    NSString *fileName = [NSString stringWithFormat:@"%@/%@", [serverUrl stringByReplacingOccurrencesOfString:[CCUtility getHomeServerUrlActiveUrl:activeUrl typeCloud:typeCloud] withString:@""], metadataFileName];
+    
+    if ([fileName hasPrefix:@"/"]) fileName = [fileName substringFromIndex:1];
+    
+    return fileName;
+}
+
 + (void)sendMailEncryptPass:(NSString *)recipient validateEmail:(BOOL)validateEmail form:(id)form
 {
     BOOL error = NO;