Changeset 707

Timestamp:

Jul 30, 2006, 6:37:29 PM (16 years ago)

Author:

livings124

Message:

Check for completed download in Torrent class.

Location:

trunk/macosx

Files:

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

trunk/macosx/Controller.h

@@ -132 +132 @@
 
 - (void) updateUI: (NSTimer *) timer;
+- (void) torrentFinishedDownloading: (NSNotification *) notification;
 - (void) updateTorrentHistory;
 

trunk/macosx/Controller.m

@@ -285 +285 @@
     //observe notifications
     NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
+    
+    [nc addObserver: self selector: @selector(torrentFinishedDownloading:)
+                    name: @"TorrentFinishedDownloading" object: nil];
     
     [nc addObserver: self selector: @selector(updateControlTint:)
@@ -840 +843 @@
 - (void) updateUI: (NSTimer *) t
 {
-    NSEnumerator * enumerator = [fTorrents objectEnumerator];
-    Torrent * torrent;
-    while ((torrent = [enumerator nextObject]))
-    {
-        [torrent update];
-
-        if ([torrent justFinished])
-        {
-            [self applyFilter: nil];
-            [self checkToStartWaiting: torrent];
-        
-            [GrowlApplicationBridge notifyWithTitle: @"Download Complete"
-                description: [torrent name] notificationName: GROWL_DOWNLOAD_COMPLETE iconData: nil
-                priority: 0 isSticky: NO clickContext: nil];
-
-            if (![fWindow isKeyWindow])
-                fCompleted++;
-        }
-    }
+    [fTorrents makeObjectsPerformSelector: @selector(update)];
 
     if ([fSortType isEqualToString: @"Progress"] || [fSortType isEqualToString: @"State"])
@@ -879 +864 @@
     //badge dock
     [fBadger updateBadgeWithCompleted: fCompleted uploadRate: uploadRate downloadRate: downloadRate];
+}
+
+- (void) torrentFinishedDownloading: (NSNotification *) notification
+{
+    Torrent * torrent = [notification object];
+
+    [self applyFilter: nil];
+    [self checkToStartWaiting: torrent];
+
+    [GrowlApplicationBridge notifyWithTitle: @"Download Complete" description: [torrent name]
+        notificationName: GROWL_DOWNLOAD_COMPLETE iconData: nil priority: 0 isSticky: NO clickContext: nil];
+
+    if (![fWindow isKeyWindow])
+        fCompleted++;
 }
 
@@ -1312 +1311 @@
     [fInfoController updateInfoStatsAndSettings];
     
-    [GrowlApplicationBridge notifyWithTitle: @"Seeding Complete"
-                description: [[notification object] name] notificationName: GROWL_SEEDING_COMPLETE
-                iconData: nil priority: 0 isSticky: NO clickContext: nil];
+    [GrowlApplicationBridge notifyWithTitle: @"Seeding Complete" description: [[notification object] name]
+        notificationName: GROWL_SEEDING_COMPLETE iconData: nil priority: 0 isSticky: NO clickContext: nil];
 }
 
@@ -1421 +1419 @@
             //import only actually happened if the torrent array is larger
             if (oldCount < [fTorrents count])
-                [GrowlApplicationBridge notifyWithTitle: @"Torrent File Auto Added"
-                    description: file notificationName: GROWL_AUTO_ADD iconData: nil
-                    priority: 0 isSticky: NO clickContext: nil];
+                [GrowlApplicationBridge notifyWithTitle: @"Torrent File Auto Added" description: file
+                    notificationName: GROWL_AUTO_ADD iconData: nil priority: 0 isSticky: NO clickContext: nil];
         }
 }

trunk/macosx/Torrent.m

@@ -144 +144 @@
     fStat = tr_torrentStat(fHandle);
     
+    //notification when downloading finished
+    if ([self justFinished])
+        [[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentFinishedDownloading" object: self];
+    
     //check to stop for ratio
     if ([self isSeeding] && ((fStopRatioSetting == RATIO_CHECK && [self ratio] >= fRatioLimit)