|
@@ -760,40 +760,35 @@
|
|
|
NSMutableArray *metadatas = [NSMutableArray new];
|
|
|
BOOL showHiddenFiles = [CCUtility getShowHiddenFiles];
|
|
|
|
|
|
- dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
|
|
|
+ for (OCFileDto *itemDto in items) {
|
|
|
|
|
|
- for (OCFileDto *itemDto in items) {
|
|
|
-
|
|
|
- NSString *serverUrl;
|
|
|
- BOOL isFolderEncrypted;
|
|
|
-
|
|
|
- NSString *fileName = [itemDto.fileName stringByReplacingOccurrencesOfString:@"/" withString:@""];
|
|
|
-
|
|
|
- // Skip hidden files
|
|
|
- if (fileName.length > 0) {
|
|
|
- if (!showHiddenFiles && [[fileName substringToIndex:1] isEqualToString:@"."])
|
|
|
- continue;
|
|
|
- } else
|
|
|
+ NSString *serverUrl;
|
|
|
+ BOOL isFolderEncrypted;
|
|
|
+
|
|
|
+ NSString *fileName = [itemDto.fileName stringByReplacingOccurrencesOfString:@"/" withString:@""];
|
|
|
+
|
|
|
+ // Skip hidden files
|
|
|
+ if (fileName.length > 0) {
|
|
|
+ if (!showHiddenFiles && [[fileName substringToIndex:1] isEqualToString:@"."])
|
|
|
continue;
|
|
|
-
|
|
|
- NSRange firstInstance = [itemDto.filePath rangeOfString:[NSString stringWithFormat:@"%@/files/%@", k_dav, userID]];
|
|
|
- NSString *serverPath = [itemDto.filePath substringFromIndex:firstInstance.length+firstInstance.location+1];
|
|
|
- if ([serverPath hasSuffix:@"/"]) serverPath = [serverPath substringToIndex:[serverPath length] - 1];
|
|
|
- serverUrl = [CCUtility stringAppendServerUrl:[url stringByAppendingString:k_webDAV] addFileName:serverPath];
|
|
|
-
|
|
|
- if (itemDto.isDirectory) {
|
|
|
- (void)[[NCManageDatabase sharedInstance] addDirectoryWithEncrypted:itemDto.isEncrypted favorite:itemDto.isFavorite fileID:itemDto.ocId permissions:itemDto.permissions serverUrl:[NSString stringWithFormat:@"%@/%@", serverUrl, fileName] account:account];
|
|
|
- }
|
|
|
-
|
|
|
- isFolderEncrypted = [CCUtility isFolderEncrypted:serverUrl account:account];
|
|
|
-
|
|
|
- [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileName:itemDto.fileName serverUrl:serverUrl autoUploadFileName:autoUploadFileName autoUploadDirectory:autoUploadDirectory activeAccount:account isFolderEncrypted:isFolderEncrypted]];
|
|
|
+ } else
|
|
|
+ continue;
|
|
|
+
|
|
|
+ NSRange firstInstance = [itemDto.filePath rangeOfString:[NSString stringWithFormat:@"%@/files/%@", k_dav, userID]];
|
|
|
+ NSString *serverPath = [itemDto.filePath substringFromIndex:firstInstance.length+firstInstance.location+1];
|
|
|
+ if ([serverPath hasSuffix:@"/"]) serverPath = [serverPath substringToIndex:[serverPath length] - 1];
|
|
|
+ serverUrl = [CCUtility stringAppendServerUrl:[url stringByAppendingString:k_webDAV] addFileName:serverPath];
|
|
|
+
|
|
|
+ if (itemDto.isDirectory) {
|
|
|
+ (void)[[NCManageDatabase sharedInstance] addDirectoryWithEncrypted:itemDto.isEncrypted favorite:itemDto.isFavorite fileID:itemDto.ocId permissions:itemDto.permissions serverUrl:[NSString stringWithFormat:@"%@/%@", serverUrl, fileName] account:account];
|
|
|
}
|
|
|
|
|
|
- dispatch_async(dispatch_get_main_queue(), ^{
|
|
|
- completion(account, metadatas, nil, 0);
|
|
|
- });
|
|
|
- });
|
|
|
+ isFolderEncrypted = [CCUtility isFolderEncrypted:serverUrl account:account];
|
|
|
+
|
|
|
+ [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileName:itemDto.fileName serverUrl:serverUrl autoUploadFileName:autoUploadFileName autoUploadDirectory:autoUploadDirectory activeAccount:account isFolderEncrypted:isFolderEncrypted]];
|
|
|
+ }
|
|
|
+
|
|
|
+ completion(account, metadatas, nil, 0);
|
|
|
|
|
|
} failureRequest:^(NSHTTPURLResponse *response, NSError *error, NSString *token, NSString *redirectedServer) {
|
|
|
|