Changeset 2041

Timestamp:

Jun 10, 2007, 11:13:44 PM (15 years ago)

Author:

livings124

Message:

get the file priority checks working for folders

Location:

branches/file_selection/macosx

Files:

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

branches/file_selection/macosx/InfoWindowController.m

@@ -629 +629 @@
         BOOL current = NO, other = NO;
         int i, priority;
+        Torrent * torrent = [fTorrents objectAtIndex: 0];
         
         if (menuItem == fFilePriorityHigh)
@@ -639 +640 @@
         for (i = [indexSet firstIndex]; i != NSNotFound && (!current || !other); i = [indexSet indexGreaterThanIndex: i])
         {
-            item = [fFileOutline itemAtRow: i];
-            #warning get working with folders
-            if ([[item objectForKey: @"IsFolder"] boolValue])
-                continue;
-            
-            if (priority == [[item objectForKey: @"Priority"] intValue])
+            if ([torrent hasFilePriority: priority forItem: [fFileOutline itemAtRow: i]])
                 current = YES;
             else
-                other = YES;
+                other = YES;  
         }
         

branches/file_selection/macosx/Torrent.h

@@ -212 +212 @@
 - (void) setFileCheckState: (int) state forFileItem: (NSDictionary *) item;
 - (void) setFilePriority: (int) priority forFileItem: (NSMutableDictionary *) item;
+- (BOOL) hasFilePriority: (int) priority forItem: (NSDictionary *) item;
 
 - (NSDate *) dateAdded;

branches/file_selection/macosx/Torrent.m

@@ -1405 +1405 @@
 }
 
+- (BOOL) hasFilePriority: (int) priority forItem: (NSDictionary *) item
+{
+    if (![[item objectForKey: @"IsFolder"] boolValue])
+        return priority == [[item objectForKey: @"Priority"] intValue];
+    else
+    {
+        NSEnumerator * enumerator = [[item objectForKey: @"Children"] objectEnumerator];
+        NSDictionary * child;
+        while ((child = [enumerator nextObject]))
+            if ([self hasFilePriority: priority forItem: child])
+                return YES;
+        return NO;
+    }
+}
+
 - (NSDate *) dateAdded
 {