Changeset 4885

Timestamp:

Feb 1, 2008, 1:38:57 AM (14 years ago)

Author:

charles

Message:

(1.0x) #666: pausing in the middle of "verify local data" makes T forget about the nonverified portion

Location:

branches/1.0x/libtransmission

Files:

• fastresume.c (modified) (3 diffs)
• torrent.c (modified) (1 diff)
• torrent.h (modified) (1 diff)

branches/1.0x/libtransmission/fastresume.c

@@ -209 +209 @@
     /* Write progress data */
     if (1) {
-        int n;
+        int i, n;
         tr_time_t * mtimes;
         uint8_t * buf = malloc( FR_PROGRESS_LEN( tor ) );
@@ -217 +217 @@
         /* mtimes */
         mtimes = getMTimes( tor, &n );
+        for( i=0; i<n; ++i )
+            if( !tr_torrentIsFileChecked( tor, i ) )
+                mtimes[i] = ~(tr_time_t)0; /* force a recheck next time */
         memcpy( walk, mtimes, n*sizeof(tr_time_t) );
         walk += n * sizeof(tr_time_t);
@@ -419 +422 @@
             if ( curMTimes[i] == mtime )
                 tr_torrentSetFileChecked( tor, i, TRUE );
-            else
+            else {
+                tr_torrentSetFileChecked( tor, i, FALSE );
                 tr_dbg( "File '%s' recheck needed", tor->info.files[i].name );
+            }
         }
         free( curMTimes );

branches/1.0x/libtransmission/torrent.c

@@ -1294 +1294 @@
 }
 
+int
+tr_torrentIsFileChecked( const tr_torrent * tor, int fileIndex )
+{
+    const tr_file * file = &tor->info.files[fileIndex];
+    const size_t begin = file->firstPiece;
+    const size_t end = file->lastPiece + 1;
+    size_t i;
+    int isChecked = TRUE;
+
+    for( i=begin; isChecked && i<end; ++i )
+        if( !tr_torrentIsPieceChecked( tor, i ) )
+            isChecked = FALSE;
+
+    return isChecked;
+}
+
 void
 tr_torrentUncheck( tr_torrent * tor )

branches/1.0x/libtransmission/torrent.h

@@ -85 +85 @@
 int  tr_torrentCountUncheckedPieces( const tr_torrent * );
 int  tr_torrentIsPieceChecked      ( const tr_torrent *, int piece );
+int  tr_torrentIsFileChecked       ( const tr_torrent *, int file );
 void tr_torrentSetPieceChecked     ( tr_torrent *, int piece, int isChecked );
 void tr_torrentSetFileChecked      ( tr_torrent *, int file, int isChecked );