Changeset 2079

Timestamp:

Jun 14, 2007, 6:12:39 PM (15 years ago)

Author:

charles

Message:

replace tr_getFinished() with something to the new states that DND causes. This re-breaks the mac build to annoy persept.

Location:

branches/file_selection

Files:

• cli/transmissioncli.c (modified) (2 diffs)
• libtransmission/internal.h (modified) (1 diff)
• libtransmission/torrent.c (modified) (3 diffs)
• libtransmission/transmission.h (modified) (1 diff)

branches/file_selection/cli/transmissioncli.c

@@ -92 +92 @@
     tr_stat_t    * s;
     tr_handle_status_t * hstat;
+    cp_status_t cpPrevStatus = TR_CP_INCOMPLETE;
 
     printf( "Transmission %s (%d) - http://transmission.m0k.org/\n\n",
@@ -283 +284 @@
             fprintf( stderr, "\n" );
         }
-        
-        if( tr_getFinished( tor ) )
-        {
-            result = system(finishCall);
+       
+        if( cpPrevStatus != s->cpStatus )
+        {
+            if( s->cpStatus == TR_CP_COMPLETE )
+                result = system(finishCall);
+
+            cpPrevStatus = s->cpStatus;
         }
     }

branches/file_selection/libtransmission/internal.h

@@ -176 +176 @@
     int               error;
     char              errorString[128];
-    int               finished;
 
     char            * id;

branches/file_selection/libtransmission/torrent.c

@@ -173 +173 @@
     tor->key      = h->key;
     tor->azId     = h->azId;
-    tor->finished = 0;
 
     /* Escaped info hash for HTTP queries */
@@ -376 +375 @@
 
     tr_lockUnlock( &tor->lock );
-}
-
-int tr_getFinished( tr_torrent_t * tor )
-{
-    if( tor->finished )
-    {
-        tor->finished = 0;
-        return 1;
-    }
-    return 0;
 }
 
@@ -969 +958 @@
             }
 
-            tor->finished = cpState != TR_CP_INCOMPLETE;
-
             if( cpState == TR_CP_COMPLETE )
                 tr_trackerCompleted( tor->tracker );

branches/file_selection/libtransmission/transmission.h

@@ -339 +339 @@
 
 /***********************************************************************
- * tr_getFinished
- ***********************************************************************
- * The first call after a torrent is completed returns 1. Returns 0
- * in other cases.
- **********************************************************************/
-int tr_getFinished( tr_torrent_t * );
-
-/***********************************************************************
  * tr_manualUpdate
  ***********************************************************************