Marino Faggiana 6 жил өмнө
parent
commit
041a16eb9b

+ 5 - 2
iOSClient/Main/CCMain.m

@@ -1536,8 +1536,11 @@
     for (tableMetadata *metadata in metadatas) {
         
         // Create directory FS
-        if ([[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", [CCUtility getDirectoryProviderStorage], metadata.fileID]] == NO)
-            [[NSFileManager defaultManager] createDirectoryAtPath:[NSString stringWithFormat:@"%@/%@", [CCUtility getDirectoryProviderStorage], metadata.fileID] withIntermediateDirectories:YES attributes:nil error:nil];
+        if (metadata.directory) {
+            [CCUtility getDirectoryProviderStorageFileID:metadata.fileID];
+        } else {
+            [CCUtility getDirectoryProviderStorageFileID:metadata.fileID fileNameView:metadata.fileNameView];
+        }
         
         // verify if the record is in download/upload progress
         if (metadata.directory == NO && [recordsInSessions count] > 0) {

+ 5 - 2
iOSClient/Move/CCMove.m

@@ -324,8 +324,11 @@
         for (tableMetadata *metadata in metadatas) {
             
             // Create directory FS
-            if ([[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", [CCUtility getDirectoryProviderStorage], metadata.fileID]] == NO)
-                [[NSFileManager defaultManager] createDirectoryAtPath:[NSString stringWithFormat:@"%@/%@", [CCUtility getDirectoryProviderStorage], metadata.fileID] withIntermediateDirectories:YES attributes:nil error:nil];
+            if (metadata.directory) {
+                [CCUtility getDirectoryProviderStorageFileID:metadata.fileID];
+            } else {
+                [CCUtility getDirectoryProviderStorageFileID:metadata.fileID fileNameView:metadata.fileNameView];
+            }
             
             // Insert in Array
             [metadatasToInsertInDB addObject:metadata];

+ 8 - 1
iOSClient/Utility/CCUtility.m

@@ -833,7 +833,14 @@
 {
     [[NSFileManager defaultManager] createDirectoryAtPath:[NSString stringWithFormat:@"%@/%@", [self getDirectoryProviderStorage], fileID] withIntermediateDirectories:YES attributes:nil error:nil];
 
-    return [NSString stringWithFormat:@"%@/%@/%@", [self getDirectoryProviderStorage], fileID, fileNameView];
+    NSString *fileNamePath = [NSString stringWithFormat:@"%@/%@/%@", [self getDirectoryProviderStorage], fileID, fileNameView];
+    
+    // if do not exists create file 0 length
+    if ([[NSFileManager defaultManager] fileExistsAtPath:fileNamePath] == NO) {
+        [[NSFileManager defaultManager] createFileAtPath:fileNamePath contents:nil attributes:nil];
+    }
+    
+    return fileNamePath;
 }
 
 + (NSString *)getDirectoryProviderStorageIconFileID:(NSString *)fileID fileNameView:(NSString *)fileNameView