Changeset 9336

Timestamp:

Oct 20, 2009, 4:15:10 AM (13 years ago)

Author:

charles

Message:

(trunk libT) semi-paranoid safeguard: when searching for a torrent's file, look for finished versions (normal filename) before unfinished ones (with the .part suffix). In the unlikely event of a bug where both exist, it's better for Transmission to use the finished one...

File:

• trunk/libtransmission/torrent.c (modified) (2 diffs)

trunk/libtransmission/torrent.c

@@ -2568 +2568 @@
 
     if( b == NULL ) {
+        char * filename = tr_buildPath( tor->downloadDir, file->name, NULL );
+        if( fileExists( filename ) ) {
+            b = tor->downloadDir;
+            s = file->name;
+        }
+        tr_free( filename );
+    }
+
+    if( ( b == NULL ) && ( tor->incompleteDir != NULL ) ) {
+        char * filename = tr_buildPath( tor->incompleteDir, file->name, NULL );
+        if( fileExists( filename ) ) {
+            b = tor->incompleteDir;
+            s = file->name;
+        }
+        tr_free( filename );
+    }
+
+    if( ( b == NULL ) && ( tor->incompleteDir != NULL ) ) {
+        char * filename = tr_buildPath( tor->incompleteDir, part, NULL );
+        if( fileExists( filename ) ) {
+            b = tor->incompleteDir;
+            s = part;
+        }
+        tr_free( filename );
+    }
+
+    if( b == NULL) {
         char * filename = tr_buildPath( tor->downloadDir, part, NULL );
         if( fileExists( filename ) ) {
@@ -2576 +2603 @@
     }
 
-    if( b == NULL ) {
-        char * filename = tr_buildPath( tor->downloadDir, file->name, NULL );
-        if( fileExists( filename ) ) {
-            b = tor->downloadDir;
-            s = file->name;
-        }
-        tr_free( filename );
-    }
-
-    if( tor->incompleteDir != NULL )
-    {
-        if( b == NULL ) {
-            char * filename = tr_buildPath( tor->incompleteDir, part, NULL );
-            if( fileExists( filename ) ) {
-                b = tor->incompleteDir;
-                s = part;
-            }
-            tr_free( filename );
-        }
-
-        if( b == NULL ) {
-            char * filename = tr_buildPath( tor->incompleteDir, file->name, NULL );
-            if( fileExists( filename ) ) {
-                b = tor->incompleteDir;
-                s = file->name;
-            }
-            tr_free( filename );
-        }
-    }
-
     if( base != NULL )
         *base = b;