Changeset 8453 for trunk/libtransmission/torrent.c

Timestamp:

May 20, 2009, 4:02:12 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

@@ -2281 +2281 @@
 {
     tr_bool move_from_old_location;
-    tr_bool * setme_done;
+    int * setme_state;
+    double * setme_progress;
     char * location;
     tr_torrent * tor;
@@ -2289 +2290 @@
 setLocation( void * vdata )
 {
+    int err = 0;
     struct LocationData * data = vdata;
     tr_torrent * tor = data->tor;
     const tr_bool do_move = data->move_from_old_location;
     const char * location = data->location;
+    double bytesHandled = 0;
 
     assert( tr_isTorrent( tor ) );
@@ -2314 +2317 @@
          * 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 )
+        for( i=0; !err && 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 );
-
+            const tr_file * f = &tor->info.files[i];
+            char * oldpath = tr_buildPath( tor->downloadDir, f->name, NULL );
+            char * newpath = tr_buildPath( location, f->name, NULL );
             
-            if( do_move && !stat( oldpath, &sb ) )
+            if( do_move )
             {
-                tr_moveFile( oldpath, newpath );
+                errno = 0;
                 tr_torinf( tor, "moving \"%s\" to \"%s\"", oldpath, newpath );
+                if( tr_moveFile( oldpath, newpath ) ) {
+                    err = 1;
+                    tr_torerr( tor, "error moving \"%s\" to \"%s\": %s",
+                                    oldpath, newpath, tr_strerror( errno ) );
+                }
             }
             else if( !stat( newpath, &sb ) )
@@ -2331 +2339 @@
             }
 
+            if( data->setme_progress )
+            {
+                bytesHandled += f->length;
+                *data->setme_progress = bytesHandled / tor->info.totalSize;
+            }
+
             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;
+        if( !err )
+        {
+            /* 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_state )
+        *data->setme_state = err ? TR_LOC_ERROR : TR_LOC_DONE;
 
     /* cleanup */
@@ -2352 +2369 @@
 
 void
-tr_torrentSetLocation( tr_torrent * tor,
-                       const char * location,
-                       tr_bool      move_from_old_location,
-                       tr_bool    * setme_done )
+tr_torrentSetLocation( tr_torrent  * tor,
+                       const char  * location,
+                       tr_bool       move_from_old_location,
+                       double      * setme_progress,
+                       int         * setme_state )
 {
     struct LocationData * data;
@@ -2361 +2379 @@
     assert( tr_isTorrent( tor ) );
 
-    if( setme_done )
-        *setme_done = FALSE;
+    if( setme_state )
+        *setme_state = TR_LOC_MOVING;
+    if( setme_progress )
+        *setme_progress = 0;
 
     /* run this in the libtransmission thread */
@@ -2369 +2389 @@
     data->location = tr_strdup( location );
     data->move_from_old_location = move_from_old_location;
-    data->setme_done = setme_done;
+    data->setme_state = setme_state;
+    data->setme_progress = setme_progress;
     tr_runInEventThread( tor->session, setLocation, data );
 }