Changeset 140

Timestamp:

Mar 9, 2006, 2:32:16 AM (17 years ago)

Author:

titer

Message:

Adds tr_torrentAvailability for the advanced progress bar (also, now
supports any width for it)

Location:

branches/new_api/libtransmission

Files:

• transmission.c (modified) (3 diffs)
• transmission.h (modified) (2 diffs)

branches/new_api/libtransmission/transmission.c

@@ -348 +348 @@
     tr_stat_t * s;
     tr_info_t * inf = &tor->info;
-    int i, j, piece;
+    int i;
 
     tor->statCur = ( tor->statCur + 1 ) % 2;
@@ -415 +415 @@
     }
 
-    for( i = 0; i < 120; i++ )
-    {
-        piece = i * inf->pieceCount / 120;
+    s->downloaded = tor->downloaded;
+    s->uploaded   = tor->uploaded;
+
+    tr_lockUnlock( &tor->lock );
+
+    return s;
+}
+
+void tr_torrentAvailability( tr_torrent_t * tor, uint8_t * tab, int size )
+{
+    int i, j, piece;
+
+    tr_lockLock( &tor->lock );
+    for( i = 0; i < size; i++ )
+    {
+        piece = i * tor->info.pieceCount / size;
 
         if( tr_cpPieceIsComplete( tor->completion, piece ) )
         {
-            s->pieces[i] = -1;
+            tab[i] = -1;
             continue;
         }
 
-        s->pieces[i] = 0;
-        
+        tab[i] = 0;
         for( j = 0; j < tor->peerCount; j++ )
         {
@@ -432 +444 @@
                 tr_bitfieldHas( tr_peerBitfield( tor->peers[j] ), piece ) )
             {
-                (s->pieces[i])++;
+                (tab[i])++;
             }
         }
     }
-
-    s->downloaded = tor->downloaded;
-    s->uploaded   = tor->uploaded;
-
     tr_lockUnlock( &tor->lock );
-
-    return s;
 }
 

branches/new_api/libtransmission/transmission.h

@@ -170 +170 @@
 
 /***********************************************************************
+ * tr_torrentAvailability
+ ***********************************************************************
+ * Use this to draw an advanced progress bar which is 'size' pixels
+ * wide. Fills 'tab' which you must have allocated: each byte is set
+ * to either -1 if we have the piece, otherwise it is set to the number
+ * of connected peers who have the piece.
+ **********************************************************************/
+void tr_torrentAvailability( tr_torrent_t *, uint8_t * tab, int size );
+
+/***********************************************************************
  * tr_torrentClose
  ***********************************************************************
@@ -240 +250 @@
     int         peersUploading;
     int         peersDownloading;
-    char        pieces[120];
     int         seeders;
     int         leechers;