Changeset 5049

Timestamp:

Feb 16, 2008, 7:32:22 PM (14 years ago)

Author:

livings124

Message:

in minimal mode, show eta for seeding

Location:

trunk/macosx

Files:

• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (6 diffs)

trunk/macosx/Torrent.h

@@ -57 +57 @@
     NSImage * fIcon;
     
-    NSString * fHashString;
+    NSString * fNameString, * fHashString;
     
     tr_file_stat * fileStat;

trunk/macosx/Torrent.m

@@ -176 +176 @@
     [fFinishedPiecesDate release];
     
+    [fNameString release];
     [fHashString release];
     
@@ -661 +662 @@
 - (NSString *) name
 {
-    return [NSString stringWithUTF8String: fInfo->name];
+    return fNameString;
 }
 
@@ -709 +710 @@
 - (NSString *) comment
 {
-    return fInfo->comment != NULL ? [NSString stringWithUTF8String: fInfo->comment] : @"";
+    return [NSString stringWithUTF8String: fInfo->comment];
 }
 
 - (NSString *) creator
 {
-    return fInfo->creator != NULL ? [NSString stringWithUTF8String: fInfo->creator] : @"";
+    return [NSString stringWithUTF8String: fInfo->creator];
 }
 
@@ -1086 +1087 @@
 - (NSString *) remainingTimeString
 {
-    switch (fStat->status)
-    {
-        case TR_STATUS_DOWNLOAD:
-            return [self eta] >= 0 ? [self etaString: [self eta]] : NSLocalizedString(@"Unknown", "Torrent -> remaining time");
-        
-        case TR_STATUS_SEED:
-        case TR_STATUS_DONE:
-            return [NSLocalizedString(@"Ratio: ", "Torrent -> status string") stringByAppendingString:
-                                                                            [NSString stringForRatio: [self ratio]]];
-        
-        default:
-            return [self shortStatusString];
-    }
+    if (![self isActive] || ([self isSeeding]
+        && !(fRatioSetting == NSOnState || (fRatioSetting == NSMixedState && [fDefaults boolForKey: @"RatioCheck"]))))
+        return [self shortStatusString];
+    
+    int eta = fStat->status == TR_STATUS_DOWNLOAD ? [self eta] : [self etaRatio];
+    return eta >= 0 ? [self etaString: eta] : NSLocalizedString(@"Unknown", "Torrent -> remaining time");
 }
 
@@ -1575 +1569 @@
     fInfo = tr_torrentInfo(fHandle);
     
+    fNameString = [[NSString alloc] initWithUTF8String: fInfo->name];
     fHashString = [[NSString alloc] initWithUTF8String: fInfo->hashString];
     
@@ -1713 +1708 @@
         case TR_CP_COMPLETE:
             canMove = YES;
-        
+            
             //move file from incomplete folder to download folder
             if (fUseIncompleteFolder && ![[self downloadFolder] isEqualToString: fDownloadFolder]