Changeset 14707

Timestamp:

Mar 5, 2016, 5:27:40 PM (7 years ago)

Author:

mikedld

Message:

#5743: Use -rad as short form of --remove-and-delete

Location:

trunk/daemon

Files:

• remote.c (modified) (4 diffs)
• transmission-remote.1 (modified) (2 diffs)

trunk/daemon/remote.c

@@ -275 +275 @@
     { 'r', "remove",                 "Remove the current torrent(s)", "r",  0, NULL },
     { 930, "peers",                  "Set the maximum number of peers for the current torrent(s) or globally", "pr", 1, "<max>" },
-    { 'R', "remove-and-delete",      "Remove the current torrent(s) and delete local data", NULL, 0, NULL },
+    { 840, "remove-and-delete",      "Remove the current torrent(s) and delete local data", "rad", 0, NULL },
     { 800, "torrent-done-script",    "Specify a script to run when a torrent finishes", NULL, 1, "<file>" },
     { 801, "no-torrent-done-script", "Don't run a script when torrents finish", NULL, 0, NULL },
@@ -472 +472 @@
 
       case 'r': /* remove */
-      case 'R': /* remove and delete */
+      case 840: /* remove and delete */
         return MODE_TORRENT_REMOVE;
 
@@ -2278 +2278 @@
             }
             case 'r':
-            case 'R':
+            case 840:
             {
                 tr_variant * args;
@@ -2285 +2285 @@
                 tr_variantDictAddStr (top, TR_KEY_method, "torrent-remove");
                 args = tr_variantDictAddDict (top, ARGUMENTS, 2);
-                tr_variantDictAddBool (args, TR_KEY_delete_local_data, c=='R');
+                tr_variantDictAddBool (args, TR_KEY_delete_local_data, c == 840);
                 addIdArg (args, id, NULL);
                 status |= flush (rpcurl, &top);

trunk/daemon/transmission-remote.1

@@ -51 +51 @@
 .Op Fl pr Ar peers
 .Op Fl r
-.Op Fl R
+.Op Fl rad
 .Op Fl s | S
 .Op Fl sr Ar ratio
@@ -230 +230 @@
 .It Fl r Fl -remove
 Remove the current torrent(s). This does not delete the downloaded data.
-.It Fl -remove-and-delete
+.It Fl rad Fl -remove-and-delete
 Remove the current torrent(s) and delete their downloaded data.
 .It Fl -reannounce