Changeset 10078

Timestamp:

Feb 2, 2010, 7:48:03 AM (13 years ago)

Author:

charles

Message:

(trunk libT) #2846 "Priority Selection in `Add' Window" -- added RPC hooks for doing this via remote client

Location:

trunk

Files:

• doc/rpc-spec.txt (modified) (2 diffs)
• libtransmission/rpcimpl.c (modified) (1 diff)
• libtransmission/torrent-ctor.c (modified) (3 diffs)
• libtransmission/torrent.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)

trunk/doc/rpc-spec.txt

@@ -331 +331 @@
    Request arguments:
 
-   key                | value type & description
-   -------------------+-------------------------------------------------
-   "download-dir"     | string      path to download the torrent to
-   "filename"         | string      filename or URL of the .torrent file
-   "metainfo"         | string      base64-encoded .torrent content
-   "paused"           | boolean     if true, don't start the torrent
-   "peer-limit"       | number      maximum number of peers
-   "files-wanted"     | array       indices of file(s) to download
-   "files-unwanted"   | array       indices of file(s) to not download
-   "priority-high"    | array       indices of high-priority file(s)
-   "priority-low"     | array       indices of low-priority file(s)
-   "priority-normal"  | array       indices of normal-priority file(s)
+   key                  | value type & description
+   ---------------------+-------------------------------------------------
+   "download-dir"       | string      path to download the torrent to
+   "filename"           | string      filename or URL of the .torrent file
+   "metainfo"           | string      base64-encoded .torrent content
+   "paused"             | boolean     if true, don't start the torrent
+   "peer-limit"         | number      maximum number of peers
+   "bandwidthPriority"  | number      torrent's bandwidth tr_priority_t 
+   "files-wanted"       | array       indices of file(s) to download
+   "files-unwanted"     | array       indices of file(s) to not download
+   "priority-high"      | array       indices of high-priority file(s)
+   "priority-low"       | array       indices of low-priority file(s)
+   "priority-normal"    | array       indices of normal-priority file(s)
 
    Either "filename" OR "metainfo" MUST be included.
@@ -577 +578 @@
    8     | 1.90    | yes       | session-set    | new arg "rename-partial-files"
          |         | yes       | session-get    | new arg "rename-partial-files"
-
+         |         | yes       | torrent-add    | new arg "bandwidthPriority"

trunk/libtransmission/rpcimpl.c

@@ -1062 +1062 @@
             tr_ctorSetPeerLimit( ctor, TR_FORCE, i );
 
+        if( tr_bencDictFindInt( args_in, "bandwidthPriority", &i ) )
+            tr_ctorSetBandwidthPriority( ctor, i );
+
         if( tr_bencDictFindList( args_in, "files-unwanted", &l ) ) {
             tr_file_index_t fileCount;

trunk/libtransmission/torrent-ctor.c

@@ -39 +39 @@
     tr_bool                 doDelete;
 
+    tr_priority_t           bandwidthPriority;
     tr_bool                 isSet_metainfo;
     tr_bool                 isSet_delete;
@@ -426 +427 @@
 ***/
 
+static tr_bool
+isPriority( int i )
+{
+    return (i==TR_PRI_LOW) || (i==TR_PRI_NORMAL) || (i==TR_PRI_HIGH);
+}
+
+void
+tr_ctorSetBandwidthPriority( tr_ctor * ctor, tr_priority_t priority )
+{
+fprintf( stderr, "in tr_ctorSetPriority with %d\n", (int)priority );
+    if( isPriority( priority ) )
+        ctor->bandwidthPriority = priority;
+}
+
+tr_priority_t
+tr_ctorGetBandwidthPriority( const tr_ctor * ctor )
+{
+fprintf( stderr, "got priority with %d\n", (int)ctor->bandwidthPriority );
+    return ctor->bandwidthPriority;
+}
+
+/***
+****
+***/
+
 tr_ctor*
 tr_ctorNew( const tr_session * session )
@@ -432 +458 @@
 
     ctor->session = session;
+    ctor->bandwidthPriority = TR_PRI_NORMAL;
     tr_ctorSetPaused( ctor, TR_FALLBACK, FALSE );
     if( session != NULL ) {

trunk/libtransmission/torrent.c

@@ -635 +635 @@
     tor->bandwidth = tr_bandwidthNew( session, session->bandwidth );
 
+    tor->bandwidth->priority = tr_ctorGetBandwidthPriority( ctor );
+
     tor->error = TR_STAT_OK;
 

trunk/libtransmission/transmission.h

@@ -340 +340 @@
 const char * tr_sessionGetDownloadDir( const tr_session * session );
 
+
+/**
+ * @brief Set the torrent's bandwidth priority.
+ */
+void tr_ctorSetBandwidthPriority( tr_ctor * ctor, tr_priority_t priority );
+
+/**
+ * @brief Get the torrent's bandwidth priority.
+ */
+tr_priority_t tr_ctorGetBandwidthPriority( const tr_ctor * ctor );
+
+
 /**
  * @brief set the per-session incomplete download folder.