Changeset 14341 for trunk/macosx/InfoActivityViewController.m

Timestamp:

Oct 17, 2014, 5:12:00 AM (8 years ago)

Author:

livings124

Message:

Yosemite: use NSDateComponentsFormatter instead of custom time string code

File:

• trunk/macosx/InfoActivityViewController.m (modified) (2 diffs)

trunk/macosx/InfoActivityViewController.m

@@ -24 +24 @@
 
 #import "InfoActivityViewController.h"
+#import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
 #import "PiecesView.h"
@@ -186 +187 @@
         [fDateAddedField setObjectValue: [torrent dateAdded]];
         
-        [fDownloadTimeField setStringValue: [NSString timeString: [torrent secondsDownloading] showSeconds: YES]];
-        [fSeedTimeField setStringValue: [NSString timeString: [torrent secondsSeeding] showSeconds: YES]];
+        if ([NSApp isOnYosemiteOrBetter]) {
+            static NSDateComponentsFormatter *timeFormatter;
+            static dispatch_once_t onceToken;
+            dispatch_once(&onceToken, ^{
+                timeFormatter = [NSDateComponentsFormatter new];
+                timeFormatter.unitsStyle = NSDateComponentsFormatterUnitsStyleShort;
+                timeFormatter.allowedUnits = NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond;
+                timeFormatter.zeroFormattingBehavior = NSDateComponentsFormatterZeroFormattingBehaviorDropLeading;
+            });
+            
+            [fDownloadTimeField setStringValue: [timeFormatter stringFromTimeInterval:[torrent secondsDownloading]]];
+            [fSeedTimeField setStringValue: [timeFormatter stringFromTimeInterval:[torrent secondsSeeding]]];
+        }
+        else {
+            [fDownloadTimeField setStringValue: [NSString timeString: [torrent secondsDownloading] includesTimeRemainingPhrase:NO showSeconds: YES]];
+            [fSeedTimeField setStringValue: [NSString timeString: [torrent secondsSeeding] includesTimeRemainingPhrase:NO showSeconds: YES]];
+        }
         
         [fPiecesView updateView];