Changeset 7940 for branches/1.5x/daemon/remote.c

Timestamp:

Feb 23, 2009, 3:26:01 AM (14 years ago)

Author:

charles

Message:

(1.5x daemon) #1819: Indicate torrent error in list

File:

• branches/1.5x/daemon/remote.c (modified) (5 diffs)

branches/1.5x/daemon/remote.c

@@ -268 +268 @@
 
 static const char * list_keys[] = {
+    "error",
     "errorString",
     "eta",
@@ -716 +717 @@
         case TR_STATUS_DOWNLOAD:
         case TR_STATUS_SEED: {
-            const char * err = NULL;
-            if( tr_bencDictFindStr( t, "errorString", &err ) && err && *err )
-                tr_strlcpy( buf, err, buflen );
-            else {
-                int64_t fromUs = 0;
-                int64_t toUs = 0;
-                tr_bencDictFindInt( t, "peersGettingFromUs", &fromUs );
-                tr_bencDictFindInt( t, "peersSendingToUs", &toUs );
-                if( !fromUs && !toUs )
-                    tr_strlcpy( buf, "Idle", buflen );
-                else if( fromUs && toUs )
-                    tr_strlcpy( buf, "Up & Down", buflen );
-                else if( toUs )
-                    tr_strlcpy( buf, "Downloading", buflen );
-                else if( fromUs ) {
-                    int64_t leftUntilDone = 0;
-                    tr_bencDictFindInt( t, "leftUntilDone", &leftUntilDone );
-                    if( leftUntilDone > 0 )
-                        tr_strlcpy( buf, "Uploading", buflen );
-                    else
-                        tr_strlcpy( buf, "Seeding", buflen );
-                }
+            int64_t fromUs = 0; 
+            int64_t toUs = 0; 
+            tr_bencDictFindInt( t, "peersGettingFromUs", &fromUs ); 
+            tr_bencDictFindInt( t, "peersSendingToUs", &toUs ); 
+            if( fromUs && toUs ) 
+                tr_strlcpy( buf, "Up & Down", buflen ); 
+            else if( toUs ) 
+                tr_strlcpy( buf, "Downloading", buflen ); 
+            else if( fromUs ) { 
+                int64_t leftUntilDone = 0; 
+                tr_bencDictFindInt( t, "leftUntilDone", &leftUntilDone ); 
+                if( leftUntilDone > 0 )
+                    tr_strlcpy( buf, "Uploading", buflen ); 
+                else
+                    tr_strlcpy( buf, "Seeding", buflen ); 
+            } else {
+                tr_strlcpy( buf, "Idle", buflen ); 
             }
             break;
@@ -1110 +1106 @@
     {
         int i, n;
-        printf( "%-4s  %-4s  %9s  %-8s  %6s  %6s  %-5s  %-11s  %s\n",
+        printf( "%-4s   %-4s  %9s  %-8s  %6s  %6s  %-5s  %-11s  %s\n",
                 "ID", "Done", "Have", "ETA", "Up", "Down", "Ratio", "Status",
                 "Name" );
@@ -1135 +1131 @@
                 char haveStr[32];
                 char doneStr[8];
+                int64_t error;
+                char errorMark;
 
                 if( sizeWhenDone )
@@ -1147 +1145 @@
                 else
                     tr_snprintf( etaStr, sizeof( etaStr ), "Done" );
+                if( tr_bencDictFindInt( d, "error", &error ) && error )
+                    errorMark = '*';
+                else
+                    errorMark = ' ';
                 printf(
-                    "%4d  %4s  %9s  %-8s  %6.1f  %6.1f  %5s  %-11s  %s\n",
-                    (int)id,
+                    "%4d%c  %4s  %9s  %-8s  %6.1f  %6.1f  %5s  %-11s  %s\n",
+                    (int)id, errorMark,
                     doneStr,
                     haveStr,