Changeset 8389 for trunk/libtransmission/torrent.c

Timestamp:

May 13, 2009, 3:54:04 PM (13 years ago)

Author:

charles

Message:

(trunk) #920: add "move data" to libT so all clients can use it

File:

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

trunk/libtransmission/torrent.c

@@ -240 +240 @@
             break;
 
-        case TR_RATIOLIMIT_UNLIMITED:
+        default: /* TR_RATIOLIMIT_UNLIMITED */
             isLimited = FALSE;
             break;
@@ -735 +735 @@
 
 void
-tr_torrentSetDownloadDir( tr_torrent * tor,
-                          const char * path )
+tr_torrentSetDownloadDir( tr_torrent * tor, const char * path )
 {
     assert( tr_isTorrent( tor  ) );
@@ -1236 +1235 @@
 
 static void
-torrentStart( tr_torrent * tor,
-              int          reloadProgress )
+torrentStart( tr_torrent * tor, int reloadProgress )
 {
     assert( tr_isTorrent( tor ) );
@@ -1273 +1271 @@
     assert( tr_isTorrent( tor ) );
     tr_torrentRecheckCompleteness( tor );
+
+    if( tor->startAfterVerify )
+    {
+        tor->startAfterVerify = FALSE;
+        tr_torrentStart( tor );
+    }
 }
 
@@ -1287 +1291 @@
 {
     assert( tr_isTorrent( tor ) );
-
+    tr_globalLock( tor->session );
+
+    /* if the torrent's already being verified, stop it */
     tr_verifyRemove( tor );
 
-    tr_globalLock( tor->session );
-
+    /* if the torrent's running, stop it & set the restart-after-verify flag */
+    if( tor->isRunning ) {
+        tr_torrentStop( tor );
+        tor->startAfterVerify = TRUE;
+    }
+
+    /* add the torrent to the recheck queue */
     tr_torrentUncheck( tor );
     tr_verifyAdd( tor, torrentRecheckDoneCB );
@@ -1316 +1327 @@
     evbuffer_free( buf );
 }
-
 
 static void
@@ -2199 +2209 @@
 ***/
 
+struct LocationData
+{
+    tr_bool move_from_old_location;
+    tr_bool * setme_done;
+    char * location;
+    tr_torrent * tor;
+};
+
+static void
+setLocation( void * vdata )
+{
+    struct LocationData * data = vdata;
+    tr_torrent * tor = data->tor;
+    const tr_bool do_move = data->move_from_old_location;
+    const char * location = data->location;
+
+    assert( tr_isTorrent( tor ) );
+
+    if( strcmp( location, tor->downloadDir ) )
+    {
+        tr_file_index_t i;
+
+        /* bad idea to move files while they're being verified... */
+        tr_verifyRemove( tor );
+
+        /* if the torrent is running, stop it and set a flag to
+         * restart after we're done */
+        if( tor->isRunning )
+        {
+            tr_torrentStop( tor );
+            tor->startAfterVerify = TRUE;
+        }
+
+        /* try to move the files.
+         * FIXME: there are still all kinds of nasty cases, like what
+         * if the target directory runs out of space halfway through... */
+        for( i=0; i<tor->info.fileCount; ++i )
+        {
+            struct stat sb;
+            char * oldpath = tr_buildPath( tor->downloadDir, tor->info.files[i].name, NULL );
+            char * newpath = tr_buildPath( location, tor->info.files[i].name, NULL );
+
+            
+            if( do_move && !stat( oldpath, &sb ) )
+            {
+                tr_moveFile( oldpath, newpath );
+                tr_torinf( tor, "moving \"%s\" to \"%s\"", oldpath, newpath );
+            }
+            else if( !stat( newpath, &sb ) )
+            {
+                tr_torinf( tor, "found \"%s\"", newpath );
+            }
+
+            tr_free( newpath );
+            tr_free( oldpath );
+        }
+
+        /* blow away the leftover subdirectories in the old location */
+        tr_torrentDeleteLocalData( tor, unlink );
+
+        /* set the new location and reverify */
+        tr_torrentSetDownloadDir( tor, location );
+        tr_torrentVerify( tor );
+    }
+
+    if( data->setme_done )
+        *data->setme_done = TRUE;
+
+    /* cleanup */
+    tr_free( data->location );
+    tr_free( data );
+}
+
+void
+tr_torrentSetLocation( tr_torrent * tor,
+                       const char * location,
+                       tr_bool      move_from_old_location,
+                       tr_bool    * setme_done )
+{
+    struct LocationData * data;
+
+    assert( tr_isTorrent( tor ) );
+
+    if( setme_done )
+        *setme_done = FALSE;
+
+    /* run this in the libtransmission thread */
+    data = tr_new( struct LocationData, 1 );
+    data->tor = tor;
+    data->location = tr_strdup( location );
+    data->move_from_old_location = move_from_old_location;
+    data->setme_done = setme_done;
+    tr_runInEventThread( tor->session, setLocation, data );
+}
+
+/***
+****
+***/
+
 void
 tr_torrentCheckSeedRatio( tr_torrent * tor )