Changeset 5537

Timestamp:

Apr 6, 2008, 2:32:43 PM (14 years ago)

Author:

charles

Message:

#843: download eta should consider availability

Location:

branches/1.1x

Files:

• gtk/torrent-cell-renderer.c (modified) (1 diff)
• gtk/tr-torrent.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (2 diffs)
• libtransmission/transmission.h (modified) (1 diff)

branches/1.1x/gtk/torrent-cell-renderer.c

@@ -84 +84 @@
         GString * gstr = g_string_new( str );
         g_string_append( gstr, " - " );
-        if( eta < 0 )
+        if( eta == TR_ETA_NOT_AVAIL )
+            g_string_append( gstr, _( "Not available" ) );
+         else if( eta == TR_ETA_UNKNOWN )
             g_string_append( gstr, _( "Stalled" ) );
         else {

branches/1.1x/gtk/tr-torrent.c

@@ -285 +285 @@
 
         case TR_STATUS_DOWNLOAD:
-            if( eta < 0 )
-                top = g_strdup_printf( _("Stalled (%.1f%%)"), prog );
+
+            if( eta == TR_ETA_NOT_AVAIL )
+                top = g_strdup_printf( _("Not available (%.1f%%)" ), prog );
+            else if( eta == TR_ETA_UNKNOWN )
+                top = g_strdup_printf( _( "Stalled (%.1f%%)" ), prog );
             else {
                 char timestr[128];

branches/1.1x/libtransmission/torrent.c

@@ -625 +625 @@
     s->activityDate = tor->activityDate;
 
-    s->eta = s->rateDownload < 0.1
-        ? -1.0f
-        : (s->leftUntilDone / s->rateDownload / 1024.0);
-
     s->corruptEver     = tor->corruptCur    + tor->corruptPrev;
     s->downloadedEver  = tor->downloadedCur + tor->downloadedPrev;
@@ -658 +654 @@
         tr_bitfieldFree( availablePieces );
     }
+
+    if( s->desiredAvailable != s->leftUntilDone )
+        s->eta = TR_ETA_NOT_AVAIL;
+    else if( s->rateDownload < 0.1 )
+        s->eta = TR_ETA_UNKNOWN;
+    else
+        s->eta = s->leftUntilDone / (s->rateDownload / 1024.0);
 
     s->ratio = tr_getRatio( s->uploadedEver,

branches/1.1x/libtransmission/transmission.h

@@ -793 +793 @@
     char errorString[128];
 
-
+    /* [0..1] */
     float recheckProgress;
+
+    /* [0..1] */
     float percentComplete;
+
+    /* [0..1] */
     float percentDone;
+
+    /* KiB/s */
     float rateDownload;
+
+    /* KiB/s */
     float rateUpload;
 
+#define TR_ETA_NOT_AVAIL -1
+#define TR_ETA_UNKNOWN -2
+    /* seconds */
     int eta;
+
     int peersKnown;
     int peersConnected;