Changeset 5868

Timestamp:

May 20, 2008, 11:58:59 PM (14 years ago)

Author:

charles

Message:

(#954) rpc: add "torrent-remove" method. rename tr_torrentDelete() as tr_torrentRemove() for consistency with various parts of the code.

Location:

trunk

Files:

• daemon/transmission-remote.1 (modified) (2 diffs)
• doc/rpc-spec.txt (modified) (1 diff)
• gtk/Makefile.am (modified) (1 diff)
• gtk/add-dialog.c (modified) (4 diffs)
• gtk/tr-core.c (modified) (1 diff)
• gtk/tr-torrent.c (modified) (3 diffs)
• gtk/tr-torrent.h (modified) (1 diff)
• libtransmission/rpc.c (modified) (2 diffs)
• libtransmission/torrent.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (4 diffs)
• macosx/Makefile.am (modified) (1 diff)
• macosx/Torrent.m (modified) (1 diff)

trunk/daemon/transmission-remote.1

@@ -27 +27 @@
 .Op Fl q
 .Oo
-.Fl r Ar all | Ar torrent-id
+.Fl r Ar all | Ar id | Ar hash
 .Oc
 .Oo
-.Fl s Ar all | Ar torrent-id
+.Fl s Ar all | Ar id | Ar hash
 .Oc
 .Oo
-.Fl S Ar all | Ar torrent-id
+.Fl S Ar all | Ar id | Ar hash
 .Oc
 .Op Fl u Ar upload-rate
 .Op Fl U
 .Oo
-.Fl V Ar all | Ar torrent-id
+.Fl v Ar all | Ar id | Ar hash
 .Oc
 .Ek
@@ -84 +84 @@
 .Ar port
 for use as a listening port to accept incoming peer connections.
-.It Fl r Fl -remove Ar all | torrent-id
-Remove all torrents, or the torrent with the unique id
-.Ar torrent-id .
-Neither the downloaded data nor the original torrent metainfo file
-will be deleted.
-.It Fl S Fl -stop Ar all | torrent-id
-Stop all torrents from downloading or seeding, or the torrent with the unique id
-.Ar torrent-id .
-.It Fl s Fl -start Ar all | torrent-id
-Start all torrents downloading or seeding, or the torrent with the unique id
-.Ar torrent-id .
+
+.It Fl r Fl -remove Ar all | id | torrent-hash
+Remove all torrents, or the torrent matching the specified
+.Ar id
+or
+.Ar hash .
+This does not delete the downloaded data.
+
+.It Fl S Fl -stop Ar all | id | torrent-hash
+Stop all torrents from downloading or seeding, or the torrent matching the specified
+.Ar id
+or
+.Ar hash .
+
+.It Fl s Fl -start Ar all | id | torrent-hash
+Start all torrents downloading or seeding, or the torrent matching the specified
+.Ar id
+or
+.Ar hash .
+
 .It Fl u Fl -upload-limit Ar upload-rate
 Set maximum upload rate to
 .Ar upload-rate
 in kilobytes per second.
+
 .It Fl U Fl -upload-unlimited
 Remove the upload limit.
+
+.It Fl v Fl -verify Ar all | id | torrent-hash
+Queue all the torrents for verification, or the torrent matching the specified
+.Ar id
+or
+.Ar hash .
 
 .El

trunk/doc/rpc-spec.txt

@@ -64 +64 @@
 3.1.  Torrent Action Requests
 
-   Method names: "torrent-start", "torrent-stop",
-                 "torrent-remove", "torrent-verify"
+   Method name         | libtransmission function
+   --------------------+-------------------------------------------------
+   "torrent-close"     | tr_torrentClose
+   "torrent-remove"    | tr_torrentRemove
+   "torrent-start"     | tr_torrentStart
+   "torrent-stop"      | tr_torrentStop
+   "torrent-verify"    | tr_torrentVerify
 
    Request arguments: "ids", a list of torrent id integers, sha1 hash strings,

trunk/gtk/Makefile.am

@@ -33 +33 @@
     torrent-cell-renderer.h \
     tr-core.h \
+    tr-core-dbus.h \
     tr-icon.h \
     tr-io.h \

trunk/gtk/add-dialog.c

@@ -32 +32 @@
 
 static void
-deleteOldTorrent( struct AddData * data )
+removeOldTorrent( struct AddData * data )
 {
     if( data->gtor )
@@ -38 +38 @@
         file_list_set_torrent( data->list, NULL );
 
-        tr_torrent_set_delete_flag( data->gtor, TRUE );
+        tr_torrent_set_remove_flag( data->gtor, TRUE );
         g_object_unref( G_OBJECT( data->gtor ) );
         data->gtor = NULL;
@@ -52 +52 @@
     {
         if( response != GTK_RESPONSE_ACCEPT )
-            deleteOldTorrent( data );
+            removeOldTorrent( data );
         else {
             if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( data->run_check ) ) )
@@ -83 +83 @@
     struct AddData * data = gdata;
 
-    deleteOldTorrent( data );
+    removeOldTorrent( data );
 
     g_free( data->filename );

trunk/gtk/tr-core.c

@@ -825 +825 @@
         tr_torrent_delete_files( gtor );
 
-    /* delete the torrent */
-    tr_torrent_set_delete_flag( gtor, TRUE );
+    /* remove the torrent */
+    tr_torrent_set_remove_flag( gtor, TRUE );
     g_object_unref( G_OBJECT( gtor ) );
 }

trunk/gtk/tr-torrent.c

@@ -40 +40 @@
 {
    tr_torrent * handle;
-   gboolean do_delete;
+   gboolean do_remove;
    gboolean seeding_cap_enabled;
    gdouble seeding_cap; /* ratio to stop seeding at */
@@ -79 +79 @@
         if( self->priv->handle )
         {
-            if( self->priv->do_delete )
-                tr_torrentDelete( self->priv->handle );
+            if( self->priv->do_remove )
+                tr_torrentRemove( self->priv->handle );
             else
                 tr_torrentClose( self->priv->handle );
@@ -319 +319 @@
 
 void
-tr_torrent_set_delete_flag( TrTorrent * gtor, gboolean do_delete )
+tr_torrent_set_remove_flag( TrTorrent * gtor, gboolean do_remove )
 {
     if( !isDisposed( gtor ) )
-        gtor->priv->do_delete = do_delete;
+        gtor->priv->do_remove = do_remove;
 }
 

trunk/gtk/tr-torrent.h

@@ -97 +97 @@
 
 void
-tr_torrent_set_delete_flag( TrTorrent *, gboolean );
+tr_torrent_set_remove_flag( TrTorrent *, gboolean );
 
 #endif

trunk/libtransmission/rpc.c

@@ -131 +131 @@
         notify( h, TR_RPC_TORRENT_CLOSING, tor );
         tr_torrentClose( tor );
+    }
+    tr_free( torrents );
+    return NULL;
+}
+
+static const char*
+torrentRemove( tr_handle * h, tr_benc * args_in, tr_benc * args_out UNUSED )
+{
+    int i, torrentCount;
+    tr_torrent ** torrents = getTorrents( h, args_in, &torrentCount );
+    for( i=0; i<torrentCount; ++i )
+    {
+        tr_torrent * tor = torrents[i];
+        notify( h, TR_RPC_TORRENT_REMOVING, tor );
+        tr_torrentRemove( tor );
     }
     tr_free( torrents );
@@ -674 +689 @@
     { "torrent-info", torrentInfo },
     { "torrent-list", torrentList },
+    { "torrent-remove", torrentRemove },
     { "torrent-set-priorities", torrentSetPriorities },
     { "torrent-set", torrentSet },

trunk/libtransmission/torrent.c

@@ -1134 +1134 @@
 
 void
-tr_torrentDelete( tr_torrent * tor )
+tr_torrentRemove( tr_torrent * tor )
 {
     tor->isDeleting = 1;

trunk/libtransmission/transmission.h

@@ -157 +157 @@
     TR_RPC_TORRENT_STOPPED,
     TR_RPC_TORRENT_CLOSING,
+    TR_RPC_TORRENT_REMOVING,
     TR_RPC_TORRENT_CHANGED,
     TR_RPC_SESSION_CHANGED
@@ -469 +470 @@
  *  + Simplifies the API down to two (non-deprecated) functions.
  *  + You can set the fields you want; the system sets defaults for the rest.
- *  + You can specify whether or not your fields should supercede fastresume's.
+ *  + You can specify whether or not your fields should supercede resume's.
  *  + We can add new features to tr_ctor without breaking tr_torrentNew()'s API.
  *
@@ -488 +489 @@
 {
     TR_FALLBACK, /* indicates the ctor value should be used only
-                    in case of missing fastresume settings */
+                    in case of missing resume settings */
 
     TR_FORCE, /* indicates the ctor value should be used
-                 regardless of what's in the fastresume settings */
+                 regardless of what's in the resume settings */
 }
 tr_ctorMode;
@@ -747 +748 @@
 /**
  * Like tr_torrentClose() but also deletes
- * the fastresume file and our copy of the
+ * the resume file and our copy of the
  * torrent file
  */
-void tr_torrentDelete( tr_torrent * );
+void tr_torrentRemove( tr_torrent * );
 
 /***********************************************************************

trunk/macosx/Makefile.am

@@ -57 +57 @@
     InfoWindowController.h \
     InfoWindowController.m \
-    IPCController.h \
-    IPCController.m \
     main.m \
     MenuLabel.h \

trunk/macosx/Torrent.m

@@ -206 +206 @@
     [self setTimeMachineExclude: NO forPath: [[self downloadFolder] stringByAppendingPathComponent: [self name]]];
     
-    tr_torrentDelete(fHandle);
+    tr_torrentRemove(fHandle);
 }