mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-01-31 03:12:44 +00:00
Code Issues Releases Wiki Activity

(daemon) #1520: "transmission-remote -l" doesn't show infinite ratio properly

Browse source
This commit is contained in:
Charles Kerr 2008-11-30 17:03:45 +00:00
parent 6c0ae34071
commit d440523475
1 changed files with 38 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
daemon/remote.c
View file

@ -270,12 +270,17 @@ static const char * details_keys[] = {
}; };
static const char * list_keys[] = { static const char * list_keys[] = {
"downloadedEver", "eta", "id", "eta",
"id",
"leftUntilDone", "leftUntilDone",
"name", "name",
"peersGettingFromUs", "peersSendingToUs", "peersGettingFromUs",
"peersSendingToUs",
"rateDownload", "rateDownload",
"rateUpload", "sizeWhenDone", "status", "uploadedEver" "rateUpload",
"sizeWhenDone",
"status",
"uploadRatio"
}; };
static void static void
@ -581,27 +586,38 @@ etaToString( char * buf,
#define MEGABYTE_FACTOR ( 1024.0 * 1024.0 ) #define MEGABYTE_FACTOR ( 1024.0 * 1024.0 )
#define GIGABYTE_FACTOR ( 1024.0 * 1024.0 * 1024.0 ) #define GIGABYTE_FACTOR ( 1024.0 * 1024.0 * 1024.0 )
static char*
strlratio2( char * buf, double ratio, size_t buflen )
{
if( (int)ratio == TR_RATIO_NA )
tr_strlcpy( buf, "None", buflen );
else if( (int)ratio == TR_RATIO_INF )
tr_strlcpy( buf, "Inf", buflen );
else if( ratio < 10.0 )
tr_snprintf( buf, buflen, "%'.2f", ratio );
else if( ratio < 100.0 )
tr_snprintf( buf, buflen, "%'.1f", ratio );
else
tr_snprintf( buf, buflen, "%'.0f", ratio );
return buf;
}
static char* static char*
strlratio( char * buf, strlratio( char * buf,
double numerator, double numerator,
double denominator, double denominator,
size_t buflen ) size_t buflen )
{ {
double ratio;
if( denominator ) if( denominator )
{ ratio = numerator / denominator;
const double ratio = numerator / denominator;
if( ratio < 10.0 )
tr_snprintf( buf, buflen, "%'.2f", ratio );
else if( ratio < 100.0 )
tr_snprintf( buf, buflen, "%'.1f", ratio );
else
tr_snprintf( buf, buflen, "%'.0f", ratio );
}
else if( numerator ) else if( numerator )
tr_strlcpy( buf, "Inf", buflen ); ratio = TR_RATIO_INF;
else else
tr_strlcpy( buf, "None", buflen ); ratio = TR_RATIO_NA;
return buf;
return strlratio2( buf, ratio, buflen );
} }
static char* static char*
@ -1010,13 +1026,12 @@ printTorrentList( tr_benc * top )
"Name" ); "Name" );
for( i = 0, n = tr_bencListSize( list ); i < n; ++i ) for( i = 0, n = tr_bencListSize( list ); i < n; ++i )
{ {
int64_t id, eta, status, up, down; int64_t id, eta, status, up, down;
int64_t sizeWhenDone, leftUntilDone; int64_t sizeWhenDone, leftUntilDone;
int64_t upEver, downEver; double ratio;
const char *name; const char * name;
tr_benc * d = tr_bencListChild( list, i ); tr_benc * d = tr_bencListChild( list, i );
if( tr_bencDictFindInt( d, "downloadedEver", &downEver ) if( tr_bencDictFindInt( d, "eta", &eta )
&& tr_bencDictFindInt( d, "eta", &eta )
&& tr_bencDictFindInt( d, "id", &id ) && tr_bencDictFindInt( d, "id", &id )
&& tr_bencDictFindInt( d, "leftUntilDone", &leftUntilDone ) && tr_bencDictFindInt( d, "leftUntilDone", &leftUntilDone )
&& tr_bencDictFindStr( d, "name", &name ) && tr_bencDictFindStr( d, "name", &name )
@ -1024,7 +1039,7 @@ printTorrentList( tr_benc * top )
&& tr_bencDictFindInt( d, "rateUpload", &up ) && tr_bencDictFindInt( d, "rateUpload", &up )
&& tr_bencDictFindInt( d, "sizeWhenDone", &sizeWhenDone ) && tr_bencDictFindInt( d, "sizeWhenDone", &sizeWhenDone )
&& tr_bencDictFindInt( d, "status", &status ) && tr_bencDictFindInt( d, "status", &status )
&& tr_bencDictFindInt( d, "uploadedEver", &upEver ) ) && tr_bencDictFindDouble( d, "uploadRatio", &ratio ) )
{ {
char etaStr[16]; char etaStr[16];
char statusStr[64]; char statusStr[64];
@ -1042,7 +1057,7 @@ printTorrentList( tr_benc * top )
etaStr, etaStr,
up / 1024.0, up / 1024.0,
down / 1024.0, down / 1024.0,
strlratio( ratioStr, downEver, upEver, sizeof( ratioStr ) ), strlratio2( ratioStr, ratio, sizeof( ratioStr ) ),
getStatusString( d, statusStr, sizeof( statusStr ) ), getStatusString( d, statusStr, sizeof( statusStr ) ),
name ); name );
} }