Ticket #1510: delete-file.diff

libtransmission/rpcimpl.c

@@ -140 +140 @@
                tr_benc *          args_in,
                tr_benc * args_out UNUSED )
 {
-    int           i, torrentCount;
-    tr_torrent ** torrents = getTorrents( h, args_in, &torrentCount );
+        int           i, torrentCount;
+        tr_file_index_t t;
+        int64_t           deleteFile = 0;
+        tr_torrent ** torrents = getTorrents( h, args_in, &torrentCount );
 
-    for( i = 0; i < torrentCount; ++i )
-    {
-        tr_torrent *                 tor = torrents[i];
-        const tr_rpc_callback_status status = notify(
-            h, TR_RPC_TORRENT_REMOVING, tor );
-        if( !( status & TR_RPC_NOREMOVE ) )
-            tr_torrentRemove( tor );
-    }
-    tr_free( torrents );
-    return NULL;
+        for( i = 0; i < torrentCount; ++i )
+        {
+                tr_torrent *                 tor = torrents[i];
+                const tr_rpc_callback_status status = notify(
+                                                                                                         h, TR_RPC_TORRENT_REMOVING, tor );
+                if( !( status & TR_RPC_NOREMOVE ) )
+                {
+                        /* 
+                         * if delete-file = 1 delete from disk every file in the torrent
+                         * being removed
+                         */
+                        if( tr_bencDictFindInt( args_in, "delete-file", &deleteFile ) && deleteFile == 1)
+                        {
+                                const tr_file_index_t n = tor->info.fileCount;
+                                for( t = 0; t < n; t++ )
+                                {
+                                        char *torrent_url;
+                                        tr_file *f = &tor -> info.files[t];
+                                        torrent_url = tr_buildPath( tor -> downloadDir, f->name, NULL );
+                                        tr_dbg ( "Deleting %s", torrent_url);
+                                        remove(torrent_url); /* is it platform safe? */
+                                        tr_free (torrent_url);
+                                }
+                        }
+                        tr_torrentRemove( tor );
+                }
+        }
+        tr_free( torrents );
+        return NULL;
 }
 
 static const char*

daemon/remote.c

@@ -99 +99 @@
       "pl", 1, "<files>"             },
     { 'r', "remove",               "Remove the current torrent(s)",
       "r",  0, NULL                  },
+    { 'R', "remove-and-delete",    "Remove the current torrent(s) and delete file(s) from disk",
+      "R",  0, NULL                  },
     { 's', "start",                "Start the current torrent(s)",
       "s",  0, NULL                  },
     { 'S', "stop",                 "Stop the current torrent(s)",
@@ -409 +411 @@
                 addIdArg( args, id );
                 break;
 
+            case 'R':
+                tr_bencDictAddStr( &top, "method", "torrent-remove" );
+                addIdArg( args, id );
+                tr_bencDictAddInt( args, "delete-file", 1 );
+                break;
+
             case 's':
                 tr_bencDictAddStr( &top, "method", "torrent-start" );
                 addIdArg( args, id );

doc/rpc-spec.txt

@@ -73 +73 @@
    "torrent-stop"      | tr_torrentStop
    "torrent-verify"    | tr_torrentVerify
 
-   Request arguments: "ids", a list of torrent id numbers, sha1 hash strings,
+   Request arguments: (1) "ids", a list of torrent id numbers, sha1 hash strings,
                       or both.  These are the torrents that the request will
                       be applied to.  If "ids" is ommitted, the request is
                       applied to all torrents.
+                      (2) torrent-remove accept the following optional
+                      argument:
 
+   string              | value type & description
+   ---------------------------+-------------------------------------------------
+   "delete-file"       | 'boolean'  true to delete files too
+
    Response arguments: none
 
 3.2.  Torrent Mutators