Changeset 3821

Timestamp:

Nov 15, 2007, 4:19:53 AM (15 years ago)

Author:

charles

Message:

cruft removal: use tr_stat's ratio field instead of calculating it ourself.

Location:

trunk/gtk

Files:

• torrent-inspector.c (modified) (1 diff)
• tr_core.c (modified) (2 diffs)
• tr_core.h (modified) (1 diff)
• tr_window.c (modified) (2 diffs)
• util.c (modified) (1 diff)
• util.h (modified) (1 diff)

trunk/gtk/torrent-inspector.c

@@ -821 +821 @@
   g_free (pch);
 
-  pch = ratiostr (stat->downloadedEver, stat->uploadedEver);
+  pch = g_strdup_printf( "%.1f", stat->ratio );
   gtk_label_set_text (GTK_LABEL(a->ratio_lb), pch);
   g_free (pch);

trunk/gtk/tr_core.c

@@ -270 +270 @@
         /* leechers, completedFromTracker, downloaded,    uploaded */
         G_TYPE_INT,  G_TYPE_INT,           G_TYPE_UINT64, G_TYPE_UINT64,
-        /* left,       TrTorrent object, ID for IPC */
-        G_TYPE_UINT64, TR_TORRENT_TYPE,  G_TYPE_INT,
+        /* ratio,      left,          TrTorrent object, ID for IPC */
+        G_TYPE_FLOAT,  G_TYPE_UINT64, TR_TORRENT_TYPE,  G_TYPE_INT,
     };
 
@@ -563 +563 @@
                             MC_DOWN,        st->downloadedEver,
                             MC_UP,          st->uploadedEver,
+                            MC_RATIO,       st->ratio,
                             MC_LEFT,        st->leftUntilDone,
                             -1 );

trunk/gtk/tr_core.h

@@ -182 +182 @@
   MC_PROG_C, MC_PROG_D, MC_DRATE, MC_URATE, MC_ETA, MC_PEERS,
   MC_UPEERS, MC_DPEERS, MC_SEED, MC_LEECH, MC_DONE,
-  MC_DOWN, MC_UP, MC_LEFT, MC_TORRENT, MC_ID,
+  MC_DOWN, MC_UP, MC_RATIO, MC_LEFT, MC_TORRENT, MC_ID,
   MC_ROW_COUNT
 };

trunk/gtk/tr_window.c

@@ -120 +120 @@
 {
     char  * dlstr, * ulstr, * str, * marked;
-    gfloat  prog, dl, ul;
+    gfloat  prog, dl, ul, ratio;
     guint64 down, up;
 
     gtk_tree_model_get( model, iter, MC_PROG_D, &prog, MC_DRATE, &dl,
-                        MC_URATE, &ul, MC_DOWN, &down, MC_UP, &up, -1 );
+                        MC_URATE, &ul, MC_DOWN, &down, MC_UP, &up, MC_RATIO, &ratio, -1 );
     prog = MAX( prog, 0.0 );
     prog = MIN( prog, 1.0 );
@@ -131 +131 @@
     if( 1.0 == prog )
     {
-        dlstr = ratiostr( down, up );
+        dlstr = g_strdup_printf( "%.1f", ratio );
         str = g_strdup_printf( _("Ratio: %s\nUL: %s"), dlstr, ulstr );
     }

trunk/gtk/util.c

@@ -122 +122 @@
 }
 
-char *
-ratiostr(guint64 down, guint64 up) {
-  double ratio;
-
-  if(0 == up && 0 == down)
-    return g_strdup(_("N/A"));
-
-  if(0 == down)
-    /* this is a UTF-8 infinity symbol */
-    return g_strdup("\xE2\x88\x9E");
-
-  ratio = (double)up / (double)down;
-
-  return g_strdup_printf("%.*f", BESTDECIMAL(ratio), ratio);
-}
-
 gboolean
 mkdir_p(const char *name, mode_t mode)

trunk/gtk/util.h

@@ -63 +63 @@
 char *
 rfc822date (guint64 epoch_msec);
-
-/* returns a string representing the download ratio.
-   the string must be g_free()d */
-char *
-ratiostr(guint64 down, guint64 up);
 
 /* create a directory and any missing parent directories */