Changeset 5904

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

Location:

trunk

Files:

• FileListNode.h (added)
• FileListNode.m (added)
• Transmission.xcodeproj/project.pbxproj (modified) (4 diffs)
• macosx/FileNameCell.m (modified) (10 diffs)
• macosx/FileOutlineController.m (modified) (17 diffs)
• macosx/FileOutlineView.m (modified) (2 diffs)
• macosx/FilePriorityCell.m (modified) (3 diffs)
• macosx/InfoWindowController.m (modified) (4 diffs)
• macosx/QuickLookController.h (modified) (1 diff)
• macosx/QuickLookController.m (modified) (5 diffs)
• macosx/Torrent.m (modified) (3 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -143 +143 @@
                 A26E75960CB6AB4800226674 /* InfoGeneral.png in Resources */ = {isa = PBXBuildFile; fileRef = A26E75950CB6AB4800226674 /* InfoGeneral.png */; };
                 A2710E770A86796000CE4F7D /* PrefsWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = A2710E750A86796000CE4F7D /* PrefsWindow.m */; };
+                A2725B6E0DE5C4F5003445E7 /* FileListNode.m in Sources */ = {isa = PBXBuildFile; fileRef = A2725B6D0DE5C4F5003445E7 /* FileListNode.m */; };
                 A277DA0B0C693D9C00DA2CD4 /* ActionOn.png in Resources */ = {isa = PBXBuildFile; fileRef = A277DA090C693D9C00DA2CD4 /* ActionOn.png */; };
                 A29576030D11D63C0093B167 /* Creator.xib in Resources */ = {isa = PBXBuildFile; fileRef = A29576010D11D63C0093B167 /* Creator.xib */; };
@@ -582 +583 @@
                 A2710E740A86796000CE4F7D /* PrefsWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PrefsWindow.h; path = macosx/PrefsWindow.h; sourceTree = "<group>"; };
                 A2710E750A86796000CE4F7D /* PrefsWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PrefsWindow.m; path = macosx/PrefsWindow.m; sourceTree = "<group>"; };
+                A2725B6C0DE5C4F5003445E7 /* FileListNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileListNode.h; sourceTree = "<group>"; };
+                A2725B6D0DE5C4F5003445E7 /* FileListNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileListNode.m; sourceTree = "<group>"; };
                 A27476FF0CC38EE6003CC76D /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = macosx/es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
                 A27477010CC38EE6003CC76D /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = macosx/es.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -906 +909 @@
                                 4DCCBB3D09C3D71100D3CABF /* TorrentCell.h */,
                                 4DCCBB3C09C3D71100D3CABF /* TorrentCell.m */,
+                                A2725B6C0DE5C4F5003445E7 /* FileListNode.h */,
+                                A2725B6D0DE5C4F5003445E7 /* FileListNode.m */,
                                 A25AFDE70D1038AD0092A1BA /* MenuLabel.h */,
                                 A25AFDE80D1038AD0092A1BA /* MenuLabel.m */,
@@ -1998 +2003 @@
                                 A2D307A40D9EC6870051FD27 /* BlocklistDownloader.m in Sources */,
                                 A2DF57740DE46A6A000795D5 /* QuickLookController.m in Sources */,
+                                A2725B6E0DE5C4F5003445E7 /* FileListNode.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

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];

trunk/macosx/FileOutlineController.m

@@ -27 +27 @@
 #import "FileOutlineView.h"
 #import "FilePriorityCell.h"
+#import "FileListNode.h"
 #import "QuickLookController.h"
 #import "NSApplicationAdditions.h"
@@ -102 +103 @@
         return fTorrent ? [[fTorrent fileList] count] : 0;
     else
-        return [[item objectForKey: @"IsFolder"] boolValue] ? [[item objectForKey: @"Children"] count] : 0;
+    {
+        FileListNode * node = (FileListNode *)item;
+        return [node isFolder] ? [[node children] count] : 0;
+    }
 }
 
 - (BOOL) outlineView: (NSOutlineView *) outlineView isItemExpandable: (id) item 
 {
-    return [[item objectForKey: @"IsFolder"] boolValue];
+    return [(FileListNode *)item isFolder];
 }
 
 - (id) outlineView: (NSOutlineView *) outlineView child: (int) index ofItem: (id) item
 {
-    return [(item ? [item objectForKey: @"Children"] : [fTorrent fileList]) objectAtIndex: index];
+    return [(item ? [(FileListNode *)item children] : [fTorrent fileList]) objectAtIndex: index];
 }
 
@@ -118 +122 @@
 {
     if ([[tableColumn identifier] isEqualToString: @"Check"])
-        return [NSNumber numberWithInt: [fTorrent checkForFiles: [item objectForKey: @"Indexes"]]];
+        return [NSNumber numberWithInt: [fTorrent checkForFiles: [(FileListNode *)item indexes]]];
     else
         return item;
@@ -128 +132 @@
     NSString * identifier = [tableColumn identifier];
     if ([identifier isEqualToString: @"Check"])
-        [cell setEnabled: [fTorrent canChangeDownloadCheckForFiles: [item objectForKey: @"Indexes"]]];
+        [cell setEnabled: [fTorrent canChangeDownloadCheckForFiles: [(FileListNode *)item indexes]]];
     else if ([identifier isEqualToString: @"Priority"])
     {
@@ -149 +153 @@
             indexSet = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fTorrent fileCount])];
         else
-            indexSet = [item objectForKey: @"Indexes"];
+            indexSet = [(FileListNode *)item indexes];
         
         [fTorrent setFileCheckState: [object intValue] != NSOffState ? NSOnState : NSOffState forIndexes: indexSet];
@@ -160 +164 @@
 - (NSString *) outlineView: (NSOutlineView *) outlineView typeSelectStringForTableColumn: (NSTableColumn *) tableColumn item: (id) item
 {
-    return [item objectForKey: @"Name"];
+    return [(FileListNode *)item name];
 }
 
@@ -168 +172 @@
     NSString * ident = [tableColumn identifier];
     if ([ident isEqualToString: @"Name"])
-        return [[fTorrent downloadFolder] stringByAppendingPathComponent: [item objectForKey: @"Path"]];
+        return [[fTorrent downloadFolder] stringByAppendingPathComponent: [(FileListNode *)item fullPath]];
     else if ([ident isEqualToString: @"Check"])
     {
@@ -183 +187 @@
     else if ([ident isEqualToString: @"Priority"])
     {
-        NSSet * priorities = [fTorrent filePrioritiesForIndexes: [item objectForKey: @"Indexes"]];
+        NSSet * priorities = [fTorrent filePrioritiesForIndexes: [(FileListNode *)item indexes]];
         switch ([priorities count])
         {
@@ -210 +214 @@
 - (float) outlineView: (NSOutlineView *) outlineView heightOfRowByItem: (id) item
 {
-    if ([[item objectForKey: @"IsFolder"] boolValue])
+    if ([(FileListNode *)item isFolder])
         return ROW_SMALL_HEIGHT;
     else
@@ -224 +228 @@
     int i;
     for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-        [itemIndexes addIndexes: [[fOutline itemAtRow: i] objectForKey: @"Indexes"]];
+        [itemIndexes addIndexes: [[fOutline itemAtRow: i] indexes]];
     
     [fTorrent setFileCheckState: state forIndexes: itemIndexes];
@@ -236 +240 @@
     int i;
     for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-        [itemIndexes addIndexes: [[fOutline itemAtRow: i] objectForKey: @"Indexes"]];
+        [itemIndexes addIndexes: [[fOutline itemAtRow: i] indexes]];
     
     [fTorrent setFileCheckState: NSOnState forIndexes: itemIndexes];
@@ -266 +270 @@
     int i;
     for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-        [itemIndexes addIndexes: [[fOutline itemAtRow: i] objectForKey: @"Indexes"]];
+        [itemIndexes addIndexes: [[fOutline itemAtRow: i] indexes]];
     
     [fTorrent setFilePriority: priority forIndexes: itemIndexes];
@@ -279 +283 @@
     for (i = [indexes firstIndex]; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
         [[NSWorkspace sharedWorkspace] selectFile: [folder stringByAppendingPathComponent:
-                [[fOutline itemAtRow: i] objectForKey: @"Path"]] inFileViewerRootedAtPath: nil];
+            [[fOutline itemAtRow: i] fullPath]] inFileViewerRootedAtPath: nil];
 }
 
@@ -297 +301 @@
         for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
             if ([[NSFileManager defaultManager] fileExistsAtPath:
-                    [downloadFolder stringByAppendingPathComponent: [[[fTorrent fileList] objectAtIndex: i] objectForKey: @"Path"]]])
+                    [downloadFolder stringByAppendingPathComponent: [[[fTorrent fileList] objectAtIndex: i] fullPath]]])
                 return YES;
         return NO;
@@ -311 +315 @@
         int i, state = ([menuItem tag] == FILE_CHECK_TAG) ? NSOnState : NSOffState;
         for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-            [itemIndexes addIndexes: [[fOutline itemAtRow: i] objectForKey: @"Indexes"]];
+            [itemIndexes addIndexes: [[fOutline itemAtRow: i] indexes]];
         
         return [fTorrent checkForFiles: itemIndexes] != state && [fTorrent canChangeDownloadCheckForFiles: itemIndexes];
@@ -325 +329 @@
         int i;
         for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-            [itemIndexes addIndexes: [[fOutline itemAtRow: i] objectForKey: @"Indexes"]];
+            [itemIndexes addIndexes: [[fOutline itemAtRow: i] indexes]];
             
         return [fTorrent canChangeDownloadCheckForFiles: itemIndexes];
@@ -358 +362 @@
         for (i = [indexSet firstIndex]; i != NSNotFound && (!current || !other); i = [indexSet indexGreaterThanIndex: i])
         {
-            fileIndexSet = [[fOutline itemAtRow: i] objectForKey: @"Indexes"];
+            fileIndexSet = [[fOutline itemAtRow: i] indexes];
             if (![fTorrent canChangeDownloadCheckForFiles: fileIndexSet])
                 continue;

trunk/macosx/FileOutlineView.m

@@ -27 +27 @@
 #import "FilePriorityCell.h"
 #import "Torrent.h"
+#import "FileListNode.h"
 #import "QuickLookController.h"
 #import "CTGradient.h"
@@ -180 +181 @@
     {
         NSDictionary * item = [self itemAtRow: row]; 
-        NSIndexSet * indexes = [item objectForKey: @"Indexes"];
+        NSIndexSet * indexes = [(FileListNode *)item indexes];
         
         if ([fTorrent checkForFiles: indexes] != NSOffState)

trunk/macosx/FilePriorityCell.m

@@ -25 +25 @@
 #import "FilePriorityCell.h"
 #import "FileOutlineView.h"
+#import "FileListNode.h"
 #import "Torrent.h"
 
@@ -74 +75 @@
     FileOutlineView * controlView = (FileOutlineView *)[self controlView];
     Torrent * torrent = [controlView torrent];
-    [torrent setFilePriority: priority forIndexes: [[self representedObject] objectForKey: @"Indexes"]];
+    [torrent setFilePriority: priority forIndexes: [(FileListNode *)[self representedObject] indexes]];
     [controlView reloadData];
 }
@@ -102 +103 @@
 {
     Torrent * torrent = [(FileOutlineView *)controlView torrent];
-    NSDictionary * dict = [self representedObject];
-    NSSet * priorities = [torrent filePrioritiesForIndexes: [dict objectForKey: @"Indexes"]];
+    FileListNode * node = [self representedObject];
+    NSSet * priorities = [torrent filePrioritiesForIndexes: [node indexes]];
     
     int count = [priorities count];

trunk/macosx/InfoWindowController.m

@@ -26 +26 @@
 #import "InfoTabButtonCell.h"
 #import "FileOutlineView.h"
+#import "FileListNode.h"
 #import "QuickLookController.h"
 #import "NSApplicationAdditions.h"
@@ -908 +909 @@
     for (i = [indexes firstIndex]; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
     {
-        NSDictionary * item = [fileOutlineView itemAtRow: i];
-        if ([[item objectForKey: @"IsFolder"] boolValue] || [torrent fileProgress: [[item objectForKey: @"Indexes"] firstIndex]] == 1.0)
-            [urlArray addObject: [NSURL fileURLWithPath: [folder stringByAppendingPathComponent: [item objectForKey: @"Path"]]]];
+        FileListNode * item = [fileOutlineView itemAtRow: i];
+        if ([item isFolder] || [torrent fileProgress: [[item indexes] firstIndex]] == 1.0)
+            [urlArray addObject: [NSURL fileURLWithPath: [folder stringByAppendingPathComponent: [item fullPath]]]];
     }
     
@@ -925 +926 @@
     for (i = [indexes firstIndex]; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
     {
-        NSDictionary * item = [fileOutlineView itemAtRow: i];
-        if ([[item objectForKey: @"IsFolder"] boolValue] || [torrent fileProgress: [[item objectForKey: @"Indexes"] firstIndex]] == 1.0)
+        FileListNode * item = [fileOutlineView itemAtRow: i];
+        if ([item isFolder] || [torrent fileProgress: [[item indexes] firstIndex]] == 1.0)
             return YES;
     }
@@ -944 +945 @@
     for (row = visibleRows.location; row < NSMaxRange(visibleRows); row++)
     {
-        id rowItem = [fileOutlineView itemAtRow: row];
-        if ([[folder stringByAppendingPathComponent: [rowItem objectForKey: @"Path"]] isEqualToString: fullPath])
+        FileListNode * rowItem = [fileOutlineView itemAtRow: row];
+        if ([[folder stringByAppendingPathComponent: [rowItem fullPath]] isEqualToString: fullPath])
         {
             NSRect frame = [fileOutlineView iconRectForRow: row];

trunk/macosx/QuickLookController.h

@@ -2 +2 @@
  * $Id$
  * 
- * Copyright (c) 2007-2008 Transmission authors and contributors
+ * Copyright (c) 2008 Transmission authors and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a

trunk/macosx/QuickLookController.m

@@ -2 +2 @@
  * $Id$
  * 
- * Copyright (c) 2007-2008 Transmission authors and contributors
+ * Copyright (c) 2008 Transmission authors and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -50 +50 @@
 }
 
-// This is the QuickLook delegate method
-// It should return the frame for the item represented by the URL
-// If an empty frame is returned then the panel will fade in/out instead
+//QuickLook delegate method
+//returns the frame for the item represented by the URL, or an empty frame to fade in/out instead
 - (NSRect) previewPanel: (NSPanel *) panel frameForURL: (NSURL *) url
 {
@@ -66 +65 @@
         return NO;
     
-    NSArray * urlArray = nil;
-    
+    NSArray * urlArray;
     if ([fInfoController shouldQuickLookFileView])
         urlArray = [fInfoController quickLookURLs];
@@ -75 +73 @@
     if (urlArray && [urlArray count] > 0)
     {
-        [[QLPreviewPanel sharedPreviewPanel] setURLs: urlArray currentIndex: 0 preservingDisplayState: YES];
+        [[QLPreviewPanel sharedPreviewPanel] setURLs: urlArray];
         return YES;
     }
@@ -84 +82 @@
 - (BOOL) canQuickLook
 {
+    if (!fQuickLookAvailable)
+        return NO;
+    
     if ([fInfoController shouldQuickLookFileView])
         return [fInfoController canQuickLook];

trunk/macosx/Torrent.m

@@ -25 +25 @@
 #import "Torrent.h"
 #import "GroupsController.h"
+#import "FileListNode.h"
 #import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
@@ -44 +45 @@
 
 - (void) createFileList;
-- (void) insertPath: (NSMutableArray *) components forSiblings: (NSMutableArray *) siblings previousPath: (NSString *) previousPath
-            fileSize: (uint64_t) size index: (int) index;
+- (void) insertPath: (NSMutableArray *) components forParent: (FileListNode *) parent fileSize: (uint64_t) size index: (int) index;
 
 - (void) completenessChange: (NSNumber *) status;
@@ -1649 +1649 @@
 - (void) createFileList
 {
-    int count = [self fileCount], i;
-    NSMutableArray * fileList = [[NSMutableArray alloc] initWithCapacity: count];
-    
-    for (i = 0; i < count; i++)
-    {
-        tr_file * file = &fInfo->files[i];
-        
-        NSMutableArray * pathComponents = [[[NSString stringWithUTF8String: file->name] pathComponents] mutableCopy];
-        NSString * path;
-        if ([self folder])
-        {
-            path = [pathComponents objectAtIndex: 0];
-            [pathComponents removeObjectAtIndex: 0];
-        }
-        else
-            path = @"";
-        
-        [self insertPath: pathComponents forSiblings: fileList previousPath: path fileSize: file->length index: i];
-        [pathComponents release];
-    }
-    
-    fFileList = [[NSArray alloc] initWithArray: fileList];
-    [fileList release];
-}
-
-- (void) insertPath: (NSMutableArray *) components forSiblings: (NSMutableArray *) siblings previousPath: (NSString *) previousPath
-            fileSize: (uint64_t) size index: (int) index
+    if ([self folder])
+    {
+        int count = [self fileCount], i;
+        NSMutableArray * fileList = [[NSMutableArray alloc] initWithCapacity: count];
+        
+        for (i = 0; i < count; i++)
+        {
+            tr_file * file = &fInfo->files[i];
+            
+            NSMutableArray * pathComponents = [[[NSString stringWithUTF8String: file->name] pathComponents] mutableCopy];
+            NSString * path = [pathComponents objectAtIndex: 0];
+            NSString * name = [pathComponents objectAtIndex: 1];
+            [pathComponents removeObjectsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, 2)]];
+            
+            if ([pathComponents count] > 0)
+            {
+                //determine if node already exists
+                NSEnumerator * enumerator = [fileList objectEnumerator];
+                FileListNode * node;
+                while ((node = [enumerator nextObject]))
+                    if ([[node name] isEqualToString: name])
+                        break;
+                
+                if (!node)
+                {
+                    node = [[FileListNode alloc] initWithFolderName: name path: path];
+                    [fileList addObject: node];
+                    [node release];
+                }
+                
+                [self insertPath: pathComponents forParent: node fileSize: file->length index: i];
+            }
+            else
+            {
+                FileListNode * node = [[FileListNode alloc] initWithFileName: name path: path size: file->length index: i];
+                [fileList addObject: node];
+                [node release];
+            }
+            
+            [pathComponents release];
+        }
+        
+        fFileList = [[NSArray alloc] initWithArray: fileList];
+        [fileList release];
+    }
+    else
+    {
+        FileListNode * node = [[FileListNode alloc] initWithFileName: [self name] path: @"" size: [self size] index: 0];
+        fFileList = [[NSArray arrayWithObject: node] retain];
+        [node release];
+    }
+}
+
+- (void) insertPath: (NSMutableArray *) components forParent: (FileListNode *) parent fileSize: (uint64_t) size index: (int) index
 {
     NSString * name = [components objectAtIndex: 0];
     BOOL isFolder = [components count] > 1;
     
-    NSMutableDictionary * dict = nil;
+    FileListNode * node = nil;
     if (isFolder)
     {
-        NSEnumerator * enumerator = [siblings objectEnumerator];
-        while ((dict = [enumerator nextObject]))
-            if ([[dict objectForKey: @"Name"] isEqualToString: name] && [[dict objectForKey: @"IsFolder"] boolValue])
+        NSEnumerator * enumerator = [[parent children] objectEnumerator];
+        while ((node = [enumerator nextObject]))
+            if ([[node name] isEqualToString: name] && [node isFolder])
                 break;
     }
     
-    NSString * currentPath = [previousPath stringByAppendingPathComponent: name];
-    
-    //create new folder or item if it doesn't already exist
-    if (!dict)
-    {
-        dict = [NSMutableDictionary dictionaryWithObjectsAndKeys: name, @"Name",
-                [NSNumber numberWithBool: isFolder], @"IsFolder", currentPath, @"Path", nil];
-        [siblings addObject: dict];
-        
+    //create new folder or file if it doesn't already exist
+    if (!node)
+    {
         if (isFolder)
-        {
-            [dict setObject: [NSMutableArray array] forKey: @"Children"];
-            [dict setObject: [NSMutableIndexSet indexSetWithIndex: index] forKey: @"Indexes"];
-        }
+            node = [[FileListNode alloc] initWithFolderName: name path: [parent fullPath]];
         else
-        {
-            [dict setObject: [NSIndexSet indexSetWithIndex: index] forKey: @"Indexes"];
-            [dict setObject: [NSNumber numberWithUnsignedLongLong: size] forKey: @"Size"];
-            
-            NSImage * icon = [[NSWorkspace sharedWorkspace] iconForFileType: [name pathExtension]];
-            [icon setFlipped: YES];
-            [dict setObject: icon forKey: @"Icon"];
-        }
-    }
-    else
-        [[dict objectForKey: @"Indexes"] addIndex: index];
+            node = [[FileListNode alloc] initWithFileName: name path: [parent fullPath] size: size index: index];
+        
+        [parent insertChild: node];
+    }
     
     if (isFolder)
     {
+        [node insertIndex: index];
+        
         [components removeObjectAtIndex: 0];
-        [self insertPath: components forSiblings: [dict objectForKey: @"Children"] previousPath: currentPath fileSize: size
-                index: index];
+        [self insertPath: components forParent: node fileSize: size index: index];
     }
 }