Changeset 8775

Timestamp:

Jul 3, 2009, 2:31:31 PM (13 years ago)

Author:

charles

Message:

(trunk libT) #2263: Night of the Living Dead (removed and deleted torrents keep coming back)

File:

• trunk/libtransmission/metainfo.c (modified) (1 diff)

trunk/libtransmission/metainfo.c

@@ -58 +58 @@
 
 static char*
-getOldTorrentFilename( const tr_session * session,
-                       const tr_info *   inf )
-{
-    char *            ret;
-    struct evbuffer * buf = evbuffer_new( );
-
-    evbuffer_add_printf( buf, "%s%c%s", tr_getTorrentDir( session ),
-                         TR_PATH_DELIMITER,
-                         inf->hashString );
-    if( session->tag )
-        evbuffer_add_printf( buf, "-%s", session->tag );
-
-    ret = tr_strndup( EVBUFFER_DATA( buf ), EVBUFFER_LENGTH( buf ) );
-    evbuffer_free( buf );
-    return ret;
+getOldTorrentFilename( const tr_session * session, const tr_info * inf )
+{
+    int i;
+    const char * tags[] = { "beos", "cli", "daemon", "gtk", "macosx", "wx" };
+    const int tagCount = 6;
+    char * path;
+    struct stat sb;
+
+    for( i=0; i<tagCount; ++i ) {
+        path = tr_strdup_printf( "%s%c%s-%s", tr_getTorrentDir( session ), '/', inf->hashString, tags[i] );
+        if( !stat( path, &sb ) && ( ( sb.st_mode & S_IFMT ) == S_IFREG ) )
+            return path;
+        tr_free( path );
+    }
+
+    path = tr_buildPath( tr_getTorrentDir( session ), inf->hashString, NULL );
+    if( !stat( path, &sb ) && ( ( sb.st_mode & S_IFMT ) == S_IFREG ) )
+        return path;
+    tr_free( path );
+
+    return NULL;
 }