Changeset 7308

Timestamp:

Dec 7, 2008, 6:20:14 PM (12 years ago)

Author:

livings124

Message:

add support to filter file list (not yet implemented in the interface)

Location:

trunk/macosx

Files:

• FileOutlineController.h (modified) (2 diffs)
• FileOutlineController.m (modified) (5 diffs)
• Torrent.m (modified) (1 diff)

trunk/macosx/FileOutlineController.h

@@ -31 +31 @@
 {
     Torrent * fTorrent;
+    NSArray * fFileList;
     
     IBOutlet FileOutlineView * fOutline;
+    
+    NSString * fFilterText;
 }
 
@@ -38 +41 @@
 
 - (void) setTorrent: (Torrent *) torrent;
+
+- (void) setFilterText: (NSString *) text;
 
 - (void) reloadData;

trunk/macosx/FileOutlineController.m

@@ -73 +73 @@
 }
 
+- (void) dealloc
+{
+    [fFileList release];
+    [fFilterText release];
+    [super dealloc];
+}
+
 - (FileOutlineView *) outlineView
 {
     return fOutline;
-}
-
-- (void) outlineViewSelectionDidChange: (NSNotification *) notification
-{
-    [[QuickLookController quickLook] updateQuickLook];
 }
 
@@ -88 +90 @@
     [fOutline setTorrent: fTorrent];
     
+    [fFileList release];
+    fFileList = [[fTorrent fileList] retain];
+    
+    [fFilterText release];
+    fFilterText = nil;
+    
     [fOutline deselectAll: nil];
     [fOutline reloadData];
 }
 
+- (void) setFilterText: (NSString *) text
+{
+    if ([text isEqualToString: @""])
+        text = nil;
+    
+    if (text == fFilterText || [text isEqualToString: fFilterText])
+        return;
+    
+    [fFilterText release];
+    fFilterText = [text retain];
+    
+    [fFileList release];
+    if (!fFilterText)
+        fFileList = [[fTorrent fileList] retain];
+    else
+    {
+        NSMutableArray * list = [NSMutableArray arrayWithCapacity: [fTorrent fileCount]];
+        
+        NSEnumerator * enumerator = [[fTorrent flatFileList] objectEnumerator];
+        FileListNode * node;
+        while ((node = [enumerator nextObject]))
+        if ([[node name] rangeOfString: fFilterText options: NSCaseInsensitiveSearch].location != NSNotFound)
+            [list addObject: node];
+        
+        fFileList = [[NSArray alloc] initWithArray: list];
+    }
+    
+    [fOutline reloadData];
+}
+
 - (void) reloadData
 {
@@ -98 +136 @@
 }
 
+- (void) outlineViewSelectionDidChange: (NSNotification *) notification
+{
+    [[QuickLookController quickLook] updateQuickLook];
+}
+
 - (NSInteger) outlineView: (NSOutlineView *) outlineView numberOfChildrenOfItem: (id) item
 {
     if (!item)
-        return fTorrent ? [[fTorrent fileList] count] : 0;
+        return fFileList ? [fFileList count] : 0;
     else
     {
@@ -116 +159 @@
 - (id) outlineView: (NSOutlineView *) outlineView child: (NSInteger) index ofItem: (id) item
 {
-    return [(item ? [(FileListNode *)item children] : [fTorrent fileList]) objectAtIndex: index];
+    return [(item ? [(FileListNode *)item children] : fFileList) objectAtIndex: index];
 }
 
@@ -296 +339 @@
         for (NSInteger i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
             if ([[NSFileManager defaultManager] fileExistsAtPath:
-                    [downloadFolder stringByAppendingPathComponent: [[[fTorrent fileList] objectAtIndex: i] fullPath]]])
+                    [downloadFolder stringByAppendingPathComponent: [[fFileList objectAtIndex: i] fullPath]]])
                 return YES;
         return NO;

trunk/macosx/Torrent.m

@@ -467 +467 @@
             while ((node = [nodeEnumerator nextObject]))
             {
+                #warning this could be more thorough
                 if ([[node fullPath] hasPrefix: file])
                 {