Changeset 9170

Timestamp:

Sep 25, 2009, 9:05:59 PM (13 years ago)

Author:

charles

Message:

(trunk)
#1699: Announce to multiple trackers at once
#2424: Tracker address is not listed in GTK client.

Location:

trunk

Files:

• daemon/remote.c (modified) (6 diffs)
• doc/rpc-spec.txt (modified) (4 diffs)
• gtk/conf.c (modified) (1 diff)
• gtk/details.c (modified) (5 diffs)
• gtk/my-valgrind.sh (modified) (1 diff)
• gtk/torrent-cell-renderer.c (modified) (1 diff)
• gtk/tr-prefs.h (modified) (1 diff)
• libtransmission/Makefile.am (modified) (4 diffs)
• libtransmission/announcer.c (added)
• libtransmission/announcer.h (added)
• libtransmission/metainfo.c (modified) (2 diffs)
• libtransmission/rpcimpl.c (modified) (7 diffs)
• libtransmission/session.c (modified) (9 diffs)
• libtransmission/session.h (modified) (2 diffs)
• libtransmission/torrent.c (modified) (16 diffs)
• libtransmission/torrent.h (modified) (3 diffs)
• libtransmission/tracker.c (deleted)
• libtransmission/tracker.h (deleted)
• libtransmission/transmission.h (modified) (7 diffs)
• libtransmission/web.c (modified) (9 diffs)

trunk/daemon/remote.c

@@ -307 +307 @@
     "activityDate",
     "addedDate",
-    "announceResponse",
-    "announceURL",
     "comment",
     "corruptEver",
@@ -324 +322 @@
     "id",
     "isPrivate",
-    "lastAnnounceTime",
-    "lastScrapeTime",
     "leechers",
     "leftUntilDone",
     "name",
-    "nextAnnounceTime",
-    "nextScrapeTime",
     "peersConnected",
     "peersGettingFromUs",
@@ -339 +333 @@
     "rateUpload",
     "recheckProgress",
-    "scrapeResponse",
     "seeders",
     "sizeWhenDone",
@@ -346 +339 @@
     "timesCompleted",
     "totalSize",
+    "trackerStats",
     "uploadedEver",
     "pieces",
@@ -971 +965 @@
 }
 
-static const char*
-getTrackerDateStr( const time_t t, tr_bool isStopped )
-{
-    const char * str;
-    switch( t ) {
-        case 0: str = isStopped ? "None (Stopped)\n" : "None\n"; break;
-        case 1: str = "In Progress\n"; break;
-        default: str = ctime( &t ); break;
-    }
-    return str;
-}
-
 static void
 printSession( tr_benc * top )
@@ -1257 +1239 @@
             printf( "\n" );
 
-            printf( "TRACKER\n" );
-            if( tr_bencDictFindInt( t, "lastAnnounceTime", &i ) )
-                printf( "  Latest announce: %s", getTrackerDateStr( (time_t)i, isStopped ) );
-            if( tr_bencDictFindStr( t, "announceURL", &str ) )
-                printf( "  Announce URL: %s\n", str );
-            if( tr_bencDictFindStr( t, "announceResponse", &str ) && str && *str )
-                printf( "  Announce response: %s\n", str );
-            if( tr_bencDictFindInt( t, "nextAnnounceTime", &i ) )
-                printf( "  Next announce:   %s", getTrackerDateStr( (time_t)i, isStopped ) );
-            if( tr_bencDictFindInt( t, "lastScrapeTime", &i ) )
-                printf( "  Latest scrape:   %s", getTrackerDateStr( (time_t)i, isStopped ) );
-            if( tr_bencDictFindStr( t, "scrapeResponse", &str ) )
-                printf( "  Scrape response: %s\n", str );
-            if( tr_bencDictFindInt( t, "nextScrapeTime", &i ) )
-                printf( "  Next scrape:     %s", getTrackerDateStr( (time_t)i, isStopped ) );
-            if( tr_bencDictFindInt( t, "seeders", &i ) && tr_bencDictFindInt( t, "leechers", &j ) )
-                printf( "  Tracker knows of %" PRId64 " seeders and %" PRId64 " leechers\n", i, j );
-            if( tr_bencDictFindInt( t, "timesCompleted", &i ) )
-                printf( "  Tracker has seen %" PRId64 " clients complete this torrent\n", i );
-            printf( "\n" );
+            printf( "TRACKERS\n" );
+
+            if( tr_bencDictFindList( t, "trackerStats", &l ) )
+            {
+                tr_benc * t;
+                for( i=0; (( t = tr_bencListChild( l, i ))); ++i )
+                {
+                    int64_t downloadCount; 
+                    tr_bool hasAnnounced; 
+                    tr_bool hasScraped; 
+                    const char * host;
+                    tr_bool isActive; 
+                    tr_bool isAnnouncing; 
+                    tr_bool isScraping; 
+                    int64_t lastAnnouncePeerCount; 
+                    const char * lastAnnounceResult; 
+                    time_t lastAnnounceStartTime; 
+                    tr_bool lastAnnounceSucceeded; 
+                    time_t lastAnnounceTime; 
+                    const char * lastScrapeResult; 
+                    time_t lastScrapeStartTime; 
+                    tr_bool lastScrapeSucceeded; 
+                    int64_t lastScrapeTime; 
+                    int64_t leecherCount; 
+                    int64_t nextAnnounceTime; 
+                    int64_t nextScrapeTime; 
+                    int64_t seederCount;
+                    int64_t tier;
+                    tr_bool willAnnounce;
+                    tr_bool willScrape;
+           
+                    if( tr_bencDictFindInt ( t, "downloadCount", &downloadCount ) &&
+                        tr_bencDictFindBool( t, "hasAnnounced", &hasAnnounced ) &&
+                        tr_bencDictFindBool( t, "hasScraped", &hasScraped ) &&
+                        tr_bencDictFindStr ( t, "host", &host ) &&
+                        tr_bencDictFindBool( t, "isActive", &isActive ) &&
+                        tr_bencDictFindBool( t, "isAnnouncing", &isAnnouncing ) &&
+                        tr_bencDictFindBool( t, "isScraping", &isScraping ) &&
+                        tr_bencDictFindInt ( t, "lastAnnouncePeerCount", &lastAnnouncePeerCount ) &&
+                        tr_bencDictFindStr ( t, "lastAnnounceResult", &lastAnnounceResult ) &&
+                        tr_bencDictFindInt ( t, "lastAnnounceStartTime", &lastAnnounceStartTime ) &&
+                        tr_bencDictFindBool( t, "lastAnnounceSucceeded", &lastAnnounceSucceeded ) &&
+                        tr_bencDictFindInt ( t, "lastAnnounceTime", &lastAnnounceTime ) &&
+                        tr_bencDictFindStr ( t, "lastScrapeResult", &lastScrapeResult ) &&
+                        tr_bencDictFindInt ( t, "lastScrapeStartTime", &lastScrapeStartTime ) &&
+                        tr_bencDictFindBool( t, "lastScrapeSucceeded", &lastScrapeSucceeded ) &&
+                        tr_bencDictFindInt ( t, "lastScrapeTime", &lastScrapeTime ) &&
+                        tr_bencDictFindInt ( t, "leecherCount", &leecherCount ) &&
+                        tr_bencDictFindInt ( t, "nextAnnounceTime", &nextAnnounceTime ) &&
+                        tr_bencDictFindInt ( t, "nextScrapeTime", &nextScrapeTime ) &&
+                        tr_bencDictFindInt ( t, "seederCount", &seederCount ) &&
+                        tr_bencDictFindInt ( t, "tier", &tier ) &&
+                        tr_bencDictFindBool( t, "willAnnounce", &willAnnounce ) &&
+                        tr_bencDictFindBool( t, "willScrape", &willScrape ) )
+                    {
+                        const time_t now = time( NULL );
+
+                        printf( "\n" );
+                        printf( "  Tracker #%d: %s\n", (int)(i+1), host );
+                        if( isActive )
+                          printf( "  Active in tier #%d\n", (int)tier );
+                        else
+                          printf( "  Backup on tier #%d\n", (int)tier );
+
+                        if( isActive && hasAnnounced )
+                        {
+                            tr_strltime( buf, now - lastAnnounceTime, sizeof( buf ) );
+                            if( lastAnnounceSucceeded )
+                                printf( "  Got a list of %'d peers %s ago\n",
+                                        (int)lastAnnouncePeerCount, buf );
+                            else
+                                printf( "  Got an error \"%s\" %s ago\n",
+                                        lastAnnounceResult, buf );
+                        }
+
+                        if( isActive && ( isAnnouncing || willAnnounce ) ) {
+                            if( !isAnnouncing ) {
+                                tr_strltime( buf, nextAnnounceTime - now, sizeof( buf ) );
+                                printf( "  Asking for more peers in %s\n", buf );
+                            } else {
+                                tr_strltime( buf, now - lastAnnounceStartTime, sizeof( buf ) );
+                                printf( "  Asking for more peers now... %s\n", buf );
+                            }
+                        }
+
+                        if( !hasAnnounced && !isAnnouncing && !willAnnounce )
+                          printf( "  No updates scheduled\n" );
+
+                        if( isActive && hasScraped ) {
+                            tr_strltime( buf, now - lastScrapeTime, sizeof( buf ) );
+                            if( lastScrapeSucceeded )
+                                printf( "  Tracker had %'d seeders and %'d leechers %s ago\n",
+                                        (int)seederCount, (int)leecherCount, buf );
+                            else
+                                printf( "  Got a scrape error \"%s\" %s ago\n", 
+                                        lastScrapeResult, buf );
+                        }
+
+                        if( isScraping || willScrape ) {
+                            if( !isScraping ) {
+                                tr_strltime( buf, nextScrapeTime - now, sizeof( buf ) );
+                                printf( "  Asking for peer counts in %s\n", buf );
+                            } else {
+                                tr_strltime( buf, now - lastScrapeStartTime, sizeof( buf ) );
+                                printf( "  Asking for peer counts now... %s\n", buf );
+                            }
+                        }
+                    }
+                }
+                printf( "\n" );
+            }
 
             printf( "ORIGINS\n" );

trunk/doc/rpc-spec.txt

@@ -73 +73 @@
 
    Request arguments: "ids", which specifies which torrents to use.
-                      All torrents are used if the "ids" argument is omitted.
-                      "ids" should be one of the following:
-                      (1) an integer referring to a torrent id
-                      (2) a list of torrent id numbers, sha1 hash strings, or both
-                      (3) a string, "recently-active", for recently-active torrents
+                  All torrents are used if the "ids" argument is omitted.
+                  "ids" should be one of the following:
+                  (1) an integer referring to a torrent id
+                  (2) a list of torrent id numbers, sha1 hash strings, or both
+                  (3) a string, "recently-active", for recently-active torrents
 
    Response arguments: none
@@ -87 +87 @@
    Request arguments:
 
-   string                            | value type & description
-   ----------------------------------+-------------------------------------------------
-   "bandwidthPriority"               | number     this torrent's bandwidth tr_priority_t
-   "downloadLimit"                   | number     maximum download speed (in K/s)
-   "downloadLimited"                 | boolean    true if "downloadLimit" is honored
-   "files-wanted"                    | array      indices of file(s) to download
-   "files-unwanted"                  | array      indices of file(s) to not download
-   "honorsSessionLimits"             | boolean    true if session upload limits are honored
-   "ids"                             | array      torrent list, as described in 3.1
-   "location"                        | string     new location of the torrent's content
-   "peer-limit"                      | number     maximum number of peers
-   "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)
-   "seedRatioLimit"                  | double     session seeding ratio
-   "seedRatioMode"                   | number     which ratio to use.  See tr_ratiolimit
-   "uploadLimit"                     | number     maximum upload speed (in K/s)
-   "uploadLimited"                   | boolean    true if "uploadLimit" is honored
+   string                | value type & description
+   ----------------------+-------------------------------------------------
+   "bandwidthPriority"   | number     this torrent's bandwidth tr_priority_t
+   "downloadLimit"       | number     maximum download speed (in K/s)
+   "downloadLimited"     | boolean    true if "downloadLimit" is honored
+   "files-wanted"        | array      indices of file(s) to download
+   "files-unwanted"      | array      indices of file(s) to not download
+   "honorsSessionLimits" | boolean    true if session upload limits are honored
+   "ids"                 | array      torrent list, as described in 3.1
+   "location"            | string     new location of the torrent's content
+   "peer-limit"          | number     maximum number of peers
+   "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)
+   "seedRatioLimit"      | double     session seeding ratio
+   "seedRatioMode"       | number     which ratio to use.  See tr_ratiolimit
+   "uploadLimit"         | number     maximum upload speed (in K/s)
+   "uploadLimited"       | boolean    true if "uploadLimit" is honored
 
    Just as an empty "ids" value is shorthand for "all ids", using an empty array
@@ -129 +129 @@
        torrents.
 
-   key                             | type                        | source 
-   --------------------------------+-----------------------------+---------
-   activityDate                    | number                      | tr_stat
-   addedDate                       | number                      | tr_stat
-   announceResponse                | string                      | tr_stat
-   announceURL                     | string                      | tr_stat
-   bandwidthPriority               | number                      | tr_priority_t
-   comment                         | string                      | tr_info
-   corruptEver                     | number                      | tr_stat
-   creator                         | string                      | tr_info
-   dateCreated                     | number                      | tr_info
-   desiredAvailable                | number                      | tr_stat
-   doneDate                        | number                      | tr_stat
-   downloadDir                     | string                      | tr_torrent
-   downloadedEver                  | number                      | tr_stat
-   downloaders                     | number                      | tr_stat
-   downloadLimit                   | number                      | tr_torrent
-   downloadLimited                 | boolean                     | tr_torrent
-   error                           | number                      | tr_stat
-   errorString                     | string                      | tr_stat
-   eta                             | number                      | tr_stat
-   files                           | array (see below)           | n/a
-   fileStats                       | array (see below)           | n/a
-   hashString                      | string                      | tr_info
-   haveUnchecked                   | number                      | tr_stat
-   haveValid                       | number                      | tr_stat
-   honorsSessionLimits             | boolean                     | tr_torrent
-   id                              | number                      | tr_torrent
-   isPrivate                       | boolean                     | tr_torrent
-   lastAnnounceTime                | number                      | tr_stat
-   lastScrapeTime                  | number                      | tr_stat
-   leechers                        | number                      | tr_stat
-   leftUntilDone                   | number                      | tr_stat
-   manualAnnounceTime              | number                      | tr_stat
-   maxConnectedPeers               | number                      | tr_torrent
-   name                            | string                      | tr_info
-   nextAnnounceTime                | number                      | tr_stat
-   nextScrapeTime                  | number                      | tr_stat
-   peer-limit                      | number                      | tr_torrent
-   peers                           | array (see below)           | n/a
-   peersConnected                  | number                      | tr_stat
-   peersFrom                       | object (see below)          | n/a
-   peersGettingFromUs              | number                      | tr_stat
-   peersKnown                      | number                      | tr_stat
-   peersSendingToUs                | number                      | tr_stat
-   percentDone                     | double                      | tr_stat
-   pieces                          | string (see below)          | tr_torrent
-   pieceCount                      | number                      | tr_info
-   pieceSize                       | number                      | tr_info
-   priorities                      | array (see below)           | n/a
-   rateDownload (B/s)              | number                      | tr_stat
-   rateUpload (B/s)                | number                      | tr_stat
-   recheckProgress                 | double                      | tr_stat
-   scrapeResponse                  | string                      | tr_stat
-   scrapeURL                       | string                      | tr_stat
-   seeders                         | number                      | tr_stat
-   seedRatioLimit                  | double                      | tr_torrent
-   seedRatioMode                   | number                      | tr_ratiolimit
-   sizeWhenDone                    | number                      | tr_stat
-   startDate                       | number                      | tr_stat
-   status                          | number                      | tr_stat
-   swarmSpeed (K/s)                | number                      | tr_stat
-   timesCompleted                  | number                      | tr_stat
-   trackers                        | array (see below)           | n/a
-   totalSize                       | number                      | tr_info
-   torrentFile                     | string                      | tr_info
-   uploadedEver                    | number                      | tr_stat
-   uploadLimit                     | number                      | tr_torrent
-   uploadLimited                   | boolean                     | tr_torrent
-   uploadRatio                     | double                      | tr_stat
-   wanted                          | array (see below)           | n/a
-   webseeds                        | array (see below)           | n/a
-   webseedsSendingToUs             | number                      | tr_stat
-                                   |                             |
-                                   |                             |
-   -----------------------+--------+-----------------------------+
-   files                  | array of objects, each containing:   |
-                          +-------------------------+------------+
-                          | key                     | type       |
-                          | bytesCompleted          | number     | tr_torrent
-                          | length                  | number     | tr_info
-                          | name                    | string     | tr_info
-   -----------------------+--------------------------------------+
-   fileStats              | a file's non-constant properties.    |
-                          | array of tr_info.filecount objects,  |
-                          | each containing:                     |
-                          +-------------------------+------------+
-                          | bytesCompleted          | number     | tr_torrent
-                          | wanted                  | boolean    | tr_info
-                          | priority                | number     | tr_info
-   -----------------------+--------------------------------------+
-   peers                  | array of objects, each containing:   |
-                          +-------------------------+------------+
-                          | address                 | string     | tr_peer_stat
-                          | clientName              | string     | tr_peer_stat
-                          | clientIsChoked          | boolean    | tr_peer_stat
-                          | clientIsInterested      | boolean    | tr_peer_stat
-                          | isDownloadingFrom       | boolean    | tr_peer_stat
-                          | isEncrypted             | boolean    | tr_peer_stat
-                          | isIncoming              | boolean    | tr_peer_stat
-                          | isUploadingTo           | boolean    | tr_peer_stat
-                          | peerIsChoked            | boolean    | tr_peer_stat
-                          | peerIsInterested        | boolean    | tr_peer_stat
-                          | port                    | number     | tr_peer_stat
-                          | progress                | double     | tr_peer_stat
-                          | rateToClient (B/s)      | number     | tr_peer_stat
-                          | rateToPeer (B/s)        | number     | tr_peer_stat
-   -----------------------+--------------------------------------+
-   peersFrom              | an object containing:                |
-                          +-------------------------+------------+
-                          | fromCache               | number     | tr_stat
-                          | fromIncoming            | number     | tr_stat
-                          | fromPex                 | number     | tr_stat
-                          | fromTracker             | number     | tr_stat
-   -----------------------+--------------------------------------+
-   pieces                 | A bitfield holding pieceCount flags  | tr_torrent
-                          | which are set to 'true' if we have   |
-                          | the piece matching that position.    |
-                          | JSON doesn't allow raw binary data,  |
-                          | so this is a base64-encoded string.  |
-   -----------------------+--------------------------------------+
-   priorities             | an array of tr_info.filecount        | tr_info
-                          | numbers. each is the tr_priority_t   |
-                          | mode for the corresponding file.     |
-   -----------------------+--------------------------------------+
-   trackers               | array of objects, each containing:   |
-                          +-------------------------+------------+
-                          | announce                | string     | tr_info
-                          | scrape                  | string     | tr_info
-                          | tier                    | number     | tr_info
-   -----------------------+--------------------------------------+
-   wanted                 | an array of tr_info.fileCount        | tr_info
-                          | 'booleans' true if the corresponding |
-                          | file is to be downloaded.            |
-   -----------------------+--------------------------------------+
-   webseeds               | an array of strings:                 |
-                          +-------------------------+------------+
-                          | webseed                 | string     | tr_info
-                          +-------------------------+------------+
+   key                         | type                        | source 
+   ----------------------------+-----------------------------+---------
+   activityDate                | number                      | tr_stat
+   addedDate                   | number                      | tr_stat
+   bandwidthPriority           | number                      | tr_priority_t
+   comment                     | string                      | tr_info
+   corruptEver                 | number                      | tr_stat
+   creator                     | string                      | tr_info
+   dateCreated                 | number                      | tr_info
+   desiredAvailable            | number                      | tr_stat
+   doneDate                    | number                      | tr_stat
+   downloadDir                 | string                      | tr_torrent
+   downloadedEver              | number                      | tr_stat
+   downloaders                 | number                      | tr_stat
+   downloadLimit               | number                      | tr_torrent
+   downloadLimited             | boolean                     | tr_torrent
+   error                       | number                      | tr_stat
+   errorString                 | string                      | tr_stat
+   eta                         | number                      | tr_stat
+   files                       | array (see below)           | n/a
+   fileStats                   | array (see below)           | n/a
+   hashString                  | string                      | tr_info
+   haveUnchecked               | number                      | tr_stat
+   haveValid                   | number                      | tr_stat
+   honorsSessionLimits         | boolean                     | tr_torrent
+   id                          | number                      | tr_torrent
+   isPrivate                   | boolean                     | tr_torrent
+   leechers                    | number                      | tr_stat
+   leftUntilDone               | number                      | tr_stat
+   manualAnnounceTime          | number                      | tr_stat
+   maxConnectedPeers           | number                      | tr_torrent
+   name                        | string                      | tr_info
+   peer-limit                  | number                      | tr_torrent
+   peers                       | array (see below)           | n/a
+   peersConnected              | number                      | tr_stat
+   peersFrom                   | object (see below)          | n/a
+   peersGettingFromUs          | number                      | tr_stat
+   peersKnown                  | number                      | tr_stat
+   peersSendingToUs            | number                      | tr_stat
+   percentDone                 | double                      | tr_stat
+   pieces                      | string (see below)          | tr_torrent
+   pieceCount                  | number                      | tr_info
+   pieceSize                   | number                      | tr_info
+   priorities                  | array (see below)           | n/a
+   rateDownload (B/s)          | number                      | tr_stat
+   rateUpload (B/s)            | number                      | tr_stat
+   recheckProgress             | double                      | tr_stat
+   seeders                     | number                      | tr_stat
+   seedRatioLimit              | double                      | tr_torrent
+   seedRatioMode               | number                      | tr_ratiolimit
+   sizeWhenDone                | number                      | tr_stat
+   startDate                   | number                      | tr_stat
+   status                      | number                      | tr_stat
+   swarmSpeed (K/s)            | number                      | tr_stat
+   timesCompleted              | number                      | tr_stat
+   trackers                    | array (see below)           | n/a
+   trackerStats                | array (see below)           | n/a
+   totalSize                   | number                      | tr_info
+   torrentFile                 | string                      | tr_info
+   uploadedEver                | number                      | tr_stat
+   uploadLimit                 | number                      | tr_torrent
+   uploadLimited               | boolean                     | tr_torrent
+   uploadRatio                 | double                      | tr_stat
+   wanted                      | array (see below)           | n/a
+   webseeds                    | array (see below)           | n/a
+   webseedsSendingToUs         | number                      | tr_stat
+                               |                             |
+                               |                             |
+   -------------------+--------+-----------------------------+
+   files              | array of objects, each containing:   |
+                      +-------------------------+------------+
+                      | key                     | type       |
+                      | bytesCompleted          | number     | tr_torrent
+                      | length                  | number     | tr_info
+                      | name                    | string     | tr_info
+   -------------------+--------------------------------------+
+   fileStats          | a file's non-constant properties.    |
+                      | array of tr_info.filecount objects,  |
+                      | each containing:                     |
+                      +-------------------------+------------+
+                      | bytesCompleted          | number     | tr_torrent
+                      | wanted                  | boolean    | tr_info
+                      | priority                | number     | tr_info
+   -------------------+--------------------------------------+
+   peers              | array of objects, each containing:   |
+                      +-------------------------+------------+
+                      | address                 | string     | tr_peer_stat
+                      | clientName              | string     | tr_peer_stat
+                      | clientIsChoked          | boolean    | tr_peer_stat
+                      | clientIsInterested      | boolean    | tr_peer_stat
+                      | isDownloadingFrom       | boolean    | tr_peer_stat
+                      | isEncrypted             | boolean    | tr_peer_stat
+                      | isIncoming              | boolean    | tr_peer_stat
+                      | isUploadingTo           | boolean    | tr_peer_stat
+                      | peerIsChoked            | boolean    | tr_peer_stat
+                      | peerIsInterested        | boolean    | tr_peer_stat
+                      | port                    | number     | tr_peer_stat
+                      | progress                | double     | tr_peer_stat
+                      | rateToClient (B/s)      | number     | tr_peer_stat
+                      | rateToPeer (B/s)        | number     | tr_peer_stat
+   -------------------+--------------------------------------+
+   peersFrom          | an object containing:                |
+                      +-------------------------+------------+
+                      | fromCache               | number     | tr_stat
+                      | fromIncoming            | number     | tr_stat
+                      | fromPex                 | number     | tr_stat
+                      | fromTracker             | number     | tr_stat
+   -------------------+--------------------------------------+
+   pieces             | A bitfield holding pieceCount flags  | tr_torrent
+                      | which are set to 'true' if we have   |
+                      | the piece matching that position.    |
+                      | JSON doesn't allow raw binary data,  |
+                      | so this is a base64-encoded string.  |
+   -------------------+--------------------------------------+
+   priorities         | an array of tr_info.filecount        | tr_info
+                      | numbers. each is the tr_priority_t   |
+                      | mode for the corresponding file.     |
+   -------------------+--------------------------------------+
+   trackers           | array of objects, each containing:   |
+                      +-------------------------+------------+
+                      | announce                | string     | tr_info
+                      | scrape                  | string     | tr_info
+                      | tier                    | number     | tr_info
+   -------------------+--------------------------------------+
+   trackerStats       | array of objects, each containing:   |
+                      +-------------------------+------------+
+                      | downloadCount           | number     | tr_tracker_stat
+                      | hasAnnounced            | boolean    | tr_tracker_stat
+                      | hasScraped              | boolean    | tr_tracker_stat
+                      | host                    | string     | tr_tracker_stat
+                      | isActive                | boolean    | tr_tracker_stat
+                      | isAnnouncing            | boolean    | tr_tracker_stat
+                      | isScraping              | boolean    | tr_tracker_stat
+                      | lastAnnouncePeerCount   | number     | tr_tracker_stat
+                      | lastAnnounceResult      | number     | tr_tracker_stat
+                      | lastAnnounceStartTime   | number     | tr_tracker_stat
+                      | lastAnnounceSucceeded   | boolean    | tr_tracker_stat
+                      | lastAnnounceTime        | number     | tr_tracker_stat
+                      | lastScrapeResult        | string     | tr_tracker_stat
+                      | lastScrapeStartTime     | number     | tr_tracker_stat
+                      | lastScrapeSucceeded     | boolean    | tr_tracker_stat
+                      | lastScrapeTime          | number     | tr_tracker_stat
+                      | leecherCount            | number     | tr_tracker_stat
+                      | nextAnnounceTime        | number     | tr_tracker_stat
+                      | nextScrapeTime          | number     | tr_tracker_stat
+                      | seederCount             | number     | tr_tracker_stat
+                      | tier                    | number     | tr_tracker_stat
+                      | willAnnounce            | boolean    | tr_tracker_stat
+                      | willScrape              | boolean    | tr_tracker_stat
+   -------------------+-------------------------+------------+
+   wanted             | an array of tr_info.fileCount        | tr_info
+                      | 'booleans' true if the corresponding |
+                      | file is to be downloaded.            |
+   -------------------+--------------------------------------+
+   webseeds           | an array of strings:                 |
+                      +-------------------------+------------+
+                      | webseed                 | string     | tr_info
+                      +-------------------------+------------+
 
    Example:
@@ -534 +553 @@
    6     | 1.70    | yes       |                | new "method torrent-set-location"
    ------+---------+-----------+----------------+-------------------------------
-
-
+   7     | 1.80    |        NO | torrent-get    | removed arg "announceResponse"
+         |         |        NO | torrent-get    | removed arg "announceURL"
+         |         |        NO | torrent-get    | removed arg "lastAnnounceTime"
+         |         |        NO | torrent-get    | removed arg "lastScrapeTime"
+         |         |        NO | torrent-get    | removed arg "nextAnnounceTime"
+         |         |        NO | torrent-get    | removed arg "nextScrapeTime"
+         |         |        NO | torrent-get    | removed arg "scrapeResponse"
+         |         |        NO | torrent-get    | removed arg "scrapeURL"
+         |         | yes    NO | torrent-get    | new arg "trackerStats"
+
+

trunk/gtk/conf.c

@@ -176 +176 @@
     tr_bencDictAddBool( d, PREF_KEY_SHOW_TRAY_ICON, FALSE );
     tr_bencDictAddBool( d, PREF_KEY_SHOW_DESKTOP_NOTIFICATION, TRUE );
+    tr_bencDictAddBool( d, PREF_KEY_SHOW_MORE_TRACKER_INFO, FALSE );
+    tr_bencDictAddBool( d, PREF_KEY_SHOW_BACKUP_TRACKERS, FALSE );
     tr_bencDictAddStr( d, PREF_KEY_STATUSBAR_STATS, "total-ratio" );
 

trunk/gtk/details.c

@@ -25 +25 @@
 #include "details.h"
 #include "file-list.h"
-#include "tracker-list.h"
 #include "hig.h"
+#include "tr-prefs.h"
 #include "util.h"
 
@@ -88 +88 @@
     GtkWidget * webseed_view;
 
-    GtkWidget * tracker_list;
-    GtkWidget * last_scrape_time_lb;
-    GtkWidget * last_scrape_response_lb;
-    GtkWidget * next_scrape_countdown_lb;
-    GtkWidget * last_announce_time_lb;
-    GtkWidget * last_announce_response_lb;
-    GtkWidget * next_announce_countdown_lb;
-    GtkWidget * manual_announce_countdown_lb;
+    GtkListStore * trackers;
+    GtkTreeModel * trackers_filtered;
+    GtkWidget * tracker_view;
+    GtkWidget * scrape_check;
+    GtkWidget * all_check;
+    //GtkWidget * tracker_list;
+    //GtkWidget * last_scrape_time_lb;
+    //GtkWidget * last_scrape_response_lb;
+    //GtkWidget * next_scrape_countdown_lb;
+    //GtkWidget * last_announce_time_lb;
+    //GtkWidget * last_announce_response_lb;
+    //GtkWidget * next_announce_countdown_lb;
+    //GtkWidget * manual_announce_countdown_lb;
 
     GtkWidget * file_list;
@@ -1642 +1647 @@
 ****/
 
+/* if it's been longer than a minute, don't bother showing the seconds */
+static void
+tr_strltime_rounded( char * buf, time_t t, size_t buflen )
+{
+    if( t > 60 ) t -= ( t % 60 );
+    tr_strltime( buf, t, buflen );
+}
+
+static char *
+buildTrackerSummary( const char * key, const tr_tracker_stat * st, gboolean showScrape )
+{
+    char * str;
+    char timebuf[256];
+    const time_t now = time( NULL );
+    GString * gstr = g_string_new( NULL );
+    const char * err_markup_begin = "<span color=\"red\">";
+    const char * err_markup_end = "</span>";
+    const char * success_markup_begin = "<span color=\"#008B00\">";
+    const char * success_markup_end = "</span>";
+
+    /* hostname */
+    {
+        const char * host = st->host;
+        const char * pch = strstr( host, "://" );
+        if( pch )
+            host = pch + 3;
+        g_string_append( gstr, st->isActive ? "<b>" : "<i>" );
+        if( key )
+            str = g_markup_printf_escaped( "%s - %s", host, key );
+        else
+            str = g_markup_printf_escaped( "%s", host );
+        g_string_append( gstr, str );
+        g_free( str );
+        g_string_append( gstr, st->isActive ? "</b>" : "</i>" );
+    }
+
+    if( st->isActive && st->hasAnnounced ) {
+        g_string_append_c( gstr, '\n' );
+        tr_strltime_rounded( timebuf, now - st->lastAnnounceTime, sizeof( timebuf ) );
+        if( st->lastAnnounceSucceeded )
+            g_string_append_printf( gstr, _( "Got a list of %s%'d peers%s %s ago" ),
+                                    success_markup_begin, st->lastAnnouncePeerCount, success_markup_end,
+                                    timebuf );
+        else
+            g_string_append_printf( gstr, _( "Got an error %s\"%s\"%s %s ago" ),
+                                    err_markup_begin, st->lastAnnounceResult, err_markup_end,
+                                    timebuf );
+    }
+
+    if( st->isActive && ( st->isAnnouncing || st->willAnnounce ) ) {
+        g_string_append_c( gstr, '\n' );
+        if( !st->isAnnouncing ) {
+            tr_strltime_rounded( timebuf, st->nextAnnounceTime - now, sizeof( timebuf ) );
+            g_string_append_printf( gstr, _( "Asking for more peers in %s" ), timebuf );
+        } else {
+            tr_strltime_rounded( timebuf, now - st->lastAnnounceStartTime, sizeof( timebuf ) );
+            g_string_append_printf( gstr, _( "Asking for more peers now... <small>%s</small>" ), timebuf );
+        }
+    }
+
+    if( !st->hasAnnounced && !st->isAnnouncing && !st->willAnnounce ) {
+        g_string_append_c( gstr, '\n' );
+        g_string_append( gstr, _( "No updates scheduled" ) );
+    }
+
+    if( st->isActive && showScrape )
+    {
+        if( st->hasScraped ) {
+            g_string_append_c( gstr, '\n' );
+            tr_strltime_rounded( timebuf, now - st->lastScrapeTime, sizeof( timebuf ) );
+            if( st->lastScrapeSucceeded )
+                g_string_append_printf( gstr, _( "Tracker had %s%'d seeders and %'d leechers%s %s ago" ),
+                                        success_markup_begin, st->seederCount, st->leecherCount, success_markup_end,
+                                        timebuf );
+            else
+                g_string_append_printf( gstr, _( "Got a scrape error \"%s%s%s\" %s ago" ), err_markup_begin, st->lastScrapeResult, err_markup_end, timebuf );
+        }
+
+        if( st->isScraping || st->willScrape ) {
+            g_string_append_c( gstr, '\n' );
+            if( !st->isScraping ) {
+                tr_strltime_rounded( timebuf, st->nextScrapeTime - now, sizeof( timebuf ) );
+                g_string_append_printf( gstr, _( "Asking for peer counts in %s" ), timebuf );
+            } else {
+                tr_strltime_rounded( timebuf, now - st->lastScrapeStartTime, sizeof( timebuf ) );
+                g_string_append_printf( gstr, _( "Asking for peer counts now... <small>%s</small>" ), timebuf );
+            }
+        }
+    }
+      
+    return g_string_free( gstr, FALSE );
+}
+
+enum
+{
+  TRACKER_COL_TORRENT_ID,
+  TRACKER_COL_TRACKER_INDEX,
+  TRACKER_COL_TEXT,
+  TRACKER_COL_ACTIVE,
+  TRACKER_COL_TORRENT_NAME,
+  TRACKER_COL_TRACKER_NAME,
+  TRACKER_N_COLS
+};
+
+static gboolean
+trackerVisibleFunc( GtkTreeModel * model, GtkTreeIter * iter, gpointer data )
+{
+    gboolean active;
+    struct DetailsImpl * di = data;
+
+    /* show all */
+    if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( di->all_check ) ) )
+        return TRUE;
+
+     /* only showing the active ones... */
+     gtk_tree_model_get( model, iter, TRACKER_COL_ACTIVE, &active, -1 );
+     return active;
+}
+
+//ccc
 static void
 refreshTracker( struct DetailsImpl * di, tr_torrent ** torrents, int n )
 {
     int i;
-    char buf[256];
-    const char * str;
-    const char * none = _("None" );
-    const char * nowStr = _("Now" );
-    const char * mixed = _( "Mixed" );
-    const char * noneSent = _( "None sent" );
-    const char * inProgress = _( "In progress" );
-    const time_t now = time( NULL );
-    const tr_stat ** stats;
-
-    stats = g_new( const tr_stat*, n );
+    int * statCount;
+    tr_tracker_stat ** stats;
+    GtkTreeIter iter;
+    GtkListStore * store = di->trackers;
+    GtkTreeModel * model;
+    const gboolean showScrape = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( di->scrape_check ) );
+
+    statCount = g_new0( int, n );
+    stats = g_new0( tr_tracker_stat *, n );
     for( i=0; i<n; ++i )
-        stats[i] = tr_torrentStatCached( torrents[i] );
-
-    /* last_scrape_time_lb */
-    if( n<1 )
-        str = none;
-    else {
-        const time_t baseline = stats[0]->lastScrapeTime;
-        for( i=1; i<n; ++i )
-            if( baseline != stats[i]->lastScrapeTime )
+        stats[i] = tr_torrentTrackers( torrents[i], &statCount[i] );
+
+    /* build the store if we don't already have it */
+    if( store == NULL )
+    {
+        GtkTreeModel * filter;
+
+        store = gtk_list_store_new( TRACKER_N_COLS, G_TYPE_INT,
+                                                    G_TYPE_INT,
+                                                    G_TYPE_STRING,
+                                                    G_TYPE_BOOLEAN,
+                                                    G_TYPE_STRING,
+                                                    G_TYPE_STRING );
+
+        filter = gtk_tree_model_filter_new( GTK_TREE_MODEL( store ), NULL );
+        gtk_tree_model_filter_set_visible_func( GTK_TREE_MODEL_FILTER( filter ),
+                                                trackerVisibleFunc, di, NULL );
+
+        di->trackers = store;
+        di->trackers_filtered = filter;
+
+        gtk_tree_view_set_model( GTK_TREE_VIEW( di->tracker_view ), filter );
+    }
+
+    /* add any missing rows (FIXME: doesn't handle edited trackers) */
+    model = GTK_TREE_MODEL( store );
+    if( n && !gtk_tree_model_get_iter_first( model, &iter ) )
+    {
+        for( i=0; i<n; ++i )
+        {
+            int j;
+            const tr_torrent * tor = torrents[i];
+            const int torrentId = tr_torrentId( tor );
+            const tr_info * inf = tr_torrentInfo( tor );
+
+            for( j=0; j<statCount[i]; ++j )
+                gtk_list_store_insert_with_values( store, &iter, -1,
+                    TRACKER_COL_TORRENT_ID, torrentId,
+                    TRACKER_COL_TRACKER_INDEX, j,
+                    TRACKER_COL_TORRENT_NAME, inf->name,
+                    TRACKER_COL_TRACKER_NAME, stats[i][j].host,
+                    -1 );
+        }
+    }
+
+    /* update the store */
+    if( gtk_tree_model_get_iter_first( model, &iter ) ) do
+    {
+        int torrentId;
+        int trackerIndex;
+
+        gtk_tree_model_get( model, &iter, TRACKER_COL_TORRENT_ID, &torrentId,
+                                          TRACKER_COL_TRACKER_INDEX, &trackerIndex,
+                                          -1 );
+
+        for( i=0; i<n; ++i )
+            if( tr_torrentId( torrents[i] ) == torrentId )
                 break;
-        if( i!=n )
-            str = mixed;
-        else if( baseline==0 )
-            str = noneSent;
-        else
-            str = gtr_localtime2( buf, baseline, sizeof( buf ) );
-    }
-    gtk_label_set_text( GTK_LABEL( di->last_scrape_time_lb ), str );
-
-
-    /* last_scrape_response_lb */
-    if( n<1 )
-        str = none;
-    else {
-        const char * baseline = stats[0]->scrapeResponse;
-        for( i=1; i<n; ++i )
-            if( strcmp( baseline, stats[i]->scrapeResponse ) )
-                break;
-        if( i==n )
-            str = baseline;
-        else
-            str = mixed;
-    }
-    gtk_label_set_text( GTK_LABEL( di->last_scrape_response_lb ), str );
-
-
-    /* next_scrape_countdown_lb */
-    if( n<1 )
-        str = none;
-    else {
-        const time_t baseline = stats[0]->nextScrapeTime;
-        for( i=1; i<n; ++i )
-            if( baseline != stats[i]->nextScrapeTime )
-                break;
-        if( i!=n )
-            str = mixed;
-        else if( baseline <= now )
-            str = inProgress;
-        else
-            str = tr_strltime( buf, baseline - now, sizeof( buf ) );
-    }
-    gtk_label_set_text( GTK_LABEL( di->next_scrape_countdown_lb ), str );
-
-
-    /* last_announce_time_lb */
-    if( n<1 )
-        str = none;
-    else {
-        const time_t baseline = stats[0]->lastAnnounceTime;
-        for( i=1; i<n; ++i )
-            if( baseline != stats[i]->lastAnnounceTime )
-                break;
-        if( i!=n )
-            str = mixed;
-        else if( baseline==0 )
-            str = noneSent;
-        else
-            str = gtr_localtime2( buf, baseline, sizeof( buf ) );
-    }
-    gtk_label_set_text( GTK_LABEL( di->last_announce_time_lb ), str );
-
-
-    /* last_announce_response_lb */
-    if( n<1 )
-        str = none;
-    else {
-        const char * baseline = stats[0]->announceResponse;
-        for( i=1; i<n; ++i )
-            if( strcmp( baseline, stats[i]->announceResponse ) )
-                break;
-        if( i==n )
-            str = baseline;
-        else
-            str = mixed;
-    }
-    gtk_label_set_text( GTK_LABEL( di->last_announce_response_lb ), str );
-
-
-    /* next_announce_countdown_lb */
-    if( n<1 )
-        str = none;
-    else {
-        const time_t baseline = stats[0]->nextAnnounceTime;
-        for( i=1; i<n; ++i )
-            if( baseline != stats[i]->nextAnnounceTime )
-                break;
-        if( i!=n )
-            str = mixed;
-        else if( baseline==0 )
-            str = none;
-        else if( baseline==1 || baseline<=now )
-            str = inProgress;
-        else
-            str = tr_strltime( buf, baseline - now, sizeof( buf ) );
-    }
-    gtk_label_set_text( GTK_LABEL( di->next_announce_countdown_lb ), str );
-
-
-    /* manual_announce_countdown_lb */
-    if( n<1 )
-        str = none;
-    else {
-        const time_t baseline = stats[0]->manualAnnounceTime;
-        for( i=1; i<n; ++i )
-            if( baseline != stats[i]->manualAnnounceTime )
-                break;
-        if( i!=n )
-            str = mixed;
-        else if( baseline<1 )
-            str = none;
-        else if( baseline<=now )
-            str = nowStr;
-        else
-            str = tr_strltime( buf, baseline - now, sizeof( buf ) );
-    }
-    gtk_label_set_text( GTK_LABEL( di->manual_announce_countdown_lb ), str );
-
-
+
+        if( i<n && trackerIndex<statCount[i] )
+        {
+            const tr_tracker_stat * st = &stats[i][trackerIndex];
+            const char * key = n>1 ? tr_torrentInfo( torrents[i] )->name : NULL;
+            char * text = buildTrackerSummary( key, st, showScrape );
+            gtk_list_store_set( store, &iter, TRACKER_COL_TEXT, text,
+                                              TRACKER_COL_ACTIVE, st->isActive,
+                                              -1 );
+            g_free( text );
+        }
+    }
+    while( gtk_tree_model_iter_next( model, &iter ) );
+
+    /* cleanup */
+    for( i=0; i<n; ++i )
+        tr_torrentTrackersFree( stats[i], statCount[i] );
     g_free( stats );
+    g_free( statCount );
+}
+
+static void refresh( struct DetailsImpl * di );
+
+static void
+onScrapeToggled( GtkToggleButton * button, struct DetailsImpl * di )
+{
+    const char * key = PREF_KEY_SHOW_MORE_TRACKER_INFO;
+    const gboolean value = gtk_toggle_button_get_active( button );
+    tr_core_set_pref_bool( di->core, key, value );
+    refresh( di );
+}
+
+static void
+onBackupToggled( GtkToggleButton * button, struct DetailsImpl * di )
+{
+    const char * key = PREF_KEY_SHOW_BACKUP_TRACKERS;
+    const gboolean value = gtk_toggle_button_get_active( button );
+    tr_core_set_pref_bool( di->core, key, value );
+    refresh( di );
+}
+
+static void
+onEditTrackers( GtkButton * button UNUSED, gpointer data )
+{
+    struct DetailsImpl * di = data;
+    g_message( "FIXME" );
 }
 
@@ -1792 +1890 @@
 tracker_page_new( struct DetailsImpl * di )
 {
-    int row = 0;
-    const char * s;
-    GtkWidget *t, *l, *w;
-
-    t = hig_workarea_create( );
-    hig_workarea_add_section_title( t, &row, _( "Trackers" ) );
-
-        w = tracker_list_new( tr_core_session( di->core ), -1, FALSE );
-        hig_workarea_add_wide_control( t, &row, w );
-        di->tracker_list = w;
-
-    hig_workarea_add_section_divider( t, &row );
-    hig_workarea_add_section_title( t, &row, _( "Scrape" ) );
-
-        s = _( "Last scrape at:" );
-        l = gtk_label_new( NULL );
-        di->last_scrape_time_lb = l;
-        hig_workarea_add_row( t, &row, s, l, NULL );
-
-        s = _( "Tracker responded:" );
-        l = gtk_label_new( NULL );
-        di->last_scrape_response_lb = l;
-        hig_workarea_add_row( t, &row, s, l, NULL );
-
-        s = _( "Next scrape in:" );
-        l = gtk_label_new( NULL );
-        di->next_scrape_countdown_lb = l;
-        hig_workarea_add_row( t, &row, s, l, NULL );
-
-    hig_workarea_add_section_divider( t, &row );
-    hig_workarea_add_section_title( t, &row, _( "Announce" ) );
-
-        l = gtk_label_new( NULL );
-        gtk_label_set_ellipsize( GTK_LABEL( l ), PANGO_ELLIPSIZE_END );
-        hig_workarea_add_row( t, &row, _( "Tracker:" ), l, NULL );
-
-        s = _( "Last announce at:" );
-        l = gtk_label_new( NULL );
-        di->last_announce_time_lb = l;
-        hig_workarea_add_row( t, &row, s, l, NULL );
-
-        s = _( "Tracker responded:" );
-        l = gtk_label_new( NULL );
-        di->last_announce_response_lb = l;
-        hig_workarea_add_row( t, &row, s, l, NULL );
-
-        s = _( "Next announce in:" );
-        l = gtk_label_new( NULL );
-        di->next_announce_countdown_lb = l;
-        hig_workarea_add_row( t, &row, s, l, NULL );
-
-        /* how long until the tracker will honor user
-         * pressing the "ask for more peers" button */
-        s = _( "Manual announce allowed in:" );
-        l = gtk_label_new( NULL );
-        di->manual_announce_countdown_lb = l;
-        hig_workarea_add_row( t, &row, s, l, NULL );
-
-    hig_workarea_finish( t, &row );
-    return t;
+    gboolean b;
+    GtkWidget *vbox, *sw, *w, *v, *hbox;
+    GtkCellRenderer *r;
+    GtkTreeViewColumn *c;
+
+    vbox = gtk_vbox_new( FALSE, GUI_PAD );
+    gtk_container_set_border_width( GTK_CONTAINER( vbox ), GUI_PAD_BIG );
+
+    v = di->tracker_view = gtk_tree_view_new( );
+    gtk_tree_view_set_rules_hint( GTK_TREE_VIEW( v ), TRUE );
+    r = gtk_cell_renderer_text_new( );
+    g_object_set( r, "ellipsize", PANGO_ELLIPSIZE_END, NULL );
+    c = gtk_tree_view_column_new_with_attributes( _( "Trackers" ), r, "markup", TRACKER_COL_TEXT, NULL );
+    gtk_tree_view_append_column( GTK_TREE_VIEW( v ), c );
+    g_object_set( G_OBJECT( r ), "ypad", (GUI_PAD+GUI_PAD_BIG)/2,
+                                 "xpad", (GUI_PAD+GUI_PAD_BIG)/2,
+                                 NULL );
+   
+    sw = gtk_scrolled_window_new( NULL, NULL );
+    gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( sw ),
+                                    GTK_POLICY_AUTOMATIC,
+                                    GTK_POLICY_AUTOMATIC );
+    gtk_container_add( GTK_CONTAINER( sw ), v );
+    w = gtk_frame_new( NULL );
+    gtk_frame_set_shadow_type( GTK_FRAME( w ), GTK_SHADOW_IN );
+    gtk_container_add( GTK_CONTAINER( w ), sw );
+    gtk_box_pack_start( GTK_BOX( vbox ), w, TRUE, TRUE, 0 );
+
+    hbox = gtk_hbox_new( FALSE, 0 );
+
+      w = gtk_check_button_new_with_mnemonic( _( "Show _more details" ) );
+      di->scrape_check = w;
+      b = pref_flag_get( PREF_KEY_SHOW_MORE_TRACKER_INFO );
+      gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( w ), b );
+      g_signal_connect( w, "toggled", G_CALLBACK( onScrapeToggled ), di );
+      gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
+
+      w = gtk_button_new_from_stock( GTK_STOCK_EDIT );
+      g_signal_connect( w, "clicked", G_CALLBACK( onEditTrackers ), di );
+      gtk_box_pack_end( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
+
+    gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+
+    w = gtk_check_button_new_with_mnemonic( _( "Show _backup trackers" ) );
+    di->all_check = w;
+    b = pref_flag_get( PREF_KEY_SHOW_BACKUP_TRACKERS );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( w ), b );
+    g_signal_connect( w, "toggled", G_CALLBACK( onBackupToggled ), di );
+    gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
+    
+    return vbox;
 }
 
@@ -1968 +2057 @@
 
         file_list_set_torrent( di->file_list, id );
-        tracker_list_set_torrent( di->tracker_list, id );
+        //tracker_list_set_torrent( di->tracker_list, id );
     }
    else
    {
         file_list_clear( di->file_list );
-        tracker_list_clear( di->tracker_list );
+        //tracker_list_clear( di->tracker_list );
         g_snprintf( title, sizeof( title ), _( "%'d Torrent Properties" ), len );
     }

trunk/gtk/my-valgrind.sh

@@ -3 +3 @@
 export G_DEBUG=gc-friendly
 export GLIBCXX_FORCE_NEW=1
-valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=64 --log-file=x-valgrind --show-reachable=yes ./transmission
+valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=64 --log-file=x-valgrind --show-reachable=yes ./transmission -g /tmp/test

trunk/gtk/torrent-cell-renderer.c

@@ -603 +603 @@
     icon = get_icon( tor, FULL_ICON_SIZE, widget );
     name = inf->name;
+g_message( "%s --- %f\n", name, (double)p->download_speed );
     status = getStatusString( st, p->upload_speed, p->download_speed );
     progress = getProgressString( tor, inf, st );

trunk/gtk/tr-prefs.h

@@ -29 +29 @@
 #define PREF_KEY_SHOW_TRAY_ICON             "show-notification-area-icon"
 #define PREF_KEY_SHOW_DESKTOP_NOTIFICATION  "show-desktop-notification"
+#define PREF_KEY_SHOW_MORE_TRACKER_INFO     "show-tracker-scrapes"
+#define PREF_KEY_SHOW_BACKUP_TRACKERS       "show-backup-trackers"
 #define PREF_KEY_START                      "start-added-torrents"
 #define PREF_KEY_TRASH_ORIGINAL             "trash-original-torrent-files"

trunk/libtransmission/Makefile.am

@@ -12 +12 @@
 
 libtransmission_a_SOURCES = \
+    announcer.c \
     bandwidth.c \
     bencode.c \
@@ -49 +50 @@
     torrent-ctor.c \
     tr-getopt.c \
-    tracker.c \
     tr-dht.c \
     trevent.c \
@@ -60 +60 @@
 
 noinst_HEADERS = \
+    announcer.h \
     bandwidth.h \
     bencode.h \
@@ -96 +97 @@
     stats.h \
     torrent.h \
-    tracker.h \
     tr-getopt.h \
     transmission.h \

trunk/libtransmission/metainfo.c

@@ -358 +358 @@
 }
 
+static int
+is_rfc2396_alnum( char ch )
+{
+    return ( '0' <= ch && ch <= '9' )
+        || ( 'A' <= ch && ch <= 'Z' )
+        || ( 'a' <= ch && ch <= 'z' );
+}
+
+static void
+escape( char * out, const uint8_t * in, size_t in_len ) /* rfc2396 */
+{
+    const uint8_t *end = in + in_len;
+
+    while( in != end )
+        if( is_rfc2396_alnum( *in ) )
+            *out++ = (char) *in++;
+        else
+            out += tr_snprintf( out, 4, "%%%02X", (unsigned int)*in++ );
+
+    *out = '\0';
+}
+
 static const char*
 tr_metainfoParseImpl( const tr_session * session,
@@ -382 +404 @@
         tr_sha1( inf->hash, bstr, len, NULL );
         tr_sha1_to_hex( inf->hashString, inf->hash );
+        escape( inf->hashEscaped, inf->hash, SHA_DIGEST_LENGTH );
         tr_free( bstr );
     }

trunk/libtransmission/rpcimpl.c

@@ -368 +368 @@
 
 static void
+addTrackerStats( const tr_tracker_stat * st, int n, tr_benc * list )
+{
+    int i;
+
+    for( i=0; i<n; ++i )
+    {
+        const tr_tracker_stat * s = &st[i];
+        tr_benc * d = tr_bencListAddDict( list, 23 );
+        tr_bencDictAddInt ( d, "downloadCount", s->downloadCount );
+        tr_bencDictAddBool( d, "hasAnnounced", s->hasAnnounced );
+        tr_bencDictAddBool( d, "hasScraped", s->hasScraped );
+        tr_bencDictAddStr ( d, "host", s->host );
+        tr_bencDictAddBool( d, "isActive", s->isActive );
+        tr_bencDictAddBool( d, "isAnnouncing", s->isAnnouncing );
+        tr_bencDictAddBool( d, "isScraping", s->isScraping );
+        tr_bencDictAddInt ( d, "lastAnnouncePeerCount", s->lastAnnouncePeerCount );
+        tr_bencDictAddStr ( d, "lastAnnounceResult", s->lastAnnounceResult );
+        tr_bencDictAddInt ( d, "lastAnnounceStartTime", s->lastAnnounceStartTime );
+        tr_bencDictAddBool( d, "lastAnnounceSucceeded", s->lastAnnounceSucceeded );
+        tr_bencDictAddInt ( d, "lastAnnounceTime", s->lastAnnounceTime );
+        tr_bencDictAddStr ( d, "lastScrapeResult", s->lastScrapeResult );
+        tr_bencDictAddInt ( d, "lastScrapeStartTime", s->lastScrapeStartTime );
+        tr_bencDictAddBool( d, "lastScrapeSucceeded", s->lastScrapeSucceeded );
+        tr_bencDictAddInt ( d, "lastScrapeTime", s->lastScrapeTime );
+        tr_bencDictAddInt ( d, "leecherCount", s->leecherCount );
+        tr_bencDictAddInt ( d, "nextAnnounceTime", s->nextAnnounceTime );
+        tr_bencDictAddInt ( d, "nextScrapeTime", s->nextScrapeTime );
+        tr_bencDictAddInt ( d, "seederCount", s->seederCount );
+        tr_bencDictAddInt ( d, "tier", s->tier );
+        tr_bencDictAddBool( d, "willAnnounce", s->willAnnounce );
+        tr_bencDictAddBool( d, "willScrape", s->willScrape );
+    }
+}
+
+static void
 addPeers( const tr_torrent * tor,
           tr_benc *          list )
@@ -417 +452 @@
     else if( tr_streq( key, keylen, "addedDate" ) )
         tr_bencDictAddInt( d, key, st->addedDate );
-    else if( tr_streq( key, keylen, "announceResponse" ) )
-        tr_bencDictAddStr( d, key, st->announceResponse );
-    else if( tr_streq( key, keylen, "announceURL" ) )
-        tr_bencDictAddStr( d, key, st->announceURL );
     else if( tr_streq( key, keylen, "bandwidthPriority" ) )
         tr_bencDictAddInt( d, key, tr_torrentGetPriority( tor ) );
@@ -467 +498 @@
     else if( tr_streq( key, keylen, "isPrivate" ) )
         tr_bencDictAddBool( d, key, tr_torrentIsPrivate( tor ) );
-    else if( tr_streq( key, keylen, "lastAnnounceTime" ) )
-        tr_bencDictAddInt( d, key, st->lastAnnounceTime );
-    else if( tr_streq( key, keylen, "lastScrapeTime" ) )
-        tr_bencDictAddInt( d, key, st->lastScrapeTime );
     else if( tr_streq( key, keylen, "leechers" ) )
         tr_bencDictAddInt( d, key, st->leechers );
@@ -481 +508 @@
     else if( tr_streq( key, keylen, "name" ) )
         tr_bencDictAddStr( d, key, inf->name );
-    else if( tr_streq( key, keylen, "nextAnnounceTime" ) )
-        tr_bencDictAddInt( d, key, st->nextAnnounceTime );
-    else if( tr_streq( key, keylen, "nextScrapeTime" ) )
-        tr_bencDictAddInt( d, key, st->nextScrapeTime );
     else if( tr_streq( key, keylen, "percentDone" ) )
         tr_bencDictAddReal( d, key, st->percentDone );
@@ -531 +554 @@
     else if( tr_streq( key, keylen, "recheckProgress" ) )
         tr_bencDictAddReal( d, key, st->recheckProgress );
-    else if( tr_streq( key, keylen, "scrapeResponse" ) )
-        tr_bencDictAddStr( d, key, st->scrapeResponse );
-    else if( tr_streq( key, keylen, "scrapeURL" ) )
-        tr_bencDictAddStr( d, key, st->scrapeURL );
     else if( tr_streq( key, keylen, "seeders" ) )
         tr_bencDictAddInt( d, key, st->seeders );
@@ -553 +572 @@
     else if( tr_streq( key, keylen, "trackers" ) )
         addTrackers( inf, tr_bencDictAddList( d, key, inf->trackerCount ) );
+    else if( tr_streq( key, keylen, "trackerStats" ) ) {
+        int n;
+        tr_tracker_stat * s = tr_torrentTrackers( tor, &n );
+        addTrackerStats( s, n, tr_bencDictAddList( d, key, n ) );
+        tr_torrentTrackersFree( s, n );
+    }
     else if( tr_streq( key, keylen, "torrentFile" ) )
         tr_bencDictAddStr( d, key, inf->torrent );
@@ -627 +652 @@
         msg = "no fields specified";
     else for( i = 0; i < torrentCount; ++i )
-            addInfo( torrents[i], tr_bencListAdd( list ), fields );
+        addInfo( torrents[i], tr_bencListAdd( list ), fields );
+
+fprintf( stderr, "%s\n", tr_bencToStr( args_out, TR_FMT_JSON, NULL ) );
 
     tr_free( torrents );

trunk/libtransmission/session.c

@@ -24 +24 @@
 
 #include "transmission.h"
+#include "announcer.h"
 #include "bandwidth.h"
 #include "bencode.h"
@@ -40 +41 @@
 #include "stats.h"
 #include "torrent.h"
-#include "tracker.h"
 #include "tr-dht.h"
 #include "trevent.h"
@@ -718 +718 @@
     tr_setConfigDir( session, data->configDir );
 
-    tr_trackerSessionInit( session );
-    assert( session->tracker != NULL );
-
     session->peerMgr = tr_peerMgrNew( session );
 
@@ -870 +867 @@
     tr_timerAdd( session->saveTimer, SAVE_INTERVAL_SECS, 0 );
 
+    tr_announcerInit( session );
+
     /* first %s is the application name
        second %s is the version number */
@@ -877 +876 @@
     session->web = tr_webInit( session );
     session->isWaiting = FALSE;
-    dbgmsg( "returning session %p; session->tracker is %p", session, session->tracker );
 
     if( session->isDHTEnabled )
@@ -1471 +1469 @@
     session->altTimer = NULL;
 
+    tr_announcerClose( session );
     tr_verifyClose( session );
     tr_statsClose( session );
@@ -1491 +1490 @@
     tr_peerMgrFree( session->peerMgr );
 
-    tr_trackerSessionClose( session );
     tr_list_free( &session->blocklists,
                   (TrListForeachFunc)_tr_blocklistFree );
@@ -1531 +1529 @@
      * that we're closing now */
     while( ( session->shared
-           || session->tracker ) && !deadlineReached( deadline ) )
-    {
-        dbgmsg( "waiting on port unmap (%p) or tracker (%p)",
-                session->shared, session->tracker );
+           || session->announcer ) && !deadlineReached( deadline ) )
+    {
+        dbgmsg( "waiting on port unmap (%p) or announcer (%p)",
+                session->shared, session->announcer );
         tr_wait( 100 );
     }
@@ -1892 +1890 @@
                 tr_torrent * tor )
 {
-    assert( tr_isSession( session ) );
-
-    return tor ? tor->next : session->torrentList;
+    tr_torrent * ret;
+
+    assert( !session || tr_isSession( session ) );
+
+    if( !session )
+        ret = NULL;
+    else if( !tor )
+        ret = session->torrentList;
+    else
+        ret = tor->next;
+
+    return ret;
 }
 

trunk/libtransmission/session.h

@@ -37 +37 @@
 
 struct tr_address;
+struct tr_announcer;
 struct tr_bandwidth;
 struct tr_bindsockets;
@@ -120 +121 @@
 
     struct tr_stats_handle     * sessionStats;
-    struct tr_tracker_handle   * tracker;
+
+    struct tr_announcer        * announcer;
 
     tr_benc                    * metainfoLookup;

trunk/libtransmission/torrent.c

@@ -26 +26 @@
 
 #include "transmission.h"
-#include "session.h"
+#include "announcer.h"
 #include "bandwidth.h"
 #include "bencode.h"
@@ -38 +38 @@
 #include "ptrarray.h"
 #include "ratecontrol.h"
+#include "session.h"
 #include "torrent.h"
-#include "tracker.h"
 #include "trevent.h"
 #include "utils.h"
@@ -663 +663 @@
     tor->completeness = tr_cpGetStatus( &tor->completion );
 
-    tor->tracker = tr_trackerNew( tor );
-    tor->trackerSubscription =
-        tr_trackerSubscribe( tor->tracker, onTrackerResponse,
-                             tor );
-
     {
         tr_torrent * it = NULL;
@@ -695 +690 @@
     }
 
+    tor->tiers = tr_announcerAddTorrent( session->announcer, tor );
+    tor->tiersSubscription = tr_announcerSubscribe( tor->tiers, onTrackerResponse, tor );
+
     tr_metainfoMigrate( session, &tor->info );
 
@@ -792 +790 @@
     assert( tr_isTorrent( tor  ) );
 
-    if( tor->tracker )
-        tr_trackerChangeMyPort( tor->tracker );
+    tr_announcerChangeMyPort( tor );
 }
 
@@ -804 +801 @@
 
     if( tor->isRunning )
-        tr_trackerReannounce( tor->tracker );
+        tr_announcerManualAnnounce( tor );
 }
 
@@ -820 +817 @@
     return ( tr_isTorrent( tor  ) )
         && ( tor->isRunning )
-        && ( tr_trackerCanManualAnnounce( tor->tracker ) );
+        && ( tr_announcerCanManualAnnounce( tor ) );
 }
 
@@ -872 +869 @@
 {
     tr_stat *               s;
-    struct tr_tracker *     tc;
-    const tr_tracker_info * ti;
     int                     usableSeeds = 0;
     uint64_t                now;
@@ -894 +889 @@
     memcpy( s->errorString, tor->errorString, sizeof( s->errorString ) );
 
-    tc = tor->tracker;
-    ti = tr_trackerGetAddress( tor->tracker, tor );
-    s->announceURL = ti ? ti->announce : NULL;
-    s->scrapeURL   = ti ? ti->scrape   : NULL;
-    tr_trackerStat( tc, s );
-
-    tr_trackerGetCounts( tc, &s->timesCompleted,
-                             &s->leechers,
-                             &s->seeders,
-                             &s->downloaders );
+    s->manualAnnounceTime = tr_announcerNextManualAnnounce( tor );
+
+    tr_announcerGetCounts( tor, &s->timesCompleted,
+                                &s->leechers,
+                                &s->seeders,
+                                &s->downloaders );
 
     tr_peerMgrTorrentStats( tor,
@@ -1159 +1150 @@
 }
 
+tr_tracker_stat *
+tr_torrentTrackers( const tr_torrent * torrent,
+                    int              * setmeTrackerCount )
+{
+    assert( tr_isTorrent( torrent ) );
+
+    return tr_announcerStats( torrent, setmeTrackerCount );
+}
+
+void
+tr_torrentTrackersFree( tr_tracker_stat * trackers,
+                        int trackerCount )
+{
+    tr_announcerStatsFree( trackers, trackerCount );
+}
+
 void
 tr_torrentAvailability( const tr_torrent * tor,
@@ -1179 +1186 @@
 }
 
-void
+static void
 tr_torrentResetTransferStats( tr_torrent * tor )
 {
@@ -1234 +1241 @@
     tr_rcDestruct( &tor->swarmSpeed );
 
-    tr_trackerUnsubscribe( tor->tracker, tor->trackerSubscription );
-    tr_trackerFree( tor->tracker );
-    tor->tracker = NULL;
+    tr_announcerRemoveTorrent( session->announcer, tor );
 
     tr_bitfieldDestruct( &tor->checkedPieces );
@@ -1292 +1297 @@
         tor->completeness = tr_cpGetStatus( &tor->completion );
         tor->startDate = tor->anyDate = now;
+
         tr_torrentResetTransferStats( tor );
-        tr_trackerStart( tor->tracker );
+        tr_announcerTorrentStarted( tor );
         tor->dhtAnnounceAt = now + tr_cryptoWeakRandInt( 20 );
         tr_peerMgrStartTorrent( tor );
@@ -1320 +1326 @@
     {
         tr_verifyRemove( tor );
+
+        /* corresponds to the peer_id sent as a tracker request parameter.
+         * one tracker admin says: "When the same torrent is opened and
+         * closed and opened again without quitting Transmission ...
+         * change the peerid. It would help sometimes if a stopped event
+         * was missed to ensure that we didn't think someone was cheating. */
+        tr_free( tor->peer_id );
+        tor->peer_id = tr_peerIdNew( );
+fprintf( stderr, "setting torrent \"%s\" peer_id as %s\n", tr_torrentName( tor ), tor->peer_id );
+
         tor->isRunning = 1;
         tor->preVerifyTotal = tr_cpHaveTotal( &tor->completion );
@@ -1416 +1432 @@
     tr_verifyRemove( tor );
     tr_peerMgrStopTorrent( tor );
-    tr_trackerStop( tor->tracker );
+    tr_announcerTorrentStopped( tor );
 
     tr_fdTorrentClose( tor->uniqueId );
@@ -1590 +1606 @@
         if( recentChange && ( completeness == TR_SEED ) )
         {
-            tr_trackerCompleted( tor->tracker );
+            tr_announcerTorrentCompleted( tor );
 
             tor->doneDate = tor->anyDate = time( NULL );

trunk/libtransmission/torrent.h

@@ -25 +25 @@
 struct tr_bandwidth;
 struct tr_ratecontrol;
-struct tr_torrent_peers;
+struct tr_torrent_tiers;
 
 /**
@@ -51 +51 @@
 
 void        tr_torrentRecheckCompleteness( tr_torrent * );
-
-void        tr_torrentResetTransferStats( tr_torrent * );
 
 void        tr_torrentSetHasPiece( tr_torrent *     tor,
@@ -178 +176 @@
     tr_completeness            completeness;
 
-    struct tr_tracker *        tracker;
-    struct tr_publisher_tag *  trackerSubscription;
+    struct tr_torrent_tiers  * tiers;
+    struct tr_publisher_tag  * tiersSubscription;
 
     time_t                     dhtAnnounceAt;

trunk/libtransmission/transmission.h

@@ -1191 +1191 @@
 tr_bool tr_torrentCanManualUpdate( const tr_torrent * torrent );
 
-/***********************************************************************
-* tr_torrentPeers
-***********************************************************************/
+/***
+****  tr_peer_stat
+***/
 
 typedef struct tr_peer_stat
@@ -1226 +1226 @@
 void           tr_torrentPeersFree( tr_peer_stat * peerStats,
                                     int            peerCount );
+
+/***
+****  tr_tracker_stat
+***/
+
+typedef struct
+{
+    /* how many downloads this tracker knows of */
+    int downloadCount;
+
+    /* whether or not we've ever sent this tracker an announcement */
+    tr_bool hasAnnounced;
+
+    /* whether or not we've ever scraped to this tracker */
+    tr_bool hasScraped;
+
+    /* ex: legaltorrents.com */
+    char * host;
+
+    /* true if we're trying to use this tracker.
+       Transmission typically uses one tracker per tier. */
+    tr_bool isActive;
+
+    /* true if we've sent an announce and waiting for the response */
+    tr_bool isAnnouncing;
+
+    /* true if we've got a scrape request pending right now */
+    tr_bool isScraping;
+
+    /* number of peers the tracker told us about last time.
+     * if "lastAnnounceSucceeded" is false, this field is undefined */
+    int lastAnnouncePeerCount;
+
+    /* human-readable string with the result of the last announce.
+       if "hasAnnounced" is false, this field is undefined */ 
+    char lastAnnounceResult[128];
+
+    /* when the last announce was sent to the tracker.
+     * if "hasAnnounced" is false, this field is undefined */
+    time_t lastAnnounceStartTime;
+   
+    /* whether or not the last announce was a success.
+       if "hasAnnounced" is false, this field is undefined */ 
+    tr_bool lastAnnounceSucceeded;
+
+    /* when the last announce was completed.
+       if "hasAnnounced" is false, this field is undefined */
+    time_t lastAnnounceTime;
+
+    /* human-readable string with the result of the last scrape.
+     * if "hasScraped" is false, this field is undefined */
+    char lastScrapeResult[128];
+
+    /* when the last scrape was sent to the tracker.
+     * if "hasScraped" is false, this field is undefined */
+    time_t lastScrapeStartTime;
+
+    /* whether or not the last scrape was a success.
+       if "hasAnnounced" is false, this field is undefined */ 
+    tr_bool lastScrapeSucceeded;
+
+    /* when the last scrape was completed.
+       if "hasScraped" is false, this field is undefined */
+    time_t lastScrapeTime;
+
+    /* number of leechers this tracker knows of */
+    int leecherCount;
+
+    /* when the next periodic announce message will be sent out.
+       if "willAnnounce" is false, this field is undefined */
+    time_t nextAnnounceTime;
+
+    /* when the next periodic scrape message will be sent out.
+       if "willScrape" is false, this field is undefined */
+    time_t nextScrapeTime;
+
+    /* number of seeders this tracker knows of */
+    int seederCount;
+
+    /* which tier this tracker is in */
+    int tier;
+
+    /* true if the torrent's not announcing now, but will at nextAnnounceTime */
+    tr_bool willAnnounce;
+
+    /* true if we're not scraping now but will at nextScrapeTime */
+    tr_bool willScrape;
+}
+tr_tracker_stat;
+
+tr_tracker_stat * tr_torrentTrackers( const tr_torrent * torrent,
+                                      int              * setmeTrackerCount );
+
+void tr_torrentTrackersFree( tr_tracker_stat * trackerStats,
+                             int               trackerCount );
+
+
+    
 
 /**
@@ -1334 +1432 @@
     char               hashString[2 * SHA_DIGEST_LENGTH + 1];
 
+    /* hash, escaped as per rfc2396 for tracker announces */
+    char               hashEscaped[3 * SHA_DIGEST_LENGTH + 1];
+
     /* Flags */
     tr_bool            isPrivate;
@@ -1396 +1497 @@
     tr_torrent_activity activity;
 
+#if 0
     /** Our current announce URL, or NULL if none.
         This URL may change during the session if the torrent's
@@ -1407 +1509 @@
         becomes unreachable. */
     char *  scrapeURL;
+#endif
 
     /** Defines what kind of text is in errorString.
@@ -1529 +1632 @@
     uint64_t    haveUnchecked;
 
+#if 0
     /**
      * This is a human-readable string with the last scrape's results.
@@ -1560 +1664 @@
         we haven't set a timer for the next one yet */
     time_t    nextAnnounceTime;
-
-    /** If the torrent is running, this is the time at which
-        the client can manually ask the torrent's tracker
-        for more peers,
-        or 0 if the torrent is stopped or doesn't allow manual,
-        or 1 if an announce is currently in progress s.t.
-        we haven't set a timer for the next one yet */
-    time_t    manualAnnounceTime;
+#endif
+
+    /** time when one or more of the torrent's trackers will
+        allow you to manually ask for more peers,
+        or 0 if you can't */
+    time_t manualAnnounceTime;
 
     /** A very rough estimate in KiB/s of how quickly data is being

trunk/libtransmission/web.c

@@ -52 +52 @@
 }
 
-
 enum
 {
-    /* arbitrary number */
-    MAX_CONCURRENT_TASKS = 100,
-
     /* arbitrary number */
     DEFAULT_TIMER_MSEC = 2500
@@ -92 +88 @@
     tr_session * session;
     struct event timer_event;
-    tr_list * easy_queue;
     tr_list * fds;
 };
@@ -165 +160 @@
 
 static size_t
-writeFunc( void * ptr, size_t size, size_t nmemb, void * task )
+writeFunc( void * ptr, size_t size, size_t nmemb, void * vtask )
 {
     const size_t byteCount = size * nmemb;
-    evbuffer_add( ((struct tr_web_task*)task)->response, ptr, byteCount );
+    struct tr_web_task * task = vtask;
+    evbuffer_add( task->response, ptr, byteCount );
+fprintf( stderr, "writing %d bytes to task #%lu [%s], done_func %p\n", (int)(size*nmemb), task->tag, task->url, task->done_func );
     dbgmsg( "wrote %zu bytes to task %p's buffer", byteCount, task );
     return byteCount;
@@ -194 +191 @@
         struct tr_web * web = session->web;
         CURL * easy;
-
+        long timeout;
+
+fprintf( stderr, "adding task #%lu [%s]\n", task->tag, task->url );
         dbgmsg( "adding task #%lu [%s]", task->tag, task->url );
 
@@ -214 +213 @@
 
         curl_easy_setopt( easy, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4 );
-        curl_easy_setopt( easy, CURLOPT_DNS_CACHE_TIMEOUT, 360L );
-        curl_easy_setopt( easy, CURLOPT_CONNECTTIMEOUT, 60L );
 
         /* set a time limit for announces & scrapes */
-        if( strstr( task->url, "scrape" ) )
-            curl_easy_setopt( easy, CURLOPT_TIMEOUT, 15L );
-        else if( strstr( task->url, "announce" ) )
-            curl_easy_setopt( easy, CURLOPT_TIMEOUT, 30L );
+        if( strstr( task->url, "scrape" ) != NULL )
+            timeout = 20L;
+        else if( strstr( task->url, "announce" ) != NULL )
+            timeout = 30L;
         else
-            curl_easy_setopt( easy, CURLOPT_TIMEOUT, 240L );
-
+            timeout = 240L;
+        curl_easy_setopt( easy, CURLOPT_TIMEOUT, timeout );
+        curl_easy_setopt( easy, CURLOPT_CONNECTTIMEOUT, timeout-5 );
+        dbgmsg( "new task's timeout is %ld\n", timeout );
+
+        curl_easy_setopt( easy, CURLOPT_DNS_CACHE_TIMEOUT, 600L );
         curl_easy_setopt( easy, CURLOPT_FOLLOWLOCATION, 1L );
         curl_easy_setopt( easy, CURLOPT_AUTOREFERER, 1L );
@@ -245 +246 @@
             curl_easy_setopt( easy, CURLOPT_ENCODING, "" );
 
-        if( web->still_running >= MAX_CONCURRENT_TASKS ) {
-            tr_list_append( &web->easy_queue, easy );
-            dbgmsg( ">> enqueueing a task... size is now %d", tr_list_size( web->easy_queue ) );
-        } else {
+        {
             const CURLMcode mcode = curl_multi_add_handle( web->multi, easy );
             tr_assert( mcode == CURLM_OK, "curl_multi_add_handle() failed: %d (%s)", mcode, curl_multi_strerror( mcode ) );
@@ -277 +275 @@
     dbgmsg( "finished a web task... response code is %ld", response_code );
     dbgmsg( "===================================================" );
-    task->done_func( task->session,
-                     response_code,
-                     EVBUFFER_DATA( task->response ),
-                     EVBUFFER_LENGTH( task->response ),
-                     task->done_func_user_data );
+
+fprintf( stderr, "finishing task #%lu [%s] done_func %p\n", task->tag, task->url, task->done_func );
+    if( task->done_func != NULL )
+        task->done_func( task->session,
+                         response_code,
+                         EVBUFFER_DATA( task->response ),
+                         EVBUFFER_LENGTH( task->response ),
+                         task->done_func_user_data );
     task_free( task );
 }
@@ -353 +354 @@
 
     stop_timer( g );
-    dbgmsg( "adding a timeout for %ld seconds from now", g->timer_ms/1000L );
+    dbgmsg( "adding a timeout for %.1f seconds from now", g->timer_ms/1000.0 );
     tr_timevalMsec( g->timer_ms, &interval );
     evtimer_add( &g->timer_event, &interval );
-}
-
-static void
-add_tasks_from_queue( tr_web * g )
-{
-    while( ( g->still_running < MAX_CONCURRENT_TASKS )
-        && ( tr_list_size( g->easy_queue ) > 0 ) )
-    {
-        CURL * easy = tr_list_pop_front( &g->easy_queue );
-        if( easy )
-        {
-            const CURLMcode rc = curl_multi_add_handle( g->multi, easy );
-            if( rc != CURLM_OK )
-                tr_err( "%s", curl_multi_strerror( rc ) );
-            else {
-                dbgmsg( "pumped the task queue, %d remain",
-                        tr_list_size( g->easy_queue ) );
-                ++g->still_running;
-            }
-        }
-    }
 }
 
@@ -429 +409 @@
 
     remove_finished_tasks( g );
-
-    add_tasks_from_queue( g );
 
     if( !g->still_running ) {