Changeset 12605

Timestamp:

Jul 31, 2011, 12:58:05 AM (12 years ago)

Author:

jordan

Message:

(trunk libT) modify announcer's scrape triggers as per discussion with Elbandi

File:

• trunk/libtransmission/announcer.c (modified) (3 diffs)

trunk/libtransmission/announcer.c

@@ -1073 +1073 @@
             int i;
             const char * str;
+            bool got_scrape_info = false;
             const bool isStopped = event == TR_ANNOUNCE_EVENT_STOPPED;
 
@@ -1080 +1081 @@
             {
                 tracker->consecutiveFailures = 0;
-                tracker->seederCount = response->seeders;
-                tracker->leecherCount = response->leechers;
-                tracker->downloadCount = response->downloads;
+
+                /* if the tracker included scrape fields in its announce response,
+                   then a separate scrape isn't needed */
+
+                got_scrape_info = response->seeders
+                               || response->leechers
+                               || response->downloads;
+
+                if( got_scrape_info )
+                {
+                    tracker->seederCount = response->seeders;
+                    tracker->leecherCount = response->leechers;
+                    tracker->downloadCount = response->downloads;
+                }
 
                 if(( str = response->tracker_id_str ))
@@ -1118 +1130 @@
 
             tier->isRunning = data->isRunningOnSuccess;
-            tier->scrapeAt = get_next_scrape_time( announcer->session, tier, tier->scrapeIntervalSec );
-            tier->lastScrapeTime = now;
-            tier->lastScrapeSucceeded = true;
+
+            if( got_scrape_info )
+            {
+                tier->scrapeAt = get_next_scrape_time( announcer->session, tier, tier->scrapeIntervalSec );
+                tier->lastScrapeTime = now;
+                tier->lastScrapeSucceeded = true;
+            }
+            else if( tier->lastScrapeTime + tier->scrapeIntervalSec <= now )
+            {
+                tier->scrapeAt = get_next_scrape_time( announcer->session, tier, 0 );
+            }
+
             tier->lastAnnounceSucceeded = true;
             tier->lastAnnouncePeerCount = response->pex_count