Changeset 2085

Timestamp:

Jun 16, 2007, 12:19:55 AM (15 years ago)

Author:

livings124

Message:

patch from Waldorf to further differentiate the justFinished ability

Location:

branches/file_selection

Files:

• libtransmission/internal.h (modified) (1 diff)
• libtransmission/torrent.c (modified) (3 diffs)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/Torrent.m (modified) (1 diff)

branches/file_selection/libtransmission/internal.h

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

branches/file_selection/libtransmission/torrent.c

@@ -173 +173 @@
     tor->key      = h->key;
     tor->azId     = h->azId;
-    tor->finished = 0;
+    tor->hasChangedState = -1;
 
     /* Escaped info hash for HTTP queries */
@@ -378 +378 @@
 }
 
-int tr_getFinished( tr_torrent_t * tor )
-{
-    if( tor->finished )
-    {
-        tor->finished = 0;
+int tr_getIncomplete( tr_torrent_t * tor )
+{
+    if( tor->hasChangedState == TR_CP_INCOMPLETE )
+    {
+        tor->hasChangedState = -1;
+        return 1;
+    }
+    return 0;
+}
+
+int tr_getDone( tr_torrent_t * tor )
+{
+    if( tor->hasChangedState == TR_CP_DONE )
+    {
+        tor->hasChangedState = -1;
+        return 1;
+    }
+    return 0;
+}
+
+int tr_getComplete( tr_torrent_t * tor )
+{
+    if( tor->hasChangedState == TR_CP_COMPLETE )
+    {
+        tor->hasChangedState = -1;
         return 1;
     }
@@ -969 +989 @@
             }
 
-            tor->finished = cpState != TR_CP_INCOMPLETE;
+            tor->hasChangedState = cpState;
 
             if( cpState == TR_CP_COMPLETE )

branches/file_selection/libtransmission/transmission.h

@@ -339 +339 @@
 
 /***********************************************************************
- * tr_getFinished
- ***********************************************************************
- * The first call after a torrent is completed returns 1. Returns 0
+ * tr_getComplete, tr_getIncomplete and tr_getPartial
+ ***********************************************************************
+ * The first call after a torrent changed state returns 1. Returns 0
  * in other cases.
  **********************************************************************/
-int tr_getFinished( tr_torrent_t * );
+int tr_getIncomplete( tr_torrent_t * tor );
+int tr_getDone( tr_torrent_t * tor );
+int tr_getComplete( tr_torrent_t * tor );
 
 

branches/file_selection/macosx/Torrent.m

@@ -306 +306 @@
     
     //notification when downloading finished
-    if (tr_getFinished(fHandle))
+    if (tr_getComplete(fHandle) || tr_getDone(fHandle))
     {
         BOOL canMove = YES;