Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-04-17 23:54:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

get last commit building

Browse Source
This commit is contained in:
Mitchell Livingston
2007-11-26 19:10:53 +00:00
parent 3aae5534bd
commit 6b5f1839aa
4 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libtransmission/stats.c
View File

@@ -106,7 +106,7 @@ saveCumulativeStats( const tr_session_stats * stats )
fclose( fp );
tr_free( str );
tr_BencFree( &top );
tr_bencFree( &top );
}
/***

1
macosx/NSStringAdditions.h
View File

@@ -30,7 +30,6 @@
- (NSString *) stringByAppendingEllipsis;
+ (NSString *) stringForFileSize: (uint64_t) size;
+ (NSString *) stringForLargeFileSizeGigs: (uint64_t) gigs bytes: (uint64_t) bytes;
+ (NSString *) stringForSpeed: (float) speed;
+ (NSString *) stringForSpeedAbbrev: (float) speed;

46
macosx/NSStringAdditions.m
View File

@@ -1,5 +1,5 @@
/******************************************************************************
* $Id: StringAdditions.m 2869 2007-08-19 03:03:28Z livings124 $
* $Id$
*
* Copyright (c) 2005-2007 Transmission authors and contributors
*
@@ -39,40 +39,30 @@
+ (NSString *) stringForFileSize: (uint64_t) size
{
[self stringForLargeFileSizeGigs: size / 1073741824 bytes: size % 1073741824];
}
if (size < 1024)
return [NSString stringWithFormat: NSLocalizedString(@"%lld bytes", "File size"), size];
+ (NSString *) stringForLargeFileSizeGigs: (uint64_t) gigs bytes: (uint64_t) bytes
{
float convertedSize;
NSString * unit;
if (gigs == 0)
if (size < 1048576)
{
if (bytes < 1024)
return [NSString stringWithFormat: NSLocalizedString(@"%lld bytes", "File size"), bytes];
else if (bytes < 1048576)
{
convertedSize = bytes / 1024.0;
unit = NSLocalizedString(@"KB", "File size");
}
else
{
convertedSize = bytes / 1048576.0;
unit = NSLocalizedString(@"MB", "File size");
}
convertedSize = size / 1024.0;
unit = NSLocalizedString(@"KB", "File size");
}
else if (size < 1073741824)
{
convertedSize = size / 1048576.0;
unit = NSLocalizedString(@"MB", "File size");
}
else if (size < 1099511627776.0)
{
convertedSize = size / 1073741824.0;
unit = NSLocalizedString(@"GB", "File size");
}
else
{
if (gigs < 1024)
{
convertedSize = (float)gigs + bytes / 1073741824.0;
unit = NSLocalizedString(@"GB", "File size");
}
else
{
convertedSize = gigs / 1024.0;
unit = NSLocalizedString(@"TB", "File size");
}
convertedSize = size / 1099511627776.0;
unit = NSLocalizedString(@"TB", "File size");
}
//attempt to have minimum of 3 digits with at least 1 decimal

11
macosx/StatsWindowController.m
View File

@@ -79,14 +79,13 @@ tr_handle * fLib;
tr_getCumulativeSessionStats(fLib, &statsAll);
tr_getSessionStats(fLib, &statsSession);
[fUploadedField setStringValue: [NSString stringForLargeFileSizeGigs: statsSession.uploadedGigs bytes: statsSession.uploadedBytes]];
[fUploadedAllField setStringValue: [[NSString stringForLargeFileSizeGigs: statsAll.uploadedGigs bytes: statsAll.uploadedBytes]
[fUploadedField setStringValue: [NSString stringForFileSize: statsSession.uploadedMiB]];
[fUploadedAllField setStringValue: [[NSString stringForFileSize: statsAll.uploadedMiB]
stringByAppendingString: NSLocalizedString(@" total", "stats total")]];
[fDownloadedField setStringValue: [NSString stringForLargeFileSizeGigs: statsSession.downloadedGigs
bytes: statsSession.downloadedBytes]];
[fDownloadedAllField setStringValue: [[NSString stringForLargeFileSizeGigs: statsAll.downloadedGigs
bytes: statsAll.downloadedBytes] stringByAppendingString: NSLocalizedString(@" total", "stats total")]];
[fDownloadedField setStringValue: [NSString stringForFileSize: statsSession.downloadedMiB]];
[fDownloadedAllField setStringValue: [[NSString stringForFileSize: statsAll.downloadedMiB]
stringByAppendingString: NSLocalizedString(@" total", "stats total")]];
[fRatioField setStringValue: [NSString stringForRatio: statsSession.ratio]];
[fRatioAllField setStringValue: [[NSString stringForRatio: statsAll.ratio]