Changeset 5750

Timestamp:

May 6, 2008, 1:43:24 AM (14 years ago)

Author:

charles

Message:

#912: Resume file parsed twice on startup

Location:

trunk

Files:

• gtk/add-dialog.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (6 diffs)
• libtransmission/verify.c (modified) (9 diffs)

trunk/gtk/add-dialog.c

@@ -206 +206 @@
     gtk_label_set_mnemonic_widget( GTK_LABEL( l ), w );
     addTorrentFilters( GTK_FILE_CHOOSER( w ) );
-    g_signal_connect( w, "selection-changed",
-                      G_CALLBACK( sourceChanged ), data );
     if( data->filename )
         if( !gtk_file_chooser_set_filename( GTK_FILE_CHOOSER( w ), data->filename ) )
             g_warning( "couldn't select '%s'", data->filename );
+    g_signal_connect( w, "selection-changed",
+                      G_CALLBACK( sourceChanged ), data );
 
     ++row;

trunk/libtransmission/torrent.c

@@ -358 +358 @@
 }
 
+static void torrentStart( tr_torrent * tor, int reloadProgress );
+
 static void
 torrentRealInit( tr_handle     * h,
@@ -478 +480 @@
 
     if( doStart )
-        tr_torrentStart( tor );
+        torrentStart( tor, FALSE );
 }
 
@@ -551 +553 @@
 tr_torrentSetFolder( tr_torrent * tor, const char * path )
 {
-    tr_free( tor->destination );
-    tor->destination = tr_strdup( path );
-    tr_torrentSaveResume( tor );
+    if( !path || !tor->destination || strcmp( path, tor->destination ) )
+    {
+        tr_free( tor->destination );
+        tor->destination = tr_strdup( path );
+        tr_torrentSaveResume( tor );
+    }
 }
 
@@ -999 +1004 @@
 }
 
-void
-tr_torrentStart( tr_torrent * tor )
+static void
+torrentStart( tr_torrent * tor, int reloadProgress )
 {
     tr_globalLock( tor->handle );
@@ -1006 +1011 @@
     if( !tor->isRunning )
     {
-        tr_torrentLoadResume( tor, TR_FR_PROGRESS, NULL );
+        if( reloadProgress )
+            tr_torrentLoadResume( tor, TR_FR_PROGRESS, NULL );
         tor->isRunning = 1;
         tr_verifyAdd( tor, checkAndStartCB );
@@ -1012 +1018 @@
 
     tr_globalUnlock( tor->handle );
+}
+
+void
+tr_torrentStart( tr_torrent * tor )
+{
+    torrentStart( tor, TRUE );
 }
 

trunk/libtransmission/verify.c

@@ -57 +57 @@
 }
 
-static void
+static int
 checkFile( tr_torrent       * tor,
            tr_file_index_t    fileIndex,
@@ -63 +63 @@
 {
     tr_piece_index_t i;
+    int changed = FALSE;
     int nofile;
     struct stat sb;
@@ -79 +80 @@
         else if( !tr_torrentIsPieceChecked( tor, i ) )
         {
+            const int wasComplete = tr_cpPieceIsComplete( tor->completion, i );
             const tr_errno err = tr_ioTestPiece( tor, i );
 
@@ -84 +86 @@
             {
                 tr_torrentSetHasPiece( tor, i, TRUE );
+                if( !wasComplete )
+                    changed = TRUE;
             }
             else
@@ -92 +96 @@
                  * want to lose blocks in those incomplete pieces */
 
-                if( tr_cpPieceIsComplete( tor->completion, i ) )
+                if( wasComplete ) {
                     tr_torrentSetHasPiece( tor, i, FALSE );
+                    changed = TRUE;
+                }
             }
         }
@@ -99 +105 @@
         tr_torrentSetPieceChecked( tor, i, TRUE );
     }
+
+    return changed;
 }
 
@@ -106 +114 @@
     for( ;; )
     {
+        int changed = 0;
         tr_file_index_t i;
         tr_torrent * tor;
@@ -128 +137 @@
         tr_torinf( tor, _( "Verifying torrent" ) );
         for( i=0; i<tor->info.fileCount && !stopCurrent; ++i )
-            checkFile( tor, i, &stopCurrent );
+            changed |= checkFile( tor, i, &stopCurrent );
 
         tor->verifyState = TR_VERIFY_NONE;
@@ -134 +143 @@
         if( !stopCurrent )
         {
-            tr_torrentSaveResume( tor );
+            if( changed )
+                tr_torrentSaveResume( tor );
             fireCheckDone( tor, currentNode.verify_done_cb );
         }