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

Display ratio while downloading and seeding, minor code cleanup.

Browse source 
Patch by Graue.
This commit is contained in:
Josh Elsasser 2007-02-15 20:56:25 +00:00
parent 7fbd08618b
commit e911d04190
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
cli/transmissioncli.c
View file

@ -64,6 +64,20 @@ static char * finishCall = NULL;
static int parseCommandLine ( int argc, char ** argv ); static int parseCommandLine ( int argc, char ** argv );
static void sigHandler ( int signal ); static void sigHandler ( int signal );
char * getStringRatio( float ratio )
{
static char string[20];
if( ratio == TR_RATIO_NA )
return "n/a";
if( ratio == TR_RATIO_INF )
return "inf";
snprintf( string, sizeof string, "%.3f", ratio );
return string;
}
#define LINEWIDTH 80
int main( int argc, char ** argv ) int main( int argc, char ** argv )
{ {
int i, error; int i, error;
@ -186,7 +200,7 @@ int main( int argc, char ** argv )
for( ;; ) for( ;; )
{ {
char string[80]; char string[LINEWIDTH];
int chars = 0; int chars = 0;
int result; int result;
@ -206,34 +220,35 @@ int main( int argc, char ** argv )
} }
else if( s->status & TR_STATUS_CHECK ) else if( s->status & TR_STATUS_CHECK )
{ {
chars = snprintf( string, 80, chars = snprintf( string, sizeof string,
"Checking files... %.2f %%", 100.0 * s->progress ); "Checking files... %.2f %%", 100.0 * s->progress );
} }
else if( s->status & TR_STATUS_DOWNLOAD ) else if( s->status & TR_STATUS_DOWNLOAD )
{ {
chars = snprintf( string, 80, chars = snprintf( string, sizeof string,
"Progress: %.2f %%, %d peer%s, dl from %d (%.2f KB/s), " "Progress: %.2f %%, %d peer%s, dl from %d (%.2f KB/s), "
"ul to %d (%.2f KB/s)", 100.0 * s->progress, "ul to %d (%.2f KB/s) [%s]", 100.0 * s->progress,
s->peersTotal, ( s->peersTotal == 1 ) ? "" : "s", s->peersTotal, ( s->peersTotal == 1 ) ? "" : "s",
s->peersUploading, s->rateDownload, s->peersUploading, s->rateDownload,
s->peersDownloading, s->rateUpload ); s->peersDownloading, s->rateUpload,
getStringRatio(s->ratio) );
} }
else if( s->status & TR_STATUS_SEED ) else if( s->status & TR_STATUS_SEED )
{ {
chars = snprintf( string, 80, chars = snprintf( string, sizeof string,
"Seeding, uploading to %d of %d peer(s), %.2f KB/s", "Seeding, uploading to %d of %d peer(s), %.2f KB/s [%s]",
s->peersDownloading, s->peersTotal, s->peersDownloading, s->peersTotal,
s->rateUpload ); s->rateUpload, getStringRatio(s->ratio) );
} }
else if( s->status & TR_STATUS_STOPPING ) else if( s->status & TR_STATUS_STOPPING )
{ {
chars = snprintf( string, 80, "Stopping..." ); chars = snprintf( string, sizeof string, "Stopping..." );
} }
if( 79 > chars ) if( ( signed )sizeof string > chars )
{ {
memset( &string[chars], ' ', 79 - chars ); memset( &string[chars], ' ', sizeof string - 1 - chars );
} }
string[79] = '\0'; string[sizeof string - 1] = '\0';
fprintf( stderr, "\r%s", string ); fprintf( stderr, "\r%s", string );
if( s->error ) if( s->error )