Changeset 3211

Timestamp:

Sep 28, 2007, 2:58:25 AM (15 years ago)

Author:

livings124

Message:

streamline display string code a little more

Location:

trunk/macosx

Files:

• Torrent.h (modified) (2 diffs)
• Torrent.m (modified) (5 diffs)

trunk/macosx/Torrent.h

@@ -150 +150 @@
 - (BOOL) publicTorrent;
 
-- (NSString *) stateString;
-
 - (float) progress;
 - (float) progressDone;
@@ -175 +173 @@
 - (NSString *) shortStatusString;
 - (NSString *) remainingTimeString;
+
+- (NSString *) stateString;
 
 - (int) seeders;

trunk/macosx/Torrent.m

@@ -273 +273 @@
     //check for error
     BOOL wasError = fError;
-    fError = [self isError] && [self isActive];
+    fError = [self isError];
     
     //check if stalled
@@ -281 +281 @@
     
     //update queue for checking (from downloading to seeding), stalled, or error
-    if ((wasChecking && !fChecking) || (!wasStalled && fStalled) || (!wasError && fError))
+    if ((wasChecking && !fChecking) || (!wasStalled && fStalled) || (!wasError && fError && [self isActive]))
         [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateQueue" object: self];
 }
@@ -724 +724 @@
 }
 
-- (NSString *) stateString
-{
-    switch( fStat->status )
-    {
-        case TR_STATUS_STOPPED:
-            return NSLocalizedString(@"Paused", "Torrent -> status string");
-            break;
-
-        case TR_STATUS_CHECK:
-            return [NSString stringWithFormat: NSLocalizedString(@"Checking existing data (%.2f%%)",
-                                    "Torrent -> status string"), 100.0 * fStat->recheckProgress];
-            break;
-        
-        case TR_STATUS_CHECK_WAIT:
-            return [NSLocalizedString(@"Waiting to check existing data", "Torrent -> status string") stringByAppendingEllipsis];
-            break;
-
-        case TR_STATUS_DOWNLOAD:
-            return NSLocalizedString(@"Downloading", "Torrent -> status string");
-            break;
-
-        case TR_STATUS_SEED:
-        case TR_STATUS_DONE:
-            return NSLocalizedString(@"Seeding", "Torrent -> status string");
-            break;
-
-        case TR_STATUS_STOPPING:
-            return [NSLocalizedString(@"Stopping", "Torrent -> status string") stringByAppendingEllipsis];
-            break;
-        
-        default:
-            return NSLocalizedString(@"N/A", "Torrent -> status string");
-    }
-}
-
 - (float) progress
 {
@@ -1021 +986 @@
     if ([self isActive] && ![self isChecking])
     {
-        NSString * stringToAppend = @"";
+        NSString * stringToAppend;
         if (![self allDownloaded])
-        {
             stringToAppend = [NSString stringWithFormat: NSLocalizedString(@"DL: %@, ", "Torrent -> status string"),
                                 [NSString stringForSpeed: [self downloadRate]]];
-        }
-        
-        stringToAppend = [stringToAppend stringByAppendingString: [NSLocalizedString(@"UL: ", "Torrent -> status string")
-                                            stringByAppendingString: [NSString stringForSpeed: [self uploadRate]]]];
-
-        string = [string stringByAppendingString: [NSString stringWithFormat: @" - %@", stringToAppend]];
+        else
+            stringToAppend = @"";
+        
+        string = [NSString stringWithFormat: @"%@ - %@UL: %@", string, stringToAppend, [NSString stringForSpeed: [self uploadRate]]];
     }
     
@@ -1122 +1084 @@
 }
 
+- (NSString *) stateString
+{
+    switch (fStat->status)
+    {
+        case TR_STATUS_STOPPED:
+            return NSLocalizedString(@"Paused", "Torrent -> status string");
+            break;
+
+        case TR_STATUS_CHECK:
+            return [NSString stringWithFormat: NSLocalizedString(@"Checking existing data (%.2f%%)",
+                                    "Torrent -> status string"), 100.0 * fStat->recheckProgress];
+            break;
+        
+        case TR_STATUS_CHECK_WAIT:
+            return [NSLocalizedString(@"Waiting to check existing data", "Torrent -> status string") stringByAppendingEllipsis];
+            break;
+
+        case TR_STATUS_DOWNLOAD:
+            return NSLocalizedString(@"Downloading", "Torrent -> status string");
+            break;
+
+        case TR_STATUS_SEED:
+        case TR_STATUS_DONE:
+            return NSLocalizedString(@"Seeding", "Torrent -> status string");
+            break;
+
+        case TR_STATUS_STOPPING:
+            return [NSLocalizedString(@"Stopping", "Torrent -> status string") stringByAppendingEllipsis];
+            break;
+        
+        default:
+            return NSLocalizedString(@"N/A", "Torrent -> status string");
+    }
+}
+
 - (int) seeders
 {