Changeset 107 for trunk/macosx/Controller.m

Timestamp:

Feb 8, 2006, 7:05:42 PM (17 years ago)

Author:

titer

Message:

Update the torrent history as the app runs, so it won't be lost if it
doesn't exit properly

File:

• trunk/macosx/Controller.m (modified) (6 diffs)

trunk/macosx/Controller.m

@@ -224 +224 @@
     [fBadger release];                                                          
 
-    // Save history and stop running torrents
-    NSMutableArray * history = [NSMutableArray arrayWithCapacity: fCount];
-    BOOL active;
+    // Save history
+    [self updateTorrentHistory];
+    
+    // Stop running torrents
     for( i = 0; i < fCount; i++ )
-    {
-        active = fStat[i].status &
-            ( TR_STATUS_CHECK | TR_STATUS_DOWNLOAD | TR_STATUS_SEED );
-
-        [history addObject: [NSDictionary dictionaryWithObjectsAndKeys:
-            [NSString stringWithUTF8String: fStat[i].info.torrent],
-            @"TorrentPath",
-            [NSString stringWithUTF8String: tr_torrentGetFolder( fHandle, i )],
-            @"DownloadFolder",
-            active ? @"NO" : @"YES",
-            @"Paused",
-            NULL]];
-
-        if( active )
-        {
+        if( fStat[i].status & ( TR_STATUS_CHECK | TR_STATUS_DOWNLOAD |
+                    TR_STATUS_SEED ) )
             tr_torrentStop( fHandle, i );
-        }
-    }
-    [fDefaults setObject: history forKey: @"History"];
 
     // Wait for torrents to stop (5 seconds timeout)
@@ -352 +337 @@
 
     [self updateUI: NULL];
+    [self updateTorrentHistory];
 }
 
@@ -431 +417 @@
     tr_torrentStart( fHandle, idx );
     [self updateUI: NULL];
+    [self updateTorrentHistory];
 }
 
@@ -455 +442 @@
     tr_torrentStop( fHandle, idx );
     [self updateUI: NULL];
+    [self updateTorrentHistory];
 }
 
@@ -528 +516 @@
     tr_torrentClose( fHandle, idx );
     [self updateUI: NULL];
+    [self updateTorrentHistory];
 }
 
@@ -617 +606 @@
         downloadRate: dl >= 0.1 && [defaults boolForKey: @"BadgeDownloadRate"]
           ? [NSString stringForSpeedAbbrev: dl] : nil];
+}
+
+- (void) updateTorrentHistory
+{
+    if( !fStat )
+        return;
+
+    NSMutableArray * history = [NSMutableArray arrayWithCapacity: fCount];
+
+    int i;
+    for (i = 0; i < fCount; i++)
+        [history addObject: [NSDictionary dictionaryWithObjectsAndKeys:
+            [NSString stringWithUTF8String: fStat[i].info.torrent],
+            @"TorrentPath",
+            [NSString stringWithUTF8String: tr_torrentGetFolder( fHandle, i )],
+            @"DownloadFolder",
+            fStat[i].status & (TR_STATUS_CHECK | TR_STATUS_DOWNLOAD |
+              TR_STATUS_SEED) ? @"NO" : @"YES",
+            @"Paused",
+            nil]];
+
+    [fDefaults setObject: history forKey: @"History"];
 }