Changeset 10109

Timestamp:

Feb 6, 2010, 5:22:27 AM (12 years ago)

Author:

charles

Message:

(trunk libT) #2716 "magnet torrents not being saved after quit" -- fix regression reported by RolCol? @ ​http://trac.transmissionbt.com/ticket/2716#comment:8

File:

• trunk/libtransmission/torrent-magnet.c (modified) (6 diffs)

trunk/libtransmission/torrent-magnet.c

@@ -13 +13 @@
 #include <assert.h>
 #include <event.h> /* struct evbuffer */
+#include <stdio.h> /* remove() */
 
 #include "transmission.h"
@@ -19 +20 @@
 #include "magnet.h"
 #include "metainfo.h"
+#include "resume.h"
 #include "torrent.h"
 #include "torrent-magnet.h"
@@ -192 +194 @@
             if(( metainfoParsed = !err ))
             {
-                /* yay we have bencoded metainfo... merge it into our .torrnet file */
+                /* yay we have bencoded metainfo... merge it into our .torrent file */
                 tr_benc newMetainfo;
-                const char * path = tor->info.torrent;
+                char * path = tr_strdup( tor->info.torrent );
+
                 if( !tr_bencLoadFile( &newMetainfo, TR_FMT_BENC, path ) )
                 {
@@ -200 +203 @@
                     tr_benc * tmp;
 
+                    /* remove any old .torrent and .resume files */
+                    remove( path );
+                    tr_torrentRemoveResume( tor );
+
                     dbgmsg( tor, "Saving completed metadata to \"%s\"", path );
                     assert( !tr_bencDictFindDict( &newMetainfo, "info", &tmp ) );
                     tr_bencMergeDicts( tr_bencDictAddDict( &newMetainfo, "info", 0 ), &infoDict );
-                    tr_bencToFile( &newMetainfo, TR_FMT_BENC, path );
 
                     success = tr_metainfoParse( tor->session, &newMetainfo, &tor->info,
@@ -211 +217 @@
                     assert( success );
 
+                    /* save the new .torrent file */
+                    tr_bencToFile( &newMetainfo, TR_FMT_BENC, tor->info.torrent );
+                    tr_sessionSetTorrentFile( tor->session, tor->info.hashString, tor->info.torrent );
                     tr_torrentGotNewInfoDict( tor );
                     tr_torrentSetDirty( tor );
@@ -218 +227 @@
         
                 tr_bencFree( &infoDict );
+                tr_free( path );
             }
         }