Changeset 6237

Timestamp:

Jun 21, 2008, 3:08:34 PM (15 years ago)

Author:

charles

Message:

(rpc) remove the sort and filter options from the "torrent-get" rpc command. NOTE: probably breaks the mac build; xcode needs to drop "rpc-utils" from its list of libtransmission source files

Location:

trunk

Files:

• doc/rpc-spec.txt (modified) (1 diff)
• libtransmission/Makefile.am (modified) (2 diffs)
• libtransmission/rpc-utils.c (deleted)
• libtransmission/rpc-utils.h (deleted)
• libtransmission/rpc.c (modified) (3 diffs)

trunk/doc/rpc-spec.txt

@@ -106 +106 @@
    "fields"     | yes       | n/a     | number    bitwise-or'ed field
                 |           |         |           values from the table below
-   "sort"       | no        | "id"    | string    "activity", "age", "id",
-                |           |         |           "name", "progress", "ratio",
-                |           |         |           "state", or "tracker".
-   "ascending"  | no        | 'true'  | 'boolean' true if sorting ascending
-   "filter"     | no        | "all"   | string    "active", "all", "paused",
-                |           |         |           "downloading", or "seeding".
 
    Response arguments:

trunk/libtransmission/Makefile.am

@@ -34 +34 @@
     rpc.c \
     rpc-server.c \
-    rpc-utils.c \
     session.c \
     stats.c \
@@ -79 +78 @@
     rpc.h \
     rpc-server.h \
-    rpc-utils.h \
     session.h \
     stats.h \

trunk/libtransmission/rpc.c

@@ -20 +20 @@
 #include "ratecontrol.h"
 #include "rpc.h"
-#include "rpc-utils.h"
 #include "json.h"
 #include "session.h"
@@ -46 +45 @@
 getTorrents( tr_handle * handle, tr_benc * args, int * setmeCount )
 {
-    int method;
     int torrentCount = 0;
     int64_t id;
-    int64_t sortAscending;
     tr_torrent ** torrents = NULL;
-    const char * str;
     tr_benc * ids;
 
@@ -95 +91 @@
             torrents[torrentCount++] = tor;
     }
-
-    /***
-    ****  filter the torrents
-    ***/
-
-    method = TR_FILTER_ALL;
-    if( tr_bencDictFindStr( args, "filter", &str ) ) {
-             if( !strcmp( str, "active"      ) ) method = TR_FILTER_ACTIVE;
-        else if( !strcmp( str, "downloading" ) ) method = TR_FILTER_DOWNLOADING;
-        else if( !strcmp( str, "paused"      ) ) method = TR_FILTER_PAUSED;
-        else if( !strcmp( str, "seeding"     ) ) method = TR_FILTER_SEEDING;
-    }
-    if( method != TR_FILTER_ALL )
-        tr_torrentFilter( torrents, &torrentCount, method );
-
-    /***
-    ****  sort the torrents
-    ***/
-
-    method = TR_SORT_ID;
-    sortAscending = 1;
-    tr_bencDictFindInt( args, "ascending", &sortAscending );
-    if( tr_bencDictFindStr( args, "sort", &str ) ) {
-             if( !strcmp( str, "activity" ) ) method = TR_SORT_ACTIVITY;
-        else if( !strcmp( str, "age" ) )      method = TR_SORT_AGE;
-        else if( !strcmp( str, "name" ) )     method = TR_SORT_NAME;
-        else if( !strcmp( str, "progress" ) ) method = TR_SORT_PROGRESS;
-        else if( !strcmp( str, "ratio" ) )    method = TR_SORT_RATIO;
-        else if( !strcmp( str, "state" ) )    method = TR_SORT_STATE;
-        else if( !strcmp( str, "tracker" ) )  method = TR_SORT_TRACKER;
-    }
-    tr_torrentSort( torrents, torrentCount, method, sortAscending!=0 );
 
     /***