Changeset 9595

Timestamp:

Nov 27, 2009, 3:20:19 AM (11 years ago)

Author:

livings124

Message:

display progress of retrieving metadata on a magnetized transfer

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• Info.plist (modified) (1 diff)
• Torrent.m (modified) (2 diffs)
• TorrentCell.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -947 +947 @@
     }
     
+    #warning show add window perhaps?
+    
     #warning should we do this?
     [torrent setWaitToStart: [fDefaults boolForKey: @"AutoStartDownload"]];
+    
+    #warning should set group
     
     [torrent update];

trunk/macosx/Info.plist

@@ -52 +52 @@
                         <array>
                                 <string>magnet</string>
-                                <string>dht</string>
                         </array>
                         <key>CFBundleURLName</key>

trunk/macosx/Torrent.m

@@ -810 +810 @@
 - (BOOL) allDownloaded
 {
-    return [self sizeLeft] == 0;
+    return [self sizeLeft] == 0 && ![self isMagnet];
 }
 
@@ -910 +910 @@
 {
     if ([self isMagnet])
+    {
+        NSString * progressString = [NSString localizedStringWithFormat: @"%.2f%% of torrent metadata retrieved",
+                                        fStat->metadataPercentComplete];
         return [NSString stringWithFormat: @"%@ - %@", NSLocalizedString(@"Magnetized transfer", "Torrent -> progress string"),
-                                            NSLocalizedString(@"torrent information needed", "Torrent -> progress string")];
+                                            progressString];
+    }
     
     NSString * string;

trunk/macosx/TorrentCell.m

@@ -630 +630 @@
     }
     
-    if (![torrent allDownloaded] && ![torrent isMagnet])
+    if (![torrent allDownloaded])
     {
         const CGFloat widthRemaining = round(NSWidth(barRect) * [torrent progressLeft]);