Changeset 1514

Timestamp:

Feb 23, 2007, 7:17:31 PM (15 years ago)

Author:

livings124

Message:

small efficiency change and some improvements for the invisible file checkboxes

Location:

trunk/macosx

Files:

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

trunk/macosx/InfoWindowController.m

@@ -108 +108 @@
     [fFileOutline setDoubleAction: @selector(revealFile:)];
     
+    [[NSNotificationCenter defaultCenter] addObserver: self
+            selector: @selector(fileFinished:) name: @"FileFinished" object: nil];
+    
     //set blank inspector
     [self updateInfoForTorrents: [NSArray array]];
@@ -114 +117 @@
 - (void) dealloc
 {
-    [fTorrents release];
+    [[NSNotificationCenter defaultCenter] removeObserver: self];
+    
+    if (fTorrents)
+        [fTorrents release];
     if (fPeers)
         [fPeers release];
@@ -400 +406 @@
         return;
     
-    [[fTorrents objectAtIndex: 0] updateFileProgress];
-    [fFileOutline reloadData];
+    if ([[fTorrents objectAtIndex: 0] updateFileProgress])
+        [fFileOutline reloadData];
 }
 
@@ -711 +717 @@
 
 - (void) outlineView: (NSOutlineView *) outlineView willDisplayCell: (id) cell
-            forTableColumn: (NSTableColumn *) tableColumn item:(id) item
+            forTableColumn: (NSTableColumn *) tableColumn item: (id) item
 {
     if ([[tableColumn identifier] isEqualToString: @"Name"])
@@ -724 +730 @@
     else if ([[tableColumn identifier] isEqualToString: @"Check"])
     {
-        /*[(NSButtonCell *)cell setImagePosition: item ? NSImageOnly : NSNoImage];
-        [cell setEnabled: NO];*/
+        /*if (!item)
+        {
+            [(NSButtonCell *)cell setImagePosition: NSNoImage];
+            [cell setEnabled: NO];
+            return;
+        }
+        
+        [(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];
     }
@@ -737 +751 @@
     
     [self setFileCheckState: state forItem: item];
+    NSMutableDictionary * topItem = [self 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];
     

trunk/macosx/Torrent.h

@@ -173 +173 @@
 - (float)       swarmSpeed;
 
-- (void) updateFileProgress;
+- (BOOL) updateFileProgress;
 
 - (NSNumber *) orderValue;

trunk/macosx/Torrent.m

@@ -1044 +1044 @@
 }
 
-- (void) updateFileProgress
-{
-    float * progress = tr_torrentCompletion( fHandle );
+- (BOOL) updateFileProgress
+{
+    BOOL change = NO;
+    float * progress = tr_torrentCompletion(fHandle);
+    NSNumber * progressNum;
+    NSMutableDictionary * item, * dict;
     
     int i, fileCount = [self fileCount];
     for (i = 0; i < fileCount; i++)
-        [[fFileFlatList objectAtIndex: i] setObject: [NSNumber numberWithFloat: progress[i]] forKey: @"Progress"];
+    {
+        if (!(progressNum = [[fFileFlatList objectAtIndex: i] objectForKey: @"Progress"])
+                || [progressNum floatValue] != progress[i])
+        {
+            item = [fFileFlatList objectAtIndex: i];
+            [item setObject: [NSNumber numberWithFloat: progress[i]] forKey: @"Progress"];
+            change = YES;
+            
+            if (progress[i] == 1.0)
+            {
+                dict = item;
+                while ((dict = [dict objectForKey: @"Parent"]))
+                    [dict setObject: [NSNumber numberWithInt: [[dict objectForKey: @"Remaining"] intValue]-1]
+                            forKey: @"Remaining"];
+                
+                [[NSNotificationCenter defaultCenter] postNotificationName: @"FileFinished" object: item];
+            }
+        }
+    }
     
     free(progress);
+    
+    return change;
 }
 
@@ -1257 +1280 @@
         
         if (isFolder)
+        {
             [dict setObject: [NSMutableArray array] forKey: @"Children"];
+            [dict setObject: [NSNumber numberWithInt: 1] forKey: @"Remaining"];
+        }
         else
         {
@@ -1270 +1296 @@
     else
     {
+        if (isFolder)
+            [dict setObject: [NSNumber numberWithInt: [[dict objectForKey: @"Remaining"] intValue]+1] forKey: @"Remaining"];
+        
         int dictState = [[dict objectForKey: @"Check"] intValue];
         if (dictState != NSMixedState && dictState != state)