mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-27 01:57:52 +00:00
Code Issues Releases Wiki Activity

(trunk gtk) #1824: Display ETA when seeding

Browse source
This commit is contained in:
Charles Kerr 2009-03-01 16:00:41 +00:00
parent 92f5e68dae
commit 52639e467a
1 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gtk/torrent-cell-renderer.c
View file

@ -35,7 +35,8 @@ enum
***/ ***/
static char* static char*
getProgressString( const tr_info * info, getProgressString( const tr_torrent * tor,
const tr_info * info,
const tr_stat * torStat ) const tr_stat * torStat )
{ {
const int isDone = torStat->leftUntilDone == 0; const int isDone = torStat->leftUntilDone == 0;
@ -43,8 +44,11 @@ getProgressString( const tr_info * info,
const int isSeed = torStat->haveValid >= info->totalSize; const int isSeed = torStat->haveValid >= info->totalSize;
char buf1[32], buf2[32], buf3[32], buf4[32]; char buf1[32], buf2[32], buf3[32], buf4[32];
char * str; char * str;
double seedRatio;
gboolean hasSeedRatio;
if( !isDone ) if( !isDone )
{
str = g_strdup_printf( str = g_strdup_printf(
/* %1$s is how much we've got, /* %1$s is how much we've got,
%2$s is how much we'll have when done, %2$s is how much we'll have when done,
@ -53,7 +57,9 @@ getProgressString( const tr_info * info,
tr_strlsize( buf1, haveTotal, sizeof( buf1 ) ), tr_strlsize( buf1, haveTotal, sizeof( buf1 ) ),
tr_strlsize( buf2, torStat->sizeWhenDone, sizeof( buf2 ) ), tr_strlsize( buf2, torStat->sizeWhenDone, sizeof( buf2 ) ),
torStat->percentDone * 100.0 ); torStat->percentDone * 100.0 );
}
else if( !isSeed ) else if( !isSeed )
{
str = g_strdup_printf( str = g_strdup_printf(
/* %1$s is how much we've got, /* %1$s is how much we've got,
%2$s is the torrent's total size, %2$s is the torrent's total size,
@ -66,7 +72,22 @@ getProgressString( const tr_info * info,
torStat->percentComplete * 100.0, torStat->percentComplete * 100.0,
tr_strlsize( buf3, torStat->uploadedEver, sizeof( buf3 ) ), tr_strlsize( buf3, torStat->uploadedEver, sizeof( buf3 ) ),
tr_strlratio( buf4, torStat->ratio, sizeof( buf4 ) ) ); tr_strlratio( buf4, torStat->ratio, sizeof( buf4 ) ) );
else }
else if(( hasSeedRatio = tr_torrentGetSeedRatio( tor, &seedRatio )))
{
str = g_strdup_printf(
/* %1$s is the torrent's total size,
%2$s is how much we've uploaded,
%3$s is our upload-to-download ratio,
$4$s is the ratio we want to reach before we stop uploading */
_( "%1$s, uploaded %2$s (Ratio: %3$s Goal: %4$s)" ),
tr_strlsize( buf1, info->totalSize, sizeof( buf1 ) ),
tr_strlsize( buf2, torStat->uploadedEver, sizeof( buf2 ) ),
tr_strlratio( buf3, torStat->ratio, sizeof( buf3 ) ),
tr_strlratio( buf4, seedRatio, sizeof( buf4 ) ) );
}
else /* seeding w/o a ratio */
{
str = g_strdup_printf( str = g_strdup_printf(
/* %1$s is the torrent's total size, /* %1$s is the torrent's total size,
%2$s is how much we've uploaded, %2$s is how much we've uploaded,
@ -75,9 +96,10 @@ getProgressString( const tr_info * info,
tr_strlsize( buf1, info->totalSize, sizeof( buf1 ) ), tr_strlsize( buf1, info->totalSize, sizeof( buf1 ) ),
tr_strlsize( buf2, torStat->uploadedEver, sizeof( buf2 ) ), tr_strlsize( buf2, torStat->uploadedEver, sizeof( buf2 ) ),
tr_strlratio( buf3, torStat->ratio, sizeof( buf3 ) ) ); tr_strlratio( buf3, torStat->ratio, sizeof( buf3 ) ) );
}
/* add time when downloading */ /* add time when downloading */
if( torStat->activity == TR_STATUS_DOWNLOAD ) if( hasSeedRatio || ( torStat->activity == TR_STATUS_DOWNLOAD ) )
{ {
const int eta = torStat->eta; const int eta = torStat->eta;
GString * gstr = g_string_new( str ); GString * gstr = g_string_new( str );
@ -298,7 +320,7 @@ torrent_cell_renderer_get_size( GtkCellRenderer * cell,
else else
{ {
int w1, h1; int w1, h1;
char * progressString = getProgressString( info, torStat ); char * progressString = getProgressString( tor, info, torStat );
str = g_markup_printf_escaped( "<b>%s</b>\n<small>%s</small>", str = g_markup_printf_escaped( "<b>%s</b>\n<small>%s</small>",
name, progressString ); name, progressString );
g_object_set( text_renderer, "markup", str, NULL ); g_object_set( text_renderer, "markup", str, NULL );
@ -391,7 +413,7 @@ torrent_cell_renderer_render(
/* above the progressbar */ /* above the progressbar */
if( !p->minimal ) if( !p->minimal )
{ {
char * progressString = getProgressString( info, torStat ); char * progressString = getProgressString( tor, info, torStat );
char * str = g_markup_printf_escaped( char * str = g_markup_printf_escaped(
"<b>%s</b>\n<small>%s</small>", "<b>%s</b>\n<small>%s</small>",
name, progressString ); name, progressString );