Changeset 1295

Timestamp:

07/02/2010 06:03:54 PM (20 months ago)

Author:

gbooker

Message:

Good compromise with size of joined files: display both the joined file's size and the total size.
Refs #344

Files:

• trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.m (modified) (3 diffs)

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.m

@@ -15 +15 @@
 #import "SapphireTVTranslation.h"
 #import "SapphireMovieTranslation.h"
+#import "SapphireJoinedFile.h"
 
 #import "NSArray-Extensions.h"
@@ -592 +593 @@
 }
 
-- (NSString *)sizeString
-{
-        /*Get size*/
-        float size = [self sizeValue];
+NSString *sizeStringForSize(float size)
+{
         if(size == 0)
                 return @"-";
@@ -623 +622 @@
         }
         return [NSString stringWithFormat:@"%.1f%cB", size, letter];    
+}
+
+- (NSString *)sizeString
+{
+        /*Get size*/
+        float size = [self sizeValue];
+        NSString *sizeStr = sizeStringForSize(size);
+        SapphireJoinedFile *joined = self.joinedFile;
+        if(joined != nil)
+        {
+                NSEnumerator *joinedEnum = [joined.joinedFilesSet objectEnumerator];
+                SapphireFileMetaData *file;
+                while((file = [joinedEnum nextObject]) != nil)
+                {
+                        size += file.sizeValue;
+                }
+                if(size != 0)
+                        sizeStr = [sizeStr stringByAppendingFormat:@"/%@", sizeStringForSize(size)];
+        }
+        return sizeStr;
 }