Changeset 2738

Timestamp:

Aug 13, 2007, 4:43:33 PM (16 years ago)

Author:

charles

Message:

let fastresume remember which torrents are stopped and which are running.

Location:

trunk/libtransmission

Files:

• fastresume.c (modified) (4 diffs)
• torrent.c (modified) (1 diff)

trunk/libtransmission/fastresume.c

@@ -93 +93 @@
      * uint32_t: ul's tr_speedlimit_t
      */
-    FR_ID_SPEED = 8
+    FR_ID_SPEED = 8,
+
+    /* active
+     * char: 't' if running, 'f' if paused
+     */
+    FR_ID_RUN = 9
 };
 
@@ -149 +154 @@
 }
 
-static void fastResumeWriteData( uint8_t id, void * data, uint32_t size,
-                                 uint32_t count, FILE * file )
+static void
+fastResumeWriteData( uint8_t       id,
+                     const void  * data,
+                     uint32_t      size,
+                     uint32_t      count,
+                     FILE        * file )
 {
     uint32_t  datalen = size * count;
@@ -262 +271 @@
     }
 
+    if( TRUE ) /* FR_ID_RUN */
+    {
+        const char is_running = (tor->runStatus == TR_RUN_RUNNING) ? 't' : 'f';
+        fastResumeWriteData( FR_ID_RUN, &is_running, 1, 1, file );
+    }
 
     /* Write download and upload totals */
@@ -556 +570 @@
                 }
                 break;
+
+            case FR_ID_RUN:
+                {
+                    char ch;
+                    if( fread( &ch, 1, 1, file ) != 1 )
+                    {
+                        fclose( file );
+                        return ret;
+                    }
+                    tor->runStatus = ch=='f' ? TR_RUN_STOPPED : TR_RUN_RUNNING;
+                    ret |= TR_FR_RUN;
+                    continue;
+                }
 
             case FR_ID_DOWNLOADED:

trunk/libtransmission/torrent.c

@@ -289 +289 @@
 
     tor->error   = TR_OK;
-    tor->runStatus = flags & TR_FLAG_PAUSED ? TR_RUN_STOPPED : TR_RUN_RUNNING;
 
     uncheckedPieces = tr_bitfieldNew( tor->info.pieceCount );
     loaded = tr_fastResumeLoad( tor, uncheckedPieces );
+
+    /* the `paused' flag has highest precedence...
+       after that, the fastresume setting is used...
+       if that's not found, default to RUNNING */
+    if( flags & TR_FLAG_PAUSED )
+        tor->runStatus = TR_RUN_STOPPED;
+    else if( !(loaded & TR_FR_RUN ) )
+        tor->runStatus = TR_RUN_RUNNING;
+
     if( tr_bitfieldIsEmpty( uncheckedPieces ) )
         tr_bitfieldFree( uncheckedPieces );