Changeset 10132

Timestamp:

Feb 7, 2010, 7:20:00 PM (13 years ago)

Author:

charles

Message:

(trunk daemon) #2875 "add incomplete-dir, dht, and seedratio options to daemon" -- committed to trunk for 1.90

Location:

trunk/daemon

Files:

• daemon.c (modified) (6 diffs)
• transmission-daemon.1 (modified) (2 diffs)

trunk/daemon/daemon.c

@@ -69 +69 @@
     { 'c', "watch-dir", "Directory to watch for new .torrent files", "c", 1, "<directory>" },
     { 'C', "no-watch-dir", "Disable the watch-dir", "C", 0, NULL },
+    { 941, "incomplete-dir", "Where to store new torrents until they're complete", NULL, 1, "<directory>" },
+    { 942, "no-incomplete-dir", "Don't store incomplete torrents in a different location", NULL, 0, NULL },
     { 'd', "dump-settings", "Dump the settings and exit", "d", 0, NULL },
     { 'f', "foreground", "Run in the foreground instead of daemonizing", "f", 0, NULL },
@@ -80 +82 @@
     { 'w', "download-dir", "Where to save downloaded data", "w", 1, "<path>" },
     { 800, "paused", "Pause all torrents on startup", NULL, 0, NULL },
+    { 'o', "dht", "Enable distributed hash tables (DHT)", "o", 0, NULL },
+    { 'O', "no-dht", "Disable distributed hash tables (DHT)", "O", 0, NULL },
     { 'P', "peerport", "Port for incoming peers (Default: " TR_DEFAULT_PEER_PORT_STR ")", "P", 1, "<port>" },
     { 'm', "portmap", "Enable portmapping via NAT-PMP or UPnP", "m", 0, NULL },
@@ -91 +95 @@
     { 'I', "bind-address-ipv6", "Where to listen for peer connections", "I", 1, "<ipv6 address>" },
     { 'r', "rpc-bind-address", "Where to listen for RPC connections", "r", 1, "<ipv4 address>" },
+    { 953, "global-seedratio", "All torrents, unless overridden by a per-torrent setting, should seed until a specific ratio", "gsr", 1, "ratio" },
+    { 954, "no-global-seedratio", "All torrents, unless overridden by a per-torrent setting, should seed regardless of ratio", "GSR", 0, NULL },
     { 0, NULL, NULL, NULL, 0, NULL }
 };
@@ -312 +318 @@
             case 'C': tr_bencDictAddBool( &settings, PREF_KEY_DIR_WATCH_ENABLED, FALSE );
                       break;
+            case 941:
+                      tr_bencDictAddStr( &settings, TR_PREFS_KEY_INCOMPLETE_DIR, optarg );
+                      tr_bencDictAddBool( &settings, TR_PREFS_KEY_INCOMPLETE_DIR_ENABLED, TRUE );
+                      break;
+            case 942:
+                      tr_bencDictAddBool( &settings, TR_PREFS_KEY_INCOMPLETE_DIR_ENABLED, FALSE );
+                      break;
             case 'd': dumpSettings = TRUE;
                       break;
@@ -321 +334 @@
                       fprintf(stderr, "Transmission %s\n", LONG_VERSION_STRING);
                       exit( 0 );
+            case 'o':
+                      tr_bencDictAddBool( &settings, TR_PREFS_KEY_DHT_ENABLED, TRUE );
+                      break;
+            case 'O':
+                      tr_bencDictAddBool( &settings, TR_PREFS_KEY_DHT_ENABLED, FALSE );
+                      break;
             case 'p': tr_bencDictAddInt( &settings, TR_PREFS_KEY_RPC_PORT, atoi( optarg ) );
                       break;
@@ -360 +379 @@
                       tr_bencDictAddStr( &settings, TR_PREFS_KEY_RPC_BIND_ADDRESS, optarg );
                       break;
+            case 953:
+                      tr_bencDictAddReal( &settings, TR_PREFS_KEY_RATIO, atof(optarg) );
+                      tr_bencDictAddBool( &settings, TR_PREFS_KEY_RATIO_ENABLED, TRUE );
+                      break;
+            case 954:
+                      tr_bencDictAddBool( &settings, TR_PREFS_KEY_RATIO_ENABLED, FALSE );
+                      break;
             default:  showUsage( );
                       break;

trunk/daemon/transmission-daemon.1

@@ -61 +61 @@
 .It Fl et Fl -encryption-tolerated
 Prefer unencrypted peer connections.
+.It Fl gsr Fl -global-seedratio Ar ratio
+All torrents, unless overridden by a per-torrent setting, should seed until a specific
+.Ar ratio
+.It Fl GSR Fl -no-global-seedratio
+All torrents, unless overridden by a per-torrent setting, should seed regardless of ratio
 .It Fl h Fl -help
 Print command-line option descriptions.
+.It Fl -incomplete-dir Ar dir
+When adding new torrents, store their contents in
+.Ar directory
+until the torrent is done.
+.It Fl -no-incomplete-dir
+Don't store incomplete torrents in a different directory.
 .It Fl i Fl -bind-address-ipv4
 Listen for IPv4 BitTorrent connections on a specific address. Only one IPv4 listening address is allowed. Default: 0.0.0.0 (All addresses)
@@ -79 +90 @@
 .It Fl M Fl -no-portmap
 Disable portmapping
+.It Fl o Fl -dht
+Enable distributed hash table (DHT).
+.It Fl O Fl -no-dht
+Disable distribued hash table (DHT).
 .It Fl p Fl -port Ar port
 Port to open and listen for RPC requests on.  Default: 9091