Changeset 3977

Timestamp:

Nov 26, 2007, 7:10:53 PM (15 years ago)

Author:

livings124

Message:

get last commit building

Location:

trunk

Files:

• libtransmission/stats.c (modified) (1 diff)
• macosx/NSStringAdditions.h (modified) (1 diff)
• macosx/NSStringAdditions.m (modified) (2 diffs)
• macosx/StatsWindowController.m (modified) (1 diff)

trunk/libtransmission/stats.c

@@ -107 +107 @@
     tr_free( str );
 
-    tr_BencFree( &top );
+    tr_bencFree( &top );
 }
 

trunk/macosx/NSStringAdditions.h

@@ -31 +31 @@
 
 + (NSString *) stringForFileSize: (uint64_t) size;
-+ (NSString *) stringForLargeFileSizeGigs: (uint64_t) gigs bytes: (uint64_t) bytes;
 
 + (NSString *) stringForSpeed: (float) speed;

trunk/macosx/NSStringAdditions.m

@@ -1 +1 @@
 /******************************************************************************
- * $Id: StringAdditions.m 2869 2007-08-19 03:03:28Z livings124 $
+ * $Id$
  *
  * Copyright (c) 2005-2007 Transmission authors and contributors
@@ -40 +40 @@
 + (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");
     }
     

trunk/macosx/StatsWindowController.m

@@ -80 +80 @@
     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]];