Changeset 1519

Timestamp:

Mar 2, 2007, 1:34:06 AM (15 years ago)

Author:

livings124

Message:

move torrent check code to the Torrent class

Location:

trunk/macosx

Files:

• InfoWindowController.m (modified) (6 diffs)
• Torrent.h (modified) (2 diffs)
• Torrent.m (modified) (4 diffs)

trunk/macosx/InfoWindowController.m

@@ -61 +61 @@
 - (NSArray *) peerSortDescriptors;
 
-- (void) setFileCheckState: (int) state forItem: (NSMutableDictionary *) item;
-- (NSMutableDictionary *) resetFileCheckStateForItemParent: (NSMutableDictionary *) originalChild;
-
 - (int) stateSettingToPopUpIndex: (int) index;
 - (int) popUpIndexToStateSetting: (int) index;
@@ -108 +105 @@
     [fFileOutline setDoubleAction: @selector(revealFile:)];
     
-    [[NSNotificationCenter defaultCenter] addObserver: self
-            selector: @selector(fileFinished:) name: @"FileFinished" object: nil];
-    
     //set blank inspector
     [self updateInfoForTorrents: [NSArray array]];
@@ -117 +111 @@
 - (void) dealloc
 {
-    [[NSNotificationCenter defaultCenter] removeObserver: self];
-    
     if (fTorrents)
         [fTorrents release];
@@ -730 +722 @@
     else if ([[tableColumn identifier] isEqualToString: @"Check"])
     {
-        /*if (!item)
+        if (!item)
         {
             [(NSButtonCell *)cell setImagePosition: NSNoImage];
@@ -739 +731 @@
         [(NSButtonCell *)cell setImagePosition: NSImageOnly];
         [cell setEnabled: [[item objectForKey: @"IsFolder"] boolValue] ? [[item objectForKey: @"Remaining"] intValue] > 0
-                                                                    : [[item objectForKey: @"Progress"] floatValue] < 1.0];*/
-        [(NSButtonCell *)cell setImagePosition: NSNoImage];
+                                                                    : [[item objectForKey: @"Progress"] floatValue] < 1.0];
+        //[(NSButtonCell *)cell setImagePosition: NSNoImage];
     }
     else;
@@ -748 +740 @@
         forTableColumn: (NSTableColumn *) tableColumn byItem: (id) item
 {
+    Torrent * torrent = [fTorrents objectAtIndex: 0];
     int state = [object intValue] != NSOffState ? NSOnState : NSOffState;
     
-    [self setFileCheckState: state forItem: item];
-    NSMutableDictionary * topItem = [self resetFileCheckStateForItemParent: item];
+    [torrent setFileCheckState: state forFileItem: item];
+    NSMutableDictionary * topItem = [torrent resetFileCheckStateForItemParent: item];
     
     [fFileOutline reloadItem: topItem reloadChildren: YES];
-}
-
-- (void) fileFinished: (NSNotification *) notification
-{
-    NSMutableDictionary * item = [notification object];
-    
-    [item setObject: [NSNumber numberWithInt: NSOnState] forKey: @"Check"];
-    NSMutableDictionary * topItem = [self resetFileCheckStateForItemParent: item];
-    
-    [fFileOutline reloadItem: topItem reloadChildren: YES];
-}
-
-- (void) setFileCheckState: (int) state forItem: (NSMutableDictionary *) item
-{
-    [item setObject: [NSNumber numberWithInt: state] forKey: @"Check"];
-    
-    if (![[item objectForKey: @"IsFolder"] boolValue])
-        return;
-    
-    NSMutableDictionary * child;
-    NSEnumerator * enumerator = [[item objectForKey: @"Children"] objectEnumerator];
-    while ((child = [enumerator nextObject]))
-        if (state != [[child objectForKey: @"Check"] intValue])
-            [self setFileCheckState: state forItem: child];
-}
-
-- (NSMutableDictionary *) resetFileCheckStateForItemParent: (NSMutableDictionary *) originalChild
-{
-    NSMutableDictionary * item;
-    if (!(item = [originalChild objectForKey: @"Parent"]))
-        return originalChild;
-    
-    int state = INVALID;
-    
-    NSMutableDictionary * child;
-    NSEnumerator * enumerator = [[item objectForKey: @"Children"] objectEnumerator];
-    while ((child = [enumerator nextObject]))
-    {
-        if (state == INVALID)
-        {
-            state = [[child objectForKey: @"Check"] intValue];
-            if (state == NSMixedState)
-                break;
-        }
-        else if (state != [[child objectForKey: @"Check"] intValue])
-        {
-            state = NSMixedState;
-            break;
-        }
-        else;
-    }
-    
-    if (state != [[item objectForKey: @"Check"] intValue])
-    {
-        [item setObject: [NSNumber numberWithInt: state] forKey: @"Check"];
-        return [self resetFileCheckStateForItemParent: item];
-    }
-    else
-        return originalChild;
 }
 

trunk/macosx/Torrent.h

@@ -173 +173 @@
 - (float)       swarmSpeed;
 
-- (BOOL) updateFileProgress;
-
 - (NSNumber *) orderValue;
 - (void) setOrderValue: (int) orderValue;
@@ -180 +178 @@
 - (NSArray *) fileList;
 - (int) fileCount;
+- (BOOL) updateFileProgress;
+- (void) setFileCheckState: (int) state forFileItem: (NSMutableDictionary *) item;
+- (NSMutableDictionary *) resetFileCheckStateForItemParent: (NSMutableDictionary *) originalChild;
 
 - (NSDate *) date;

trunk/macosx/Torrent.m

@@ -30 +30 @@
 #define MAX_PIECES 324
 #define BLANK_PIECE -99
+
+#define INVALID -99
 
 @interface Torrent (Private)
@@ -1044 +1046 @@
 }
 
+- (NSNumber *) orderValue
+{
+    return [NSNumber numberWithInt: fOrderValue];
+}
+
+- (void) setOrderValue: (int) orderValue
+{
+    fOrderValue = orderValue;
+}
+
+- (NSArray *) fileList
+{
+    return fFileList;
+}
+
+- (int) fileCount
+{
+    return fInfo->fileCount;
+}
+
 - (BOOL) updateFileProgress
 {
@@ -1068 +1090 @@
                             forKey: @"Remaining"];
                 
-                [[NSNotificationCenter defaultCenter] postNotificationName: @"FileFinished" object: item];
+                [item setObject: [NSNumber numberWithInt: NSOnState] forKey: @"Check"];
+                [self resetFileCheckStateForItemParent: item];
             }
         }
@@ -1078 +1101 @@
 }
 
-- (NSNumber *) orderValue
-{
-    return [NSNumber numberWithInt: fOrderValue];
-}
-
-- (void) setOrderValue: (int) orderValue
-{
-    fOrderValue = orderValue;
-}
-
-- (NSArray *) fileList
-{
-    return fFileList;
-}
-
-- (int) fileCount
-{
-    return fInfo->fileCount;
+- (void) setFileCheckState: (int) state forFileItem: (NSMutableDictionary *) item
+{
+    [item setObject: [NSNumber numberWithInt: state] forKey: @"Check"];
+    
+    if (![[item objectForKey: @"IsFolder"] boolValue])
+        return;
+    
+    NSMutableDictionary * child;
+    NSEnumerator * enumerator = [[item objectForKey: @"Children"] objectEnumerator];
+    while ((child = [enumerator nextObject]))
+        if (state != [[child objectForKey: @"Check"] intValue])
+            [self setFileCheckState: state forFileItem: child];
+}
+
+- (NSMutableDictionary *) resetFileCheckStateForItemParent: (NSMutableDictionary *) originalChild
+{
+    NSMutableDictionary * item;
+    if (!(item = [originalChild objectForKey: @"Parent"]))
+        return originalChild;
+    
+    int state = INVALID;
+    
+    NSMutableDictionary * child;
+    NSEnumerator * enumerator = [[item objectForKey: @"Children"] objectEnumerator];
+    while ((child = [enumerator nextObject]))
+    {
+        if (state == INVALID)
+        {
+            state = [[child objectForKey: @"Check"] intValue];
+            if (state == NSMixedState)
+                break;
+        }
+        else if (state != [[child objectForKey: @"Check"] intValue])
+        {
+            state = NSMixedState;
+            break;
+        }
+        else;
+    }
+    
+    if (state != [[item objectForKey: @"Check"] intValue])
+    {
+        [item setObject: [NSNumber numberWithInt: state] forKey: @"Check"];
+        return [self resetFileCheckStateForItemParent: item];
+    }
+    else
+        return originalChild;
 }