Changeset 5904 for trunk/macosx/FileNameCell.m

Timestamp:

May 22, 2008, 6:39:49 PM (14 years ago)

Author:

livings124

Message:

use a custom class instead of a dictionary for holding a torrent's file structure

File:

• trunk/macosx/FileNameCell.m (modified) (10 diffs)

trunk/macosx/FileNameCell.m

@@ -26 +26 @@
 #import "FileOutlineView.h"
 #import "Torrent.h"
+#import "FileListNode.h"
 #import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
@@ -92 +93 @@
 - (NSImage *) image
 {
-    NSImage * image = [[self objectValue] objectForKey: @"Icon"];
-    if (!image)
+    FileListNode * node = (FileListNode *)[self objectValue];
+    NSImage * image;
+    if ([node isFolder])
     {
         if (!fFolderImage)
@@ -102 +104 @@
         image = fFolderImage;
     }
+    else
+        image = [node icon];
+    
     return image;
 }
@@ -111 +116 @@
     result.origin.x += PADDING_HORIZONAL;
     
-    const float IMAGE_SIZE = [[[self objectValue] objectForKey: @"IsFolder"] boolValue] ? IMAGE_FOLDER_SIZE : IMAGE_ICON_SIZE;
+    const float IMAGE_SIZE = [(FileListNode *)[self objectValue] isFolder] ? IMAGE_FOLDER_SIZE : IMAGE_ICON_SIZE;
     result.origin.y += (result.size.height - IMAGE_SIZE) * 0.5;
     result.size = NSMakeSize(IMAGE_SIZE, IMAGE_SIZE);
@@ -139 +144 @@
         specialColor = [NSColor whiteColor];
     else if ([[(FileOutlineView *)[self controlView] torrent] checkForFiles:
-                    [[self objectValue] objectForKey: @"Indexes"]] == NSOffState)
+                    [(FileListNode *)[self objectValue] indexes]] == NSOffState)
         specialColor = [NSColor disabledControlTextColor];
     else;
@@ -148 +153 @@
     
     //status
-    if (![[[self objectValue] objectForKey: @"IsFolder"] boolValue])
+    if (![(FileListNode *)[self objectValue] isFolder])
     {
         NSAttributedString * statusString = [self attributedStatusWithColor: specialColor ? specialColor : [NSColor darkGrayColor]];
@@ -166 +171 @@
     NSRect result = bounds;
     
-    if (![[[self objectValue] objectForKey: @"IsFolder"] boolValue])
+    if (![(FileListNode *)[self objectValue] isFolder])
     {
         result.origin.x += PADDING_HORIZONAL + IMAGE_ICON_SIZE + PADDING_BETWEEN_IMAGE_AND_TITLE;
@@ -184 +189 @@
 - (NSRect) rectForStatusWithString: (NSAttributedString *) string inBounds: (NSRect) bounds
 {
-    if ([[[self objectValue] objectForKey: @"IsFolder"] boolValue])
+    if ([(FileListNode *)[self objectValue] isFolder])
         return NSZeroRect;
     
@@ -205 +210 @@
         [fTitleAttributes setObject: color forKey: NSForegroundColorAttributeName];
         
-    NSString * title = [[self objectValue] objectForKey: @"Name"];
+    NSString * title = [(FileListNode *)[self objectValue] name];
     return [[[NSAttributedString alloc] initWithString: title attributes: fTitleAttributes] autorelease];
 }
@@ -215 +220 @@
     
     Torrent * torrent = [(FileOutlineView *)[self controlView] torrent];
-    float percent = [torrent fileProgress: [[[self objectValue] objectForKey: @"Indexes"] firstIndex]] * 100.0;
+    FileListNode * node = (FileListNode *)[self objectValue];
+    float percent = [torrent fileProgress: [[node indexes] firstIndex]] * 100.0;
     
     NSString * status = [NSString localizedStringWithFormat: NSLocalizedString(@"%.2f%% of %@",
-                            "Inspector -> Files tab -> file status string"), percent,
-                            [NSString stringForFileSize: [[[self objectValue] objectForKey: @"Size"] unsignedLongLongValue]]];
+                            "Inspector -> Files tab -> file status string"), percent, [NSString stringForFileSize: [node size]]];
     
     return [[[NSAttributedString alloc] initWithString: status attributes: fStatusAttributes] autorelease];