Changeset 3147

Timestamp:

Sep 23, 2007, 1:53:44 PM (15 years ago)

Author:

charles

Message:

• when a torrent's done downloading, have it switch to seeding mode.
• tweak the gtk+ client's torrent inspector's display of transfer rates

Location:

trunk

Files:

• gtk/torrent-inspector.c (modified) (2 diffs)
• libtransmission/internal.h (modified) (1 diff)
• libtransmission/peer-mgr.c (modified) (2 diffs)
• libtransmission/torrent.c (modified) (5 diffs)

trunk/gtk/torrent-inspector.c

@@ -378 +378 @@
                 gpointer             data UNUSED)
 {
-  char * pch;
   float rate = 0.0;
   gtk_tree_model_get (tree_model, iter, PEER_COL_UPLOAD_RATE, &rate, -1);
-  pch = readablespeed (rate);
-  g_object_set (renderer, "text", pch, NULL);
-  g_free (pch); 
+  if( rate < 0.01 )
+    g_object_set (renderer, "text", "", NULL);
+  else {
+    char * pch = readablespeed (rate);
+    g_object_set (renderer, "text", pch, NULL);
+    g_free (pch); 
+  }
 }
 
@@ -393 +396 @@
                 gpointer             data UNUSED)
 {
-  char * pch;
   float rate = 0.0;
   gtk_tree_model_get (tree_model, iter, PEER_COL_DOWNLOAD_RATE, &rate, -1);
-  pch = readablespeed (rate);
-  g_object_set (renderer, "text", pch, NULL);
-  g_free (pch); 
+  if( rate < 0.01 )
+    g_object_set (renderer, "text", "", NULL);
+  else {
+    char * pch = readablespeed (rate);
+    g_object_set (renderer, "text", pch, NULL);
+    g_free (pch); 
+  }
 }
 

trunk/libtransmission/internal.h

@@ -45 +45 @@
 #define FALSE 0
 #endif
+
+
+void tr_torrentRecheckCompleteness( tr_torrent * );
 
 int tr_trackerInfoInit( struct tr_tracker_info  * info,

trunk/libtransmission/peer-mgr.c

@@ -633 +633 @@
         case TR_PEERMSG_CLIENT_HAVE:
             broadcastClientHave( t, e->pieceIndex );
+            tr_torrentRecheckCompleteness( t->tor );
             break;
 
@@ -700 +701 @@
         return;
     }
-
-    fprintf( stderr, "peer-mgr: torrent [%s] finished a handshake. Connected? %s.\n", t->tor->info.name, (isConnected?"yes":"no") );
 
     /* if we couldn't connect or were snubbed,

trunk/libtransmission/torrent.c

@@ -254 +254 @@
 }
 
-static void recheckCpState( tr_torrent * );
-
 static void
 tr_torrentStartImpl( tr_torrent * tor )
@@ -264 +262 @@
     *tor->errorString = '\0';
     tr_torrentResetTransferStats( tor );
-    recheckCpState( tor );
+    tr_torrentRecheckCompleteness( tor );
     tor->startDate = tr_date();
     tr_trackerStart( tor->tracker );
@@ -273 +271 @@
 recheckDoneCB( tr_torrent * tor )
 {
-    recheckCpState( tor );
+    tr_torrentRecheckCompleteness( tor );
 
     if( tor->doStopAfterHashCheck ) {
@@ -636 +634 @@
 
     tr_fastResumeSave( tor );
-    recheckCpState( tor );
+    tr_torrentRecheckCompleteness( tor );
 
     tr_timerFree( &tor->saveTimer );
@@ -1097 +1095 @@
 }
 
-static void
-recheckCpState( tr_torrent * tor )
+void
+tr_torrentRecheckCompleteness( tr_torrent * tor )
 {
     cp_status_t cpStatus;