mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

remove `TR_STATUS_DONE' from libtransmission's public API. It's useful as an internal state but not for code calling libtransmission.

This commit is contained in:
Charles Kerr 2008-03-31 17:59:16 +00:00
parent 11513cd1ba
commit 51a82e70c1
10 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
beos/TRTransfer.cpp
View File

@ -20,7 +20,7 @@
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
* $Id:$
* $Id$
*/
#include "TRTransfer.h"
@ -154,8 +154,6 @@ void TRTransfer::DrawItem(BView *owner, BRect frame, bool) {
} else if (fStatus->status & TR_STATUS_CHECK ) {
sprintf(fTimeStr, "Checking Existing Files (%.2f %%)",
100 * fStatus->percentDone);
} else if (fStatus->status & TR_STATUS_DONE ) {
sprintf(fTimeStr, "Done...");
} else if (fStatus->status & TR_STATUS_DOWNLOAD) {
if (fStatus->eta < 0 ) {
sprintf(fTimeStr, "--:--:-- Remaining (%.2f %%Complete)",

4
gtk/torrent-cell-renderer.c
View File

@ -149,8 +149,7 @@ getShortStatusString( const tr_stat * torStat )
break;
case TR_STATUS_DOWNLOAD:
case TR_STATUS_SEED:
case TR_STATUS_DONE: {
case TR_STATUS_SEED: {
char buf[128];
if( torStat->status != TR_STATUS_DOWNLOAD ) {
tr_strlratio( buf, torStat->ratio, sizeof( buf ) );
@ -202,7 +201,6 @@ getStatusString( const tr_stat * torStat )
torStat->peersConnected );
break;
case TR_STATUS_DONE:
case TR_STATUS_SEED:
g_string_append_printf( gstr,
ngettext( "Seeding to %1$'d of %2$'d connected peer",

7
gtk/tr-torrent.c
View File

@ -295,13 +295,6 @@ tr_torrent_status_str ( TrTorrent * gtor )
}
break;
case TR_STATUS_DONE:
top = g_strdup_printf(
ngettext( "Uploading to %1$'d of %2$'d connected peer",
"Uploading to %1$'d of %2$'d connected peers", tpeers ),
upeers, tpeers );
break;
case TR_STATUS_SEED:
top = g_strdup_printf(
ngettext( "Seeding to %1$'d of %2$'d connected peer",

3
gtk/tr-window.c
View File

@ -316,8 +316,7 @@ checkFilterMode( filter_mode_t filter_mode,
ret = torStat->status == TR_STATUS_DOWNLOAD;
break;
case FILTER_MODE_SEEDING:
ret = ( torStat->status == TR_STATUS_DONE )
|| ( torStat->status == TR_STATUS_SEED );
ret = torStat->status == TR_STATUS_SEED;
break;
case FILTER_MODE_PAUSED:
ret = torStat->status == TR_STATUS_STOPPED;

2
libtransmission/ipcparse.c
View File

@ -785,7 +785,7 @@ ipc_addstat( tr_benc * list, int tor,
{
tr_bencInitStr( item, "downloading", -1, 1 );
}
else if( ( TR_STATUS_DONE | TR_STATUS_SEED ) & st->status )
else if( TR_STATUS_SEED & st->status )
{
tr_bencInitStr( item, "seeding", -1, 1 );
}

2
libtransmission/torrent.c
View File

@ -605,8 +605,6 @@ tr_torrentStat( tr_torrent * tor )
s->status = TR_STATUS_STOPPED;
else if( tor->cpStatus == TR_CP_INCOMPLETE )
s->status = TR_STATUS_DOWNLOAD;
else if( tor->cpStatus == TR_CP_DONE )
s->status = TR_STATUS_DONE;
else
s->status = TR_STATUS_SEED;

7
libtransmission/transmission.h
View File

@ -734,11 +734,8 @@ typedef enum
TR_STATUS_CHECK_WAIT = (1<<0), /* Waiting in queue to check files */
TR_STATUS_CHECK = (1<<1), /* Checking files */
TR_STATUS_DOWNLOAD = (1<<2), /* Downloading */
TR_STATUS_DONE = (1<<3), /* not at 100% so can't tell the tracker
we're a seeder, but due to DND files
there's nothing we want right now */
TR_STATUS_SEED = (1<<4), /* Seeding */
TR_STATUS_STOPPED = (1<<5) /* Torrent is stopped */
TR_STATUS_SEED = (1<<3), /* Seeding */
TR_STATUS_STOPPED = (1<<4) /* Torrent is stopped */
}
tr_torrent_status;

5
macosx/Torrent.m
View File

@ -890,7 +890,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
- (BOOL) isSeeding
{
return fStat->status == TR_STATUS_SEED || fStat->status == TR_STATUS_DONE;
return fStat->status == TR_STATUS_SEED;
}
- (BOOL) isChecking
@ -1058,7 +1058,6 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
break;
case TR_STATUS_SEED:
case TR_STATUS_DONE:
if ([self totalPeersConnected] != 1)
string = [NSString stringWithFormat: NSLocalizedString(@"Seeding to %d of %d peers", "Torrent -> status string"),
[self peersGettingFromUs], [self totalPeersConnected]];
@ -1125,7 +1124,6 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
break;
case TR_STATUS_SEED:
case TR_STATUS_DONE:
string = [NSString stringWithFormat: @"%@: %@, %@: %@",
NSLocalizedString(@"Ratio", "Torrent -> status string"), [NSString stringForRatio: [self ratio]],
NSLocalizedString(@"UL", "Torrent -> status string"), [NSString stringForSpeed: [self uploadRate]]];
@ -1167,7 +1165,6 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
return NSLocalizedString(@"Downloading", "Torrent -> status string");
case TR_STATUS_SEED:
case TR_STATUS_DONE:
return NSLocalizedString(@"Seeding", "Torrent -> status string");
default:

1
wx/filter.cc
View File

@ -33,7 +33,6 @@ TorrentFilter :: GetFlags( const tr_torrent * tor )
flags |= FLAG_LEECHING;
break;
case TR_STATUS_DONE:
case TR_STATUS_SEED:
flags |= FLAG_SEEDING;
break;

1
wx/torrent-list.cc
View File

@ -307,7 +307,6 @@ TorrentListCtrl :: RefreshTorrent( tr_torrent * tor,
case TR_STATUS_CHECK: xstr = wxString::Format ( _("Checking Files (%.0f)"), s->recheckProgress ); break;
case TR_STATUS_CHECK_WAIT: xstr = _("Waiting to Check"); break;
case TR_STATUS_DOWNLOAD: xstr = _("Downloading"); break;
case TR_STATUS_DONE:
case TR_STATUS_SEED: xstr = _("Seeding"); break;
default: assert( 0 );
}