Changeset 5457

Timestamp:

Mar 31, 2008, 5:59:16 PM (14 years ago)

Author:

charles

Message:

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

Location:

trunk

Files:

• beos/TRTransfer.cpp (modified) (2 diffs)
• gtk/torrent-cell-renderer.c (modified) (2 diffs)
• gtk/tr-torrent.c (modified) (1 diff)
• gtk/tr-window.c (modified) (1 diff)
• libtransmission/ipcparse.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/Torrent.m (modified) (4 diffs)
• wx/filter.cc (modified) (1 diff)
• wx/torrent-list.cc (modified) (1 diff)

trunk/beos/TRTransfer.cpp

@@ -21 +21 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * $Id:$
+ * $Id$
  */
 
@@ -155 +155 @@
                         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 ) {

trunk/gtk/torrent-cell-renderer.c

@@ -150 +150 @@
 
         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 ) {
@@ -203 +202 @@
             break;
 
-        case TR_STATUS_DONE:
         case TR_STATUS_SEED:
             g_string_append_printf( gstr,

trunk/gtk/tr-torrent.c

@@ -296 +296 @@
             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(

trunk/gtk/tr-window.c

@@ -317 +317 @@
             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:

trunk/libtransmission/ipcparse.c

@@ -786 +786 @@
                     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 );

trunk/libtransmission/torrent.c

@@ -606 +606 @@
     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;

trunk/libtransmission/transmission.h

@@ -735 +735 @@
     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;

trunk/macosx/Torrent.m

@@ -891 +891 @@
 - (BOOL) isSeeding
 {
-    return fStat->status == TR_STATUS_SEED || fStat->status == TR_STATUS_DONE;
+    return fStat->status == TR_STATUS_SEED;
 }
 
@@ -1059 +1059 @@
 
             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"),
@@ -1126 +1125 @@
         
         case TR_STATUS_SEED:
-        case TR_STATUS_DONE:
             string = [NSString stringWithFormat: @"%@: %@, %@: %@",
                             NSLocalizedString(@"Ratio", "Torrent -> status string"), [NSString stringForRatio: [self ratio]],
@@ -1168 +1166 @@
 
         case TR_STATUS_SEED:
-        case TR_STATUS_DONE:
             return NSLocalizedString(@"Seeding", "Torrent -> status string");
         

trunk/wx/filter.cc

@@ -34 +34 @@
             break;
 
-        case TR_STATUS_DONE:
         case TR_STATUS_SEED:
             flags |= FLAG_SEEDING;

trunk/wx/torrent-list.cc

@@ -308 +308 @@
                     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 );