Changeset 10878

Timestamp:

Jun 26, 2010, 6:52:05 PM (13 years ago)

Author:

livings124

Message:

(2.0x) #3320 When a download completes at the same time seeding completes, still show a Growl notification and play a sound

Location:

branches/2.0x

Files:

• libtransmission/peer-mgr.c (modified) (1 diff)
• libtransmission/rpcimpl.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (10 diffs)
• libtransmission/torrent.h (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/Controller.m (modified) (3 diffs)
• macosx/Torrent.m (modified) (4 diffs)

branches/2.0x/libtransmission/peer-mgr.c

@@ -3132 +3132 @@
     }
 
-    /* possibly stop torrents that have an error */
+    /* stop torrents that are ready to stop, but couldn't be stopped earlier
+    * during the peer-io callback call chain */
     tor = NULL;
     while(( tor = tr_torrentNext( mgr->session, tor )))
-        if( tor->isRunning && ( tor->error == TR_STAT_LOCAL_ERROR ))
+        if( tor->isStopping )
             tr_torrentStop( tor );
 

branches/2.0x/libtransmission/rpcimpl.c

@@ -222 +222 @@
     {
         tr_torrent * tor = torrents[i];
+
         if( tor->isRunning )
         {
-            tr_torrentStop( tor );
+            tor->isStopping = TRUE;
             notify( session, TR_RPC_TORRENT_STOPPED, tor );
         }

branches/2.0x/libtransmission/torrent.c

@@ -322 +322 @@
         tr_torinf( tor, "Seed ratio reached; pausing torrent" );
 
-        tr_torrentStop( tor );
+        tor->isStopping = TRUE;
 
         /* maybe notify the client */
@@ -347 +347 @@
     evutil_vsnprintf( tor->errorString, sizeof( tor->errorString ), fmt, ap );
     va_end( ap );
+
+    if( tor->isRunning )
+        tor->isStopping = TRUE;
 }
 
@@ -1361 +1364 @@
     {
         tr_torrentSetLocalError( tor, _( "No data found!  Reconnect any disconnected drives, use \"Set Location\", or restart the torrent to re-download." ) );
-        tr_torrentStop( tor );
     }
     else
@@ -1444 +1446 @@
     {
         tr_torrentSetLocalError( tor, _( "Can't find local data.  Try \"Set Location\" to find it, or restart the torrent to re-download." ) );
-        tr_torrentStop( tor );
     }
     else if( tor->startAfterVerify )
@@ -1534 +1535 @@
 
         tor->isRunning = 0;
+        tor->isStopping = 0;
         tr_torrentSetDirty( tor );
         tr_runInEventThread( tor->session, stopTorrent, tor );
@@ -1619 +1621 @@
 static void
 fireCompletenessChange( tr_torrent       * tor,
-                        tr_completeness    status )
+                        tr_completeness    status,
+                        tr_bool            wasRunning )
 {
     assert( tr_isTorrent( tor ) );
@@ -1627 +1630 @@
 
     if( tor->completeness_func )
-        tor->completeness_func( tor, status, tor->completeness_func_user_data );
+        tor->completeness_func( tor, status, wasRunning,
+                                tor->completeness_func_user_data );
 }
 
@@ -1697 +1701 @@
 tr_torrentRecheckCompleteness( tr_torrent * tor )
 {
+    tr_bool wasRunning;
     tr_completeness completeness;
 
@@ -1704 +1709 @@
 
     completeness = tr_cpGetStatus( &tor->completion );
+    wasRunning = tor->isRunning;
 
     if( completeness != tor->completeness )
@@ -1736 +1742 @@
         }
 
-        fireCompletenessChange( tor, completeness );
+        fireCompletenessChange( tor, wasRunning, completeness );
 
         tr_torrentSetDirty( tor );

branches/2.0x/libtransmission/torrent.h

@@ -232 +232 @@
 
     tr_bool                    isRunning;
+    tr_bool                    isStopping;
     tr_bool                    isDeleting;
     tr_bool                    startAfterVerify;

branches/2.0x/libtransmission/transmission.h

@@ -1277 +1277 @@
 tr_completeness;
 
+/** 
+* @param wasRunning whether or not the torrent was running when
+*                   it changed its completeness state
+*/
 typedef void ( tr_torrent_completeness_func )( tr_torrent       * torrent,
                                                tr_completeness    completeness,
+                                               tr_bool            wasRunning,
                                                void             * user_data );
 

branches/2.0x/macosx/Controller.m

@@ -1889 +1889 @@
     Torrent * torrent = [notification object];
     
-    if ([torrent isActive])
+    if ([[[notification userInfo] objectForKey: @"WasRunning"] boolValue])
     {
         if (!fSoundPlaying && [fDefaults boolForKey: @"PlayDownloadSound"])
@@ -1919 +1919 @@
             object: [torrent dataLocation]];
         
-        if ([fDefaults boolForKey: @"QueueSeed"] && [self numToStartFromQueue: NO] == 0)
+        if ([torrent isActive] && [fDefaults boolForKey: @"QueueSeed"] && [self numToStartFromQueue: NO] == 0)
         {
             [torrent stopTransfer];
@@ -1932 +1932 @@
 {
     Torrent * torrent = [notification object];
-    if ([torrent isActive])
-    {
-        if ([fDefaults boolForKey: @"Queue"] && [self numToStartFromQueue: YES] == 0)
-        {
-            [torrent stopTransfer];
-            [torrent setWaitToStart: YES];
-        }
+    if ([torrent isActive] && [fDefaults boolForKey: @"Queue"] && [self numToStartFromQueue: YES] == 0)
+    {
+        [torrent stopTransfer];
+        [torrent setWaitToStart: YES];
     }
     

branches/2.0x/macosx/Torrent.m

@@ -44 +44 @@
     index: (NSInteger) index flatList: (NSMutableArray *) flatFileList;
 
-- (void) completenessChange: (NSNumber *) status;
+- (void) completenessChange: (NSDictionary *) statusInfo;
 - (void) ratioLimitHit;
 - (void) metadataRetrieved;
@@ -54 +54 @@
 @end
 
-void completenessChangeCallback(tr_torrent * torrent, tr_completeness status, void * torrentData)
-{
-    [(Torrent *)torrentData performSelectorOnMainThread: @selector(completenessChange:)
-        withObject: [[NSNumber alloc] initWithInt: status] waitUntilDone: NO];
+void completenessChangeCallback(tr_torrent * torrent, tr_completeness status, tr_bool wasRunning, void * torrentData)
+{
+    NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys: [NSNumber numberWithInt: status], @"Status",
+                            [NSNumber numberWithBool: wasRunning], @"WasRunning", nil];
+    [(Torrent *)torrentData performSelectorOnMainThread: @selector(completenessChange:) withObject: dict waitUntilDone: NO];
 }
 
@@ -1748 +1749 @@
 
 //status has been retained
-- (void) completenessChange: (NSNumber *) status
+- (void) completenessChange: (NSDictionary *) statusInfo
 {
     fStat = tr_torrentStat(fHandle); //don't call update yet to avoid auto-stop
     
-    switch ([status intValue])
+    switch ([[statusInfo objectForKey: @"Status"] intValue])
     {
         case TR_SEED:
         case TR_PARTIAL_SEED:
-            [[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentFinishedDownloading" object: self];
+            //simpler to create a new dictionary than to use statusInfo - avoids retention chicanery 
+            [[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentFinishedDownloading" object: self 
+                userInfo: [NSDictionary dictionaryWithObject: [statusInfo objectForKey: @"WasRunning"] forKey: @"WasRunning"]];
             break;
         
@@ -1763 +1766 @@
             break;
     }
-    [status release];
+    [statusInfo release];
     
     [self update];