(trunk daemon) #2158: transmission-remote should support "turtle mode"

diff --git a/daemon/remote.c b/daemon/remote.c
index 0598913b13e273a2acf50d6b90748c191de378da..85515f9d2a7220cceff8f34c7146c068fde27f98 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -63,6 +63,15 @@ getUsage( void )
 static tr_option opts[] =
 {
     { 'a', "add",                  "Add torrent files by filename or URL", "a",  0, NULL },
+    { 970, "alt-speed",            "Use the alternate Limits", "as",  0, NULL },
+    { 971, "no-alt-speed",         "Don't use the alternate Limits", "AS",  0, NULL },
+    { 972, "alt-speed-downlimit",  "max alternate download speed (in KB/s)", "asd",  1, "<speed>" },
+    { 973, "alt-speed-uplimit",    "max alternate upload speed (in KB/s)", "asu",  1, "<speed>" },
+    { 974, "alt-speed-scheduler",  "Use the scheduled on/off times", "asc",  0, NULL },
+    { 975, "no-alt-speed-scheduler","Don't use the scheduled on/off times", "ASC",  0, NULL },
+    { 976, "alt-speed-time-begin", "Time to start using the alt speed limits (in hhmm)", NULL,  1, "<time>" },
+    { 977, "alt-speed-time-end",   "Time to stop using the alt speed limits (in hhmm)", NULL,  1, "<time>" },
+    { 978, "alt-speed-days",       "Numbers for any/all days of the week - eg. \"1-7\"", NULL,  1, "<days>" },
     { 'b', "debug",                "Print debugging information", "b",  0, NULL },
     { 'd', "downlimit",            "Set the maximum global download speed in KB/s", "d",  1, "<speed>" },
     { 'D', "no-downlimit",         "Don't limit the global download speed", "D",  0, NULL },
@@ -210,6 +219,58 @@ addIdArg( tr_benc *    args,
     }
 }
 
+static void
+addTime( tr_benc * args, const char * key, const char * arg )
+{
+    int time;
+    tr_bool success = FALSE;
+
+    if( arg && ( strlen( arg ) == 4 ) )
+    {
+        const char hh[3] = { arg[0], arg[1], '\0' };
+        const char mm[3] = { arg[2], arg[3], '\0' };
+        const int hour = atoi( hh );
+        const int min = atoi( mm );
+
+        if( 0<=hour && hour<24 && 0<=min && min<60 )
+        {
+            time = min + ( hour * 60 );
+            success = TRUE;
+        }
+    }
+
+    if( success )
+        tr_bencDictAddInt( args, key, time );
+    else
+        fprintf( stderr, "Please specify the time of day in 'hhmm' format.\n" );
+}
+
+static void
+addDays( tr_benc * args, const char * key, const char * arg )
+{
+    int days = 0;
+
+    if( arg )
+    {
+        int i;
+        int valueCount;
+        int * values = tr_parseNumberRange( arg, -1, &valueCount );
+        for( i=0; i<valueCount; ++i )
+        {
+            if ( values[i] < 0 || values[i] > 7 ) continue;
+            if ( values[i] == 7 ) values[i] = 0;
+
+            days |= 1 << values[i];
+        }
+        tr_free( values );
+    }
+
+    if ( days )
+        tr_bencDictAddInt( args, key, days );
+    else
+        fprintf( stderr, "Please specify the days of the week in '1-3,4,7' format.\n" );
+}
+
 static void
 addFiles( tr_benc *    args,
           const char * key,
@@ -373,6 +434,51 @@ readargs( int           argc,
                 tr_bencDictAddBool( args, TR_PREFS_KEY_DSPEED_ENABLED, FALSE );
                 break;
 
+            case 970:
+                tr_bencDictAddStr( &top, "method", "session-set" );
+                tr_bencDictAddBool( args, TR_PREFS_KEY_ALT_SPEED_ENABLED, TRUE );
+                break;
+
+            case 971:
+                tr_bencDictAddStr( &top, "method", "session-set" );
+                tr_bencDictAddBool( args, TR_PREFS_KEY_ALT_SPEED_ENABLED, FALSE );
+                break;
+
+            case 972:
+                tr_bencDictAddStr( &top, "method", "session-set" );
+                tr_bencDictAddInt( args, TR_PREFS_KEY_ALT_SPEED_DOWN, numarg( optarg ) );
+                break;
+
+            case 973:
+                tr_bencDictAddStr( &top, "method", "session-set" );
+                tr_bencDictAddInt( args, TR_PREFS_KEY_ALT_SPEED_UP, numarg( optarg ) );
+                break;
+
+            case 974:
+                tr_bencDictAddStr( &top, "method", "session-set" );
+                tr_bencDictAddBool( args, TR_PREFS_KEY_ALT_SPEED_TIME_ENABLED, TRUE );
+                break;
+
+            case 975:
+                tr_bencDictAddStr( &top, "method", "session-set" );
+                tr_bencDictAddBool( args, TR_PREFS_KEY_ALT_SPEED_TIME_ENABLED, FALSE );
+                break;
+
+            case 976:
+                tr_bencDictAddStr( &top, "method", "session-set" );
+                addTime( args, TR_PREFS_KEY_ALT_SPEED_TIME_BEGIN, optarg);
+                break;
+
+            case 977:
+                tr_bencDictAddStr( &top, "method", "session-set" );
+                addTime( args, TR_PREFS_KEY_ALT_SPEED_TIME_END, optarg);
+                break;
+
+            case 978:
+                tr_bencDictAddStr( &top, "method", "session-set" );
+                addDays( args, TR_PREFS_KEY_ALT_SPEED_TIME_DAY, optarg );
+                break;
+
             case 'f':
                 tr_bencDictAddStr( &top, "method", "torrent-get" );
                 tr_bencDictAddInt( &top, "tag", TAG_FILES );

diff --git a/daemon/transmission-remote.1 b/daemon/transmission-remote.1
index 83874ba0ff564020545a2645d9a83b092bb475c1..958768078b632485a00346789e2a5deae165dff2 100644 (file)
--- a/daemon/transmission-remote.1
+++ b/daemon/transmission-remote.1
@@ -12,6 +12,12 @@ and
 .Nm
 .Op Ar host:port | host | port
 .Op Fl a Ar filenames-or-URLs
+.Op Fl as
+.Op Fl AS
+.Op Fl asd Ar number
+.Op Fl asu Ar number
+.Op Fl asc
+.Op Fl ASC
 .Op Fl b
 .Op Fl d Ar number | Fl D
 .Op Fl er | ep | et
@@ -40,6 +46,7 @@ and
 .Op Fl SR
 .Op Fl srd
 .Op Fl si
+.Op Fl st
 .Op Fl t Ar all | Ar id | Ar hash
 .Op Fl u Ar number | Fl U
 .Op Fl v
@@ -68,6 +75,41 @@ Add torrents to transmission.
 .It Fl b Fl -debug
 Enable debugging mode.
 
+.It Fl as Fl -alt-speed
+Use the alternate Limits.
+
+.It Fl AS Fl -no-alt-speed
+Don't use the alternate Limits.
+
+.It Fl asd Fl -alt-speed-downlimit Ar limit
+Limit the alternate download speed to
+.Ar limit
+kilobytes per second.
+
+.It Fl asu Fl -alt-speed-uplimit Ar limit
+Limit the alternate upload speed to
+.Ar limit
+kilobytes per second.
+
+.It Fl asc Fl -alt-speed-scheduler
+Use the scheduled on/off times.
+
+.It Fl ASC Fl -no-alt-speed-scheduler
+Don't use the scheduled on/off days and times.
+
+.It Fl -alt-speed-time-begin Ar time
+.Ar Time
+to start using the alt speed limits (in hhmm).
+
+.It Fl -alt-speed-time-end Ar time
+.Ar Time
+to stop using the alt speed limits (in hhmm).
+
+.It Fl -alt-speed-days Ar days
+Set the number of
+.Ar days
+on which to enable the speed scheduler, using a list such as "2,4-6".
+
 .It Fl d Fl -downlimit Ar limit
 Limit the global download speed to
 .Ar limit
@@ -248,10 +290,24 @@ In the `status' section of the list, the following shorthand is used:
 .El
 .Sh EXAMPLES
 
-Set download and upload limits to 100 KiB/sec and 20 KiB/sec:
+Set download and upload limits to 400 KiB/sec and 60 KiB/sec:
+.Bd -literal -offset indent
+$ transmission-remote -d400 -u60
+$ transmission-remote --downlimit=400 --uplimit=60
+.Ed
+
+Set alternate download and upload limits to 100 KiB/sec and 20 KiB/sec:
+.Bd -literal -offset indent
+$ transmission-remote -asd100 -asu20
+$ transmission-remote --alt-speed-downlimit=100 --alt-speed-uplimit=20
+.Ed
+
+Set the scheduler to use the alternate speed limits on weekdays between 10AM and 11PM
 .Bd -literal -offset indent
-$ transmission-remote -d100 -u20
-$ transmission-remote --downlimit=100 --uplimit=20
+$ transmission-remote --alt-speed-time-begin=1000
+$ transmission-remote --alt-speed-time-end=2300
+$ transmission-remote --alt-speed-days=1-5
+$ transmission-remote --alt-speed-scheduler
 .Ed
 
 List all torrents' IDs and states: