Changeset 13160

Timestamp:

Jan 14, 2012, 4:07:58 PM (10 years ago)

Author:

livings124

Message:

search for folder nodes concurrently when generating a torrent's file list

File:

• trunk/macosx/Torrent.m (modified) (3 diffs)

trunk/macosx/Torrent.m

@@ -1711 +1711 @@
             {
                 //determine if folder node already exists
-                FileListNode * node;
-                for (node in fileList)
-                    if ([[node name] isEqualToString: name] && [node isFolder])
-                        break;
+                __block FileListNode * node = nil;
+                [fileList enumerateObjectsWithOptions: NSEnumerationConcurrent usingBlock: ^(FileListNode * searchNode, NSUInteger idx, BOOL * stop) {
+                    if ([[searchNode name] isEqualToString: name] && [searchNode isFolder])
+                    {
+                        node = searchNode;
+                        *stop = YES;
+                    }
+                }];
                 
                 if (!node)
@@ -1723 +1727 @@
                 }
                 
-                NSMutableArray * trimmedComponents = [NSMutableArray arrayWithArray: [pathComponents subarrayWithRange:
-                                                        NSMakeRange(2, [pathComponents count]-2)]];
+                NSMutableArray * trimmedComponents = [NSMutableArray arrayWithArray: [pathComponents subarrayWithRange: NSMakeRange(2, [pathComponents count]-2)]];
                 
                 [node insertIndex: i withSize: file->length];
@@ -1759 +1762 @@
     const BOOL isFolder = [components count] > 1;
     
+    //determine if folder node already exists
     __block FileListNode * node = nil;
     if (isFolder)