Changeset 9330

Timestamp:

Oct 19, 2009, 5:25:50 AM (13 years ago)

Author:

charles

Message:

(trunk) #1483: move completed torrents to a user-specified directory

Location:

trunk

Files:

• doc/rpc-spec.txt (modified) (2 diffs)
• libtransmission/rpcimpl.c (modified) (3 diffs)
• qt/prefs-dialog.cc (modified) (2 diffs)
• qt/prefs-dialog.h (modified) (2 diffs)
• qt/prefs.cc (modified) (1 diff)
• qt/prefs.h (modified) (1 diff)
• qt/session.cc (modified) (1 diff)

trunk/doc/rpc-spec.txt

@@ -391 +391 @@
    "blocklist-enabled"        | boolean    true means enabled
    "blocklist-size"           | number     number of rules in the blocklist
+   "download-dir"             | string     default path to download torrents
    "dht-enabled"              | boolean    true means allow dht in public torrents
    "encryption"               | string     "required", "preferred", "tolerated"
-   "download-dir"             | string     default path to download torrents
+   "incomplete-dir"           | string     path for incomplete torrents, when enabled
+   "incomplete-dir-enabled"   | boolean    true means keep torrents in incomplete-dir until done
    "peer-limit-global"        | number     maximum global number of peers
    "peer-limit-per-torrent"   | number     maximum global number of peers
@@ -560 +562 @@
          |         |        NO | torrent-get    | removed arg "seeders"
          |         |        NO | torrent-get    | removed arg "timesCompleted"
-         |         | yes    NO | torrent-get    | new arg "trackerStats"
-
-
+         |         | yes       | torrent-get    | new arg "trackerStats"
+         |         | yes       | session-set    | new arg "incomplete-dir"
+         |         | yes       | session-set    | new arg "incomplete-dir-enabled"
+
+

trunk/libtransmission/rpcimpl.c

@@ -1147 +1147 @@
     if( tr_bencDictFindStr( args_in, TR_PREFS_KEY_DOWNLOAD_DIR, &str ) )
         tr_sessionSetDownloadDir( session, str );
+    if( tr_bencDictFindStr( args_in, TR_PREFS_KEY_INCOMPLETE_DIR, &str ) )
+        tr_sessionSetIncompleteDir( session, str );
+    if( tr_bencDictFindBool( args_in, TR_PREFS_KEY_INCOMPLETE_DIR_ENABLED, &boolVal ) )
+        tr_sessionSetIncompleteDirEnabled( session, boolVal );
     if( tr_bencDictFindInt( args_in, TR_PREFS_KEY_PEER_LIMIT_GLOBAL, &i ) )
         tr_sessionSetPeerLimit( session, i );
@@ -1256 +1260 @@
     tr_bencDictAddInt ( d, TR_PREFS_KEY_PEER_LIMIT_GLOBAL, tr_sessionGetPeerLimit( s ) );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_PEER_LIMIT_TORRENT, tr_sessionGetPeerLimitPerTorrent( s ) );
+    tr_bencDictAddStr ( d, TR_PREFS_KEY_INCOMPLETE_DIR, tr_sessionGetIncompleteDir( s ) );
+    tr_bencDictAddBool( d, TR_PREFS_KEY_INCOMPLETE_DIR_ENABLED, tr_sessionGetIncompleteDirEnabled( s ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_PEX_ENABLED, tr_sessionIsPexEnabled( s ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_DHT_ENABLED, tr_sessionIsDHTEnabled( s ) );
@@ -1261 +1267 @@
     tr_bencDictAddInt ( d, TR_PREFS_KEY_PEER_PORT_RANDOM_ON_START, tr_sessionGetPeerPortRandomOnStart( s ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_PORT_FORWARDING, tr_sessionIsPortForwardingEnabled( s ) );
-    tr_bencDictAddInt ( d, "rpc-version", 6 );
+    tr_bencDictAddInt ( d, "rpc-version", 7 );
     tr_bencDictAddInt ( d, "rpc-version-minimum", 1 );
     tr_bencDictAddReal( d, "seedRatioLimit", tr_sessionGetRatioLimit( s ) );

trunk/qt/prefs-dialog.cc

@@ -487 +487 @@
 
 void
+PrefsDialog :: onIncompleteClicked( void )
+{
+    const QString title = tr( "Select Incomplete Directory" );
+    const QString path = myPrefs.getString( Prefs::INCOMPLETE_DIR );
+    QFileDialog * d = new QFileDialog( this, title, path );
+    d->setFileMode( QFileDialog::Directory );
+    connect( d, SIGNAL(filesSelected(const QStringList&)),
+             this, SLOT(onIncompleteSelected(const QStringList&)) );
+    d->show( );
+}
+
+void
+PrefsDialog :: onIncompleteSelected( const QStringList& list )
+{
+    if( list.size() == 1 )
+        myPrefs.set( Prefs::INCOMPLETE_DIR, list.first( ) );
+}
+
+
+void
 PrefsDialog :: onWatchClicked( void )
 {
-    QFileDialog * d = new QFileDialog( this,
-                                       tr( "Select Watch Directory" ),
-                                       myPrefs.getString( Prefs::DIR_WATCH ) );
+    const QString title = tr( "Select Watch Directory" );
+    const QString path = myPrefs.getString( Prefs::DIR_WATCH );
+    QFileDialog * d = new QFileDialog( this, title, path );
     d->setFileMode( QFileDialog::Directory );
-    connect( d, SIGNAL(filesSelected(const QStringList&)), this, SLOT(onWatchSelected(const QStringList&)) );
+    connect( d, SIGNAL(filesSelected(const QStringList&)),
+             this, SLOT(onWatchSelected(const QStringList&)) );
     d->show( );
 }
@@ -507 +528 @@
 PrefsDialog :: onDestinationClicked( void )
 {
-    QFileDialog * d = new QFileDialog( this,
-                                       tr( "Select Destination" ),
-                                       myPrefs.getString( Prefs::DOWNLOAD_DIR ) );
+    const QString title = tr( "Select Destination" );
+    const QString path = myPrefs.getString( Prefs::DOWNLOAD_DIR );
+    QFileDialog * d = new QFileDialog( this, title, path );
     d->setFileMode( QFileDialog::Directory );
-    connect( d, SIGNAL(filesSelected(const QStringList&)), this, SLOT(onDestinationSelected(const QStringList&)) );
+    connect( d, SIGNAL(filesSelected(const QStringList&)),
+             this, SLOT(onDestinationSelected(const QStringList&)) );
     d->show( );
 }

trunk/qt/prefs-dialog.h

@@ -53 +53 @@
         void onWatchClicked( );
         void onWatchSelected( const QStringList& );
+        void onIncompleteClicked( );
+        void onIncompleteSelected( const QStringList& );
         void onDestinationClicked( );
         void onDestinationSelected( const QStringList& );
@@ -95 +97 @@
         QPushButton * myPortButton;
         QPushButton * myWatchButton;
+        QPushButton * myIncompleteButton;
         QPushButton * myDestinationButton;
         QWidgetList myWebWidgets;

trunk/qt/prefs.cc

@@ -78 +78 @@
     { DOWNLOAD_DIR, TR_PREFS_KEY_DOWNLOAD_DIR, QVariant::String },
     { ENCRYPTION, TR_PREFS_KEY_ENCRYPTION, QVariant::Int },
+    { INCOMPLETE_DIR, TR_PREFS_KEY_INCOMPLETE_DIR, QVariant::String },
+    { INCOMPLETE_DIR_ENABLED, TR_PREFS_KEY_INCOMPLETE_DIR_ENABLED, QVariant::Bool },
     { LAZY_BITFIELD, TR_PREFS_KEY_LAZY_BITFIELD, QVariant::Bool },
     { MSGLEVEL, TR_PREFS_KEY_MSGLEVEL, QVariant::Int },

trunk/qt/prefs.h

@@ -82 +82 @@
             DOWNLOAD_DIR,
             ENCRYPTION,
+            INCOMPLETE_DIR,
+            INCOMPLETE_DIR_ENABLED,
             LAZY_BITFIELD,
             MSGLEVEL,

trunk/qt/session.cc

@@ -123 +123 @@
         case Prefs :: DHT_ENABLED:
         case Prefs :: DOWNLOAD_DIR:
+        case Prefs :: INCOMPLETE_DIR:
+        case Prefs :: INCOMPLETE_DIR_ENABLED:
         case Prefs :: PEER_LIMIT_GLOBAL:
         case Prefs :: PEER_LIMIT_TORRENT: