mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-24 08:43:27 +00:00
Code Issues Releases Wiki Activity

cleaner code for rounding file size, speed, and ratio

Browse source
This commit is contained in:
Mitchell Livingston 2008-04-07 02:17:45 +00:00
parent 69eaaed409
commit b57d6932f0
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
macosx/NSStringAdditions.m
View file

@ -25,8 +25,6 @@
#import "NSStringAdditions.h" #import "NSStringAdditions.h"
#import <transmission.h> #import <transmission.h>
#warning better rounding
@implementation NSString (NSStringAdditions) @implementation NSString (NSStringAdditions)
+ (NSString *) ellipsis + (NSString *) ellipsis
@ -68,8 +66,8 @@
} }
//attempt to have minimum of 3 digits with at least 1 decimal //attempt to have minimum of 3 digits with at least 1 decimal
return convertedSize < 10.0 ? [NSString localizedStringWithFormat: @"%.2f %@", convertedSize - .005, unit] return convertedSize <= 9.995 ? [NSString localizedStringWithFormat: @"%.2f %@", convertedSize, unit]
: [NSString localizedStringWithFormat: @"%.1f %@", convertedSize - .05, unit]; : [NSString localizedStringWithFormat: @"%.1f %@", convertedSize, unit];
} }
+ (NSString *) stringForSpeed: (float) speed + (NSString *) stringForSpeed: (float) speed
@ -79,14 +77,17 @@
+ (NSString *) stringForSpeedAbbrev: (float) speed + (NSString *) stringForSpeedAbbrev: (float) speed
{ {
if (speed < 1000.0) //0.0 K to 999.9 K if (speed <= 999.95) //0.0 K to 999.9 K
return [NSString localizedStringWithFormat: @"%.1f K", MAX(0.0, speed - .05)]; return [NSString localizedStringWithFormat: @"%.1f K", speed];
else if (speed < 102400.0) //0.98 M to 99.99 M
return [NSString localizedStringWithFormat: @"%.2f M", (speed / 1024.0) - .005]; speed /= 1024.0;
else if (speed < 1024000.0) //100.0 M to 999.9 M
return [NSString localizedStringWithFormat: @"%.1f M", (speed / 1024.0) - .05]; if (speed <= 99.995) //0.98 M to 99.99 M
return [NSString localizedStringWithFormat: @"%.2f M", speed];
else if (speed <= 999.95) //100.0 M to 999.9 M
return [NSString localizedStringWithFormat: @"%.1f M", speed];
else //insane speeds else //insane speeds
return [NSString localizedStringWithFormat: @"%.2f G", (speed / 1048576.0) - .005]; return [NSString localizedStringWithFormat: @"%.2f G", (speed / 1024.0)];
} }
+ (NSString *) stringForRatio: (float) ratio + (NSString *) stringForRatio: (float) ratio
@ -97,12 +98,12 @@
return [NSString stringWithUTF8String: "\xE2\x88\x9E"]; return [NSString stringWithUTF8String: "\xE2\x88\x9E"];
else; else;
if (ratio < 10.0) if (ratio <= 9.995) //0.00 to 9.99
return [NSString localizedStringWithFormat: @"%.2f", MAX(0.0, ratio - .005)]; return [NSString localizedStringWithFormat: @"%.2f", ratio];
else if (ratio < 100.0) else if (ratio <= 99.95) //10.0 to 99.9
return [NSString localizedStringWithFormat: @"%.1f", ratio - .05]; return [NSString localizedStringWithFormat: @"%.1f", ratio];
else else //rest are single digit
return [NSString localizedStringWithFormat: @"%.0f", ratio]; return [NSString stringWithFormat: @"%d", ratio];
} }
+ (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds + (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds