Changeset 6322

Timestamp:

Jul 11, 2008, 11:51:15 AM (15 years ago)

Author:

charles

Message:

#1042: "Announce allowed: Never"

Location:

trunk

Files:

• gtk/details.c (modified) (1 diff)
• libtransmission/tracker.c (modified) (2 diffs)
• libtransmission/transmission.h (modified) (2 diffs)

trunk/gtk/details.c

@@ -1239 +1239 @@
 
 static void
-refresh_countdown_lb( GtkWidget * l, time_t t,
+refresh_countdown_lb( GtkWidget * w, time_t t,
                       const char * countdown_done )
 {
     const time_t now = time( NULL );
-
-    if( !t || ( t < now ) )
-        gtk_label_set_text( GTK_LABEL( l ), countdown_done );
+    GtkLabel * l = GTK_LABEL( w );
+
+    if( t == 1 )
+        gtk_label_set_text( l, _( "In progress" ) );
+    else if( t < now )
+        gtk_label_set_text( l, countdown_done );
     else {
         char buf[1024];
         const int seconds = t - now;
         tr_strltime( buf, seconds, sizeof( buf ) );
-        gtk_label_set_text( GTK_LABEL( l ), buf );
+        gtk_label_set_text( l, buf );
     }
 }

trunk/libtransmission/tracker.c

@@ -724 +724 @@
         {
             t->lastScrapeTime = now;
-            t->scrapeAt = 0;
+            t->scrapeAt = 1;
         }
         else
         {
             t->lastAnnounceTime = now;
-            t->reannounceAt = 0;
+            t->reannounceAt = 1;
+            t->manualAnnounceAllowedAt = 1;
             t->scrapeAt = req->reqtype == TR_REQ_STOPPED
                         ? now + t->scrapeIntervalSec + t->randOffset
@@ -783 +784 @@
         tr_tracker * t = tor->tracker;
 
-        if( t->scrapeAt && trackerSupportsScrape( t, tor ) && ( now >= t->scrapeAt ) ) {
-            t->scrapeAt = 0;
+        if( ( t->scrapeAt > 1 ) &&
+            ( t->scrapeAt <= now ) &&
+            ( trackerSupportsScrape( t, tor ) ) )
+        {
+            t->scrapeAt = 1;
             enqueueScrape( session, t );
         }
 
-        if( t->reannounceAt && t->isRunning && ( now >= t->reannounceAt ) ) {
-            t->reannounceAt = 0;
+        if( ( t->reannounceAt > 1 ) && 
+            ( t->reannounceAt <= now ) &&
+            ( t->isRunning ) )
+        {
+            t->reannounceAt = 1;
+            t->manualAnnounceAllowedAt = 1;
             enqueueRequest( session, t, TR_REQ_REANNOUNCE );
         }

trunk/libtransmission/transmission.h

@@ -1302 +1302 @@
     time_t lastScrapeTime;
 
-    /** Time when the next scrape request will be sent.
-        This value is always a valid time. */
+    /** Time when the next scrape request will be sent,
+        or 0 if an error has occured that stops scraping,
+        or 1 if a scrape is currently in progress s.t.
+        we haven't set a timer for the next one yet. */
     time_t nextScrapeTime;
 
@@ -1311 +1313 @@
 
     /** Time when the next reannounce request will be sent,
-        or zero if the torrent is stopped. */
+        or 0 if the torrent is stopped,
+        or 1 if an announce is currently in progress s.t.
+        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.  otherwise, the value is zero. */
+        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;