Merged heads.

--HG--
rename : help_me/templates/credits.mako => help_me/en/credits.md
rename : help_me/templates/directories.mako => help_me/en/directories.md
rename : help_me/templates/faq.mako => help_me/en/faq.md
rename : help_me/templates/intro.mako => help_me/en/intro.md
rename : help_me/templates/power_marker.mako => help_me/en/power_marker.md
rename : help_me/templates/preferences.mako => help_me/en/preferences.md
rename : help_me/templates/quick_start.mako => help_me/en/quick_start.md
rename : help_me/templates/results.mako => help_me/en/results.md
rename : help_me/templates/versions.mako => help_me/en/versions.md
rename : help_pe/templates/credits.mako => help_pe/en/credits.md
rename : help_pe/templates/directories.mako => help_pe/en/directories.md
rename : help_pe/templates/faq.mako => help_pe/en/faq.md
rename : help_pe/templates/intro.mako => help_pe/en/intro.md
rename : help_pe/templates/power_marker.mako => help_pe/en/power_marker.md
rename : help_pe/templates/preferences.mako => help_pe/en/preferences.md
rename : help_pe/templates/quick_start.mako => help_pe/en/quick_start.md
rename : help_pe/templates/results.mako => help_pe/en/results.md
rename : help_pe/templates/versions.mako => help_pe/en/versions.md
rename : help_se/templates/credits.mako => help_se/en/credits.md
rename : help_se/templates/directories.mako => help_se/en/directories.md
rename : help_se/templates/faq.mako => help_se/en/faq.md
rename : help_se/templates/intro.mako => help_se/en/intro.md
rename : help_se/templates/power_marker.mako => help_se/en/power_marker.md
rename : help_se/templates/preferences.mako => help_se/en/preferences.md
rename : help_se/templates/quick_start.mako => help_se/en/quick_start.md
rename : help_se/templates/results.mako => help_se/en/results.md
rename : help_se/templates/versions.mako => help_se/en/versions.md

.hgtags

@@ -9,3 +9,13 @@ cbcf9c80fee4c908ef2efbf1c143c9e47676c9b2 pe1.8.0
 0e923897a3389331d4ab3debbc40b8dd616199d9 pe1.8.1
 2c454eca9ebe93b6cf34916068f828a6a39e3eaf me5.7.1
 19e40bab20521d4256acf325dba9b32e95e135c5 pe1.8.2
+7b7c5a66ebee4e4b8125330d24fe9ce1a070ff25 se2.9.2
+1cef6d39855f85d4be728646bc78b860e6d4e398 pe1.8.3
+90ed56ee602666db2f267f73eac6f824347039b5 me5.7.2
+4c3cb1e671a333eabde1151c7c6ffb3609cab025 pe1.8.4
+0a71306434bca51bea9a5d5ae54fe1bf0e4900d8 pe1.8.5
+556baf4a410779e9bbf43129de133e4c4b26d679 pe1.8.6
+9149024283959a50fe9a47a5f175b905d1672c19 se2.10.0
+388a7e5aef6385e515189f4a15b4c4fed3ae2fcf me5.8.0
+27501167e3b9262ecb60c967941294f36d77eb25 pe1.9.0
+cb0a860430bacd712820bce426bcf47a4135efe1 se2.10.1

README

@@ -12,9 +12,8 @@ This package contains the source for dupeGuru. To learns how to build it, refer
 There are also other sub-folder that comes from external repositories (automatically checked out
 with svn:externals):
 
-- hsutil: A collection of helpers used across HS applications.
+- hscommon: A collection of helpers used across HS applications.
 - hsdocgen: An ad-hoc document generation used across HS project (used for help files)
-- hsmedia: A library to read audio file metadata, used in dupeGuru ME.
 - cocoalib: A collection of helpers used across Cocoa UI codebases of HS applications.
 - qtlib: A collection of helpers used across Qt UI codebases of HS applications.
 
@@ -27,9 +26,13 @@ General dependencies
 -----
 
 - Python 2.6 (http://www.python.org)
+- Send2Trash (http://hg.hardcoded.net/send2trash)
+- hsutil (http://hg.hardcoded.net/hsutil)
+- hsaudiotag (for ME) (http://hg.hardcoded.net/hsaudiotag)
+- lxml, to read and write XML files. (http://codespeak.net/lxml/)
 - Mako, to generate help files. (http://www.makotemplates.org/)
 - PyYaml, for help files and the build system. (http://pyyaml.org/)
-- Nose, to run unit tests. (http://somethingaboutorange.com/mrl/projects/nose/)
+- py.test, to run unit tests. (http://codespeak.net/py/dist/test/)
 
 OS X prerequisites
 -----
@@ -45,7 +48,7 @@ Windows prerequisites
 - Visual Studio 2008 (Express is enough) is needed to build C extensions. (http://www.microsoft.com/Express/)
 - PyQt 4.6 (http://www.riverbankcomputing.co.uk/news)
 - Python Imaging Library for dupeGuru PE. (http://www.pythonware.com/products/pil/)
-- PyInstaller, if you want to build a exe. You don't need it if you just want to run dupeGuru. (http://www.pyinstaller.org/)
+- cx_Freeze, if you want to build a exe. You don't need it if you just want to run dupeGuru. (http://cx-freeze.sourceforge.net/)
 - Advanced Installer, if you want to build the installer file. (http://www.advancedinstaller.com/)
 
 Building dupeGuru

build.py

@@ -15,8 +15,8 @@ import shutil
 from setuptools import setup
 import yaml
 
-from hsdocgen import generate_help, filters
-from hsutil.build import add_to_pythonpath, print_and_do, build_all_qt_ui, copy_packages
+from hscommon import helpgen
+from hscommon.build import add_to_pythonpath, print_and_do, build_all_qt_ui, copy_packages
 
 def build_cocoa(edition, dev, help_destpath):
     if not dev:
@@ -30,10 +30,10 @@ def build_cocoa(edition, dev, help_destpath):
     if not dev:
         specific_packages = {
             'se': ['core_se'],
-            'me': ['core_me', 'hsmedia'],
+            'me': ['core_me'],
             'pe': ['core_pe'],
         }[edition]
-        copy_packages(['core', 'hsutil'] + specific_packages, 'build')
+        copy_packages(['core', 'hscommon'] + specific_packages, 'build')
     cocoa_project_path = 'cocoa/{0}'.format(edition)
     shutil.copy(op.join(cocoa_project_path, 'dg_cocoa.py'), 'build')
     os.chdir('build')
@@ -85,13 +85,12 @@ def main():
     add_to_pythonpath('.')
     print "Generating Help"
     windows = sys.platform == 'win32'
-    tix = filters.tixgen("https://hardcoded.lighthouseapp.com/projects/31699-dupeguru/tickets/{0}")
+    profile = 'win_en' if windows else 'osx_en'
     help_dir = 'help_{0}'.format(edition)
     dest_dir = 'dupeguru_{0}_help'.format(edition) if edition != 'se' else 'dupeguru_help'
     help_basepath = op.abspath(help_dir)
     help_destpath = op.abspath(op.join(help_dir, dest_dir))
-    generate_help.main(help_basepath, help_destpath, force_render=not dev, tix=tix, windows=windows)
-    
+    helpgen.gen(help_basepath, help_destpath, profile=profile)
     print "Building dupeGuru"
     if edition == 'pe':
         os.chdir('core_pe')

cocoa/base/Consts.h

@@ -8,11 +8,6 @@ http://www.hardcoded.net/licenses/hs_license
 
 #import <Cocoa/Cocoa.h>
 
-/* ResultsChangedNotification happens on major changes, which requires a complete reload of the data*/
-#define ResultsChangedNotification @"ResultsChangedNotification"
-/* ResultsChangedNotification happens on minor changes, which requires buffer flush*/
-#define ResultsUpdatedNotification @"ResultsUpdatedNotification"
-#define ResultsMarkingChangedNotification @"ResultsMarkingChangedNotification"
 #define RegistrationRequired @"RegistrationRequired"
 #define JobStarted @"JobStarted"
 #define JobInProgress @"JobInProgress"

cocoa/base/DetailsPanel.m

@@ -14,9 +14,16 @@ http://www.hardcoded.net/licenses/hs_license
 {
     self = [super initWithNibName:@"DetailsPanel" pyClassName:@"PyDetailsPanel" pyParent:aPy];
     [self window]; //So the detailsTable is initialized.
+    [self connect];
     return self;
 }
 
+- (void)dealloc
+{
+    [self disconnect];
+    [super dealloc];
+}
+
 - (PyDetailsPanel *)py
 {
     return (PyDetailsPanel *)py;

cocoa/base/DirectoryOutline.m

@@ -13,9 +13,16 @@ http://www.hardcoded.net/licenses/hs_license
 {
     self = [super initWithPyClassName:@"PyDirectoryOutline" pyParent:aPyParent view:aOutlineView];
     [outlineView registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
+    [self connect];
     return self;
 }
 
+- (void)dealloc
+{
+    [self disconnect];
+    [super dealloc];
+}
+
 - (PyDirectoryOutline *)py
 {
     return (PyDirectoryOutline *)py;

cocoa/base/ProblemDialog.h

@@ -0,0 +1,25 @@
+/* 
+Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+
+This software is licensed under the "HS" License as described in the "LICENSE" file, 
+which should be included with this package. The terms are also available at 
+http://www.hardcoded.net/licenses/hs_license
+*/
+
+#import <Cocoa/Cocoa.h>
+#import "HSWindowController.h"
+#import "PyApp.h"
+#import "PyProblemDialog.h"
+#import "HSTable.h"
+
+@interface ProblemDialog : HSWindowController
+{
+    IBOutlet NSTableView *problemTableView;
+    
+    HSTable *problemTable;
+}
+- (id)initWithPy:(PyApp *)aPy;
+- (PyProblemDialog *)py;
+
+- (IBAction)revealSelected:(id)sender;
+@end

cocoa/base/ProblemDialog.m

@@ -0,0 +1,40 @@
+/* 
+Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+
+This software is licensed under the "HS" License as described in the "LICENSE" file, 
+which should be included with this package. The terms are also available at 
+http://www.hardcoded.net/licenses/hs_license
+*/
+
+#import "ProblemDialog.h"
+#import "Utils.h"
+
+@implementation ProblemDialog
+- (id)initWithPy:(PyApp *)aPy
+{
+    self = [super initWithNibName:@"ProblemDialog" pyClassName:@"PyProblemDialog" pyParent:aPy];
+    [self window]; //So the detailsTable is initialized.
+    problemTable = [[HSTable alloc] initWithPyClassName:@"PyProblemTable" pyParent:[self py] view:problemTableView];
+    [self connect];
+    [problemTable connect];
+    return self;
+}
+
+- (void)dealloc
+{
+    [problemTable disconnect];
+    [self disconnect];
+    [problemTable release];
+    [super dealloc];
+}
+
+- (PyProblemDialog *)py
+{
+    return (PyProblemDialog *)py;
+}
+
+- (IBAction)revealSelected:(id)sender
+{
+    [[self py] revealSelected];
+}
+@end

cocoa/base/PyDupeGuru.h

@@ -20,30 +20,21 @@ http://www.hardcoded.net/licenses/hs_license
 - (void)clearIgnoreList;
 - (void)purgeIgnoreList;
 - (NSString *)exportToXHTMLwithColumns:(NSArray *)aColIds;
+- (void)invokeCommand:(NSString *)cmd;
 
 - (NSNumber *)doScan;
 
-- (NSArray *)selectedPowerMarkerNodePaths;
-- (void)selectPowerMarkerNodePaths:(NSArray *)aIndexPaths;
-- (NSArray *)selectedResultNodePaths;
-- (void)selectResultNodePaths:(NSArray *)aIndexPaths;
-
 - (void)toggleSelectedMark;
 - (void)markAll;
 - (void)markInvert;
 - (void)markNone;
 
 - (void)addSelectedToIgnoreList;
-- (void)removeSelected;
 - (void)openSelected;
-- (NSNumber *)renameSelected:(NSString *)aNewName;
 - (void)revealSelected;
 - (void)makeSelectedReference;
 - (void)applyFilter:(NSString *)filter;
 
-- (void)sortGroupsBy:(NSNumber *)aIdentifier ascending:(NSNumber *)aAscending;
-- (void)sortDupesBy:(NSNumber *)aIdentifier ascending:(NSNumber *)aAscending;
-
 - (void)copyOrMove:(NSNumber *)aCopy markedTo:(NSString *)destination recreatePath:(NSNumber *)aRecreateType;
 - (void)deleteMarked;
 - (void)removeMarked;
@@ -51,13 +42,11 @@ http://www.hardcoded.net/licenses/hs_license
 //Data
 - (NSNumber *)getIgnoreListCount;
 - (NSNumber *)getMarkCount;
-- (NSString *)getStatLine;
-- (NSNumber *)getOperationalErrorCount;
+- (BOOL)scanWasProblematic;
 
 //Scanning options
 - (void)setMinMatchPercentage:(NSNumber *)percentage;
 - (void)setMixFileKind:(NSNumber *)mix_file_kind;
-- (void)setDisplayDeltaValues:(NSNumber *)display_delta_values;
 - (void)setEscapeFilterRegexp:(NSNumber *)escape_filter_regexp;
 - (void)setRemoveEmptyFolders:(NSNumber *)remove_empty_folders;
 - (void)setSizeThreshold:(NSInteger)size_threshold;

cocoa/base/PyProblemDialog.h

@@ -0,0 +1,14 @@
+/* 
+Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+
+This software is licensed under the "HS" License as described in the "LICENSE" file, 
+which should be included with this package. The terms are also available at 
+http://www.hardcoded.net/licenses/hs_license
+*/
+
+#import <Cocoa/Cocoa.h>
+#import "PyGUI.h"
+
+@interface PyProblemDialog : PyGUI
+- (void)revealSelected;
+@end

cocoa/base/PyResultTree.h

@@ -0,0 +1,24 @@
+/* 
+Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+
+This software is licensed under the "HS" License as described in the "LICENSE" file, 
+which should be included with this package. The terms are also available at 
+http://www.hardcoded.net/licenses/hs_license
+*/
+
+#import <Cocoa/Cocoa.h>
+#import "PyOutline.h"
+
+@interface PyResultTree : PyOutline
+- (BOOL)powerMarkerMode;
+- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode;
+- (BOOL)deltaValuesMode;
+- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode;
+
+- (NSString *)valueForPath:(NSArray *)aPath column:(NSInteger)aColumn;
+- (BOOL)renameSelected:(NSString *)aNewName;
+- (void)sortBy:(NSInteger)aIdentifier ascending:(BOOL)aAscending;
+- (void)markSelected;
+- (void)removeSelected;
+- (NSArray *)rootChildrenCounts;
+@end

cocoa/base/PyStatsLabel.h

@@ -0,0 +1,14 @@
+/* 
+Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+
+This software is licensed under the "HS" License as described in the "LICENSE" file, 
+which should be included with this package. The terms are also available at 
+http://www.hardcoded.net/licenses/hs_license
+*/
+
+#import <Cocoa/Cocoa.h>
+#import "PyGUI.h"
+
+@interface PyStatsLabel : PyGUI
+- (NSString *)display;
+@end

cocoa/base/ResultOutline.h

@@ -0,0 +1,26 @@
+/* 
+Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+
+This software is licensed under the "HS" License as described in the "LICENSE" file, 
+which should be included with this package. The terms are also available at 
+http://www.hardcoded.net/licenses/hs_license
+*/
+
+#import <Cocoa/Cocoa.h>
+#import "HSOutline.h"
+#import "PyResultTree.h"
+
+@interface ResultOutline : HSOutline
+{
+    NSIndexSet *_deltaColumns;
+    NSArray *_rootChildrenCounts;
+}
+- (PyResultTree *)py;
+- (BOOL)powerMarkerMode;
+- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode;
+- (BOOL)deltaValuesMode;
+- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode;
+- (void)setDeltaColumns:(NSIndexSet *)aDeltaColumns;
+- (NSInteger)selectedDupeCount;
+- (void)removeSelected;
+@end;

cocoa/base/ResultOutline.m

@@ -0,0 +1,207 @@
+/* 
+Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+
+This software is licensed under the "HS" License as described in the "LICENSE" file, 
+which should be included with this package. The terms are also available at 
+http://www.hardcoded.net/licenses/hs_license
+*/
+
+#import "ResultOutline.h"
+#import "Dialogs.h"
+#import "Utils.h"
+#import "Consts.h"
+
+@implementation ResultOutline
+- (id)initWithPyParent:(id)aPyParent view:(HSOutlineView *)aOutlineView
+{
+    self = [super initWithPyClassName:@"PyResultOutline" pyParent:aPyParent view:aOutlineView];
+    _rootChildrenCounts = nil;
+    [self connect];
+    return self;
+}
+
+- (void)dealloc
+{
+    [self disconnect];
+    [_deltaColumns release];
+    [super dealloc];
+}
+
+- (PyResultTree *)py
+{
+    return (PyResultTree *)py;
+}
+
+/* Public */
+- (BOOL)powerMarkerMode
+{
+    return [[self py] powerMarkerMode];
+}
+
+- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode
+{
+    [[self py] setPowerMarkerMode:aPowerMarkerMode];
+}
+
+- (BOOL)deltaValuesMode
+{
+    return [[self py] deltaValuesMode];
+}
+
+- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode
+{
+    [[self py] setDeltaValuesMode:aDeltaValuesMode];
+}
+
+- (void)setDeltaColumns:(NSIndexSet *)aDeltaColumns
+{
+    [_deltaColumns release];
+    _deltaColumns = [aDeltaColumns retain];
+}
+
+- (NSInteger)selectedDupeCount
+{
+    NSArray *selected = [self selectedIndexPaths];
+    if ([self powerMarkerMode]) {
+        return [selected count];
+    }
+    else {
+        NSInteger r = 0;
+        for (NSIndexPath *path in selected) {
+            if ([path length] == 2) {
+                r++;
+            }
+        }
+        return r;
+    }
+}
+
+- (void)removeSelected
+{
+    NSInteger selectedDupeCount = [self selectedDupeCount];
+    if (!selectedDupeCount)
+        return;
+    NSString *msg = [NSString stringWithFormat:@"You are about to remove %d files from results. Continue?",selectedDupeCount];
+    if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
+        return;
+    [[self py] removeSelected];
+}
+
+/* Datasource */
+- (NSInteger)outlineView:(NSOutlineView *)aOutlineView numberOfChildrenOfItem:(id)item
+{
+    NSIndexPath *path = item;
+    if ((path != nil) && ([path length] == 1)) {
+        if (_rootChildrenCounts == nil) {
+            _rootChildrenCounts = [[[self py] rootChildrenCounts] retain];
+        }
+        NSInteger index = [path indexAtPosition:0];
+        return n2i([_rootChildrenCounts objectAtIndex:index]);
+    }
+    return [super outlineView:aOutlineView numberOfChildrenOfItem:item];
+}
+
+- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)column byItem:(id)item
+{
+    NSIndexPath *path = item;
+    NSString *identifier = [column identifier];
+    if ([identifier isEqual:@"marked"]) {
+        return b2n([self boolProperty:@"marked" valueAtPath:path]);
+    }
+    NSInteger columnId = [identifier integerValue];
+    return [[self py] valueForPath:p2a(path) column:columnId];
+}
+
+- (void)outlineView:(NSOutlineView *)aOutlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
+{
+    if ([[tableColumn identifier] isEqual:@"0"]) {
+        NSIndexPath *path = item;
+        NSString *oldName = [[self py] valueForPath:p2a(path) column:0];
+        NSString *newName = object;
+        if (![newName isEqual:oldName]) {
+            BOOL renamed = [[self py] renameSelected:newName];
+            if (!renamed) {
+                [Dialogs showMessage:[NSString stringWithFormat:@"The name '%@' already exists.", newName]];
+            }
+            else {
+                [self refreshItemAtPath:path];
+            }
+        }
+    }
+    else {
+        [super outlineView:aOutlineView setObjectValue:object forTableColumn:tableColumn byItem:item];
+    }
+}
+
+/* Delegate */
+- (void)outlineView:(NSOutlineView *)aOutlineView didClickTableColumn:(NSTableColumn *)tableColumn
+{
+    if ([[outlineView sortDescriptors] count] < 1)
+        return;
+    NSSortDescriptor *sd = [[outlineView sortDescriptors] objectAtIndex:0];
+    [[self py] sortBy:[[sd key] integerValue] ascending:[sd ascending]];
+}
+
+- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
+{ 
+    NSIndexPath *path = item;
+    BOOL isMarkable = [self boolProperty:@"markable" valueAtPath:path];
+    if ([[tableColumn identifier] isEqual:@"marked"]) {
+        [cell setEnabled:isMarkable];
+    }
+    if ([cell isKindOfClass:[NSTextFieldCell class]]) {
+        // Determine if the text color will be blue due to directory being reference.
+        NSTextFieldCell *textCell = cell;
+        if (isMarkable) {
+            [textCell setTextColor:[NSColor blackColor]];
+        }
+        else {
+            [textCell setTextColor:[NSColor blueColor]];
+        }
+        if (([self deltaValuesMode]) && ([self powerMarkerMode] || ([path length] > 1))) {
+            NSInteger i = [[tableColumn identifier] integerValue];
+            if ([_deltaColumns containsIndex:i]) {
+                [textCell setTextColor:[NSColor orangeColor]];
+            }
+        }
+    }
+}
+
+- (BOOL)tableViewHadDeletePressed:(NSTableView *)tableView
+{
+    [self removeSelected];
+    return YES;
+}
+
+- (BOOL)tableViewHadSpacePressed:(NSTableView *)tableView
+{
+    [[self py] markSelected];
+    return YES;
+}
+
+/* don't calls saveEdits and cancelEdits */
+- (void)outlineViewDidEndEditing:(HSOutlineView *)outlineView
+{
+}
+
+- (void)outlineViewCancelsEdition:(HSOutlineView *)outlineView
+{
+}
+
+/* Python --> Cocoa */
+- (void)refresh /* Override */
+{
+    [_rootChildrenCounts release];
+    _rootChildrenCounts = nil;
+    [super refresh];
+    [outlineView expandItem:nil expandChildren:YES];
+}
+
+- (void)invalidateMarkings
+{
+    for (NSMutableDictionary *props in [itemData objectEnumerator]) {
+        [props removeObjectForKey:@"marked"];
+    }
+    [outlineView setNeedsDisplay:YES];
+}
+@end

cocoa/base/ResultWindow.h

@@ -7,43 +7,36 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "Outline.h"
+#import "HSOutlineView.h"
+#import "StatsLabel.h"
+#import "ResultOutline.h"
+#import "ProblemDialog.h"
 #import "PyDupeGuru.h"
 
-@interface MatchesView : OutlineView
-- (void)keyDown:(NSEvent *)theEvent;
-@end
-
 @interface ResultWindowBase : NSWindowController
 {
 @protected
     IBOutlet PyDupeGuruBase *py;
     IBOutlet id app;
     IBOutlet NSSegmentedControl *deltaSwitch;
-    IBOutlet MatchesView *matches;
+    IBOutlet HSOutlineView *matches;
 	IBOutlet NSSegmentedControl *pmSwitch;
 	IBOutlet NSTextField *stats;
 	IBOutlet NSMenu *columnsMenu;
 	IBOutlet NSSearchField *filterField;
     
-    BOOL _powerMode;
-    BOOL _displayDelta;
     NSMutableArray *_resultColumns;
-    NSMutableIndexSet *_deltaColumns;
     NSWindowController *preferencesPanel;
+    ResultOutline *outline;
+    StatsLabel *statsLabel;
+    ProblemDialog *problemDialog;
 }
 /* Helpers */
 - (void)fillColumnsMenu;
 - (NSTableColumn *)getColumnForIdentifier:(NSInteger)aIdentifier title:(NSString *)aTitle width:(NSInteger)aWidth refCol:(NSTableColumn *)aColumn;
 - (NSArray *)getColumnsOrder;
 - (NSDictionary *)getColumnsWidth;
-- (NSArray *)getSelected:(BOOL)aDupesOnly;
-- (NSArray *)getSelectedPaths:(BOOL)aDupesOnly;
 - (void)initResultColumns;
-- (void)updatePySelection;
-- (void)performPySelection:(NSArray *)aIndexPaths;
-- (void)refreshStats;
-- (void)reloadMatches;
 - (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth;
 
 /* Actions */
@@ -55,11 +48,11 @@ http://www.hardcoded.net/licenses/hs_license
 - (IBAction)exportToXHTML:(id)sender;
 - (IBAction)filter:(id)sender;
 - (IBAction)ignoreSelected:(id)sender;
+- (IBAction)invokeCustomCommand:(id)sender;
 - (IBAction)markAll:(id)sender;
 - (IBAction)markInvert:(id)sender;
 - (IBAction)markNone:(id)sender;
 - (IBAction)markSelected:(id)sender;
-- (IBAction)markToggle:(id)sender;
 - (IBAction)moveMarked:(id)sender;
 - (IBAction)openClicked:(id)sender;
 - (IBAction)openSelected:(id)sender;
@@ -69,6 +62,7 @@ http://www.hardcoded.net/licenses/hs_license
 - (IBAction)resetColumnsToDefault:(id)sender;
 - (IBAction)revealSelected:(id)sender;
 - (IBAction)showPreferencesPanel:(id)sender;
+- (IBAction)startDuplicateScan:(id)sender;
 - (IBAction)switchSelected:(id)sender;
 - (IBAction)toggleColumn:(id)sender;
 - (IBAction)toggleDelta:(id)sender;

cocoa/base/ResultWindow.m

@@ -14,67 +14,33 @@ http://www.hardcoded.net/licenses/hs_license
 #import "AppDelegate.h"
 #import "Consts.h"
 
-@implementation MatchesView
-- (void)keyDown:(NSEvent *)theEvent
-{
-    unichar key = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
-    // get flags and strip the lower 16 (device dependant) bits
-    NSUInteger flags = ( [theEvent modifierFlags] & 0x00FF );
-    if (((key == NSDeleteFunctionKey) || (key == NSDeleteCharacter)) && (flags == 0))
-        [self sendAction:@selector(removeSelected:) to:[self delegate]];
-    else
-    if ((key == 0x20) && (flags == 0)) // Space
-        [self sendAction:@selector(markSelected:) to:[self delegate]];
-    else
-        [super keyDown:theEvent];
-}
-
-- (void)outlineView:(NSOutlineView *)outlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
-{
-    if (![[tableColumn identifier] isEqual:@"0"])
-        return; //We only want to cover renames.
-    OVNode *node = item;
-    NSString *oldName = [[node buffer] objectAtIndex:0];
-    NSString *newName = object;
-    if (![newName isEqual:oldName])
-    {
-        BOOL renamed = n2b([(PyDupeGuruBase *)py renameSelected:newName]);
-        if (renamed)
-            [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
-        else
-            [Dialogs showMessage:[NSString stringWithFormat:@"The name '%@' already exists.",newName]];
-    }
-}
-@end
-
 @implementation ResultWindowBase
 - (void)awakeFromNib
 {
-    _displayDelta = NO;
-    _powerMode = NO;
     [self window];
     preferencesPanel = [[NSWindowController alloc] initWithWindowNibName:@"Preferences"];
+    outline = [[ResultOutline alloc] initWithPyParent:py view:matches];
+    statsLabel = [[StatsLabel alloc] initWithPyParent:py labelView:stats];
+    problemDialog = [[ProblemDialog alloc] initWithPy:py];
     [self initResultColumns];
     [self fillColumnsMenu];
     [deltaSwitch setSelectedSegment:0];
     [pmSwitch setSelectedSegment:0];
-    [py setDisplayDeltaValues:b2n(_displayDelta)];
     [matches setTarget:self];
     [matches setDoubleAction:@selector(openClicked:)];
-    [self refreshStats];
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(registrationRequired:) name:RegistrationRequired object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobCompleted:) name:JobCompletedNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobStarted:) name:JobStarted object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobInProgress:) name:JobInProgress object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsMarkingChanged:) name:ResultsMarkingChangedNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsChanged:) name:ResultsChangedNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsUpdated:) name:ResultsUpdatedNotification object:nil];
 }
 
 - (void)dealloc
 {
+    [outline release];
     [preferencesPanel release];
+    [statsLabel release];
+    [problemDialog release];
     [super dealloc];
 }
 
@@ -130,34 +96,6 @@ http://www.hardcoded.net/licenses/hs_license
     return result;
 }
 
-- (NSArray *)getSelected:(BOOL)aDupesOnly
-{
-    if (_powerMode)
-        aDupesOnly = NO;
-    NSIndexSet *indexes = [matches selectedRowIndexes];
-    NSMutableArray *nodeList = [NSMutableArray array];
-    OVNode *node;
-    NSInteger i = [indexes firstIndex];
-    while (i != NSNotFound)
-    {
-        node = [matches itemAtRow:i];
-        if (!aDupesOnly || ([node level] > 1))
-            [nodeList addObject:node];
-        i = [indexes indexGreaterThanIndex:i];
-    }
-    return nodeList;
-}
-
-- (NSArray *)getSelectedPaths:(BOOL)aDupesOnly
-{
-    NSMutableArray *r = [NSMutableArray array];
-    NSArray *selected = [self getSelected:aDupesOnly];
-    for (OVNode *node in selected) {
-        [r addObject:p2a([node indexPath])];
-    }
-    return r;
-}
-
 - (void)initResultColumns
 {
     // Virtual
@@ -172,12 +110,13 @@ http://www.hardcoded.net/licenses/hs_license
     }
     //Add columns and set widths
     for (NSString *colId in aColumnsOrder) {
-        if ([colId isEqual:@"mark"]) {
+        NSInteger colIndex = [colId integerValue];
+        if ((colIndex == 0) && (![colId isEqual:@"0"])) {
             continue;
         }
-        NSTableColumn *col = [_resultColumns objectAtIndex:[colId intValue]];
+        NSTableColumn *col = [_resultColumns objectAtIndex:colIndex];
         NSNumber *width = [aColumnsWidth objectForKey:[col identifier]];
-        NSMenuItem *mi = [columnsMenu itemWithTag:[colId intValue]];
+        NSMenuItem *mi = [columnsMenu itemWithTag:colIndex];
         if (width) {
             [col setWidth:[width floatValue]];
         }
@@ -185,43 +124,6 @@ http://www.hardcoded.net/licenses/hs_license
     }
 }
 
-- (void)updatePySelection
-{
-    NSArray *selection;
-    if (_powerMode) {
-        selection = [py selectedPowerMarkerNodePaths];
-    }
-    else {
-        selection = [py selectedResultNodePaths];
-    }
-    [matches selectNodePaths:selection];
-}
-
-- (void)performPySelection:(NSArray *)aIndexPaths
-{
-    if (_powerMode) {
-        [py selectPowerMarkerNodePaths:aIndexPaths];
-    }
-    else {
-        [py selectResultNodePaths:aIndexPaths];
-    }
-}
-
-- (void)refreshStats
-{
-    [stats setStringValue:[py getStatLine]];
-}
-
-/* Reload the matches outline and restore selection from py */
-- (void)reloadMatches
-{
-    [matches setDelegate:nil];
-    [matches reloadData];
-    [matches expandItem:nil expandChildren:YES];
-    [matches setDelegate:self];
-    [self updatePySelection];
-}
-
 /* Actions */
 - (IBAction)clearIgnoreList:(id)sender
 {
@@ -235,21 +137,12 @@ http://www.hardcoded.net/licenses/hs_license
 
 - (IBAction)changeDelta:(id)sender
 {
-    _displayDelta = [deltaSwitch selectedSegment] == 1;
-    [py setDisplayDeltaValues:b2n(_displayDelta)];
-    [self reloadMatches];
+    [outline setDeltaValuesMode:[deltaSwitch selectedSegment] == 1];
 }
 
 - (IBAction)changePowerMarker:(id)sender
 {
-    _powerMode = [pmSwitch selectedSegment] == 1;
-    if (_powerMode)
-        [matches setTag:2];
-    else
-        [matches setTag:0];
-    [matches expandItem:nil expandChildren:YES];
-    [self outlineView:matches didClickTableColumn:nil];
-    [self updatePySelection];
+    [outline setPowerMarkerMode:[pmSwitch selectedSegment] == 1];
 }
 
 - (IBAction)copyMarked:(id)sender
@@ -294,52 +187,49 @@ http://www.hardcoded.net/licenses/hs_license
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
     [py setEscapeFilterRegexp:b2n(!n2b([ud objectForKey:@"useRegexpFilter"]))];
     [py applyFilter:[filterField stringValue]];
-    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
 }
 
 - (IBAction)ignoreSelected:(id)sender
 {
-    NSArray *nodeList = [self getSelected:YES];
-    if (![nodeList count])
+    NSInteger selectedDupeCount = [outline selectedDupeCount];
+    if (!selectedDupeCount)
         return;
-    NSString *msg = [NSString stringWithFormat:@"All selected %d matches are going to be ignored in all subsequent scans. Continue?",[nodeList count]];
+    NSString *msg = [NSString stringWithFormat:@"All selected %d matches are going to be ignored in all subsequent scans. Continue?",selectedDupeCount];
     if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
         return;
     [py addSelectedToIgnoreList];
-    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)invokeCustomCommand:(id)sender
+{
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    NSString *cmd = [ud stringForKey:@"CustomCommand"];
+    if ((cmd != nil) && ([cmd length] > 0)) {
+        [py invokeCommand:cmd];
+    }
+    else {
+        [Dialogs showMessage:@"You have no custom command set up. Set it up in your preferences."];
+    }
 }
 
 - (IBAction)markAll:(id)sender
 {
     [py markAll];
-    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
 }
 
 - (IBAction)markInvert:(id)sender
 {
     [py markInvert];
-    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
 }
 
 - (IBAction)markNone:(id)sender
 {
     [py markNone];
-    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
 }
 
 - (IBAction)markSelected:(id)sender
 {
-    [self performPySelection:[self getSelectedPaths:YES]];
     [py toggleSelectedMark];
-    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
-}
-
-- (IBAction)markToggle:(id)sender
-{
-    OVNode *node = [matches itemAtRow:[matches clickedRow]];
-    [self performPySelection:[NSArray arrayWithObject:p2a([node indexPath])]];
-    [py toggleSelectedMark];
-    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
 }
 
 - (IBAction)moveMarked:(id)sender
@@ -373,15 +263,9 @@ http://www.hardcoded.net/licenses/hs_license
 
 - (IBAction)openSelected:(id)sender
 {
-    [self performPySelection:[self getSelectedPaths:NO]];
     [py openSelected];
 }
 
-- (IBAction)refresh:(id)sender
-{
-    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
-}
-
 - (IBAction)removeMarked:(id)sender
 {
     int mark_count = [[py getMarkCount] intValue];
@@ -390,19 +274,11 @@ http://www.hardcoded.net/licenses/hs_license
     if ([Dialogs askYesNo:[NSString stringWithFormat:@"You are about to remove %d files from results. Continue?",mark_count]] == NSAlertSecondButtonReturn) // NO
         return;
     [py removeMarked];
-    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
 }
 
 - (IBAction)removeSelected:(id)sender
 {
-    NSArray *nodeList = [self getSelected:YES];
-    if (![nodeList count])
-        return;
-    if ([Dialogs askYesNo:[NSString stringWithFormat:@"You are about to remove %d files from results. Continue?",[nodeList count]]] == NSAlertSecondButtonReturn) // NO
-        return;
-    [self performPySelection:[self getSelectedPaths:YES]];
-    [py removeSelected];
-    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+    [outline removeSelected];
 }
 
 - (IBAction)renameSelected:(id)sender
@@ -419,7 +295,6 @@ http://www.hardcoded.net/licenses/hs_license
 
 - (IBAction)revealSelected:(id)sender
 {
-    [self performPySelection:[self getSelectedPaths:NO]];
     [py revealSelected];
 }
 
@@ -428,21 +303,14 @@ http://www.hardcoded.net/licenses/hs_license
     [preferencesPanel showWindow:sender];
 }
 
+- (IBAction)startDuplicateScan:(id)sender
+{
+    // Virtual
+}
+
 - (IBAction)switchSelected:(id)sender
 {
-    // It might look like a complicated way to get the length of the current dupe list on the py side
-    // but after a lot of fussing around, believe it or not, it actually is.
-    NSInteger matchesTag = _powerMode ? 2 : 0;
-    NSInteger startLen = [[py getOutlineView:matchesTag childCountsForPath:[NSArray array]] count];
     [py makeSelectedReference];
-    [self performPySelection:[self getSelectedPaths:NO]];
-    // In some cases (when in a filtered view in Power Marker mode, it's possible that the demoted
-    // ref is not a part of the filter, making the table smaller. In those cases, we want to do a
-    // complete reload of the table to avoid a crash.
-    if ([[py getOutlineView:matchesTag childCountsForPath:[NSArray array]] count] == startLen)
-        [[NSNotificationCenter defaultCenter] postNotificationName:ResultsUpdatedNotification object:self];
-    else
-        [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
 }
 
 - (IBAction)toggleColumn:(id)sender
@@ -488,43 +356,6 @@ http://www.hardcoded.net/licenses/hs_license
     [self changePowerMarker:sender];
 }
 
-/* Delegate */
-- (void)outlineView:(NSOutlineView *)outlineView didClickTableColumn:(NSTableColumn *)tableColumn
-{
-    if ([[outlineView sortDescriptors] count] < 1)
-        return;
-    NSSortDescriptor *sd = [[outlineView sortDescriptors] objectAtIndex:0];
-    if (_powerMode)
-        [py sortDupesBy:i2n([[sd key] intValue]) ascending:b2n([sd ascending])];
-    else
-        [py sortGroupsBy:i2n([[sd key] intValue]) ascending:b2n([sd ascending])];
-    [self reloadMatches];
-}
-
-- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
-{ 
-    OVNode *node = item;
-    if ([[tableColumn identifier] isEqual:@"mark"]) {
-        [cell setEnabled: [node isMarkable]];
-    }
-    if ([cell isKindOfClass:[NSTextFieldCell class]]) {
-        // Determine if the text color will be blue due to directory being reference.
-        NSTextFieldCell *textCell = cell;
-        if ([node isMarkable]) {
-            [textCell setTextColor:[NSColor blackColor]];
-        }
-        else {
-            [textCell setTextColor:[NSColor blueColor]];
-        }
-        if ((_displayDelta) && (_powerMode || ([node level] > 1))) {
-            NSInteger i = [[tableColumn identifier] integerValue];
-            if ([_deltaColumns containsIndex:i]) {
-                [textCell setTextColor:[NSColor orangeColor]];
-            }
-        }
-    }
-}
-
 /* Notifications */
 - (void)windowWillClose:(NSNotification *)aNotification
 {
@@ -533,32 +364,33 @@ http://www.hardcoded.net/licenses/hs_license
 
 - (void)jobCompleted:(NSNotification *)aNotification
 {
-    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
-    NSInteger r = n2i([py getOperationalErrorCount]);
     id lastAction = [[ProgressController mainProgressController] jobId];
     if ([lastAction isEqualTo:jobCopy]) {
-        if (r > 0)
-            [Dialogs showMessage:[NSString stringWithFormat:@"%d file(s) couldn't be copied.",r]];
-        else
+        if ([py scanWasProblematic]) {
+            [problemDialog showWindow:self];
+        }
+        else {
             [Dialogs showMessage:@"All marked files were copied sucessfully."];
+        }
     }
     else if ([lastAction isEqualTo:jobMove]) {
-        if (r > 0)
-            [Dialogs showMessage:[NSString stringWithFormat:@"%d file(s) couldn't be moved. They were kept in the results, and still are marked.",r]];
-        else
+        if ([py scanWasProblematic]) {
+            [problemDialog showWindow:self];
+        }
+        else {
             [Dialogs showMessage:@"All marked files were moved sucessfully."];
+        }
     }
     else if ([lastAction isEqualTo:jobDelete]) {
-        if (r > 0) {
-            NSString *msg = @"%d file(s) couldn't be sent to Trash. They were kept in the results, "\
-                "and still are marked. See the F.A.Q. section in the help file for details.";
-            [Dialogs showMessage:[NSString stringWithFormat:msg,r]];
+        if ([py scanWasProblematic]) {
+            [problemDialog showWindow:self];
         }
-        else
+        else {
             [Dialogs showMessage:@"All marked files were sucessfully sent to Trash."];
+        }
     }
     else if ([lastAction isEqualTo:jobScan]) {
-        NSInteger groupCount = [[py getOutlineView:0 childCountsForPath:[NSArray array]] count];
+        NSInteger groupCount = [outline intProperty:@"children_count" valueAtPath:nil];
         if (groupCount == 0)
             [Dialogs showMessage:@"No duplicates found."];
     }
@@ -589,29 +421,6 @@ http://www.hardcoded.net/licenses/hs_license
     [Dialogs showMessage:msg];
 }
 
-- (void)outlineViewSelectionDidChange:(NSNotification *)notification
-{
-    [self performPySelection:[self getSelectedPaths:NO]];
-}
-
-- (void)resultsChanged:(NSNotification *)aNotification
-{
-    [self reloadMatches];
-    [self refreshStats];
-}
-
-- (void)resultsMarkingChanged:(NSNotification *)aNotification
-{
-    [matches invalidateMarkings];
-    [self refreshStats];
-}
-
-- (void)resultsUpdated:(NSNotification *)aNotification
-{
-    [matches invalidateBuffers];
-    [matches invalidateMarkings];
-}
-
 - (BOOL)validateToolbarItem:(NSToolbarItem *)theItem
 {
     return ![[ProgressController mainProgressController] isShown];

cocoa/base/StatsLabel.h

@@ -0,0 +1,19 @@
+/* 
+Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+
+This software is licensed under the "HS" License as described in the "LICENSE" file, 
+which should be included with this package. The terms are also available at 
+http://www.hardcoded.net/licenses/hs_license
+*/
+
+#import <Cocoa/Cocoa.h>
+#import "HSGUIController.h"
+#import "PyStatsLabel.h"
+
+@interface StatsLabel : HSGUIController
+{
+    NSTextField *labelView;
+}
+- (id)initWithPyParent:(id)aPyParent labelView:(NSTextField *)aLabelView;
+- (PyStatsLabel *)py;
+@end

cocoa/base/StatsLabel.m

@@ -0,0 +1,38 @@
+/* 
+Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+
+This software is licensed under the "HS" License as described in the "LICENSE" file, 
+which should be included with this package. The terms are also available at 
+http://www.hardcoded.net/licenses/hs_license
+*/
+
+#import "StatsLabel.h"
+#import "Utils.h"
+
+@implementation StatsLabel
+- (id)initWithPyParent:(id)aPyParent labelView:(NSTextField *)aLabelView
+{
+    self = [super initWithPyClassName:@"PyStatsLabel" pyParent:aPyParent];
+    labelView = [aLabelView retain];
+    [self connect];
+    return self;
+}
+
+- (void)dealloc
+{
+    [self disconnect];
+    [labelView release];
+    [super dealloc];
+}
+
+- (PyStatsLabel *)py
+{
+    return (PyStatsLabel *)py;
+}
+
+/* Python --> Cocoa */
+- (void)refresh
+{
+    [labelView setStringValue:[[self py] display]];
+}
+@end

cocoa/base/xib/MainMenu.xib

@@ -2,18 +2,18 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10C540</string>
+		<string key="IBDocument.SystemVersion">10D573</string>
 		<string key="IBDocument.InterfaceBuilderVersion">740</string>
-		<string key="IBDocument.AppKitVersion">1038.25</string>
-		<string key="IBDocument.HIToolboxVersion">458.00</string>
+		<string key="IBDocument.AppKitVersion">1038.29</string>
+		<string key="IBDocument.HIToolboxVersion">460.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			<string key="NS.object.0">740</string>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="29"/>
-			<integer value="21"/>
+			<integer value="598"/>
+			<integer value="219"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -710,7 +710,7 @@
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
 												<object class="NSTableColumn" id="430098394">
-													<string key="NSIdentifier">mark</string>
+													<string key="NSIdentifier">marked</string>
 													<double key="NSWidth">47</double>
 													<double key="NSMinWidth">16</double>
 													<double key="NSMaxWidth">1000</double>
@@ -752,6 +752,7 @@
 														<int key="NSPeriodicDelay">400</int>
 														<int key="NSPeriodicInterval">75</int>
 													</object>
+													<bool key="NSIsEditable">YES</bool>
 													<reference key="NSTableView" ref="40047569"/>
 												</object>
 												<object class="NSTableColumn" id="932540235">
@@ -1145,7 +1146,7 @@
 								<object class="NSMenuItem" id="578499792">
 									<reference key="NSMenu" ref="600111647"/>
 									<string key="NSTitle">Clear Ignore List</string>
-									<string key="NSKeyEquiv">I</string>
+									<string key="NSKeyEquiv">G</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="852972005"/>
@@ -1230,7 +1231,7 @@
 								<object class="NSMenuItem" id="904423169">
 									<reference key="NSMenu" ref="600111647"/>
 									<string key="NSTitle">Add Selected to Ignore List</string>
-									<string key="NSKeyEquiv">i</string>
+									<string key="NSKeyEquiv">g</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="852972005"/>
@@ -1274,6 +1275,15 @@
 									<reference key="NSOnImage" ref="852972005"/>
 									<reference key="NSMixedImage" ref="218295580"/>
 								</object>
+								<object class="NSMenuItem" id="517397504">
+									<reference key="NSMenu" ref="600111647"/>
+									<string key="NSTitle">Invoke Custom Command</string>
+									<string key="NSKeyEquiv">i</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="852972005"/>
+									<reference key="NSMixedImage" ref="218295580"/>
+								</object>
 								<object class="NSMenuItem" id="564101661">
 									<reference key="NSMenu" ref="600111647"/>
 									<string key="NSTitle">Rename Selected</string>
@@ -1667,14 +1677,6 @@
 					</object>
 					<int key="connectionID">212</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">matches</string>
-						<reference key="source" ref="339936126"/>
-						<reference key="destination" ref="40047569"/>
-					</object>
-					<int key="connectionID">245</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">initialFirstResponder</string>
@@ -1683,22 +1685,6 @@
 					</object>
 					<int key="connectionID">279</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="40047569"/>
-						<reference key="destination" ref="339936126"/>
-					</object>
-					<int key="connectionID">410</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">markToggle:</string>
-						<reference key="source" ref="339936126"/>
-						<reference key="destination" ref="705360835"/>
-					</object>
-					<int key="connectionID">414</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">stats</string>
@@ -1939,14 +1925,6 @@
 					</object>
 					<int key="connectionID">758</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">py</string>
-						<reference key="source" ref="40047569"/>
-						<reference key="destination" ref="875360857"/>
-					</object>
-					<int key="connectionID">764</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">removeSelected:</string>
@@ -2227,6 +2205,22 @@
 					</object>
 					<int key="connectionID">1175</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">matches</string>
+						<reference key="source" ref="339936126"/>
+						<reference key="destination" ref="40047569"/>
+					</object>
+					<int key="connectionID">1176</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">invokeCustomCommand:</string>
+						<reference key="source" ref="339936126"/>
+						<reference key="destination" ref="517397504"/>
+					</object>
+					<int key="connectionID">1178</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -2553,6 +2547,7 @@
 							<reference ref="564101661"/>
 							<reference ref="630362403"/>
 							<reference ref="747820446"/>
+							<reference ref="517397504"/>
 						</object>
 						<reference key="parent" ref="528113253"/>
 					</object>
@@ -3089,6 +3084,11 @@
 						<reference key="object" ref="747820446"/>
 						<reference key="parent" ref="600111647"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1177</int>
+						<reference key="object" ref="517397504"/>
+						<reference key="parent" ref="600111647"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -3140,6 +3140,7 @@
 					<string>1171.IBPluginDependency</string>
 					<string>1172.IBPluginDependency</string>
 					<string>1173.IBPluginDependency</string>
+					<string>1177.IBPluginDependency</string>
 					<string>134.IBPluginDependency</string>
 					<string>134.ImportedFromIB2</string>
 					<string>136.IBPluginDependency</string>
@@ -3378,6 +3379,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
@@ -3397,16 +3399,16 @@
 					<boolean value="YES"/>
 					<boolean value="YES"/>
 					<boolean value="YES"/>
-					<string>{{109, 366}, {557, 400}}</string>
+					<string>{{439, 345}, {557, 400}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{109, 366}, {557, 400}}</string>
+					<string>{{439, 345}, {557, 400}}</string>
 					<boolean value="YES"/>
 					<boolean value="YES"/>
 					<boolean value="YES"/>
 					<string>{340, 340}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
-					<string>MatchesView</string>
+					<string>HSOutlineView</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3446,7 +3448,7 @@
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
-					<string>{{286, 475}, {361, 293}}</string>
+					<string>{{286, 455}, {361, 313}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3584,7 +3586,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">1175</int>
+			<int key="maxID">1178</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3663,7 +3665,7 @@
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">dgbase/AppDelegate.h</string>
+						<string key="minorKey">../base/AppDelegate.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -3675,19 +3677,22 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">MatchesView</string>
-					<string key="superclassName">OutlineView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="417275989">
+					<string key="className">HSOutlineView</string>
+					<string key="superclassName">NSOutlineView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="384069338">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">dgbase/ResultWindow.h</string>
+						<string key="minorKey">../views/HSOutlineView.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">MatchesView</string>
-					<string key="superclassName">OutlineView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="384069338"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="653924221">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">../views/NSTableViewAdditions.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -3699,31 +3704,15 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">OutlineView</string>
-					<string key="superclassName">NSOutlineView</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">py</string>
-						<string key="NS.object.0">PyApp</string>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">cocoalib/Outline.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">OutlineView</string>
-					<string key="superclassName">NSOutlineView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
+					<string key="className">NSTableView</string>
+					<reference key="sourceIdentifier" ref="653924221"/>
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">PyApp</string>
 					<string key="superclassName">PyRegistrable</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">cocoalib/PyApp.h</string>
+						<string key="minorKey">../PyApp.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -3755,7 +3744,7 @@
 					<string key="superclassName">PyApp</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">dgbase/PyDupeGuru.h</string>
+						<string key="minorKey">../base/PyDupeGuru.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -3763,7 +3752,7 @@
 					<string key="superclassName">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">cocoalib/PyRegistrable.h</string>
+						<string key="minorKey">../PyRegistrable.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -3797,7 +3786,7 @@
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">cocoalib/RecentDirectories.h</string>
+						<string key="minorKey">../RecentDirectories.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -3815,120 +3804,20 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>clearIgnoreList:</string>
-							<string>filter:</string>
-							<string>ignoreSelected:</string>
-							<string>markAll:</string>
-							<string>markInvert:</string>
-							<string>markNone:</string>
-							<string>markSelected:</string>
-							<string>markToggle:</string>
-							<string>openSelected:</string>
-							<string>refresh:</string>
-							<string>removeMarked:</string>
-							<string>removeSelected:</string>
-							<string>renameSelected:</string>
 							<string>resetColumnsToDefault:</string>
-							<string>revealSelected:</string>
 							<string>startDuplicateScan:</string>
-							<string>toggleDelta:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">filterField</string>
-						<string key="NS.object.0">NSSearchField</string>
-					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">ResultWindow.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ResultWindow</string>
-					<string key="superclassName">ResultWindowBase</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>changeDelta:</string>
-							<string>changePowerMarker:</string>
-							<string>collapseAll:</string>
-							<string>copyMarked:</string>
-							<string>deleteMarked:</string>
-							<string>expandAll:</string>
-							<string>exportToXHTML:</string>
-							<string>moveMarked:</string>
-							<string>switchSelected:</string>
-							<string>togglePowerMarker:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>actionMenuView</string>
-							<string>app</string>
-							<string>deltaSwitch</string>
-							<string>deltaSwitchView</string>
-							<string>filterFieldView</string>
-							<string>matches</string>
-							<string>pmSwitch</string>
-							<string>pmSwitchView</string>
-							<string>py</string>
-							<string>stats</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSView</string>
-							<string>id</string>
-							<string>NSSegmentedControl</string>
-							<string>NSView</string>
-							<string>NSView</string>
-							<string>MatchesView</string>
-							<string>NSSegmentedControl</string>
-							<string>NSView</string>
-							<string>PyDupeGuru</string>
-							<string>NSTextField</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">ResultWindowBase</string>
 					<string key="superclassName">NSWindowController</string>
@@ -3938,15 +3827,30 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>changeDelta:</string>
 							<string>changePowerMarker:</string>
+							<string>clearIgnoreList:</string>
 							<string>copyMarked:</string>
 							<string>deleteMarked:</string>
-							<string>expandAll:</string>
 							<string>exportToXHTML:</string>
+							<string>filter:</string>
+							<string>ignoreSelected:</string>
+							<string>invokeCustomCommand:</string>
+							<string>markAll:</string>
+							<string>markInvert:</string>
+							<string>markNone:</string>
+							<string>markSelected:</string>
 							<string>moveMarked:</string>
+							<string>openClicked:</string>
+							<string>openSelected:</string>
+							<string>removeMarked:</string>
+							<string>removeSelected:</string>
+							<string>renameSelected:</string>
 							<string>resetColumnsToDefault:</string>
+							<string>revealSelected:</string>
 							<string>showPreferencesPanel:</string>
+							<string>startDuplicateScan:</string>
 							<string>switchSelected:</string>
 							<string>toggleColumn:</string>
+							<string>toggleDelta:</string>
 							<string>toggleDetailsPanel:</string>
 							<string>togglePowerMarker:</string>
 						</object>
@@ -3965,6 +3869,21 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -3974,6 +3893,7 @@
 							<string>app</string>
 							<string>columnsMenu</string>
 							<string>deltaSwitch</string>
+							<string>filterField</string>
 							<string>matches</string>
 							<string>pmSwitch</string>
 							<string>py</string>
@@ -3984,13 +3904,17 @@
 							<string>id</string>
 							<string>NSMenu</string>
 							<string>NSSegmentedControl</string>
-							<string>MatchesView</string>
+							<string>NSSearchField</string>
+							<string>HSOutlineView</string>
 							<string>NSSegmentedControl</string>
 							<string>PyDupeGuruBase</string>
 							<string>NSTextField</string>
 						</object>
 					</object>
-					<reference key="sourceIdentifier" ref="417275989"/>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">../base/ResultWindow.h</string>
+					</object>
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">SUUpdater</string>
@@ -4612,7 +4536,7 @@
 			<integer value="3000" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../../dupeguru.xcodeproj</string>
+		<string key="IBDocument.LastKnownRelativeProjectPath">../../se/dupeguru.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 	</data>
 </archive>

cocoa/me/Info.plist

@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>5.7.1</string>
+	<string>5.8.0</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

cocoa/me/ResultWindow.h

@@ -7,14 +7,9 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "../../cocoalib/Outline.h"
 #import "../base/ResultWindow.h"
 #import "DirectoryPanel.h"
 
-@interface ResultWindow : ResultWindowBase
-{
-    NSString *_lastAction;
-}
+@interface ResultWindow : ResultWindowBase {}
 - (IBAction)removeDeadTracks:(id)sender;
-- (IBAction)startDuplicateScan:(id)sender;
 @end

cocoa/me/ResultWindow.m

@@ -20,8 +20,9 @@ http://www.hardcoded.net/licenses/hs_license
 {
     [super awakeFromNib];
     [[self window] setTitle:@"dupeGuru Music Edition"];
-    _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,7)] retain];
-    [_deltaColumns removeIndex:6];
+    NSMutableIndexSet *deltaColumns = [NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,7)];
+    [deltaColumns removeIndex:6];
+    [outline setDeltaColumns:deltaColumns];
 }
 
 /* Actions */
@@ -68,8 +69,6 @@ http://www.hardcoded.net/licenses/hs_license
     [_py setMixFileKind:[ud objectForKey:@"mixFileKind"]];
     [_py setMatchSimilarWords:[ud objectForKey:@"matchSimilarWords"]];
     NSInteger r = n2i([py doScan]);
-    [matches reloadData];
-    [self refreshStats];
     if (r == 1)
         [Dialogs showMessage:@"You cannot make a duplicate scan with only reference directories."];
     if (r == 3)

cocoa/me/dg_cocoa.py

@@ -4,16 +4,18 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-from hsutil.cocoa import signature
+from hscommon.cocoa import signature
 
 from core.app_cocoa_inter import PyDupeGuruBase, PyDetailsPanel
 from core_me.app_cocoa import DupeGuruME
 from core.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
     SCAN_TYPE_TAG, SCAN_TYPE_CONTENT, SCAN_TYPE_CONTENT_AUDIO)
 
-# Fix py2app imports which chokes on relative imports
+# Fix py2app imports which chokes on relative imports and other stuff
 from core_me import app_cocoa, data, fs, scanner
-from hsmedia import aiff, flac, genres, id3v1, id3v2, mp4, mpeg, ogg, wma
+from hsaudiotag import aiff, flac, genres, id3v1, id3v2, mp4, mpeg, ogg, wma
+from lxml import etree, _elementpath
+import gzip
 
 class PyDupeGuru(PyDupeGuruBase):
     def init(self):

cocoa/me/dupeguru.xcodeproj/project.pbxproj

@@ -21,7 +21,19 @@
 /* Begin PBXBuildFile section */
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+		CE003CC611242D00004B0AA7 /* HSGUIController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CB411242D00004B0AA7 /* HSGUIController.m */; };
+		CE003CC711242D00004B0AA7 /* HSOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CB611242D00004B0AA7 /* HSOutline.m */; };
+		CE003CC811242D00004B0AA7 /* HSWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CB811242D00004B0AA7 /* HSWindowController.m */; };
+		CE003CC911242D00004B0AA7 /* NSEventAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CBA11242D00004B0AA7 /* NSEventAdditions.m */; };
+		CE003CCA11242D00004B0AA7 /* HSOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CC111242D00004B0AA7 /* HSOutlineView.m */; };
+		CE003CCB11242D00004B0AA7 /* NSIndexPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CC311242D00004B0AA7 /* NSIndexPathAdditions.m */; };
+		CE003CCC11242D00004B0AA7 /* NSTableViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CC511242D00004B0AA7 /* NSTableViewAdditions.m */; };
+		CE003CD011242D2C004B0AA7 /* DirectoryOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CCE11242D2C004B0AA7 /* DirectoryOutline.m */; };
 		CE073F6309CAE1A3005C1D2F /* dupeguru_me_help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* dupeguru_me_help */; };
+		CE0A0C001175A1C000DCA3C6 /* HSTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0A0BFF1175A1C000DCA3C6 /* HSTable.m */; };
+		CE0A0C041175A1DE00DCA3C6 /* ProblemDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0A0C021175A1DE00DCA3C6 /* ProblemDialog.m */; };
+		CE0A0C061175A24800DCA3C6 /* ProblemDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0A0C051175A24800DCA3C6 /* ProblemDialog.xib */; };
+		CE0B3D6711243F83009A7A30 /* ResultOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0B3D6611243F83009A7A30 /* ResultOutline.m */; };
 		CE1425890AFB718500BD5167 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE1425880AFB718500BD5167 /* Sparkle.framework */; };
 		CE14259F0AFB719300BD5167 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE1425880AFB718500BD5167 /* Sparkle.framework */; };
 		CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; };
@@ -35,7 +47,6 @@
 		CE4B59CA1119919700C06C9E /* registration.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE4B59C71119919700C06C9E /* registration.xib */; };
 		CE515DF30FC6C12E00EC695D /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DE10FC6C12E00EC695D /* Dialogs.m */; };
 		CE515DF40FC6C12E00EC695D /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DE30FC6C12E00EC695D /* HSErrorReportWindow.m */; };
-		CE515DF50FC6C12E00EC695D /* Outline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DE50FC6C12E00EC695D /* Outline.m */; };
 		CE515DF60FC6C12E00EC695D /* ProgressController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DE70FC6C12E00EC695D /* ProgressController.m */; };
 		CE515DF70FC6C12E00EC695D /* RecentDirectories.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DEA0FC6C12E00EC695D /* RecentDirectories.m */; };
 		CE515DF80FC6C12E00EC695D /* RegistrationInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DEC0FC6C12E00EC695D /* RegistrationInterface.m */; };
@@ -50,6 +61,7 @@
 		CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE848A1809DD85810004CB44 /* Consts.h */; };
 		CE900AD2109B238600754048 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE900AD1109B238600754048 /* Preferences.xib */; };
 		CE900AD7109B2A9B00754048 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE900AD6109B2A9B00754048 /* MainMenu.xib */; };
+		CEDF07A3112493B200EE5BC0 /* StatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDF07A2112493B200EE5BC0 /* StatsLabel.m */; };
 		CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; };
 		CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; };
 		CEFC295509C89FF200D9F998 /* details32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295309C89FF200D9F998 /* details32.png */; };
@@ -78,7 +90,37 @@
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; };
 		8D1107320486CEB800E47090 /* dupeGuru ME.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "dupeGuru ME.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		CE003CB311242D00004B0AA7 /* HSGUIController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSGUIController.h; sourceTree = "<group>"; };
+		CE003CB411242D00004B0AA7 /* HSGUIController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSGUIController.m; sourceTree = "<group>"; };
+		CE003CB511242D00004B0AA7 /* HSOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutline.h; sourceTree = "<group>"; };
+		CE003CB611242D00004B0AA7 /* HSOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutline.m; sourceTree = "<group>"; };
+		CE003CB711242D00004B0AA7 /* HSWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSWindowController.h; sourceTree = "<group>"; };
+		CE003CB811242D00004B0AA7 /* HSWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSWindowController.m; sourceTree = "<group>"; };
+		CE003CB911242D00004B0AA7 /* NSEventAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSEventAdditions.h; path = ../../cocoalib/NSEventAdditions.h; sourceTree = SOURCE_ROOT; };
+		CE003CBA11242D00004B0AA7 /* NSEventAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSEventAdditions.m; path = ../../cocoalib/NSEventAdditions.m; sourceTree = SOURCE_ROOT; };
+		CE003CBC11242D00004B0AA7 /* PyGUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyGUI.h; sourceTree = "<group>"; };
+		CE003CBD11242D00004B0AA7 /* PyOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyOutline.h; sourceTree = "<group>"; };
+		CE003CBE11242D00004B0AA7 /* PyRegistrable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyRegistrable.h; path = ../../cocoalib/PyRegistrable.h; sourceTree = SOURCE_ROOT; };
+		CE003CC011242D00004B0AA7 /* HSOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutlineView.h; sourceTree = "<group>"; };
+		CE003CC111242D00004B0AA7 /* HSOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutlineView.m; sourceTree = "<group>"; };
+		CE003CC211242D00004B0AA7 /* NSIndexPathAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSIndexPathAdditions.h; sourceTree = "<group>"; };
+		CE003CC311242D00004B0AA7 /* NSIndexPathAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSIndexPathAdditions.m; sourceTree = "<group>"; };
+		CE003CC411242D00004B0AA7 /* NSTableViewAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSTableViewAdditions.h; sourceTree = "<group>"; };
+		CE003CC511242D00004B0AA7 /* NSTableViewAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSTableViewAdditions.m; sourceTree = "<group>"; };
+		CE003CCD11242D2C004B0AA7 /* DirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryOutline.h; path = ../base/DirectoryOutline.h; sourceTree = SOURCE_ROOT; };
+		CE003CCE11242D2C004B0AA7 /* DirectoryOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryOutline.m; path = ../base/DirectoryOutline.m; sourceTree = SOURCE_ROOT; };
+		CE003CCF11242D2C004B0AA7 /* PyDirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDirectoryOutline.h; path = ../base/PyDirectoryOutline.h; sourceTree = SOURCE_ROOT; };
 		CE073F5409CAE1A3005C1D2F /* dupeguru_me_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_me_help; path = ../../help_me/dupeguru_me_help; sourceTree = "<group>"; };
+		CE0A0BFE1175A1C000DCA3C6 /* HSTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSTable.h; sourceTree = "<group>"; };
+		CE0A0BFF1175A1C000DCA3C6 /* HSTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSTable.m; sourceTree = "<group>"; };
+		CE0A0C011175A1DE00DCA3C6 /* ProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProblemDialog.h; path = ../base/ProblemDialog.h; sourceTree = SOURCE_ROOT; };
+		CE0A0C021175A1DE00DCA3C6 /* ProblemDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProblemDialog.m; path = ../base/ProblemDialog.m; sourceTree = SOURCE_ROOT; };
+		CE0A0C031175A1DE00DCA3C6 /* PyProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyProblemDialog.h; path = ../base/PyProblemDialog.h; sourceTree = SOURCE_ROOT; };
+		CE0A0C051175A24800DCA3C6 /* ProblemDialog.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ProblemDialog.xib; path = ../base/xib/ProblemDialog.xib; sourceTree = SOURCE_ROOT; };
+		CE0A0C131175A28100DCA3C6 /* PyTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyTable.h; sourceTree = "<group>"; };
+		CE0B3D6411243F83009A7A30 /* PyResultTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyResultTree.h; path = ../base/PyResultTree.h; sourceTree = SOURCE_ROOT; };
+		CE0B3D6511243F83009A7A30 /* ResultOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultOutline.h; path = ../base/ResultOutline.h; sourceTree = SOURCE_ROOT; };
+		CE0B3D6611243F83009A7A30 /* ResultOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultOutline.m; path = ../base/ResultOutline.m; sourceTree = SOURCE_ROOT; };
 		CE1425880AFB718500BD5167 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
 		CE381C9409914ACE003581CE /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = SOURCE_ROOT; };
 		CE381C9509914ACE003581CE /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = SOURCE_ROOT; };
@@ -96,8 +138,6 @@
 		CE515DE10FC6C12E00EC695D /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = ../../cocoalib/Dialogs.m; sourceTree = SOURCE_ROOT; };
 		CE515DE20FC6C12E00EC695D /* HSErrorReportWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSErrorReportWindow.h; path = ../../cocoalib/HSErrorReportWindow.h; sourceTree = SOURCE_ROOT; };
 		CE515DE30FC6C12E00EC695D /* HSErrorReportWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSErrorReportWindow.m; path = ../../cocoalib/HSErrorReportWindow.m; sourceTree = SOURCE_ROOT; };
-		CE515DE40FC6C12E00EC695D /* Outline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Outline.h; path = ../../cocoalib/Outline.h; sourceTree = SOURCE_ROOT; };
-		CE515DE50FC6C12E00EC695D /* Outline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Outline.m; path = ../../cocoalib/Outline.m; sourceTree = SOURCE_ROOT; };
 		CE515DE60FC6C12E00EC695D /* ProgressController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressController.h; path = ../../cocoalib/ProgressController.h; sourceTree = SOURCE_ROOT; };
 		CE515DE70FC6C12E00EC695D /* ProgressController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProgressController.m; path = ../../cocoalib/ProgressController.m; sourceTree = SOURCE_ROOT; };
 		CE515DE80FC6C12E00EC695D /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = ../../cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
@@ -125,9 +165,10 @@
 		CE848A1809DD85810004CB44 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Consts.h; sourceTree = "<group>"; };
 		CE900AD1109B238600754048 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Preferences.xib; sourceTree = "<group>"; };
 		CE900AD6109B2A9B00754048 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = ../../base/xib/MainMenu.xib; sourceTree = "<group>"; };
-		CECA899A09DB132E00A3D774 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DetailsPanel.h; sourceTree = "<group>"; };
-		CECA899B09DB132E00A3D774 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DetailsPanel.m; sourceTree = "<group>"; };
 		CED0A591111C9FD10020AD7D /* PyDetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDetailsPanel.h; path = ../base/PyDetailsPanel.h; sourceTree = SOURCE_ROOT; };
+		CEDF07A0112493B200EE5BC0 /* PyStatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyStatsLabel.h; path = ../base/PyStatsLabel.h; sourceTree = SOURCE_ROOT; };
+		CEDF07A1112493B200EE5BC0 /* StatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatsLabel.h; path = ../base/StatsLabel.h; sourceTree = SOURCE_ROOT; };
+		CEDF07A2112493B200EE5BC0 /* StatsLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatsLabel.m; path = ../base/StatsLabel.m; sourceTree = SOURCE_ROOT; };
 		CEEB135109C837A2004D2330 /* dupeguru.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = dupeguru.icns; sourceTree = "<group>"; };
 		CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = ../../images/folder32.png; sourceTree = SOURCE_ROOT; };
 		CEFC295309C89FF200D9F998 /* details32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = details32.png; path = ../../images/details32.png; sourceTree = SOURCE_ROOT; };
@@ -148,21 +189,19 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		080E96DDFE201D6D7F000001 /* Classes */ = {
+		080E96DDFE201D6D7F000001 /* DGME */ = {
 			isa = PBXGroup;
 			children = (
 				CE381C9509914ACE003581CE /* AppDelegate.h */,
 				CE381C9409914ACE003581CE /* AppDelegate.m */,
 				CE848A1809DD85810004CB44 /* Consts.h */,
-				CECA899A09DB132E00A3D774 /* DetailsPanel.h */,
-				CECA899B09DB132E00A3D774 /* DetailsPanel.m */,
 				CE68EE6509ABC48000971085 /* DirectoryPanel.h */,
 				CE68EE6609ABC48000971085 /* DirectoryPanel.m */,
 				CEFF18A009A4D387005E6321 /* PyDupeGuru.h */,
 				CE381C9B09914ADF003581CE /* ResultWindow.h */,
 				CE381C9A09914ADF003581CE /* ResultWindow.m */,
 			);
-			name = Classes;
+			name = DGME;
 			sourceTree = "<group>";
 		};
 		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
@@ -195,7 +234,7 @@
 		29B97314FDCFA39411CA2CEA /* dupeguru */ = {
 			isa = PBXGroup;
 			children = (
-				080E96DDFE201D6D7F000001 /* Classes */,
+				080E96DDFE201D6D7F000001 /* DGME */,
 				CE515E140FC6C17900EC695D /* dgbase */,
 				CE515DDD0FC6C09400EC695D /* cocoalib */,
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
@@ -237,6 +276,47 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		CE003CB211242D00004B0AA7 /* controllers */ = {
+			isa = PBXGroup;
+			children = (
+				CE003CB311242D00004B0AA7 /* HSGUIController.h */,
+				CE003CB411242D00004B0AA7 /* HSGUIController.m */,
+				CE003CB511242D00004B0AA7 /* HSOutline.h */,
+				CE003CB611242D00004B0AA7 /* HSOutline.m */,
+				CE0A0BFE1175A1C000DCA3C6 /* HSTable.h */,
+				CE0A0BFF1175A1C000DCA3C6 /* HSTable.m */,
+				CE003CB711242D00004B0AA7 /* HSWindowController.h */,
+				CE003CB811242D00004B0AA7 /* HSWindowController.m */,
+			);
+			name = controllers;
+			path = ../../cocoalib/controllers;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE003CBB11242D00004B0AA7 /* proxies */ = {
+			isa = PBXGroup;
+			children = (
+				CE003CBC11242D00004B0AA7 /* PyGUI.h */,
+				CE003CBD11242D00004B0AA7 /* PyOutline.h */,
+				CE0A0C131175A28100DCA3C6 /* PyTable.h */,
+			);
+			name = proxies;
+			path = ../../cocoalib/proxies;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE003CBF11242D00004B0AA7 /* views */ = {
+			isa = PBXGroup;
+			children = (
+				CE003CC011242D00004B0AA7 /* HSOutlineView.h */,
+				CE003CC111242D00004B0AA7 /* HSOutlineView.m */,
+				CE003CC211242D00004B0AA7 /* NSIndexPathAdditions.h */,
+				CE003CC311242D00004B0AA7 /* NSIndexPathAdditions.m */,
+				CE003CC411242D00004B0AA7 /* NSTableViewAdditions.h */,
+				CE003CC511242D00004B0AA7 /* NSTableViewAdditions.m */,
+			);
+			name = views;
+			path = ../../cocoalib/views;
+			sourceTree = SOURCE_ROOT;
+		};
 		CE3FBDD01094637800B72D77 /* xib */ = {
 			isa = PBXGroup;
 			children = (
@@ -244,6 +324,7 @@
 				CE3FBDD11094637800B72D77 /* DetailsPanel.xib */,
 				CE3FBDD21094637800B72D77 /* DirectoryPanel.xib */,
 				CE900AD1109B238600754048 /* Preferences.xib */,
+				CE0A0C051175A24800DCA3C6 /* ProblemDialog.xib */,
 			);
 			path = xib;
 			sourceTree = "<group>";
@@ -272,17 +353,21 @@
 		CE515DDD0FC6C09400EC695D /* cocoalib */ = {
 			isa = PBXGroup;
 			children = (
+				CE003CB211242D00004B0AA7 /* controllers */,
+				CE003CBB11242D00004B0AA7 /* proxies */,
+				CE003CBF11242D00004B0AA7 /* views */,
 				CE4B59C41119919700C06C9E /* xib */,
 				CE49DEF10FDFEB810098617B /* brsinglelineformatter */,
 				CE515DE00FC6C12E00EC695D /* Dialogs.h */,
 				CE515DE10FC6C12E00EC695D /* Dialogs.m */,
 				CE515DE20FC6C12E00EC695D /* HSErrorReportWindow.h */,
 				CE515DE30FC6C12E00EC695D /* HSErrorReportWindow.m */,
-				CE515DE40FC6C12E00EC695D /* Outline.h */,
-				CE515DE50FC6C12E00EC695D /* Outline.m */,
+				CE003CB911242D00004B0AA7 /* NSEventAdditions.h */,
+				CE003CBA11242D00004B0AA7 /* NSEventAdditions.m */,
 				CE515DE60FC6C12E00EC695D /* ProgressController.h */,
 				CE515DE70FC6C12E00EC695D /* ProgressController.m */,
 				CE515DE80FC6C12E00EC695D /* PyApp.h */,
+				CE003CBE11242D00004B0AA7 /* PyRegistrable.h */,
 				CE515DE90FC6C12E00EC695D /* RecentDirectories.h */,
 				CE515DEA0FC6C12E00EC695D /* RecentDirectories.m */,
 				CE515DEB0FC6C12E00EC695D /* RegistrationInterface.h */,
@@ -298,6 +383,9 @@
 		CE515E140FC6C17900EC695D /* dgbase */ = {
 			isa = PBXGroup;
 			children = (
+				CE003CCD11242D2C004B0AA7 /* DirectoryOutline.h */,
+				CE003CCE11242D2C004B0AA7 /* DirectoryOutline.m */,
+				CE003CCF11242D2C004B0AA7 /* PyDirectoryOutline.h */,
 				CE515E150FC6C19300EC695D /* AppDelegate.h */,
 				CE515E160FC6C19300EC695D /* AppDelegate.m */,
 				CE515E170FC6C19300EC695D /* Consts.h */,
@@ -305,10 +393,19 @@
 				CE6032BF0FE6784C007E33FF /* DetailsPanel.m */,
 				CE515E180FC6C19300EC695D /* DirectoryPanel.h */,
 				CE515E190FC6C19300EC695D /* DirectoryPanel.m */,
-				CE515E1A0FC6C19300EC695D /* PyDupeGuru.h */,
-				CED0A591111C9FD10020AD7D /* PyDetailsPanel.h */,
+				CE0A0C011175A1DE00DCA3C6 /* ProblemDialog.h */,
+				CE0A0C021175A1DE00DCA3C6 /* ProblemDialog.m */,
 				CE515E1B0FC6C19300EC695D /* ResultWindow.h */,
 				CE515E1C0FC6C19300EC695D /* ResultWindow.m */,
+				CE0B3D6511243F83009A7A30 /* ResultOutline.h */,
+				CE0B3D6611243F83009A7A30 /* ResultOutline.m */,
+				CEDF07A1112493B200EE5BC0 /* StatsLabel.h */,
+				CEDF07A2112493B200EE5BC0 /* StatsLabel.m */,
+				CE515E1A0FC6C19300EC695D /* PyDupeGuru.h */,
+				CED0A591111C9FD10020AD7D /* PyDetailsPanel.h */,
+				CE0A0C031175A1DE00DCA3C6 /* PyProblemDialog.h */,
+				CE0B3D6411243F83009A7A30 /* PyResultTree.h */,
+				CEDF07A0112493B200EE5BC0 /* PyStatsLabel.h */,
 			);
 			name = dgbase;
 			sourceTree = "<group>";
@@ -382,6 +479,7 @@
 				CE4B59C81119919700C06C9E /* ErrorReportWindow.xib in Resources */,
 				CE4B59C91119919700C06C9E /* progress.xib in Resources */,
 				CE4B59CA1119919700C06C9E /* registration.xib in Resources */,
+				CE0A0C061175A24800DCA3C6 /* ProblemDialog.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -398,7 +496,6 @@
 				CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */,
 				CE515DF30FC6C12E00EC695D /* Dialogs.m in Sources */,
 				CE515DF40FC6C12E00EC695D /* HSErrorReportWindow.m in Sources */,
-				CE515DF50FC6C12E00EC695D /* Outline.m in Sources */,
 				CE515DF60FC6C12E00EC695D /* ProgressController.m in Sources */,
 				CE515DF70FC6C12E00EC695D /* RecentDirectories.m in Sources */,
 				CE515DF80FC6C12E00EC695D /* RegistrationInterface.m in Sources */,
@@ -409,6 +506,18 @@
 				CE515E1F0FC6C19300EC695D /* ResultWindow.m in Sources */,
 				CE49DEF60FDFEB810098617B /* BRSingleLineFormatter.m in Sources */,
 				CE6032C00FE6784C007E33FF /* DetailsPanel.m in Sources */,
+				CE003CC611242D00004B0AA7 /* HSGUIController.m in Sources */,
+				CE003CC711242D00004B0AA7 /* HSOutline.m in Sources */,
+				CE003CC811242D00004B0AA7 /* HSWindowController.m in Sources */,
+				CE003CC911242D00004B0AA7 /* NSEventAdditions.m in Sources */,
+				CE003CCA11242D00004B0AA7 /* HSOutlineView.m in Sources */,
+				CE003CCB11242D00004B0AA7 /* NSIndexPathAdditions.m in Sources */,
+				CE003CCC11242D00004B0AA7 /* NSTableViewAdditions.m in Sources */,
+				CE003CD011242D2C004B0AA7 /* DirectoryOutline.m in Sources */,
+				CE0B3D6711243F83009A7A30 /* ResultOutline.m in Sources */,
+				CEDF07A3112493B200EE5BC0 /* StatsLabel.m in Sources */,
+				CE0A0C001175A1C000DCA3C6 /* HSTable.m in Sources */,
+				CE0A0C041175A1DE00DCA3C6 /* ProblemDialog.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

cocoa/pe/DirectoryPanel.m

@@ -44,9 +44,8 @@ static NSString* jobAddIPhoto = @"jobAddIPhoto";
 
 - (void)jobCompleted:(NSNotification *)aNotification
 {
-    if ([[ProgressController mainProgressController] jobId] == jobAddIPhoto)
-    {
-        [directories reloadData];
+    if ([[ProgressController mainProgressController] jobId] == jobAddIPhoto) {
+        [outlineView reloadData];
     }
 }
 @end

cocoa/pe/Info.plist

@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>1.8.2</string>
+	<string>1.9.0</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

cocoa/pe/ResultWindow.h

@@ -7,7 +7,6 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "Outline.h"
 #import "../base/ResultWindow.h"
 
 @interface ResultWindow : ResultWindowBase {}

cocoa/pe/ResultWindow.m

@@ -20,9 +20,10 @@ http://www.hardcoded.net/licenses/hs_license
 {
     [super awakeFromNib];
     [[self window] setTitle:@"dupeGuru Picture Edition"];
-    _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,5)] retain];
-    [_deltaColumns removeIndex:3];
-    [_deltaColumns removeIndex:4];
+    NSMutableIndexSet *deltaColumns = [NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,5)];
+    [deltaColumns removeIndex:3];
+    [deltaColumns removeIndex:4];
+    [outline setDeltaColumns:deltaColumns];
 }
 
 /* Actions */
@@ -63,8 +64,6 @@ http://www.hardcoded.net/licenses/hs_license
     [_py setMixFileKind:[ud objectForKey:@"mixFileKind"]];
     [_py setMatchScaled:[ud objectForKey:@"matchScaled"]];
     int r = n2i([py doScan]);
-    [matches reloadData];
-    [self refreshStats];
     if (r != 0)
         [[ProgressController mainProgressController] hide];
     if (r == 1)

cocoa/pe/dg_cocoa.py

@@ -7,8 +7,10 @@
 from core.app_cocoa_inter import PyDupeGuruBase, PyDetailsPanel
 from core_pe import app_cocoa as app_pe_cocoa
 
-# Fix py2app imports which chokes on relative imports
+# Fix py2app imports which chokes on relative imports and other stuff
 from core_pe import block, cache, matchbase, data, _block_osx
+from lxml import etree, _elementpath
+import gzip
 
 class PyDupeGuru(PyDupeGuruBase):
     def init(self):

cocoa/pe/dupeguru.xcodeproj/project.pbxproj

@@ -12,6 +12,9 @@
 		CE031751109B340A00517EE6 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE031750109B340A00517EE6 /* Preferences.xib */; };
 		CE031754109B345200517EE6 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE031753109B345200517EE6 /* MainMenu.xib */; };
 		CE073F6309CAE1A3005C1D2F /* dupeguru_pe_help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */; };
+		CE0C2AB61177011000BC749F /* HSTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0C2AB51177011000BC749F /* HSTable.m */; };
+		CE0C2ABD1177014200BC749F /* ProblemDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0C2ABB1177014200BC749F /* ProblemDialog.m */; };
+		CE0C2AC81177021600BC749F /* ProblemDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0C2AC71177021600BC749F /* ProblemDialog.xib */; };
 		CE15C8A80ADEB8B50061D4A5 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */; };
 		CE15C8C00ADEB8D40061D4A5 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */; };
 		CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; };
@@ -27,7 +30,6 @@
 		CE7AC91A1119911200D02F6C /* registration.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE7AC9171119911200D02F6C /* registration.xib */; };
 		CE80DB2E0FC192D60086DCA6 /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB1C0FC192D60086DCA6 /* Dialogs.m */; };
 		CE80DB2F0FC192D60086DCA6 /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB1E0FC192D60086DCA6 /* HSErrorReportWindow.m */; };
-		CE80DB300FC192D60086DCA6 /* Outline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB200FC192D60086DCA6 /* Outline.m */; };
 		CE80DB310FC192D60086DCA6 /* ProgressController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB220FC192D60086DCA6 /* ProgressController.m */; };
 		CE80DB320FC192D60086DCA6 /* RecentDirectories.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB250FC192D60086DCA6 /* RecentDirectories.m */; };
 		CE80DB330FC192D60086DCA6 /* RegistrationInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB270FC192D60086DCA6 /* RegistrationInterface.m */; };
@@ -39,6 +41,16 @@
 		CE80DB8B0FC1951C0086DCA6 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB860FC1951C0086DCA6 /* DirectoryPanel.m */; };
 		CE80DB8C0FC1951C0086DCA6 /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB890FC1951C0086DCA6 /* ResultWindow.m */; };
 		CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE848A1809DD85810004CB44 /* Consts.h */; };
+		CE95865E112C516400F95FD2 /* ResultOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE95865B112C516400F95FD2 /* ResultOutline.m */; };
+		CE95865F112C516400F95FD2 /* StatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE95865D112C516400F95FD2 /* StatsLabel.m */; };
+		CE9EA7561122C96C008CD2BC /* HSGUIController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7441122C96C008CD2BC /* HSGUIController.m */; };
+		CE9EA7571122C96C008CD2BC /* HSOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7461122C96C008CD2BC /* HSOutline.m */; };
+		CE9EA7581122C96C008CD2BC /* HSWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7481122C96C008CD2BC /* HSWindowController.m */; };
+		CE9EA7591122C96C008CD2BC /* NSEventAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA74A1122C96C008CD2BC /* NSEventAdditions.m */; };
+		CE9EA75A1122C96C008CD2BC /* HSOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7511122C96C008CD2BC /* HSOutlineView.m */; };
+		CE9EA75B1122C96C008CD2BC /* NSIndexPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7531122C96C008CD2BC /* NSIndexPathAdditions.m */; };
+		CE9EA75C1122C96C008CD2BC /* NSTableViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7551122C96C008CD2BC /* NSTableViewAdditions.m */; };
+		CE9EA7721122CA0B008CD2BC /* DirectoryOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7701122CA0B008CD2BC /* DirectoryOutline.m */; };
 		CEBAE4270FDA97E000B7887D /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBAE4240FDA97E000B7887D /* BRSingleLineFormatter.m */; };
 		CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CECA899A09DB132E00A3D774 /* DetailsPanel.h */; };
 		CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CECA899B09DB132E00A3D774 /* DetailsPanel.m */; };
@@ -75,6 +87,13 @@
 		CE031750109B340A00517EE6 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Preferences.xib; sourceTree = "<group>"; };
 		CE031753109B345200517EE6 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = ../../base/xib/MainMenu.xib; sourceTree = "<group>"; };
 		CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_pe_help; path = ../../help_pe/dupeguru_pe_help; sourceTree = SOURCE_ROOT; };
+		CE0C2AAA117700E700BC749F /* PyTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyTable.h; sourceTree = "<group>"; };
+		CE0C2AB41177011000BC749F /* HSTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSTable.h; sourceTree = "<group>"; };
+		CE0C2AB51177011000BC749F /* HSTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSTable.m; sourceTree = "<group>"; };
+		CE0C2ABA1177014200BC749F /* ProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProblemDialog.h; path = ../base/ProblemDialog.h; sourceTree = SOURCE_ROOT; };
+		CE0C2ABB1177014200BC749F /* ProblemDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProblemDialog.m; path = ../base/ProblemDialog.m; sourceTree = SOURCE_ROOT; };
+		CE0C2ABC1177014200BC749F /* PyProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyProblemDialog.h; path = ../base/PyProblemDialog.h; sourceTree = SOURCE_ROOT; };
+		CE0C2AC71177021600BC749F /* ProblemDialog.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ProblemDialog.xib; path = ../base/xib/ProblemDialog.xib; sourceTree = SOURCE_ROOT; };
 		CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
 		CE18126F111C9D5100E49FCE /* PyDetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDetailsPanel.h; path = ../base/PyDetailsPanel.h; sourceTree = SOURCE_ROOT; };
 		CE381C9409914ACE003581CE /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = SOURCE_ROOT; };
@@ -96,8 +115,6 @@
 		CE80DB1C0FC192D60086DCA6 /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = ../../cocoalib/Dialogs.m; sourceTree = SOURCE_ROOT; };
 		CE80DB1D0FC192D60086DCA6 /* HSErrorReportWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSErrorReportWindow.h; path = ../../cocoalib/HSErrorReportWindow.h; sourceTree = SOURCE_ROOT; };
 		CE80DB1E0FC192D60086DCA6 /* HSErrorReportWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSErrorReportWindow.m; path = ../../cocoalib/HSErrorReportWindow.m; sourceTree = SOURCE_ROOT; };
-		CE80DB1F0FC192D60086DCA6 /* Outline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Outline.h; path = ../../cocoalib/Outline.h; sourceTree = SOURCE_ROOT; };
-		CE80DB200FC192D60086DCA6 /* Outline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Outline.m; path = ../../cocoalib/Outline.m; sourceTree = SOURCE_ROOT; };
 		CE80DB210FC192D60086DCA6 /* ProgressController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressController.h; path = ../../cocoalib/ProgressController.h; sourceTree = SOURCE_ROOT; };
 		CE80DB220FC192D60086DCA6 /* ProgressController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProgressController.m; path = ../../cocoalib/ProgressController.m; sourceTree = SOURCE_ROOT; };
 		CE80DB230FC192D60086DCA6 /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = ../../cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
@@ -122,6 +139,32 @@
 		CE80DB880FC1951C0086DCA6 /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultWindow.h; path = ../base/ResultWindow.h; sourceTree = SOURCE_ROOT; };
 		CE80DB890FC1951C0086DCA6 /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultWindow.m; path = ../base/ResultWindow.m; sourceTree = SOURCE_ROOT; };
 		CE848A1809DD85810004CB44 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Consts.h; sourceTree = "<group>"; };
+		CE958658112C516400F95FD2 /* PyResultTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyResultTree.h; path = ../base/PyResultTree.h; sourceTree = SOURCE_ROOT; };
+		CE958659112C516400F95FD2 /* PyStatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyStatsLabel.h; path = ../base/PyStatsLabel.h; sourceTree = SOURCE_ROOT; };
+		CE95865A112C516400F95FD2 /* ResultOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultOutline.h; path = ../base/ResultOutline.h; sourceTree = SOURCE_ROOT; };
+		CE95865B112C516400F95FD2 /* ResultOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultOutline.m; path = ../base/ResultOutline.m; sourceTree = SOURCE_ROOT; };
+		CE95865C112C516400F95FD2 /* StatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatsLabel.h; path = ../base/StatsLabel.h; sourceTree = SOURCE_ROOT; };
+		CE95865D112C516400F95FD2 /* StatsLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatsLabel.m; path = ../base/StatsLabel.m; sourceTree = SOURCE_ROOT; };
+		CE9EA7431122C96C008CD2BC /* HSGUIController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSGUIController.h; sourceTree = "<group>"; };
+		CE9EA7441122C96C008CD2BC /* HSGUIController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSGUIController.m; sourceTree = "<group>"; };
+		CE9EA7451122C96C008CD2BC /* HSOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutline.h; sourceTree = "<group>"; };
+		CE9EA7461122C96C008CD2BC /* HSOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutline.m; sourceTree = "<group>"; };
+		CE9EA7471122C96C008CD2BC /* HSWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSWindowController.h; sourceTree = "<group>"; };
+		CE9EA7481122C96C008CD2BC /* HSWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSWindowController.m; sourceTree = "<group>"; };
+		CE9EA7491122C96C008CD2BC /* NSEventAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSEventAdditions.h; path = ../../cocoalib/NSEventAdditions.h; sourceTree = SOURCE_ROOT; };
+		CE9EA74A1122C96C008CD2BC /* NSEventAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSEventAdditions.m; path = ../../cocoalib/NSEventAdditions.m; sourceTree = SOURCE_ROOT; };
+		CE9EA74C1122C96C008CD2BC /* PyGUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyGUI.h; sourceTree = "<group>"; };
+		CE9EA74D1122C96C008CD2BC /* PyOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyOutline.h; sourceTree = "<group>"; };
+		CE9EA74E1122C96C008CD2BC /* PyRegistrable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyRegistrable.h; path = ../../cocoalib/PyRegistrable.h; sourceTree = SOURCE_ROOT; };
+		CE9EA7501122C96C008CD2BC /* HSOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutlineView.h; sourceTree = "<group>"; };
+		CE9EA7511122C96C008CD2BC /* HSOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutlineView.m; sourceTree = "<group>"; };
+		CE9EA7521122C96C008CD2BC /* NSIndexPathAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSIndexPathAdditions.h; sourceTree = "<group>"; };
+		CE9EA7531122C96C008CD2BC /* NSIndexPathAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSIndexPathAdditions.m; sourceTree = "<group>"; };
+		CE9EA7541122C96C008CD2BC /* NSTableViewAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSTableViewAdditions.h; sourceTree = "<group>"; };
+		CE9EA7551122C96C008CD2BC /* NSTableViewAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSTableViewAdditions.m; sourceTree = "<group>"; };
+		CE9EA76F1122CA0B008CD2BC /* DirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryOutline.h; path = ../base/DirectoryOutline.h; sourceTree = SOURCE_ROOT; };
+		CE9EA7701122CA0B008CD2BC /* DirectoryOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryOutline.m; path = ../base/DirectoryOutline.m; sourceTree = SOURCE_ROOT; };
+		CE9EA7711122CA0B008CD2BC /* PyDirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDirectoryOutline.h; path = ../base/PyDirectoryOutline.h; sourceTree = SOURCE_ROOT; };
 		CEBAE4230FDA97E000B7887D /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
 		CEBAE4240FDA97E000B7887D /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
 		CECA899A09DB132E00A3D774 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DetailsPanel.h; sourceTree = "<group>"; };
@@ -147,7 +190,7 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		080E96DDFE201D6D7F000001 /* Classes */ = {
+		080E96DDFE201D6D7F000001 /* DGPE */ = {
 			isa = PBXGroup;
 			children = (
 				CE381C9509914ACE003581CE /* AppDelegate.h */,
@@ -161,7 +204,7 @@
 				CE381C9B09914ADF003581CE /* ResultWindow.h */,
 				CE381C9A09914ADF003581CE /* ResultWindow.m */,
 			);
-			name = Classes;
+			name = DGPE;
 			sourceTree = "<group>";
 		};
 		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
@@ -194,7 +237,7 @@
 		29B97314FDCFA39411CA2CEA /* dupeguru */ = {
 			isa = PBXGroup;
 			children = (
-				080E96DDFE201D6D7F000001 /* Classes */,
+				080E96DDFE201D6D7F000001 /* DGPE */,
 				CE80DB1A0FC192AB0086DCA6 /* cocoalib */,
 				CE80DB810FC194BD0086DCA6 /* dgbase */,
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
@@ -243,6 +286,7 @@
 				CE77C8A710946CE20078B0DB /* DetailsPanel.xib */,
 				CE77C89C10946C6D0078B0DB /* DirectoryPanel.xib */,
 				CE031750109B340A00517EE6 /* Preferences.xib */,
+				CE0C2AC71177021600BC749F /* ProblemDialog.xib */,
 			);
 			path = xib;
 			sourceTree = "<group>";
@@ -261,21 +305,25 @@
 		CE80DB1A0FC192AB0086DCA6 /* cocoalib */ = {
 			isa = PBXGroup;
 			children = (
+				CE9EA7421122C96C008CD2BC /* controllers */,
+				CE9EA74B1122C96C008CD2BC /* proxies */,
+				CE9EA74F1122C96C008CD2BC /* views */,
 				CE7AC9141119911200D02F6C /* xib */,
 				CEBAE4220FDA97E000B7887D /* brsinglelineformatter */,
 				CE80DB480FC193770086DCA6 /* NSImageAdditions.h */,
 				CE80DB490FC193770086DCA6 /* NSImageAdditions.m */,
 				CE80DB450FC193650086DCA6 /* NSNotificationAdditions.h */,
 				CE80DB460FC193650086DCA6 /* NSNotificationAdditions.m */,
+				CE9EA7491122C96C008CD2BC /* NSEventAdditions.h */,
+				CE9EA74A1122C96C008CD2BC /* NSEventAdditions.m */,
 				CE80DB1B0FC192D60086DCA6 /* Dialogs.h */,
 				CE80DB1C0FC192D60086DCA6 /* Dialogs.m */,
 				CE80DB1D0FC192D60086DCA6 /* HSErrorReportWindow.h */,
 				CE80DB1E0FC192D60086DCA6 /* HSErrorReportWindow.m */,
-				CE80DB1F0FC192D60086DCA6 /* Outline.h */,
-				CE80DB200FC192D60086DCA6 /* Outline.m */,
 				CE80DB210FC192D60086DCA6 /* ProgressController.h */,
 				CE80DB220FC192D60086DCA6 /* ProgressController.m */,
 				CE80DB230FC192D60086DCA6 /* PyApp.h */,
+				CE9EA74E1122C96C008CD2BC /* PyRegistrable.h */,
 				CE80DB240FC192D60086DCA6 /* RecentDirectories.h */,
 				CE80DB250FC192D60086DCA6 /* RecentDirectories.m */,
 				CE80DB260FC192D60086DCA6 /* RegistrationInterface.h */,
@@ -298,14 +346,67 @@
 				CE6044EB0FE6796200B71262 /* DetailsPanel.m */,
 				CE80DB850FC1951C0086DCA6 /* DirectoryPanel.h */,
 				CE80DB860FC1951C0086DCA6 /* DirectoryPanel.m */,
-				CE80DB870FC1951C0086DCA6 /* PyDupeGuru.h */,
-				CE18126F111C9D5100E49FCE /* PyDetailsPanel.h */,
+				CE9EA76F1122CA0B008CD2BC /* DirectoryOutline.h */,
+				CE9EA7701122CA0B008CD2BC /* DirectoryOutline.m */,
+				CE0C2ABA1177014200BC749F /* ProblemDialog.h */,
+				CE0C2ABB1177014200BC749F /* ProblemDialog.m */,
 				CE80DB880FC1951C0086DCA6 /* ResultWindow.h */,
 				CE80DB890FC1951C0086DCA6 /* ResultWindow.m */,
+				CE958658112C516400F95FD2 /* PyResultTree.h */,
+				CE95865A112C516400F95FD2 /* ResultOutline.h */,
+				CE95865B112C516400F95FD2 /* ResultOutline.m */,
+				CE95865C112C516400F95FD2 /* StatsLabel.h */,
+				CE95865D112C516400F95FD2 /* StatsLabel.m */,
+				CE80DB870FC1951C0086DCA6 /* PyDupeGuru.h */,
+				CE18126F111C9D5100E49FCE /* PyDetailsPanel.h */,
+				CE9EA7711122CA0B008CD2BC /* PyDirectoryOutline.h */,
+				CE0C2ABC1177014200BC749F /* PyProblemDialog.h */,
+				CE958659112C516400F95FD2 /* PyStatsLabel.h */,
 			);
 			name = dgbase;
 			sourceTree = "<group>";
 		};
+		CE9EA7421122C96C008CD2BC /* controllers */ = {
+			isa = PBXGroup;
+			children = (
+				CE9EA7431122C96C008CD2BC /* HSGUIController.h */,
+				CE9EA7441122C96C008CD2BC /* HSGUIController.m */,
+				CE9EA7451122C96C008CD2BC /* HSOutline.h */,
+				CE9EA7461122C96C008CD2BC /* HSOutline.m */,
+				CE0C2AB41177011000BC749F /* HSTable.h */,
+				CE0C2AB51177011000BC749F /* HSTable.m */,
+				CE9EA7471122C96C008CD2BC /* HSWindowController.h */,
+				CE9EA7481122C96C008CD2BC /* HSWindowController.m */,
+			);
+			name = controllers;
+			path = ../../cocoalib/controllers;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE9EA74B1122C96C008CD2BC /* proxies */ = {
+			isa = PBXGroup;
+			children = (
+				CE9EA74C1122C96C008CD2BC /* PyGUI.h */,
+				CE9EA74D1122C96C008CD2BC /* PyOutline.h */,
+				CE0C2AAA117700E700BC749F /* PyTable.h */,
+			);
+			name = proxies;
+			path = ../../cocoalib/proxies;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE9EA74F1122C96C008CD2BC /* views */ = {
+			isa = PBXGroup;
+			children = (
+				CE9EA7501122C96C008CD2BC /* HSOutlineView.h */,
+				CE9EA7511122C96C008CD2BC /* HSOutlineView.m */,
+				CE9EA7521122C96C008CD2BC /* NSIndexPathAdditions.h */,
+				CE9EA7531122C96C008CD2BC /* NSIndexPathAdditions.m */,
+				CE9EA7541122C96C008CD2BC /* NSTableViewAdditions.h */,
+				CE9EA7551122C96C008CD2BC /* NSTableViewAdditions.m */,
+			);
+			name = views;
+			path = ../../cocoalib/views;
+			sourceTree = SOURCE_ROOT;
+		};
 		CEBAE4220FDA97E000B7887D /* brsinglelineformatter */ = {
 			isa = PBXGroup;
 			children = (
@@ -386,6 +487,7 @@
 				CE7AC9181119911200D02F6C /* ErrorReportWindow.xib in Resources */,
 				CE7AC9191119911200D02F6C /* progress.xib in Resources */,
 				CE7AC91A1119911200D02F6C /* registration.xib in Resources */,
+				CE0C2AC81177021600BC749F /* ProblemDialog.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -403,7 +505,6 @@
 				CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */,
 				CE80DB2E0FC192D60086DCA6 /* Dialogs.m in Sources */,
 				CE80DB2F0FC192D60086DCA6 /* HSErrorReportWindow.m in Sources */,
-				CE80DB300FC192D60086DCA6 /* Outline.m in Sources */,
 				CE80DB310FC192D60086DCA6 /* ProgressController.m in Sources */,
 				CE80DB320FC192D60086DCA6 /* RecentDirectories.m in Sources */,
 				CE80DB330FC192D60086DCA6 /* RegistrationInterface.m in Sources */,
@@ -416,6 +517,18 @@
 				CE80DB8C0FC1951C0086DCA6 /* ResultWindow.m in Sources */,
 				CEBAE4270FDA97E000B7887D /* BRSingleLineFormatter.m in Sources */,
 				CE6044EC0FE6796200B71262 /* DetailsPanel.m in Sources */,
+				CE9EA7561122C96C008CD2BC /* HSGUIController.m in Sources */,
+				CE9EA7571122C96C008CD2BC /* HSOutline.m in Sources */,
+				CE9EA7581122C96C008CD2BC /* HSWindowController.m in Sources */,
+				CE9EA7591122C96C008CD2BC /* NSEventAdditions.m in Sources */,
+				CE9EA75A1122C96C008CD2BC /* HSOutlineView.m in Sources */,
+				CE9EA75B1122C96C008CD2BC /* NSIndexPathAdditions.m in Sources */,
+				CE9EA75C1122C96C008CD2BC /* NSTableViewAdditions.m in Sources */,
+				CE9EA7721122CA0B008CD2BC /* DirectoryOutline.m in Sources */,
+				CE95865E112C516400F95FD2 /* ResultOutline.m in Sources */,
+				CE95865F112C516400F95FD2 /* StatsLabel.m in Sources */,
+				CE0C2AB61177011000BC749F /* HSTable.m in Sources */,
+				CE0C2ABD1177014200BC749F /* ProblemDialog.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

cocoa/se/Info.plist

@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>2.9.2</string>
+	<string>2.10.1</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

cocoa/se/ResultWindow.h

@@ -7,7 +7,6 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "../../cocoalib/Outline.h"
 #import "../base/ResultWindow.h"
 #import "DirectoryPanel.h"
 

cocoa/se/ResultWindow.m

@@ -18,8 +18,9 @@ http://www.hardcoded.net/licenses/hs_license
 - (void)awakeFromNib
 {
     [super awakeFromNib];
-    _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,4)] retain];
-    [_deltaColumns removeIndex:3];
+    NSMutableIndexSet *deltaColumns = [NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,4)];
+    [deltaColumns removeIndex:3];
+    [outline setDeltaColumns:deltaColumns];
 }
 
 /* Actions */
@@ -56,8 +57,6 @@ http://www.hardcoded.net/licenses/hs_license
     int sizeThreshold = [ud boolForKey:@"ignoreSmallFiles"] ? smallFileThreshold * 1024 : 0; // The py side wants bytes
     [_py setSizeThreshold:sizeThreshold];
     int r = n2i([py doScan]);
-    [matches reloadData];
-    [self refreshStats];
     if (r != 0)
         [[ProgressController mainProgressController] hide];
     if (r == 1)

cocoa/se/dg_cocoa.py

@@ -4,14 +4,16 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-from hsutil.cocoa import signature
+from hscommon.cocoa import signature
 
 from core import scanner
 from core.app_cocoa_inter import PyDupeGuruBase, PyDetailsPanel
 from core_se.app_cocoa import DupeGuru
 
-# Fix py2app imports with chokes on relative imports
+# Fix py2app imports with chokes on relative imports and other stuff
 from core_se import fs, data
+from lxml import etree, _elementpath
+import gzip
 
 class PyDupeGuru(PyDupeGuruBase):
     def init(self):

cocoa/se/dupeguru.xcodeproj/project.pbxproj

@@ -19,6 +19,8 @@
 		CE3A46FA109B212E002ABFD5 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE3A46F9109B212E002ABFD5 /* MainMenu.xib */; };
 		CE45579B0AE3BC2B005A9546 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE45579A0AE3BC2B005A9546 /* Sparkle.framework */; };
 		CE4557B40AE3BC50005A9546 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE45579A0AE3BC2B005A9546 /* Sparkle.framework */; };
+		CE647E571173024A006D28BA /* ProblemDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE647E551173024A006D28BA /* ProblemDialog.m */; };
+		CE647E591173026F006D28BA /* ProblemDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE647E581173026F006D28BA /* ProblemDialog.xib */; };
 		CE6E0DFE1054E9EF008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */; };
 		CE76FDC4111EE37C006618EA /* HSOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDBF111EE37C006618EA /* HSOutlineView.m */; };
 		CE76FDC5111EE37C006618EA /* NSIndexPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDC1111EE37C006618EA /* NSIndexPathAdditions.m */; };
@@ -27,6 +29,9 @@
 		CE76FDD4111EE3A7006618EA /* DirectoryOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDD2111EE3A7006618EA /* DirectoryOutline.m */; };
 		CE76FDDF111EE42F006618EA /* HSOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDDE111EE42F006618EA /* HSOutline.m */; };
 		CE76FDF7111EE561006618EA /* NSEventAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDF6111EE561006618EA /* NSEventAdditions.m */; };
+		CE8C53BC117324CE0011B41F /* HSTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE8C53BB117324CE0011B41F /* HSTable.m */; };
+		CE91F215113BC22D0010360B /* ResultOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE91F212113BC22D0010360B /* ResultOutline.m */; };
+		CE91F216113BC22D0010360B /* StatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE91F214113BC22D0010360B /* StatsLabel.m */; };
 		CEAC6811109B0B7E00B43C85 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEAC6810109B0B7E00B43C85 /* Preferences.xib */; };
 		CEBE4D74111F0EE1009AAC6D /* HSWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBE4D73111F0EE1009AAC6D /* HSWindowController.m */; };
 		CEDD92DA0FDD01640031C7B7 /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */; };
@@ -39,7 +44,6 @@
 		CEFC295609C89FF200D9F998 /* preferences32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295409C89FF200D9F998 /* preferences32.png */; };
 		CEFC7F9E0FC9517500CD5728 /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F8B0FC9517500CD5728 /* Dialogs.m */; };
 		CEFC7F9F0FC9517500CD5728 /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F8D0FC9517500CD5728 /* HSErrorReportWindow.m */; };
-		CEFC7FA00FC9517500CD5728 /* Outline.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F8F0FC9517500CD5728 /* Outline.m */; };
 		CEFC7FA10FC9517500CD5728 /* ProgressController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F910FC9517500CD5728 /* ProgressController.m */; };
 		CEFC7FA20FC9517500CD5728 /* RecentDirectories.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F950FC9517500CD5728 /* RecentDirectories.m */; };
 		CEFC7FA30FC9517500CD5728 /* RegistrationInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F970FC9517500CD5728 /* RegistrationInterface.m */; };
@@ -82,6 +86,10 @@
 		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
 		CE3A46F9109B212E002ABFD5 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = ../base/xib/MainMenu.xib; sourceTree = "<group>"; };
 		CE45579A0AE3BC2B005A9546 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
+		CE647E541173024A006D28BA /* ProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProblemDialog.h; path = ../base/ProblemDialog.h; sourceTree = SOURCE_ROOT; };
+		CE647E551173024A006D28BA /* ProblemDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProblemDialog.m; path = ../base/ProblemDialog.m; sourceTree = SOURCE_ROOT; };
+		CE647E561173024A006D28BA /* PyProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyProblemDialog.h; path = ../base/PyProblemDialog.h; sourceTree = SOURCE_ROOT; };
+		CE647E581173026F006D28BA /* ProblemDialog.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ProblemDialog.xib; path = ../base/xib/ProblemDialog.xib; sourceTree = SOURCE_ROOT; };
 		CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = ../base/dsa_pub.pem; sourceTree = "<group>"; };
 		CE6E7407111C997500C350E3 /* PyDetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDetailsPanel.h; path = ../base/PyDetailsPanel.h; sourceTree = SOURCE_ROOT; };
 		CE76FDBE111EE37C006618EA /* HSOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutlineView.h; sourceTree = "<group>"; };
@@ -101,6 +109,14 @@
 		CE76FDDE111EE42F006618EA /* HSOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutline.m; sourceTree = "<group>"; };
 		CE76FDF5111EE561006618EA /* NSEventAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSEventAdditions.h; path = ../../cocoalib/NSEventAdditions.h; sourceTree = SOURCE_ROOT; };
 		CE76FDF6111EE561006618EA /* NSEventAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSEventAdditions.m; path = ../../cocoalib/NSEventAdditions.m; sourceTree = SOURCE_ROOT; };
+		CE8C53B61173248F0011B41F /* PyTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyTable.h; sourceTree = "<group>"; };
+		CE8C53BB117324CE0011B41F /* HSTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSTable.m; sourceTree = "<group>"; };
+		CE91F20F113BC22D0010360B /* PyResultTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyResultTree.h; path = ../base/PyResultTree.h; sourceTree = SOURCE_ROOT; };
+		CE91F210113BC22D0010360B /* PyStatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyStatsLabel.h; path = ../base/PyStatsLabel.h; sourceTree = SOURCE_ROOT; };
+		CE91F211113BC22D0010360B /* ResultOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultOutline.h; path = ../base/ResultOutline.h; sourceTree = SOURCE_ROOT; };
+		CE91F212113BC22D0010360B /* ResultOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultOutline.m; path = ../base/ResultOutline.m; sourceTree = SOURCE_ROOT; };
+		CE91F213113BC22D0010360B /* StatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatsLabel.h; path = ../base/StatsLabel.h; sourceTree = SOURCE_ROOT; };
+		CE91F214113BC22D0010360B /* StatsLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatsLabel.m; path = ../base/StatsLabel.m; sourceTree = SOURCE_ROOT; };
 		CEAC6810109B0B7E00B43C85 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Preferences.xib; path = xib/Preferences.xib; sourceTree = "<group>"; };
 		CEBE4D72111F0EE1009AAC6D /* HSWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSWindowController.h; sourceTree = "<group>"; };
 		CEBE4D73111F0EE1009AAC6D /* HSWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSWindowController.m; sourceTree = "<group>"; };
@@ -118,8 +134,6 @@
 		CEFC7F8B0FC9517500CD5728 /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = ../../cocoalib/Dialogs.m; sourceTree = SOURCE_ROOT; };
 		CEFC7F8C0FC9517500CD5728 /* HSErrorReportWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSErrorReportWindow.h; path = ../../cocoalib/HSErrorReportWindow.h; sourceTree = SOURCE_ROOT; };
 		CEFC7F8D0FC9517500CD5728 /* HSErrorReportWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSErrorReportWindow.m; path = ../../cocoalib/HSErrorReportWindow.m; sourceTree = SOURCE_ROOT; };
-		CEFC7F8E0FC9517500CD5728 /* Outline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Outline.h; path = ../../cocoalib/Outline.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F8F0FC9517500CD5728 /* Outline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Outline.m; path = ../../cocoalib/Outline.m; sourceTree = SOURCE_ROOT; };
 		CEFC7F900FC9517500CD5728 /* ProgressController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressController.h; path = ../../cocoalib/ProgressController.h; sourceTree = SOURCE_ROOT; };
 		CEFC7F910FC9517500CD5728 /* ProgressController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProgressController.m; path = ../../cocoalib/ProgressController.m; sourceTree = SOURCE_ROOT; };
 		CEFC7F920FC9517500CD5728 /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = ../../cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
@@ -266,6 +280,7 @@
 				CE76FDDE111EE42F006618EA /* HSOutline.m */,
 				CE76FDC8111EE38E006618EA /* HSGUIController.h */,
 				CE76FDC9111EE38E006618EA /* HSGUIController.m */,
+				CE8C53BB117324CE0011B41F /* HSTable.m */,
 			);
 			name = controllers;
 			path = ../../cocoalib/controllers;
@@ -276,6 +291,7 @@
 			children = (
 				CE76FDCD111EE38E006618EA /* PyGUI.h */,
 				CE76FDCE111EE38E006618EA /* PyOutline.h */,
+				CE8C53B61173248F0011B41F /* PyTable.h */,
 			);
 			name = proxies;
 			path = ../../cocoalib/proxies;
@@ -294,6 +310,7 @@
 		CEEFC0CA10943849001F3A39 /* xib */ = {
 			isa = PBXGroup;
 			children = (
+				CE647E581173026F006D28BA /* ProblemDialog.xib */,
 				CE3A46F9109B212E002ABFD5 /* MainMenu.xib */,
 				CEAC6810109B0B7E00B43C85 /* Preferences.xib */,
 				CEEFC0F710945D9F001F3A39 /* DirectoryPanel.xib */,
@@ -326,8 +343,6 @@
 				CEFC7F8B0FC9517500CD5728 /* Dialogs.m */,
 				CEFC7F8C0FC9517500CD5728 /* HSErrorReportWindow.h */,
 				CEFC7F8D0FC9517500CD5728 /* HSErrorReportWindow.m */,
-				CEFC7F8E0FC9517500CD5728 /* Outline.h */,
-				CEFC7F8F0FC9517500CD5728 /* Outline.m */,
 				CEFC7F900FC9517500CD5728 /* ProgressController.h */,
 				CEFC7F910FC9517500CD5728 /* ProgressController.m */,
 				CEFC7F920FC9517500CD5728 /* PyApp.h */,
@@ -347,6 +362,12 @@
 		CEFC7FB00FC9518F00CD5728 /* dgbase */ = {
 			isa = PBXGroup;
 			children = (
+				CE91F20F113BC22D0010360B /* PyResultTree.h */,
+				CE91F210113BC22D0010360B /* PyStatsLabel.h */,
+				CE91F211113BC22D0010360B /* ResultOutline.h */,
+				CE91F212113BC22D0010360B /* ResultOutline.m */,
+				CE91F213113BC22D0010360B /* StatsLabel.h */,
+				CE91F214113BC22D0010360B /* StatsLabel.m */,
 				CE76FDD1111EE3A7006618EA /* DirectoryOutline.h */,
 				CE76FDD2111EE3A7006618EA /* DirectoryOutline.m */,
 				CE76FDD3111EE3A7006618EA /* PyDirectoryOutline.h */,
@@ -361,6 +382,9 @@
 				CE6E7407111C997500C350E3 /* PyDetailsPanel.h */,
 				CEFC7FB70FC951A700CD5728 /* ResultWindow.h */,
 				CEFC7FB80FC951A700CD5728 /* ResultWindow.m */,
+				CE647E541173024A006D28BA /* ProblemDialog.h */,
+				CE647E551173024A006D28BA /* ProblemDialog.m */,
+				CE647E561173024A006D28BA /* PyProblemDialog.h */,
 			);
 			name = dgbase;
 			sourceTree = "<group>";
@@ -426,6 +450,7 @@
 				CE19BC6311199231007CCEB0 /* ErrorReportWindow.xib in Resources */,
 				CE19BC6411199231007CCEB0 /* progress.xib in Resources */,
 				CE19BC6511199231007CCEB0 /* registration.xib in Resources */,
+				CE647E591173026F006D28BA /* ProblemDialog.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -441,7 +466,6 @@
 				CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */,
 				CEFC7F9E0FC9517500CD5728 /* Dialogs.m in Sources */,
 				CEFC7F9F0FC9517500CD5728 /* HSErrorReportWindow.m in Sources */,
-				CEFC7FA00FC9517500CD5728 /* Outline.m in Sources */,
 				CEFC7FA10FC9517500CD5728 /* ProgressController.m in Sources */,
 				CEFC7FA20FC9517500CD5728 /* RecentDirectories.m in Sources */,
 				CEFC7FA30FC9517500CD5728 /* RegistrationInterface.m in Sources */,
@@ -460,6 +484,10 @@
 				CE76FDDF111EE42F006618EA /* HSOutline.m in Sources */,
 				CE76FDF7111EE561006618EA /* NSEventAdditions.m in Sources */,
 				CEBE4D74111F0EE1009AAC6D /* HSWindowController.m in Sources */,
+				CE91F215113BC22D0010360B /* ResultOutline.m in Sources */,
+				CE91F216113BC22D0010360B /* StatsLabel.m in Sources */,
+				CE647E571173024A006D28BA /* ProblemDialog.m in Sources */,
+				CE8C53BC117324CE0011B41F /* HSTable.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

core/app.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Created By: Virgil Dupras
 # Created On: 2006/11/11
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
@@ -12,12 +11,15 @@ from __future__ import unicode_literals
 import os
 import os.path as op
 import logging
+import subprocess
+import re
 
+from send2trash import send2trash
+from hscommon.reg import RegistrableApplication, RegistrationRequired
+from hscommon.notify import Broadcaster
 from hsutil import io, files
 from hsutil.path import Path
-from hsutil.reg import RegistrableApplication, RegistrationRequired
 from hsutil.misc import flatten, first
-from hsutil.notify import Broadcaster
 from hsutil.str import escape
 
 from . import directories, results, scanner, export, fs
@@ -48,7 +50,6 @@ class DupeGuru(RegistrableApplication, Broadcaster):
         self.results = results.Results(data_module)
         self.scanner = scanner.Scanner()
         self.action_count = 0
-        self.last_op_error_count = 0
         self.options = {
             'escape_filter_regexp': True,
             'clean_empty_dirs': False,
@@ -70,17 +71,13 @@ class DupeGuru(RegistrableApplication, Broadcaster):
             return self._do_delete_dupe(dupe)
         
         j.start_job(self.results.mark_count)
-        self.last_op_error_count = self.results.perform_on_marked(op, True)
+        self.results.perform_on_marked(op, True)
     
     def _do_delete_dupe(self, dupe):
         if not io.exists(dupe.path):
-            return True
-        self._recycle_dupe(dupe)
+            return
+        send2trash(unicode(dupe.path)) # Raises OSError when there's a problem
         self.clean_empty_dirs(dupe.path[:-1])
-        if not io.exists(dupe.path):
-            return True
-        logging.warning("Could not send {0} to trash.".format(unicode(dupe.path)))
-        return False
     
     def _do_load(self, j):
         self.directories.load_from_file(op.join(self.appdata, 'last_directories.xml'))
@@ -88,8 +85,14 @@ class DupeGuru(RegistrableApplication, Broadcaster):
         j = j.start_subjob([1, 9])
         self.results.load_from_xml(op.join(self.appdata, 'last_results.xml'), self._get_file, j)
         files = flatten(g[:] for g in self.results.groups)
-        for file in j.iter_with_progress(files, 'Reading metadata %d/%d'):
-            file._read_all_info(attrnames=self.data.METADATA_TO_READ)
+        try:
+            for file in j.iter_with_progress(files, 'Reading metadata %d/%d'):
+                file._read_all_info(attrnames=self.data.METADATA_TO_READ)
+        except (OSError, IOError):
+            # If this error is raised, it means that a file was deleted while we were reading
+            # metadata. Proper handling of this rare occurrence is complex because there's no easy
+            # way to remove an arbitrary file from the Results. Thus, we simply clear them.
+            self.results.groups = []
     
     def _get_display_info(self, dupe, group, delta=False):
         if (dupe is None) or (group is None):
@@ -104,12 +107,16 @@ class DupeGuru(RegistrableApplication, Broadcaster):
         path = Path(str_path)
         return fs.get_file(path, self.directories.fileclasses)    
     
-    @staticmethod
-    def _open_path(path):
-        raise NotImplementedError()
+    def _job_completed(self, jobid):
+        # Must be called by subclasses when they detect that an async job is completed.
+        if jobid == JOB_SCAN:
+            self.notify('results_changed')
+        elif jobid in (JOB_LOAD, JOB_MOVE, JOB_DELETE):
+            self.notify('results_changed')
+            self.notify('problems_changed')
     
     @staticmethod
-    def _recycle_dupe(dupe):
+    def _open_path(path):
         raise NotImplementedError()
     
     @staticmethod
@@ -151,6 +158,7 @@ class DupeGuru(RegistrableApplication, Broadcaster):
             filter = escape(filter, '()[]\\.|+?^')
             filter = escape(filter, '*', '.')
         self.results.apply_filter(filter)
+        self.notify('results_changed')
     
     def clean_empty_dirs(self, path):
         if self.options['clean_empty_dirs']:
@@ -172,28 +180,23 @@ class DupeGuru(RegistrableApplication, Broadcaster):
             dest_path = dest_path + source_path[1:-1] #Remove drive letter and filename
         elif dest_type == 1:
             dest_path = dest_path + source_path[location_path:-1]
-        try:
-            if not io.exists(dest_path):
-                io.makedirs(dest_path)
-            if copy:
-                files.copy(source_path, dest_path)
-            else:
-                files.move(source_path, dest_path)
-                self.clean_empty_dirs(source_path[:-1])
-        except EnvironmentError as e:
-            operation = 'Copy' if copy else 'Move'
-            logging.warning('%s operation failed on %s. Error: %s' % (operation, unicode(dupe.path), unicode(e)))
-            return False
-        return True
+        if not io.exists(dest_path):
+            io.makedirs(dest_path)
+        # Raises an EnvironmentError if there's a problem
+        if copy:
+            files.copy(source_path, dest_path)
+        else:
+            files.move(source_path, dest_path)
+            self.clean_empty_dirs(source_path[:-1])
     
     def copy_or_move_marked(self, copy, destination, recreate_path):
         def do(j):
             def op(dupe):
                 j.add_progress()
-                return self.copy_or_move(dupe, copy, destination, recreate_path)
+                self.copy_or_move(dupe, copy, destination, recreate_path)
             
             j.start_job(self.results.mark_count)
-            self.last_op_error_count = self.results.perform_on_marked(op, not copy)
+            self.results.perform_on_marked(op, not copy)
         
         self._demo_check()
         jobid = JOB_COPY if copy else JOB_MOVE
@@ -217,6 +220,31 @@ class DupeGuru(RegistrableApplication, Broadcaster):
                 rows.append(row)
         return export.export_to_xhtml(colnames, rows)
     
+    def invoke_command(self, cmd):
+        """Calls command `cmd` with %d and %r placeholders replaced.
+        
+        Using the current selection, %d is replaced with the currently selected dupe and %r is
+        replaced with that dupe's ref file. If there's no selection, the command is not invoked.
+        If the dupe is a ref, %d and %r will be the same.
+        """
+        if not self.selected_dupes:
+            return
+        dupe = self.selected_dupes[0]
+        group = self.results.get_group_of_duplicate(dupe)
+        ref = group.ref
+        cmd = cmd.replace('%d', unicode(dupe.path))
+        cmd = cmd.replace('%r', unicode(ref.path))
+        match = re.match(r'"([^"]+)"(.*)', cmd)
+        if match is not None:
+            # This code here is because subprocess. Popen doesn't seem to accept, under Windows,
+            # executable paths with spaces in it, *even* when they're enclosed in "". So this is
+            # a workaround to make the damn thing work.
+            exepath, args = match.groups()
+            path, exename = op.split(exepath)
+            subprocess.Popen(exename + args, shell=True, cwd=path)
+        else:
+            subprocess.Popen(cmd, shell=True)
+    
     def load(self):
         self._start_job(JOB_LOAD, self._do_load)
         self.load_ignore_list()
@@ -233,11 +261,34 @@ class DupeGuru(RegistrableApplication, Broadcaster):
             if g not in changed_groups:
                 self.results.make_ref(dupe)
                 changed_groups.add(g)
+        self.notify('results_changed_but_keep_selection')
+    
+    def mark_all(self):
+        self.results.mark_all()
+        self.notify('marking_changed')
+    
+    def mark_none(self):
+        self.results.mark_none()
+        self.notify('marking_changed')
+    
+    def mark_invert(self):
+        self.results.mark_invert()
+        self.notify('marking_changed')
+    
+    def mark_dupe(self, dupe, marked):
+        if marked:
+            self.results.mark(dupe)
+        else:
+            self.results.unmark(dupe)
+        self.notify('marking_changed')
     
     def open_selected(self):
         if self.selected_dupes:
             self._open_path(self.selected_dupes[0].path)
     
+    def purge_ignore_list(self):
+        self.scanner.ignore_list.Filter(lambda f,s:op.exists(f) and op.exists(s))
+    
     def remove_directory(self,index):
         try:
             del self.directories[index]
@@ -246,11 +297,25 @@ class DupeGuru(RegistrableApplication, Broadcaster):
             pass
     
     def remove_duplicates(self, duplicates):
-        self.results.remove_duplicates(duplicates)
+        self.results.remove_duplicates(self.without_ref(duplicates))
+        self.notify('results_changed_but_keep_selection')
+    
+    def remove_marked(self):
+        self.results.perform_on_marked(lambda x:None, True)
+        self.notify('results_changed')
     
     def remove_selected(self):
         self.remove_duplicates(self.selected_dupes)
     
+    def rename_selected(self, newname):
+        try:
+            d = self.selected_dupes[0]
+            d.rename(newname)
+            return True
+        except (IndexError, fs.FSError) as e:
+            logging.warning("dupeGuru Warning: %s" % unicode(e))
+        return False
+    
     def reveal_selected(self):
         if self.selected_dupes:
             self._reveal_path(self.selected_dupes[0].path)
@@ -283,6 +348,11 @@ class DupeGuru(RegistrableApplication, Broadcaster):
         self.results.groups = []
         self._start_job(JOB_SCAN, do)
     
+    def toggle_selected_mark_state(self):
+        for dupe in self.selected_dupes:
+            self.results.mark_toggle(dupe)
+        self.notify('marking_changed')
+    
     def without_ref(self, dupes):
         return [dupe for dupe in dupes if self.results.get_group_of_duplicate(dupe).ref is not dupe]
     

core/app_cocoa.py

@@ -9,15 +9,14 @@
 import logging
 import os.path as op
 
-from hsutil import cocoa, job
-from hsutil.cocoa import install_exception_hook
-from hsutil.cocoa.objcmin import (NSNotificationCenter, NSUserDefaults,
+from hscommon import cocoa, job
+from hscommon.cocoa import install_exception_hook
+from hscommon.cocoa.objcmin import (NSNotificationCenter, NSUserDefaults,
     NSSearchPathForDirectoriesInDomains, NSApplicationSupportDirectory, NSUserDomainMask,
-    NSWorkspace, NSWorkspaceRecycleOperation)
-from hsutil.misc import stripnone
-from hsutil.reg import RegistrationRequired
+    NSWorkspace)
+from hscommon.reg import RegistrationRequired
 
-from . import app, fs
+from . import app
 
 JOBID2TITLE = {
     app.JOB_SCAN: "Scanning for duplicates",
@@ -46,21 +45,12 @@ class DupeGuru(app.DupeGuru):
         appdata = op.join(appsupport, appdata_subdir)
         app.DupeGuru.__init__(self, data_module, appdata, appid)
         self.progress = cocoa.ThreadedJobPerformer()
-        self.display_delta_values = False
     
     #--- Override
     @staticmethod
     def _open_path(path):
         NSWorkspace.sharedWorkspace().openFile_(unicode(path))
     
-    @staticmethod
-    def _recycle_dupe(dupe):
-        # local import because first appkit import takes a lot of memory. we want to avoid it.
-        directory = unicode(dupe.path[:-1])
-        filename = dupe.name
-        result, tag = NSWorkspace.sharedWorkspace().performFileOperation_source_destination_files_tag_(
-            NSWorkspaceRecycleOperation, directory, '', [filename], None)
-    
     @staticmethod
     def _reveal_path(path):
         NSWorkspace.sharedWorkspace().selectFile_inFileViewerRootedAtPath_(unicode(path), '')
@@ -75,34 +65,10 @@ class DupeGuru(app.DupeGuru):
             ud = {'desc': JOBID2TITLE[jobid], 'jobid':jobid}
             NSNotificationCenter.defaultCenter().postNotificationName_object_userInfo_('JobStarted', self, ud)
     
-    #---Helpers
-    def GetObjects(self,node_path):
-        #returns a tuple g,d
-        try:
-            g = self.results.groups[node_path[0]]
-            if len(node_path) == 2:
-                return (g,self.results.groups[node_path[0]].dupes[node_path[1]])
-            else:
-                return (g,None)
-        except IndexError:
-            return (None,None)
-    
     #---Public
     copy_or_move_marked = demo_method(app.DupeGuru.copy_or_move_marked)
     delete_marked = demo_method(app.DupeGuru.delete_marked)
     
-    def PurgeIgnoreList(self):
-        self.scanner.ignore_list.Filter(lambda f,s:op.exists(f) and op.exists(s))
-    
-    def RenameSelected(self, newname):
-        try:
-            d = self.selected_dupes[0]
-            d.rename(newname)
-            return True
-        except (IndexError, fs.FSError) as e:
-            logging.warning("dupeGuru Warning: %s" % unicode(e))
-        return False
-    
     def start_scanning(self):
         self._select_dupes([])
         try:
@@ -113,106 +79,3 @@ class DupeGuru(app.DupeGuru):
         except app.AllFilesAreRefError:
             return 1
     
-    def selected_result_node_paths(self):
-        def get_path(dupe):
-            try:
-                group = self.results.get_group_of_duplicate(dupe)
-                groupindex = self.results.groups.index(group)
-                if dupe is group.ref:
-                    return [groupindex]
-                dupeindex = group.dupes.index(dupe)
-                return [groupindex, dupeindex]
-            except ValueError: # dupe not in there
-                return None
-        
-        dupes = self.selected_dupes
-        return stripnone(get_path(dupe) for dupe in dupes)
-    
-    def selected_powermarker_node_paths(self):
-        def get_path(dupe):
-            try:
-                dupeindex = self.results.dupes.index(dupe)
-                return [dupeindex]
-            except ValueError: # dupe not in there
-                return None
-        
-        dupes = self.selected_dupes
-        return stripnone(get_path(dupe) for dupe in dupes)
-    
-    def SelectResultNodePaths(self,node_paths):
-        def extract_dupe(t):
-            g,d = t
-            if d is not None:
-                return d
-            else:
-                if g is not None:
-                    return g.ref
-        
-        selected = [extract_dupe(self.GetObjects(p)) for p in node_paths]
-        self._select_dupes([dupe for dupe in selected if dupe is not None])
-    
-    def SelectPowerMarkerNodePaths(self,node_paths):
-        rows = [p[0] for p in node_paths]
-        dupes = [self.results.dupes[row] for row in rows if row in xrange(len(self.results.dupes))]
-        self._select_dupes(dupes)
-    
-    def sort_dupes(self,key,asc):
-        self.results.sort_dupes(key,asc,self.display_delta_values)
-    
-    def sort_groups(self,key,asc):
-        self.results.sort_groups(key,asc)
-    
-    def ToggleSelectedMarkState(self):
-        for dupe in self.selected_dupes:
-            self.results.mark_toggle(dupe)
-    
-    #---Data
-    def GetOutlineViewMaxLevel(self, tag):
-        if tag == 0:
-            return 2
-        elif tag == 2:
-            return 1
-    
-    def GetOutlineViewChildCounts(self, tag, node_path):
-        if self.progress._job_running:
-            return []
-        if tag == 0: #Normal results
-            assert not node_path # no other value is possible
-            return [len(g.dupes) for g in self.results.groups]
-        else: #Power Marker
-            assert not node_path # no other value is possible
-            return [0 for d in self.results.dupes]
-    
-    def GetOutlineViewValues(self, tag, node_path):
-        if self.progress._job_running:
-            return
-        if not node_path:
-            return
-        if tag in (0,2): #Normal results / Power Marker
-            if tag == 0:
-                g, d = self.GetObjects(node_path)
-                if (d is None) and (g is not None):
-                    d = g.ref
-            else:
-                d = self.results.dupes[node_path[0]]
-                g = self.results.get_group_of_duplicate(d)
-            result = self._get_display_info(d, g, self.display_delta_values)
-            return result
-    
-    def GetOutlineViewMarked(self, tag, node_path):
-        # 0=unmarked 1=marked 2=unmarkable
-        if self.progress._job_running:
-            return
-        if not node_path:
-            return 2
-        if tag == 0: #Normal results
-            g, d = self.GetObjects(node_path)
-        else: #Power Marker
-            d = self.results.dupes[node_path[0]]
-        if (d is None) or (not self.results.is_markable(d)):
-            return 2
-        elif self.results.is_marked(d):
-            return 1
-        else:
-            return 0
-    

core/app_cocoa_inter.py

@@ -9,10 +9,14 @@
 
 # Common interface for all editions' dg_cocoa unit.
 
-from hsutil.cocoa.inter import signature, PyOutline, PyGUIObject, PyRegistrable
+from hscommon.cocoa.inter import signature, PyTable, PyOutline, PyGUIObject, PyRegistrable
 
 from .gui.details_panel import DetailsPanel
 from .gui.directory_tree import DirectoryTree
+from .gui.problem_dialog import ProblemDialog
+from .gui.problem_table import ProblemTable
+from .gui.result_tree import ResultTree
+from .gui.stats_label import StatsLabel
 
 # Fix py2app's problems on relative imports
 from core import app, app_cocoa, data, directories, engine, export, ignore, results, fs, scanner
@@ -43,19 +47,19 @@ class PyDupeGuruBase(PyRegistrable):
         self.py.load()
     
     def markAll(self):
-        self.py.results.mark_all()
+        self.py.mark_all()
     
     def markNone(self):
-        self.py.results.mark_none()
+        self.py.mark_none()
     
     def markInvert(self):
-        self.py.results.mark_invert()
+        self.py.mark_invert()
     
     def purgeIgnoreList(self):
-        self.py.PurgeIgnoreList()
+        self.py.purge_ignore_list()
     
     def toggleSelectedMark(self):
-        self.py.ToggleSelectedMarkState()
+        self.py.toggle_selected_mark_state()
     
     def saveIgnoreList(self):
         self.py.save_ignore_list()
@@ -63,18 +67,6 @@ class PyDupeGuruBase(PyRegistrable):
     def saveResults(self):
         self.py.save()
     
-    def selectedResultNodePaths(self):
-        return self.py.selected_result_node_paths()
-    
-    def selectResultNodePaths_(self,node_paths):
-        self.py.SelectResultNodePaths(node_paths)
-    
-    def selectedPowerMarkerNodePaths(self):
-        return self.py.selected_powermarker_node_paths()
-    
-    def selectPowerMarkerNodePaths_(self,node_paths):
-        self.py.SelectPowerMarkerNodePaths(node_paths)
-    
     #---Actions
     def addSelectedToIgnoreList(self):
         self.py.add_selected_to_ignore_list()
@@ -95,23 +87,16 @@ class PyDupeGuruBase(PyRegistrable):
         self.py.open_selected()
     
     def removeMarked(self):
-        self.py.results.perform_on_marked(lambda x:True, True)
-    
-    def removeSelected(self):
-        self.py.remove_selected()
+        self.py.remove_marked()
     
     def renameSelected_(self,newname):
-        return self.py.RenameSelected(newname)
+        return self.py.rename_selected(newname)
     
     def revealSelected(self):
         self.py.reveal_selected()
     
-    #---Misc
-    def sortDupesBy_ascending_(self, key, asc):
-        self.py.sort_dupes(key, asc)
-    
-    def sortGroupsBy_ascending_(self, key, asc):
-        self.py.sort_groups(key, asc)
+    def invokeCommand_(self, cmd):
+        self.py.invoke_command(cmd)
     
     #---Information
     def getIgnoreListCount(self):
@@ -120,34 +105,14 @@ class PyDupeGuruBase(PyRegistrable):
     def getMarkCount(self):
         return self.py.results.mark_count
     
-    def getStatLine(self):
-        return self.py.stat_line
-    
-    def getOperationalErrorCount(self):
-        return self.py.last_op_error_count
-    
-    #---Data
-    @signature('i@:i')
-    def getOutlineViewMaxLevel_(self, tag):
-        return self.py.GetOutlineViewMaxLevel(tag)
-    
-    @signature('@@:i@')
-    def getOutlineView_childCountsForPath_(self, tag, node_path):
-        return self.py.GetOutlineViewChildCounts(tag, node_path)
-    
-    def getOutlineView_valuesForIndexes_(self, tag, node_path):
-        return self.py.GetOutlineViewValues(tag, node_path)
-    
-    def getOutlineView_markedAtIndexes_(self, tag, node_path):
-        return self.py.GetOutlineViewMarked(tag, node_path)
+    @signature('i@:')
+    def scanWasProblematic(self):
+        return bool(self.py.results.problems)
     
     #---Properties
     def setMixFileKind_(self, mix_file_kind):
         self.py.scanner.mix_file_kind = mix_file_kind
     
-    def setDisplayDeltaValues_(self, display_delta_values):
-        self.py.display_delta_values= display_delta_values
-    
     def setEscapeFilterRegexp_(self, escape_filter_regexp):
         self.py.options['escape_filter_regexp'] = escape_filter_regexp
     
@@ -164,6 +129,9 @@ class PyDupeGuruBase(PyRegistrable):
     def cancelJob(self):
         self.py.progress.job_cancelled = True
     
+    def jobCompleted_(self, jobid):
+        self.py._job_completed(jobid)
+    
 
 class PyDetailsPanel(PyGUIObject):
     py_class = DetailsPanel
@@ -182,3 +150,65 @@ class PyDirectoryOutline(PyOutline):
     def addDirectory_(self, path):
         self.py.add_directory(path)
     
+
+class PyResultOutline(PyOutline):
+    py_class = ResultTree
+    
+    @signature('c@:')
+    def powerMarkerMode(self):
+        return self.py.power_marker
+    
+    @signature('v@:c')
+    def setPowerMarkerMode_(self, value):
+        self.py.power_marker = value
+    
+    @signature('c@:')
+    def deltaValuesMode(self):
+        return self.py.delta_values
+    
+    @signature('v@:c')
+    def setDeltaValuesMode_(self, value):
+        self.py.delta_values = value
+    
+    @signature('@@:@i')
+    def valueForPath_column_(self, path, column):
+        return self.py.get_node_value(path, column)
+    
+    @signature('c@:@')
+    def renameSelected_(self, newname):
+        return self.py.rename_selected(newname)
+    
+    @signature('v@:ic')
+    def sortBy_ascending_(self, key, asc):
+        self.py.sort(key, asc)
+    
+    def markSelected(self):
+        self.py.app.toggle_selected_mark_state()
+    
+    def removeSelected(self):
+        self.py.app.remove_selected()
+    
+    def rootChildrenCounts(self):
+        return self.py.root_children_counts()
+    
+    # python --> cocoa
+    def invalidate_markings(self):
+        self.cocoa.invalidateMarkings()
+    
+
+class PyStatsLabel(PyGUIObject):
+    py_class = StatsLabel
+    
+    def display(self):
+        return self.py.display
+    
+
+class PyProblemDialog(PyGUIObject):
+    py_class = ProblemDialog
+    
+    def revealSelected(self):
+        self.py.reveal_selected_dupe()
+    
+
+class PyProblemTable(PyTable):
+    py_class = ProblemTable

core/directories.py

@@ -6,7 +6,7 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-import xml.dom.minidom
+from lxml import etree
 
 from hsutil import io
 from hsutil.files import FileOrPath
@@ -126,38 +126,38 @@ class Directories(object):
     
     def load_from_file(self, infile):
         try:
-            doc = xml.dom.minidom.parse(infile)
+            root = etree.parse(infile).getroot()
         except:
             return
-        root_path_nodes = doc.getElementsByTagName('root_directory')
-        for rdn in root_path_nodes:
-            if not rdn.getAttributeNode('path'):
+        for rdn in root.iterchildren('root_directory'):
+            attrib = rdn.attrib
+            if 'path' not in attrib:
                 continue
-            path = rdn.getAttributeNode('path').nodeValue
+            path = attrib['path']
             try:
                 self.add_path(Path(path))
             except (AlreadyThereError, InvalidPathError):
                 pass
-        state_nodes = doc.getElementsByTagName('state')
-        for sn in state_nodes:
-            if not (sn.getAttributeNode('path') and sn.getAttributeNode('value')):
+        for sn in root.iterchildren('state'):
+            attrib = sn.attrib
+            if not ('path' in attrib and 'value' in attrib):
                 continue
-            path = sn.getAttributeNode('path').nodeValue
-            state = sn.getAttributeNode('value').nodeValue
+            path = attrib['path']
+            state = attrib['value']
             self.set_state(Path(path), int(state))
     
-    def save_to_file(self,outfile):
+    def save_to_file(self, outfile):
         with FileOrPath(outfile, 'wb') as fp:
-            doc = xml.dom.minidom.Document()
-            root = doc.appendChild(doc.createElement('directories'))
+            root = etree.Element('directories')
             for root_path in self:
-                root_path_node = root.appendChild(doc.createElement('root_directory'))
-                root_path_node.setAttribute('path', unicode(root_path).encode('utf-8'))
+                root_path_node = etree.SubElement(root, 'root_directory')
+                root_path_node.set('path', unicode(root_path))
             for path, state in self.states.iteritems():
-                state_node = root.appendChild(doc.createElement('state'))
-                state_node.setAttribute('path', unicode(path).encode('utf-8'))
-                state_node.setAttribute('value', str(state))
-            doc.writexml(fp, '\t', '\t', '\n', encoding='utf-8')
+                state_node = etree.SubElement(root, 'state')
+                state_node.set('path', unicode(path))
+                state_node.set('value', unicode(state))
+            tree = etree.ElementTree(root)
+            tree.write(fp, encoding='utf-8')
     
     def set_state(self, path, state):
         if self.get_state(path) == state:

core/engine.py

@@ -16,7 +16,7 @@ from unicodedata import normalize
 
 from hsutil.misc import flatten
 from hsutil.str import multi_replace
-from hsutil import job
+from hscommon import job
 
 (WEIGHT_WORDS,
 MATCH_SIMILAR_WORDS,

core/gui/base.py

@@ -7,7 +7,7 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-from hsutil.notify import Listener
+from hscommon.notify import Listener
 
 class GUIObject(Listener):
     def __init__(self, view, app):
@@ -21,3 +21,15 @@ class GUIObject(Listener):
     def dupes_selected(self):
         pass
     
+    def marking_changed(self):
+        pass
+    
+    def problems_changed(self):
+        pass
+    
+    def results_changed(self):
+        pass
+    
+    def results_changed_but_keep_selection(self):
+        pass
+    

core/gui/details_panel.py

@@ -13,8 +13,11 @@ class DetailsPanel(GUIObject):
     def __init__(self, view, app):
         GUIObject.__init__(self, view, app)
         self._table = []
+    
+    def connect(self):
+        GUIObject.connect(self)
         self._refresh()
-        self.connect()
+        self.view.refresh()
     
     #--- Private
     def _refresh(self):

core/gui/directory_tree.py

@@ -53,7 +53,9 @@ class DirectoryTree(GUIObject, Tree):
     def __init__(self, view, app):
         GUIObject.__init__(self, view, app)
         Tree.__init__(self)
-        self.connect()
+    
+    def connect(self):
+        GUIObject.connect(self)
         self._refresh()
         self.view.refresh()
     

core/gui/problem_dialog.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2010-04-12
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+# 
+# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/hs_license
+
+from hscommon.notify import Broadcaster
+
+from .base import GUIObject
+
+class ProblemDialog(GUIObject, Broadcaster):
+    def __init__(self, view, app):
+        GUIObject.__init__(self, view, app)
+        Broadcaster.__init__(self)
+        self._selected_dupe = None
+    
+    def reveal_selected_dupe(self):
+        if self._selected_dupe is not None:
+            self.app._reveal_path(self._selected_dupe.path)
+    
+    def select_dupe(self, dupe):
+        self._selected_dupe = dupe
+    
+    #--- Event Handlers
+    def problems_changed(self):
+        self._selected_dupe = None
+        self.notify('problems_changed')
+    

core/gui/problem_table.py

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2010-04-12
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+# 
+# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/hs_license
+
+from hscommon.notify import Listener
+from hsgui.table import GUITable, Row
+
+class ProblemTable(GUITable, Listener):
+    def __init__(self, view, problem_dialog):
+        GUITable.__init__(self)
+        Listener.__init__(self, problem_dialog)
+        self.view = view
+        self.dialog = problem_dialog
+    
+    #--- Override
+    def _update_selection(self):
+        row = self.selected_row
+        dupe = row.dupe if row is not None else None
+        self.dialog.select_dupe(dupe)
+    
+    def _fill(self):
+        problems = self.dialog.app.results.problems
+        for dupe, msg in problems:
+            self.append(ProblemRow(self, dupe, msg))
+    
+    #--- Event handlers
+    def problems_changed(self):
+        self.refresh()
+        self.view.refresh()
+    
+
+class ProblemRow(Row):
+    def __init__(self, table, dupe, msg):
+        Row.__init__(self, table)
+        self.dupe = dupe
+        self.msg = msg
+        self.path = unicode(dupe.path)
+    

core/gui/result_tree.py

@@ -0,0 +1,159 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2010-02-11
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+# 
+# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/hs_license
+
+from operator import attrgetter
+
+from hsgui.tree import Tree, Node
+
+from .base import GUIObject
+
+class DupeNode(Node):
+    def __init__(self, app, group, dupe):
+        Node.__init__(self, '')
+        self._app = app
+        self._group = group
+        self._dupe = dupe
+        self._data = None
+        self._data_delta = None
+    
+    @property
+    def data(self):
+        if self._data is None:
+            self._data = self._app._get_display_info(self._dupe, self._group, False)
+        return self._data
+    
+    @property
+    def data_delta(self):
+        if self._data_delta is None:
+            self._data_delta = self._app._get_display_info(self._dupe, self._group, True)
+        return self._data_delta
+    
+    @property
+    def markable(self):
+        return self._app.results.is_markable(self._dupe)
+    
+    @property
+    def marked(self):
+        return self._app.results.is_marked(self._dupe)
+    
+    @marked.setter
+    def marked(self, value):
+        self._app.mark_dupe(self._dupe, value)
+    
+
+class ResultTree(GUIObject, Tree):
+    def __init__(self, view, app):
+        GUIObject.__init__(self, view, app)
+        Tree.__init__(self)
+        self._power_marker = False
+        self._delta_values = False
+        self._sort_descriptors = (0, True)
+    
+    #--- Override
+    def connect(self):
+        GUIObject.connect(self)
+        self._refresh()
+        self.view.refresh()
+    
+    def _select_nodes(self, nodes):
+        Tree._select_nodes(self, nodes)
+        self.app._select_dupes(map(attrgetter('_dupe'), nodes))
+    
+    #--- Private
+    def _refresh(self):
+        self.clear()
+        if not self.power_marker:
+            for group in self.app.results.groups:
+                group_node = DupeNode(self.app, group, group.ref)
+                self.append(group_node)
+                for dupe in group.dupes:
+                    group_node.append(DupeNode(self.app, group, dupe))
+        else:
+            for dupe in self.app.results.dupes:
+                group = self.app.results.get_group_of_duplicate(dupe)
+                self.append(DupeNode(self.app, group, dupe))
+        if self.app.selected_dupes:
+            to_find = set(self.app.selected_dupes)
+            nodes = list(self.findall(lambda n: n is not self and n._dupe in to_find))
+            self.selected_nodes = nodes
+    
+    #--- Public
+    def get_node_value(self, path, column):
+        try:
+            node = self.get_node(path)
+        except IndexError:
+            return '---'
+        if self.delta_values:
+            return node.data_delta[column]
+        else:
+            return node.data[column]
+    
+    def rename_selected(self, newname):
+        node = self.selected_node
+        node._data = None
+        node._data_delta = None
+        return self.app.rename_selected(newname)
+    
+    def root_children_counts(self):
+        # This is a speed optimization for cases where there's a lot of results so that there is
+        # not thousands of children_count queries when expandAll is called.
+        return [len(node) for node in self]
+    
+    def sort(self, key, asc):
+        if self.power_marker:
+            self.app.results.sort_dupes(key, asc, self.delta_values)
+        else:
+            self.app.results.sort_groups(key, asc)
+        self._sort_descriptors = (key, asc)
+        self._refresh()
+        self.view.refresh()
+    
+    #--- Properties
+    @property
+    def power_marker(self):
+        return self._power_marker
+    
+    @power_marker.setter
+    def power_marker(self, value):
+        if value == self._power_marker:
+            return
+        self._power_marker = value
+        key, asc = self._sort_descriptors
+        self.sort(key, asc)
+        self._refresh()
+        self.view.refresh()
+    
+    @property
+    def delta_values(self):
+        return self._delta_values
+    
+    @delta_values.setter
+    def delta_values(self, value):
+        if value == self._delta_values:
+            return
+        self._delta_values = value
+        self._refresh()
+        self.view.refresh()
+    
+    #--- Event Handlers
+    def marking_changed(self):
+        self.view.invalidate_markings()
+    
+    def results_changed(self):
+        self._refresh()
+        self.view.refresh()
+    
+    def results_changed_but_keep_selection(self):
+        # What we want to to here is that instead of restoring selected *dupes* after refresh, we
+        # restore selected *paths*.
+        paths = self.selected_paths
+        self._refresh()
+        self.selected_paths = paths
+        self.view.refresh()
+    

core/gui/stats_label.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2010-02-11
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+# 
+# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/hs_license
+
+from .base import GUIObject
+
+class StatsLabel(GUIObject):
+    def connect(self):
+        GUIObject.connect(self)
+        self.view.refresh()
+    
+    @property
+    def display(self):
+        return self.app.stat_line
+    
+    def results_changed(self):
+        self.view.refresh()
+    marking_changed = results_changed

core/ignore.py

@@ -6,9 +6,9 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-from hsutil.files import FileOrPath
+from lxml import etree
 
-import xml.dom.minidom
+from hsutil.files import FileOrPath
 
 class IgnoreList(object):
     """An ignore list implementation that is iterable, filterable and exportable to XML.
@@ -71,45 +71,38 @@ class IgnoreList(object):
                 self._ignored[first] = matches
         self._count += 1
     
-    def load_from_xml(self,infile):
+    def load_from_xml(self, infile):
         """Loads the ignore list from a XML created with save_to_xml.
         
         infile can be a file object or a filename.
         """
         try:
-            doc = xml.dom.minidom.parse(infile)
+            root = etree.parse(infile).getroot()
         except Exception:
             return
-        file_nodes = doc.getElementsByTagName('file')
-        for fn in file_nodes:
-            if not fn.getAttributeNode('path'):
+        for fn in root.iterchildren('file'):
+            file_path = fn.get('path')
+            if not file_path:
                 continue
-            file_path = fn.getAttributeNode('path').nodeValue
-            subfile_nodes = fn.getElementsByTagName('file')
-            for sfn in subfile_nodes:
-                if not sfn.getAttributeNode('path'):
-                    continue
-                subfile_path = sfn.getAttributeNode('path').nodeValue
-                self.Ignore(file_path,subfile_path)
+            for sfn in fn.iterchildren('file'):
+                subfile_path = sfn.get('path')
+                if subfile_path:
+                    self.Ignore(file_path, subfile_path)
     
-    def save_to_xml(self,outfile):
+    def save_to_xml(self, outfile):
         """Create a XML file that can be used by load_from_xml.
         
         outfile can be a file object or a filename.
         """
-        doc = xml.dom.minidom.Document()
-        root = doc.appendChild(doc.createElement('ignore_list'))
-        for file,subfiles in self._ignored.items():
-            file_node = root.appendChild(doc.createElement('file'))
-            if isinstance(file,unicode):
-                file = file.encode('utf-8')
-            file_node.setAttribute('path',file)
-            for subfile in subfiles:
-                subfile_node = file_node.appendChild(doc.createElement('file'))
-                if isinstance(subfile,unicode):
-                    subfile = subfile.encode('utf-8')
-                subfile_node.setAttribute('path',subfile)
+        root = etree.Element('ignore_list')
+        for filename, subfiles in self._ignored.items():
+            file_node = etree.SubElement(root, 'file')
+            file_node.set('path', filename)
+            for subfilename in subfiles:
+                subfile_node = etree.SubElement(file_node, 'file')
+                subfile_node.set('path', subfilename)
+        tree = etree.ElementTree(root)
         with FileOrPath(outfile, 'wb') as fp:
-            doc.writexml(fp,'\t','\t','\n',encoding='utf-8')
+            tree.write(fp, encoding='utf-8')
     
 

core/results.py

@@ -8,16 +8,14 @@
 
 import logging
 import re
-from xml.sax import handler, make_parser, SAXException
-from xml.sax.saxutils import XMLGenerator
-from xml.sax.xmlreader import AttributesImpl
+from lxml import etree
 
 from . import engine
-from hsutil.job import nulljob
-from hsutil.markable import Markable
-from hsutil.misc import flatten, cond, nonone
+from hscommon.job import nulljob
+from hscommon.markable import Markable
+from hsutil.misc import flatten, nonone
 from hsutil.str import format_size
-from hsutil.files import open_if_filename
+from hsutil.files import FileOrPath
 
 class Results(Markable):
     #---Override
@@ -34,6 +32,7 @@ class Results(Markable):
         self.__recalculate_stats()
         self.__marked_size = 0
         self.data = data_module
+        self.problems = [] # (dupe, error_msg)
     
     def _did_mark(self, dupe):
         self.__marked_size += dupe.size
@@ -148,7 +147,7 @@ class Results(Markable):
             self.__filters.append(filter_str)
             if self.__filtered_dupes is None:
                 self.__filtered_dupes = flatten(g[:] for g in self.groups)
-            self.__filtered_dupes = set(dupe for dupe in self.__filtered_dupes if filter_re.search(dupe.name))
+            self.__filtered_dupes = set(dupe for dupe in self.__filtered_dupes if filter_re.search(unicode(dupe.path)))
             filtered_groups = set()
             for dupe in self.__filtered_dupes:
                 filtered_groups.add(self.get_group_of_duplicate(dupe))
@@ -168,42 +167,54 @@ class Results(Markable):
     is_markable = _is_markable
     
     def load_from_xml(self, infile, get_file, j=nulljob):
+        def do_match(ref_file, other_files, group):
+            if not other_files:
+                return
+            for other_file in other_files:
+                group.add_match(engine.get_match(ref_file, other_file))
+            do_match(other_files[0], other_files[1:], group)
+        
         self.apply_filter(None)
-        handler = _ResultsHandler(get_file)
         try:
-            parser = make_parser()
-        except Exception as e:
-            # This special handling is to try to figure out the cause of #47
-            # We don't silently return, because we want the user to send error report.
-            logging.exception(e)
-            try:
-                import xml.parsers.expat
-                logging.warning('importing xml.parsers.expat went ok, WTF?')
-            except Exception as e:
-                # This log should give a little more details about the cause of this all
-                logging.exception(e)
-                raise
-            raise
-        parser.setContentHandler(handler)
-        try:
-            infile, must_close = open_if_filename(infile)
-        except IOError:
+            root = etree.parse(infile).getroot()
+        except Exception:
             return
-        BUFSIZE = 1024 * 1024 # 1mb buffer
-        infile.seek(0, 2)
-        j.start_job(infile.tell() // BUFSIZE)
-        infile.seek(0, 0)
-        try:
-            while True:
-                data = infile.read(BUFSIZE)
-                if not data:
-                    break
-                parser.feed(data)
-                j.add_progress()
-        except SAXException:
-            return
-        self.groups = handler.groups
-        for dupe_file in handler.marked:
+        group_elems = list(root.iterchildren('group'))
+        groups = []
+        marked = set()
+        for group_elem in j.iter_with_progress(group_elems, every=100):
+            group = engine.Group()
+            dupes = []
+            for file_elem in group_elem.iterchildren('file'):
+                path = file_elem.get('path')
+                words = file_elem.get('words', '')
+                if not path:
+                    continue
+                file = get_file(path)
+                if file is None:
+                    continue
+                file.words = words.split(',')
+                file.is_ref = file_elem.get('is_ref') == 'y'
+                dupes.append(file)
+                if file_elem.get('marked') == 'y':
+                    marked.add(file)
+            for match_elem in group_elem.iterchildren('match'):
+                try:
+                    attrs = match_elem.attrib
+                    first_file = dupes[int(attrs['first'])]
+                    second_file = dupes[int(attrs['second'])]
+                    percentage = int(attrs['percentage'])
+                    group.add_match(engine.Match(first_file, second_file, percentage))
+                except (IndexError, KeyError, ValueError): # Covers missing attr, non-int values and indexes out of bounds
+                    pass
+            if (not group.matches) and (len(dupes) >= 2):
+                do_match(dupes[0], dupes[1:], group)
+            group.prioritize(lambda x: dupes.index(x))
+            if len(group):
+                groups.append(group)    
+            j.add_progress()
+        self.groups = groups
+        for dupe_file in marked:
             self.mark(dupe_file)
     
     def make_ref(self, dupe):
@@ -220,17 +231,22 @@ class Results(Markable):
         self.__dupes = None
     
     def perform_on_marked(self, func, remove_from_results):
-        problems = []
-        for d in self.dupes:
-            if self.is_marked(d) and (not func(d)):
-                problems.append(d)
+        # Performs `func` on all marked dupes. If an EnvironmentError is raised during the call,
+        # the problematic dupe is added to self.problems.
+        self.problems = []
+        to_remove = []
+        marked = (dupe for dupe in self.dupes if self.is_marked(dupe))
+        for dupe in marked:
+            try:
+                func(dupe)
+                to_remove.append(dupe)
+            except EnvironmentError as e:
+                self.problems.append((dupe, unicode(e)))
         if remove_from_results:
-            to_remove = [d for d in self.dupes if self.is_marked(d) and (d not in problems)]
             self.remove_duplicates(to_remove)
             self.mark_none()
-            for d in problems:
-                self.mark(d)
-        return len(problems)
+            for dupe, _ in self.problems:
+                self.mark(dupe)
     
     def remove_duplicates(self, dupes):
         '''Remove 'dupes' from their respective group, and remove the group is it ends up empty.
@@ -256,13 +272,10 @@ class Results(Markable):
     
     def save_to_xml(self, outfile):
         self.apply_filter(None)
-        outfile, must_close = open_if_filename(outfile, 'wb')
-        writer = XMLGenerator(outfile, 'utf-8')
-        writer.startDocument()
-        empty_attrs = AttributesImpl({})
-        writer.startElement('results', empty_attrs)
+        root = etree.Element('results')
+        # writer = XMLGenerator(outfile, 'utf-8')
         for g in self.groups:
-            writer.startElement('group', empty_attrs)
+            group_elem = etree.SubElement(root, 'group')
             dupe2index = {}
             for index, d in enumerate(g):
                 dupe2index[d] = index
@@ -270,27 +283,22 @@ class Results(Markable):
                     words = engine.unpack_fields(d.words)
                 except AttributeError:
                     words = ()
-                attrs = AttributesImpl({
-                    'path': unicode(d.path),
-                    'is_ref': cond(d.is_ref, 'y', 'n'),
-                    'words': ','.join(words),
-                    'marked': cond(self.is_marked(d), 'y', 'n')
-                })
-                writer.startElement('file', attrs)
-                writer.endElement('file')
+                file_elem = etree.SubElement(group_elem, 'file')
+                try:
+                    file_elem.set('path', unicode(d.path))
+                    file_elem.set('words', ','.join(words))
+                except ValueError: # If there's an invalid character, just skip the file
+                    file_elem.set('path', '')
+                file_elem.set('is_ref', ('y' if d.is_ref else 'n'))
+                file_elem.set('marked', ('y' if self.is_marked(d) else 'n'))
             for match in g.matches:
-                attrs = AttributesImpl({
-                    'first': str(dupe2index[match.first]),
-                    'second': str(dupe2index[match.second]),
-                    'percentage': str(int(match.percentage)),
-                })
-                writer.startElement('match', attrs)
-                writer.endElement('match')
-            writer.endElement('group')
-        writer.endElement('results')
-        writer.endDocument()
-        if must_close:
-            outfile.close()
+                match_elem = etree.SubElement(group_elem, 'match')
+                match_elem.set('first', unicode(dupe2index[match.first]))
+                match_elem.set('second', unicode(dupe2index[match.second]))
+                match_elem.set('percentage', unicode(int(match.percentage)))
+        tree = etree.ElementTree(root)
+        with FileOrPath(outfile, 'wb') as fp:
+            tree.write(fp, encoding='utf-8')
     
     def sort_dupes(self, key, asc=True, delta=False):
         if not self.__dupes:
@@ -310,60 +318,3 @@ class Results(Markable):
     dupes     = property(__get_dupe_list)
     groups    = property(__get_groups, __set_groups)
     stat_line = property(__get_stat_line)
-
-class _ResultsHandler(handler.ContentHandler):
-    def __init__(self, get_file):
-        self.group = None
-        self.dupes = None
-        self.marked = set()
-        self.groups = []
-        self.get_file = get_file
-    
-    def startElement(self, name, attrs):
-        if name == 'group':
-            self.group = engine.Group()
-            self.dupes = []
-            return
-        if (name == 'file') and (self.group is not None):
-            if not (('path' in attrs) and ('words' in attrs)):
-                return
-            path = attrs['path']
-            file = self.get_file(path)
-            if file is None:
-                return
-            file.words = attrs['words'].split(',')
-            file.is_ref = attrs.get('is_ref') == 'y'
-            self.dupes.append(file)
-            if attrs.get('marked') == 'y':
-                self.marked.add(file)
-        if (name == 'match') and (self.group is not None):
-            try:
-                first_file = self.dupes[int(attrs['first'])]
-                second_file = self.dupes[int(attrs['second'])]
-                percentage = int(attrs['percentage'])
-                self.group.add_match(engine.Match(first_file, second_file, percentage))
-            except (IndexError, KeyError, ValueError): # Covers missing attr, non-int values and indexes out of bounds
-                pass
-    
-    def endElement(self, name):
-        def do_match(ref_file, other_files, group):
-            if not other_files:
-                return
-            for other_file in other_files:
-                group.add_match(engine.get_match(ref_file, other_file))
-            do_match(other_files[0], other_files[1:], group)
-        
-        if name == 'group':
-            group = self.group
-            self.group = None
-            dupes = self.dupes
-            self.dupes = []
-            if group is None:
-                return
-            if len(dupes) < 2:
-                return
-            if not group.matches: # <match> elements not present, do it manually, without %
-                do_match(dupes[0], dupes[1:], group)
-            group.prioritize(lambda x: dupes.index(x))
-            self.groups.append(group)
-    

core/scanner.py

@@ -9,7 +9,8 @@
 import logging
 
 
-from hsutil import job, io
+from hscommon import job
+from hsutil import io
 from hsutil.misc import dedupe
 from hsutil.str import get_file_ext, rem_file_ext
 

core/tests/app_cocoa_test.py

@@ -1,402 +0,0 @@
-# Created By: Virgil Dupras
-# Created On: 2006/11/11
-# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
-# which should be included with this package. The terms are also available at 
-# http://www.hardcoded.net/licenses/hs_license
-
-import tempfile
-import shutil
-import logging
-import os.path as op
-
-from nose.tools import eq_
-
-from hsutil.path import Path
-from hsutil.testcase import TestCase
-from hsutil.decorators import log_calls
-from hsutil import io
-
-from . import data
-from .results_test import GetTestGroups
-from .. import engine, fs
-try:
-    from ..app_cocoa import DupeGuru as DupeGuruBase
-except ImportError:
-    from nose.plugins.skip import SkipTest
-    raise SkipTest("These tests can only be run on OS X")
-from ..gui.details_panel import DetailsPanel
-from ..gui.directory_tree import DirectoryTree
-
-class DupeGuru(DupeGuruBase):
-    def __init__(self):
-        DupeGuruBase.__init__(self, data, '/tmp', appid=4)
-    
-    def _start_job(self, jobid, func):
-        func(nulljob)
-    
-def r2np(rows):
-    #Transforms a list of rows [1,2,3] into a list of node paths [[1],[2],[3]]
-    return [[i] for i in rows]
-
-class CallLogger(object):
-    """This is a dummy object that logs all calls made to it.
-    
-    It is used to simulate the GUI layer.
-    """
-    def __init__(self):
-        self.calls = []
-    
-    def __getattr__(self, func_name):
-        def func(*args, **kw):
-            self.calls.append(func_name)
-        return func
-    
-    def clear_calls(self):
-        del self.calls[:]
-    
-
-class TCDupeGuru(TestCase):
-    def setUp(self):
-        self.app = DupeGuru()
-        self.dpanel_gui = CallLogger()
-        self.dpanel = DetailsPanel(self.dpanel_gui, self.app)
-        self.dtree_gui = CallLogger()
-        self.dtree = DirectoryTree(self.dtree_gui, self.app)
-        self.objects,self.matches,self.groups = GetTestGroups()
-        self.app.results.groups = self.groups
-        tmppath = self.tmppath()
-        io.mkdir(tmppath + 'foo')
-        io.mkdir(tmppath + 'bar')
-        self.app.directories.add_path(tmppath)
-    
-    def check_gui_calls(self, gui, expected, verify_order=False):
-        """Checks that the expected calls have been made to 'gui', then clears the log.
-        
-        `expected` is an iterable of strings representing method names.
-        If `verify_order` is True, the order of the calls matters.
-        """
-        if verify_order:
-            eq_(gui.calls, expected)
-        else:
-            eq_(set(gui.calls), set(expected))
-        gui.clear_calls()
-    
-    def check_gui_calls_partial(self, gui, expected=None, not_expected=None):
-        """Checks that the expected calls have been made to 'gui', then clears the log.
-        
-        `expected` is an iterable of strings representing method names. Order doesn't matter.
-        Moreover, if calls have been made that are not in expected, no failure occur.
-        `not_expected` can be used for a more explicit check (rather than calling `check_gui_calls`
-        with an empty `expected`) to assert that calls have *not* been made.
-        """
-        calls = set(gui.calls)
-        if expected is not None:
-            expected = set(expected)
-            not_called = expected - calls
-            assert not not_called, u"These calls haven't been made: {0}".format(not_called)
-        if not_expected is not None:
-            not_expected = set(not_expected)
-            called = not_expected & calls
-            assert not called, u"These calls shouldn't have been made: {0}".format(called)
-        gui.clear_calls()
-    
-    def clear_gui_calls(self):
-        for attr in dir(self):
-            if attr.endswith('_gui'):
-                gui = getattr(self, attr)
-                if hasattr(gui, 'calls'): # We might have test methods ending with '_gui'
-                    gui.clear_calls()
-    
-    def test_GetObjects(self):
-        app = self.app
-        objects = self.objects
-        groups = self.groups
-        g,d = app.GetObjects([0])
-        self.assert_(g is groups[0])
-        self.assert_(d is None)
-        g,d = app.GetObjects([0,0])
-        self.assert_(g is groups[0])
-        self.assert_(d is objects[1])
-        g,d = app.GetObjects([1,0])
-        self.assert_(g is groups[1])
-        self.assert_(d is objects[4])
-    
-    def test_GetObjects_after_sort(self):
-        app = self.app
-        objects = self.objects
-        groups = self.groups[:] #To keep the old order in memory
-        app.sort_groups(0,False) #0 = Filename
-        #Now, the group order is supposed to be reversed
-        g,d = app.GetObjects([0,0])
-        self.assert_(g is groups[1])
-        self.assert_(d is objects[4])
-    
-    def test_GetObjects_out_of_range(self):
-        app = self.app
-        self.assertEqual((None,None),app.GetObjects([2]))
-        self.assertEqual((None,None),app.GetObjects([]))
-        self.assertEqual((None,None),app.GetObjects([1,2]))
-    
-    def test_selected_result_node_paths(self):
-        # app.selected_dupes is correctly converted into node paths
-        app = self.app
-        objects = self.objects
-        paths = [[0, 0], [0, 1], [1]]
-        app.SelectResultNodePaths(paths)
-        eq_(app.selected_result_node_paths(), paths)
-    
-    def test_selected_result_node_paths_after_deletion(self):
-        # cases where the selected dupes aren't there are correctly handled
-        app = self.app
-        objects = self.objects
-        paths = [[0, 0], [0, 1], [1]]
-        app.SelectResultNodePaths(paths)
-        app.remove_selected()
-        # The first 2 dupes have been removed. The 3rd one is a ref. it stays there, in first pos.
-        eq_(app.selected_result_node_paths(), [[0]]) # no exception
-    
-    def test_selectResultNodePaths(self):
-        app = self.app
-        objects = self.objects
-        app.SelectResultNodePaths([[0,0],[0,1]])
-        self.assertEqual(2,len(app.selected_dupes))
-        self.assert_(app.selected_dupes[0] is objects[1])
-        self.assert_(app.selected_dupes[1] is objects[2])
-    
-    def test_selectResultNodePaths_with_ref(self):
-        app = self.app
-        objects = self.objects
-        app.SelectResultNodePaths([[0,0],[0,1],[1]])
-        self.assertEqual(3,len(app.selected_dupes))
-        self.assert_(app.selected_dupes[0] is objects[1])
-        self.assert_(app.selected_dupes[1] is objects[2])
-        self.assert_(app.selected_dupes[2] is self.groups[1].ref)
-    
-    def test_selectResultNodePaths_empty(self):
-        self.app.SelectResultNodePaths([])
-        self.assertEqual(0,len(self.app.selected_dupes))        
-    
-    def test_selectResultNodePaths_after_sort(self):
-        app = self.app
-        objects = self.objects
-        groups = self.groups[:] #To keep the old order in memory
-        app.sort_groups(0,False) #0 = Filename
-        #Now, the group order is supposed to be reversed
-        app.SelectResultNodePaths([[0,0],[1],[1,0]])
-        self.assertEqual(3,len(app.selected_dupes))
-        self.assert_(app.selected_dupes[0] is objects[4])
-        self.assert_(app.selected_dupes[1] is groups[0].ref)
-        self.assert_(app.selected_dupes[2] is objects[1])
-    
-    def test_selectResultNodePaths_out_of_range(self):
-        app = self.app
-        app.SelectResultNodePaths([[0,0],[0,1],[1],[1,1],[2]])
-        self.assertEqual(3,len(app.selected_dupes))
-    
-    def test_selected_powermarker_node_paths(self):
-        # app.selected_dupes is correctly converted into paths
-        app = self.app
-        objects = self.objects
-        paths = r2np([0, 1, 2])
-        app.SelectPowerMarkerNodePaths(paths)
-        eq_(app.selected_powermarker_node_paths(), paths)
-    
-    def test_selected_powermarker_node_paths_after_deletion(self):
-        # cases where the selected dupes aren't there are correctly handled
-        app = self.app
-        objects = self.objects
-        paths = r2np([0, 1, 2])
-        app.SelectPowerMarkerNodePaths(paths)
-        app.remove_selected()
-        eq_(app.selected_powermarker_node_paths(), []) # no exception
-    
-    def test_selectPowerMarkerRows(self):
-        app = self.app
-        objects = self.objects
-        app.SelectPowerMarkerNodePaths(r2np([0,1,2]))
-        self.assertEqual(3,len(app.selected_dupes))
-        self.assert_(app.selected_dupes[0] is objects[1])
-        self.assert_(app.selected_dupes[1] is objects[2])
-        self.assert_(app.selected_dupes[2] is objects[4])
-    
-    def test_selectPowerMarkerRows_empty(self):
-        self.app.SelectPowerMarkerNodePaths([])
-        self.assertEqual(0,len(self.app.selected_dupes))
-    
-    def test_selectPowerMarkerRows_after_sort(self):
-        app = self.app
-        objects = self.objects
-        app.sort_dupes(0,False) #0 = Filename
-        app.SelectPowerMarkerNodePaths(r2np([0,1,2]))
-        self.assertEqual(3,len(app.selected_dupes))
-        self.assert_(app.selected_dupes[0] is objects[4])
-        self.assert_(app.selected_dupes[1] is objects[2])
-        self.assert_(app.selected_dupes[2] is objects[1])
-    
-    def test_selectPowerMarkerRows_out_of_range(self):
-        app = self.app
-        app.SelectPowerMarkerNodePaths(r2np([0,1,2,3]))
-        self.assertEqual(3,len(app.selected_dupes))
-    
-    def test_toggleSelectedMark(self):
-        app = self.app
-        objects = self.objects
-        app.ToggleSelectedMarkState()
-        self.assertEqual(0,app.results.mark_count)
-        app.SelectPowerMarkerNodePaths(r2np([0,2]))
-        app.ToggleSelectedMarkState()
-        self.assertEqual(2,app.results.mark_count)
-        self.assert_(not app.results.is_marked(objects[0]))
-        self.assert_(app.results.is_marked(objects[1]))
-        self.assert_(not app.results.is_marked(objects[2]))
-        self.assert_(not app.results.is_marked(objects[3]))
-        self.assert_(app.results.is_marked(objects[4]))
-    
-    def test_refreshDetailsWithSelected(self):
-        self.app.SelectPowerMarkerNodePaths(r2np([0,2]))
-        eq_(self.dpanel.row(0), ('Filename', 'bar bleh', 'foo bar'))
-        self.check_gui_calls(self.dpanel_gui, ['refresh'])
-        self.app.SelectPowerMarkerNodePaths([])
-        eq_(self.dpanel.row(0), ('Filename', '---', '---'))
-        self.check_gui_calls(self.dpanel_gui, ['refresh'])
-    
-    def test_makeSelectedReference(self):
-        app = self.app
-        objects = self.objects
-        groups = self.groups
-        app.SelectPowerMarkerNodePaths(r2np([0,2]))
-        app.make_selected_reference()
-        assert groups[0].ref is objects[1]
-        assert groups[1].ref is objects[4]
-    
-    def test_makeSelectedReference_by_selecting_two_dupes_in_the_same_group(self):
-        app = self.app
-        objects = self.objects
-        groups = self.groups
-        app.SelectPowerMarkerNodePaths(r2np([0,1,2]))
-        #Only 0 and 2 must go ref, not 1 because it is a part of the same group
-        app.make_selected_reference()
-        assert groups[0].ref is objects[1]
-        assert groups[1].ref is objects[4]
-    
-    def test_removeSelected(self):
-        app = self.app
-        app.SelectPowerMarkerNodePaths(r2np([0,2]))
-        app.remove_selected()
-        eq_(len(app.results.dupes), 1)
-        app.remove_selected()
-        eq_(len(app.results.dupes), 1)
-        app.SelectPowerMarkerNodePaths(r2np([0,2]))
-        app.remove_selected()
-        eq_(len(app.results.dupes), 0)
-    
-    def test_addDirectory_simple(self):
-        # There's already a directory in self.app, so adding another once makes 2 of em
-        app = self.app
-        eq_(app.add_directory(self.datadirpath()), 0)
-        eq_(len(app.directories), 2)
-    
-    def test_addDirectory_already_there(self):
-        app = self.app
-        self.assertEqual(0,app.add_directory(self.datadirpath()))
-        self.assertEqual(1,app.add_directory(self.datadirpath()))
-    
-    def test_addDirectory_does_not_exist(self):
-        app = self.app
-        self.assertEqual(2,app.add_directory('/does_not_exist'))
-    
-    def test_ignore(self):
-        app = self.app
-        app.SelectPowerMarkerNodePaths(r2np([2])) #The dupe of the second, 2 sized group
-        app.add_selected_to_ignore_list()
-        self.assertEqual(1,len(app.scanner.ignore_list))
-        app.SelectPowerMarkerNodePaths(r2np([0])) #first dupe of the 3 dupes group
-        app.add_selected_to_ignore_list()
-        #BOTH the ref and the other dupe should have been added
-        self.assertEqual(3,len(app.scanner.ignore_list))
-    
-    def test_purgeIgnoreList(self):
-        app = self.app
-        p1 = self.filepath('zerofile')
-        p2 = self.filepath('zerofill')
-        dne = '/does_not_exist'
-        app.scanner.ignore_list.Ignore(dne,p1)
-        app.scanner.ignore_list.Ignore(p2,dne)
-        app.scanner.ignore_list.Ignore(p1,p2)
-        app.PurgeIgnoreList()
-        self.assertEqual(1,len(app.scanner.ignore_list))
-        self.assert_(app.scanner.ignore_list.AreIgnored(p1,p2))
-        self.assert_(not app.scanner.ignore_list.AreIgnored(dne,p1))
-    
-    def test_only_unicode_is_added_to_ignore_list(self):
-        def FakeIgnore(first,second):
-            if not isinstance(first,unicode):
-                self.fail()
-            if not isinstance(second,unicode):
-                self.fail()
-        
-        app = self.app
-        app.scanner.ignore_list.Ignore = FakeIgnore
-        app.SelectPowerMarkerNodePaths(r2np([2])) #The dupe of the second, 2 sized group
-        app.add_selected_to_ignore_list()
-    
-
-class TCDupeGuru_renameSelected(TestCase):
-    def setUp(self):
-        p = self.tmppath()
-        fp = open(unicode(p + 'foo bar 1'),mode='w')
-        fp.close()
-        fp = open(unicode(p + 'foo bar 2'),mode='w')
-        fp.close()
-        fp = open(unicode(p + 'foo bar 3'),mode='w')
-        fp.close()
-        files = fs.get_files(p)
-        matches = engine.getmatches(files)
-        groups = engine.get_groups(matches)
-        g = groups[0]
-        g.prioritize(lambda x:x.name)
-        app = DupeGuru()
-        app.results.groups = groups
-        self.app = app
-        self.groups = groups
-        self.p = p
-        self.files = files
-    
-    def test_simple(self):
-        app = self.app
-        g = self.groups[0]
-        app.SelectPowerMarkerNodePaths(r2np([0]))
-        assert app.RenameSelected('renamed')
-        names = io.listdir(self.p)
-        assert 'renamed' in names
-        assert 'foo bar 2' not in names
-        eq_(g.dupes[0].name, 'renamed')
-    
-    def test_none_selected(self):
-        app = self.app
-        g = self.groups[0]
-        app.SelectPowerMarkerNodePaths([])
-        self.mock(logging, 'warning', log_calls(lambda msg: None))
-        assert not app.RenameSelected('renamed')
-        msg = logging.warning.calls[0]['msg']
-        eq_('dupeGuru Warning: list index out of range', msg)
-        names = io.listdir(self.p)
-        assert 'renamed' not in names
-        assert 'foo bar 2' in names
-        eq_(g.dupes[0].name, 'foo bar 2')
-    
-    def test_name_already_exists(self):
-        app = self.app
-        g = self.groups[0]
-        app.SelectPowerMarkerNodePaths(r2np([0]))
-        self.mock(logging, 'warning', log_calls(lambda msg: None))
-        assert not app.RenameSelected('foo bar 1')
-        msg = logging.warning.calls[0]['msg']
-        assert msg.startswith('dupeGuru Warning: \'foo bar 1\' already exists in')
-        names = io.listdir(self.p)
-        assert 'foo bar 1' in names
-        assert 'foo bar 2' in names
-        eq_(g.dupes[0].name, 'foo bar 2')
-    

core/tests/app_test.py

@@ -7,17 +7,23 @@
 # http://www.hardcoded.net/licenses/hs_license
 
 import os
+import logging
 
+from hsutil.testutil import eq_
 from hsutil.testcase import TestCase
 from hsutil import io
 from hsutil.path import Path
 from hsutil.decorators import log_calls
 import hsutil.files
-from hsutil.job import nulljob
+from hscommon.job import nulljob
 
 from . import data
-from .. import app, fs
+from .results_test import GetTestGroups
+from .. import app, fs, engine
 from ..app import DupeGuru as DupeGuruBase
+from ..gui.details_panel import DetailsPanel
+from ..gui.directory_tree import DirectoryTree
+from ..gui.result_tree import ResultTree
 
 class DupeGuru(DupeGuruBase):
     def __init__(self):
@@ -27,6 +33,23 @@ class DupeGuru(DupeGuruBase):
         func(nulljob)
     
 
+class CallLogger(object):
+    """This is a dummy object that logs all calls made to it.
+    
+    It is used to simulate the GUI layer.
+    """
+    def __init__(self):
+        self.calls = []
+    
+    def __getattr__(self, func_name):
+        def func(*args, **kw):
+            self.calls.append(func_name)
+        return func
+    
+    def clear_calls(self):
+        del self.calls[:]
+    
+
 class TCDupeGuru(TestCase):
     cls_tested_module = app
     def test_apply_filter_calls_results_apply_filter(self):
@@ -133,3 +156,327 @@ class TCDupeGuru_clean_empty_dirs(TestCase):
         self.assertEqual(Path('not-empty/empty'), calls[1]['path'])
         self.assertEqual(Path('not-empty'), calls[2]['path'])
     
+
+class TCDupeGuruWithResults(TestCase):
+    def setUp(self):
+        self.app = DupeGuru()
+        self.objects,self.matches,self.groups = GetTestGroups()
+        self.app.results.groups = self.groups
+        self.dpanel_gui = CallLogger()
+        self.dpanel = DetailsPanel(self.dpanel_gui, self.app)
+        self.dtree_gui = CallLogger()
+        self.dtree = DirectoryTree(self.dtree_gui, self.app)
+        self.rtree_gui = CallLogger()
+        self.rtree = ResultTree(self.rtree_gui, self.app)
+        self.dpanel.connect()
+        self.dtree.connect()
+        self.rtree.connect()
+        tmppath = self.tmppath()
+        io.mkdir(tmppath + 'foo')
+        io.mkdir(tmppath + 'bar')
+        self.app.directories.add_path(tmppath)
+    
+    def check_gui_calls(self, gui, expected, verify_order=False):
+        """Checks that the expected calls have been made to 'gui', then clears the log.
+        
+        `expected` is an iterable of strings representing method names.
+        If `verify_order` is True, the order of the calls matters.
+        """
+        if verify_order:
+            eq_(gui.calls, expected)
+        else:
+            eq_(set(gui.calls), set(expected))
+        gui.clear_calls()
+    
+    def check_gui_calls_partial(self, gui, expected=None, not_expected=None):
+        """Checks that the expected calls have been made to 'gui', then clears the log.
+        
+        `expected` is an iterable of strings representing method names. Order doesn't matter.
+        Moreover, if calls have been made that are not in expected, no failure occur.
+        `not_expected` can be used for a more explicit check (rather than calling `check_gui_calls`
+        with an empty `expected`) to assert that calls have *not* been made.
+        """
+        calls = set(gui.calls)
+        if expected is not None:
+            expected = set(expected)
+            not_called = expected - calls
+            assert not not_called, u"These calls haven't been made: {0}".format(not_called)
+        if not_expected is not None:
+            not_expected = set(not_expected)
+            called = not_expected & calls
+            assert not called, u"These calls shouldn't have been made: {0}".format(called)
+        gui.clear_calls()
+    
+    def clear_gui_calls(self):
+        for attr in dir(self):
+            if attr.endswith('_gui'):
+                gui = getattr(self, attr)
+                if hasattr(gui, 'calls'): # We might have test methods ending with '_gui'
+                    gui.clear_calls()
+    
+    def test_GetObjects(self):
+        objects = self.objects
+        groups = self.groups
+        n = self.rtree.get_node([0])
+        assert n._group is groups[0]
+        assert n._dupe is objects[0]
+        n = self.rtree.get_node([0, 0])
+        assert n._group is groups[0]
+        assert n._dupe is objects[1]
+        n = self.rtree.get_node([1, 0])
+        assert n._group is groups[1]
+        assert n._dupe is objects[4]
+    
+    def test_GetObjects_after_sort(self):
+        objects = self.objects
+        groups = self.groups[:] # we need an un-sorted reference
+        self.rtree.sort(0, False) #0 = Filename
+        n = self.rtree.get_node([0, 0])
+        assert n._group is groups[1]
+        assert n._dupe is objects[4]
+    
+    def test_selected_result_node_paths(self):
+        # app.selected_dupes is correctly converted into node paths
+        paths = [[0, 0], [0, 1], [1]]
+        self.rtree.selected_paths = paths
+        eq_(self.rtree.selected_paths, paths)
+    
+    def test_selected_result_node_paths_after_deletion(self):
+        # cases where the selected dupes aren't there are correctly handled
+        paths = [[0, 0], [0, 1], [1]]
+        self.rtree.selected_paths = paths
+        self.app.remove_selected()
+        # The first 2 dupes have been removed. The 3rd one is a ref. it stays there, in first pos.
+        eq_(self.rtree.selected_paths, [[0, 0]]) # no exception
+    
+    def test_selectResultNodePaths(self):
+        app = self.app
+        objects = self.objects
+        self.rtree.selected_paths = [[0, 0], [0, 1]]
+        eq_(len(app.selected_dupes), 2)
+        assert app.selected_dupes[0] is objects[1]
+        assert app.selected_dupes[1] is objects[2]
+    
+    def test_selectResultNodePaths_with_ref(self):
+        app = self.app
+        objects = self.objects
+        self.rtree.selected_paths = [[0, 0], [0, 1], [1]]
+        eq_(len(app.selected_dupes), 3)
+        assert app.selected_dupes[0] is objects[1]
+        assert app.selected_dupes[1] is objects[2]
+        assert app.selected_dupes[2] is self.groups[1].ref
+    
+    def test_selectResultNodePaths_after_sort(self):
+        app = self.app
+        objects = self.objects
+        groups = self.groups[:] #To keep the old order in memory
+        self.rtree.sort(0, False) #0 = Filename
+        #Now, the group order is supposed to be reversed
+        self.rtree.selected_paths = [[0, 0], [1], [1, 0]]
+        eq_(len(app.selected_dupes), 3)
+        assert app.selected_dupes[0] is objects[4]
+        assert app.selected_dupes[1] is groups[0].ref
+        assert app.selected_dupes[2] is objects[1]
+    
+    def test_selected_powermarker_node_paths(self):
+        # app.selected_dupes is correctly converted into paths
+        app = self.app
+        objects = self.objects
+        self.rtree.power_marker = True
+        self.rtree.selected_paths = [[0], [1], [2]]
+        self.rtree.power_marker = False
+        eq_(self.rtree.selected_paths, [[0, 0], [0, 1], [1, 0]])
+    
+    def test_selected_powermarker_node_paths_after_deletion(self):
+        # cases where the selected dupes aren't there are correctly handled
+        app = self.app
+        objects = self.objects
+        self.rtree.power_marker = True
+        self.rtree.selected_paths = [[0], [1], [2]]
+        app.remove_selected()
+        eq_(self.rtree.selected_paths, []) # no exception
+    
+    def test_selectPowerMarkerRows(self):
+        app = self.app
+        objects = self.objects
+        self.rtree.selected_paths = [[0, 0], [0, 1], [1, 0]]
+        eq_(len(app.selected_dupes), 3)
+        assert app.selected_dupes[0] is objects[1]
+        assert app.selected_dupes[1] is objects[2]
+        assert app.selected_dupes[2] is objects[4]
+    
+    def test_selectPowerMarkerRows_empty(self):
+        self.rtree.selected_paths = []
+        eq_(len(self.app.selected_dupes), 0)
+    
+    def test_selectPowerMarkerRows_after_sort(self):
+        app = self.app
+        objects = self.objects
+        self.rtree.power_marker = True
+        self.rtree.sort(0, False) #0 = Filename
+        self.rtree.selected_paths = [[0], [1], [2]]
+        eq_(len(app.selected_dupes), 3)
+        assert app.selected_dupes[0] is objects[4]
+        assert app.selected_dupes[1] is objects[2]
+        assert app.selected_dupes[2] is objects[1]
+    
+    def test_toggleSelectedMark(self):
+        app = self.app
+        objects = self.objects
+        app.toggle_selected_mark_state()
+        eq_(app.results.mark_count, 0)
+        self.rtree.selected_paths = [[0, 0], [1, 0]]
+        app.toggle_selected_mark_state()
+        eq_(app.results.mark_count, 2)
+        assert not app.results.is_marked(objects[0])
+        assert app.results.is_marked(objects[1])
+        assert not app.results.is_marked(objects[2])
+        assert not app.results.is_marked(objects[3])
+        assert app.results.is_marked(objects[4])
+    
+    def test_refreshDetailsWithSelected(self):
+        self.rtree.selected_paths = [[0, 0], [1, 0]]
+        eq_(self.dpanel.row(0), ('Filename', 'bar bleh', 'foo bar'))
+        self.check_gui_calls(self.dpanel_gui, ['refresh'])
+        self.rtree.selected_paths = []
+        eq_(self.dpanel.row(0), ('Filename', '---', '---'))
+        self.check_gui_calls(self.dpanel_gui, ['refresh'])
+    
+    def test_makeSelectedReference(self):
+        app = self.app
+        objects = self.objects
+        groups = self.groups
+        self.rtree.selected_paths = [[0, 0], [1, 0]]
+        app.make_selected_reference()
+        assert groups[0].ref is objects[1]
+        assert groups[1].ref is objects[4]
+    
+    def test_makeSelectedReference_by_selecting_two_dupes_in_the_same_group(self):
+        app = self.app
+        objects = self.objects
+        groups = self.groups
+        self.rtree.selected_paths = [[0, 0], [0, 1], [1, 0]]
+        #Only [0, 0] and [1, 0] must go ref, not [0, 1] because it is a part of the same group
+        app.make_selected_reference()
+        assert groups[0].ref is objects[1]
+        assert groups[1].ref is objects[4]
+    
+    def test_removeSelected(self):
+        app = self.app
+        self.rtree.selected_paths = [[0, 0], [1, 0]]
+        app.remove_selected()
+        eq_(len(app.results.dupes), 1) # the first path is now selected
+        app.remove_selected()
+        eq_(len(app.results.dupes), 0)
+    
+    def test_addDirectory_simple(self):
+        # There's already a directory in self.app, so adding another once makes 2 of em
+        app = self.app
+        eq_(app.add_directory(self.datadirpath()), 0)
+        eq_(len(app.directories), 2)
+    
+    def test_addDirectory_already_there(self):
+        app = self.app
+        self.assertEqual(0,app.add_directory(self.datadirpath()))
+        self.assertEqual(1,app.add_directory(self.datadirpath()))
+    
+    def test_addDirectory_does_not_exist(self):
+        app = self.app
+        self.assertEqual(2,app.add_directory('/does_not_exist'))
+    
+    def test_ignore(self):
+        app = self.app
+        self.rtree.selected_path = [1, 0] #The dupe of the second, 2 sized group
+        app.add_selected_to_ignore_list()
+        eq_(len(app.scanner.ignore_list), 1)
+        self.rtree.selected_path = [0, 0] #first dupe of the 3 dupes group
+        app.add_selected_to_ignore_list()
+        #BOTH the ref and the other dupe should have been added
+        eq_(len(app.scanner.ignore_list), 3)
+    
+    def test_purgeIgnoreList(self):
+        app = self.app
+        p1 = self.filepath('zerofile')
+        p2 = self.filepath('zerofill')
+        dne = '/does_not_exist'
+        app.scanner.ignore_list.Ignore(dne,p1)
+        app.scanner.ignore_list.Ignore(p2,dne)
+        app.scanner.ignore_list.Ignore(p1,p2)
+        app.purge_ignore_list()
+        self.assertEqual(1,len(app.scanner.ignore_list))
+        self.assert_(app.scanner.ignore_list.AreIgnored(p1,p2))
+        self.assert_(not app.scanner.ignore_list.AreIgnored(dne,p1))
+    
+    def test_only_unicode_is_added_to_ignore_list(self):
+        def FakeIgnore(first,second):
+            if not isinstance(first,unicode):
+                self.fail()
+            if not isinstance(second,unicode):
+                self.fail()
+        
+        app = self.app
+        app.scanner.ignore_list.Ignore = FakeIgnore
+        self.rtree.selected_path = [1, 0]
+        app.add_selected_to_ignore_list()
+    
+
+class TCDupeGuru_renameSelected(TestCase):
+    def setUp(self):
+        p = self.tmppath()
+        fp = open(unicode(p + 'foo bar 1'),mode='w')
+        fp.close()
+        fp = open(unicode(p + 'foo bar 2'),mode='w')
+        fp.close()
+        fp = open(unicode(p + 'foo bar 3'),mode='w')
+        fp.close()
+        files = fs.get_files(p)
+        matches = engine.getmatches(files)
+        groups = engine.get_groups(matches)
+        g = groups[0]
+        g.prioritize(lambda x:x.name)
+        app = DupeGuru()
+        app.results.groups = groups
+        self.app = app
+        self.groups = groups
+        self.p = p
+        self.files = files
+        self.rtree_gui = CallLogger()
+        self.rtree = ResultTree(self.rtree_gui, self.app)
+        self.rtree.connect()
+    
+    def test_simple(self):
+        app = self.app
+        g = self.groups[0]
+        self.rtree.selected_path = [0, 0]
+        assert app.rename_selected('renamed')
+        names = io.listdir(self.p)
+        assert 'renamed' in names
+        assert 'foo bar 2' not in names
+        eq_(g.dupes[0].name, 'renamed')
+    
+    def test_none_selected(self):
+        app = self.app
+        g = self.groups[0]
+        self.rtree.selected_paths = []
+        self.mock(logging, 'warning', log_calls(lambda msg: None))
+        assert not app.rename_selected('renamed')
+        msg = logging.warning.calls[0]['msg']
+        eq_('dupeGuru Warning: list index out of range', msg)
+        names = io.listdir(self.p)
+        assert 'renamed' not in names
+        assert 'foo bar 2' in names
+        eq_(g.dupes[0].name, 'foo bar 2')
+    
+    def test_name_already_exists(self):
+        app = self.app
+        g = self.groups[0]
+        self.rtree.selected_path = [0, 0]
+        self.mock(logging, 'warning', log_calls(lambda msg: None))
+        assert not app.rename_selected('foo bar 1')
+        msg = logging.warning.calls[0]['msg']
+        assert msg.startswith('dupeGuru Warning: \'foo bar 1\' already exists in')
+        names = io.listdir(self.p)
+        assert 'foo bar 1' in names
+        assert 'foo bar 2' in names
+        eq_(g.dupes[0].name, 'foo bar 2')
+    

core/tests/conftest.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2010-07-11
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+# 
+# This software is licensed under the "BSD" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/bsd_license
+
+# This unit is required to make tests work with py.test. When running
+
+import py
+
+def get_testunit(item):
+    if hasattr(item, 'obj'):
+        testunit = py.builtin._getimself(item.obj)
+        if hasattr(testunit, 'global_setup'):
+            return testunit
+
+def pytest_runtest_setup(item):
+    testunit = get_testunit(item)
+    if testunit is not None:
+        testunit.global_setup()
+
+def pytest_runtest_teardown(item):
+    testunit = get_testunit(item)
+    if testunit is not None:
+        testunit.global_teardown()

core/tests/directories_test.py

@@ -10,10 +10,9 @@ import os.path as op
 import os
 import time
 
-from nose.tools import eq_
-
 from hsutil import io
 from hsutil.path import Path
+from hsutil.testutil import eq_
 from hsutil.testcase import TestCase
 
 from ..directories import *

core/tests/engine_test.py

@@ -8,13 +8,13 @@
 
 import sys
 
-from nose.tools import eq_
-
-from hsutil import job
+from hscommon import job
 from hsutil.decorators import log_calls
+from hsutil.misc import first
+from hsutil.testutil import eq_
 from hsutil.testcase import TestCase
 
-from .. import engine, fs
+from .. import engine
 from ..engine import *
 
 class NamedObject(object):
@@ -46,6 +46,15 @@ def get_test_group():
     result.add_match(m3)
     return result
 
+def assert_match(m, name1, name2):
+    # When testing matches, whether objects are in first or second position very often doesn't
+    # matter. This function makes this test more convenient.
+    if m.first.name == name1:
+        eq_(m.second.name, name2)
+    else:
+        eq_(m.first.name, name2)
+        eq_(m.second.name, name1)
+
 class TCgetwords(TestCase):
     def test_spaces(self):
         self.assertEqual(['a', 'b', 'c', 'd'], getwords("a b c d"))
@@ -229,10 +238,9 @@ class TCbuild_word_dict(TestCase):
         self.log = []
         s = "foo bar"
         build_word_dict([NamedObject(s, True), NamedObject(s, True), NamedObject(s, True)], j)
+        # We don't have intermediate log because iter_with_progress is called with every > 1
         self.assertEqual(0,self.log[0])
-        self.assertEqual(33,self.log[1])
-        self.assertEqual(66,self.log[2])
-        self.assertEqual(100,self.log[3])
+        self.assertEqual(100,self.log[1])
     
 
 class TCmerge_similar_words(TestCase):
@@ -352,23 +360,18 @@ class GetMatches(TestCase):
         l = [NamedObject("foo bar"),NamedObject("bar bleh"),NamedObject("a b c foo")]
         r = getmatches(l)
         self.assertEqual(2,len(r))
-        seek = [m for m in r if m.percentage == 50] #"foo bar" and "bar bleh"
-        m = seek[0]
-        self.assertEqual(['foo','bar'],m.first.words)
-        self.assertEqual(['bar','bleh'],m.second.words)
-        seek = [m for m in r if m.percentage == 33] #"foo bar" and "a b c foo"
-        m = seek[0]
-        self.assertEqual(['foo','bar'],m.first.words)
-        self.assertEqual(['a','b','c','foo'],m.second.words)
+        m = first(m for m in r if m.percentage == 50) #"foo bar" and "bar bleh"
+        assert_match(m, 'foo bar', 'bar bleh')
+        m = first(m for m in r if m.percentage == 33) #"foo bar" and "a b c foo"
+        assert_match(m, 'foo bar', 'a b c foo')
     
     def test_null_and_unrelated_objects(self):
         l = [NamedObject("foo bar"),NamedObject("bar bleh"),NamedObject(""),NamedObject("unrelated object")]
         r = getmatches(l)
-        self.assertEqual(1,len(r))
+        eq_(len(r), 1)
         m = r[0]
-        self.assertEqual(50,m.percentage)
-        self.assertEqual(['foo','bar'],m.first.words)
-        self.assertEqual(['bar','bleh'],m.second.words)
+        eq_(m.percentage, 50)
+        assert_match(m, 'foo bar', 'bar bleh')
     
     def test_twice_the_same_word(self):
         l = [NamedObject("foo foo bar"),NamedObject("bar bleh")]

core/tests/ignore_test.py

@@ -7,9 +7,9 @@
 # http://www.hardcoded.net/licenses/hs_license
 
 import cStringIO
-import xml.dom.minidom
+from lxml import etree
 
-from nose.tools import eq_
+from hsutil.testutil import eq_
 
 from ..ignore import *
 
@@ -62,26 +62,25 @@ def test_save_to_xml():
     f = cStringIO.StringIO()
     il.save_to_xml(f)
     f.seek(0)
-    doc = xml.dom.minidom.parse(f)
-    root = doc.documentElement
-    eq_('ignore_list',root.nodeName)
-    children = [c for c in root.childNodes if c.localName]
-    eq_(2,len(children))
-    eq_(2,len([c for c in children if c.nodeName == 'file']))
-    f1,f2 = children
-    subchildren = [c for c in f1.childNodes if c.localName == 'file'] +\
-        [c for c in f2.childNodes if c.localName == 'file']
-    eq_(3,len(subchildren))
+    doc = etree.parse(f)
+    root = doc.getroot()
+    eq_(root.tag, 'ignore_list')
+    eq_(len(root), 2)
+    eq_(len([c for c in root if c.tag == 'file']), 2)
+    f1, f2 = root[:]
+    subchildren = [c for c in f1 if c.tag == 'file'] + [c for c in f2 if c.tag == 'file']
+    eq_(len(subchildren), 3)
 
 def test_SaveThenLoad():
     il = IgnoreList()
-    il.Ignore('foo','bar')
-    il.Ignore('foo','bleh')
-    il.Ignore('bleh','bar')
-    il.Ignore(u'\u00e9','bar')
+    il.Ignore('foo', 'bar')
+    il.Ignore('foo', 'bleh')
+    il.Ignore('bleh', 'bar')
+    il.Ignore(u'\u00e9', 'bar')
     f = cStringIO.StringIO()
     il.save_to_xml(f)
     f.seek(0)
+    f.seek(0)
     il = IgnoreList()
     il.load_from_xml(f)
     eq_(4,len(il))
@@ -129,9 +128,9 @@ def test_filter():
     assert not il.AreIgnored('foo','bar')
     assert il.AreIgnored('bar','baz')
 
-def test_save_with_non_ascii_non_unicode_items():
+def test_save_with_non_ascii_items():
     il = IgnoreList()
-    il.Ignore('\xac','\xbf')
+    il.Ignore(u'\xac', u'\xbf')
     f = cStringIO.StringIO()
     try:
         il.save_to_xml(f)

core/tests/results_test.py

@@ -7,18 +7,19 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-import unittest
 import StringIO
-import xml.dom.minidom
 import os.path as op
 
+from lxml import etree
+
 from hsutil.path import Path
+from hsutil.testutil import eq_
 from hsutil.testcase import TestCase
 from hsutil.misc import first
 
 from . import engine_test, data
 from .. import engine
-from ..results import *
+from ..results import Results
 
 class NamedObject(engine_test.NamedObject):
     path = property(lambda x:Path('basepath') + x.name)
@@ -65,9 +66,9 @@ class TCResultsEmpty(TestCase):
         f = StringIO.StringIO()
         self.results.save_to_xml(f)
         f.seek(0)
-        doc = xml.dom.minidom.parse(f)
-        root = doc.documentElement
-        self.assertEqual('results',root.nodeName)
+        doc = etree.parse(f)
+        root = doc.getroot()
+        self.assertEqual('results', root.tag)
     
 
 class TCResultsWithSomeGroups(TestCase):
@@ -253,18 +254,23 @@ class TCResultsMarkings(TestCase):
     def test_perform_on_marked_with_problems(self):
         def log_object(o):
             log.append(o)
-            return o is not self.objects[1]
+            if o is self.objects[1]:
+                raise EnvironmentError('foobar')
         
         log = []
         self.results.mark_all()
-        self.assert_(self.results.is_marked(self.objects[1]))
-        self.assertEqual(1,self.results.perform_on_marked(log_object, True))
-        self.assertEqual(3,len(log))
-        self.assertEqual(1,len(self.results.groups))
-        self.assertEqual(2,len(self.results.groups[0]))
-        self.assert_(self.objects[1] in self.results.groups[0])
-        self.assert_(not self.results.is_marked(self.objects[2]))
-        self.assert_(self.results.is_marked(self.objects[1]))
+        assert self.results.is_marked(self.objects[1])
+        self.results.perform_on_marked(log_object, True)
+        eq_(len(log), 3)
+        eq_(len(self.results.groups), 1)
+        eq_(len(self.results.groups[0]), 2)
+        assert self.objects[1] in self.results.groups[0]
+        assert not self.results.is_marked(self.objects[2])
+        assert self.results.is_marked(self.objects[1])
+        eq_(len(self.results.problems), 1)
+        dupe, msg = self.results.problems[0]
+        assert dupe is self.objects[1]
+        eq_(msg, 'foobar')
     
     def test_perform_on_marked_with_ref(self):
         def log_object(o):
@@ -321,16 +327,16 @@ class TCResultsMarkings(TestCase):
         f = StringIO.StringIO()
         self.results.save_to_xml(f)
         f.seek(0)
-        doc = xml.dom.minidom.parse(f)
-        root = doc.documentElement
-        g1,g2 = root.getElementsByTagName('group')
-        d1,d2,d3 = g1.getElementsByTagName('file')
-        self.assertEqual('n',d1.getAttributeNode('marked').nodeValue)
-        self.assertEqual('n',d2.getAttributeNode('marked').nodeValue)
-        self.assertEqual('y',d3.getAttributeNode('marked').nodeValue)
-        d1,d2 = g2.getElementsByTagName('file')
-        self.assertEqual('n',d1.getAttributeNode('marked').nodeValue)
-        self.assertEqual('y',d2.getAttributeNode('marked').nodeValue)
+        doc = etree.parse(f)
+        root = doc.getroot()
+        g1, g2 = root.iterchildren('group')
+        d1, d2, d3 = g1.iterchildren('file')
+        self.assertEqual('n', d1.get('marked'))
+        self.assertEqual('n', d2.get('marked'))
+        self.assertEqual('y', d3.get('marked'))
+        d1, d2 = g2.iterchildren('file')
+        self.assertEqual('n', d1.get('marked'))
+        self.assertEqual('y', d2.get('marked'))
     
     def test_LoadXML(self):
         def get_file(path):
@@ -366,38 +372,35 @@ class TCResultsXML(TestCase):
         f = StringIO.StringIO()
         self.results.save_to_xml(f)
         f.seek(0)
-        doc = xml.dom.minidom.parse(f)
-        root = doc.documentElement
-        self.assertEqual('results',root.nodeName)
-        children = [c for c in root.childNodes if c.localName]
-        self.assertEqual(2,len(children))
-        self.assertEqual(2,len([c for c in children if c.nodeName == 'group']))
-        g1,g2 = children
-        children = [c for c in g1.childNodes if c.localName]
-        self.assertEqual(6,len(children))
-        self.assertEqual(3,len([c for c in children if c.nodeName == 'file']))
-        self.assertEqual(3,len([c for c in children if c.nodeName == 'match']))
-        d1,d2,d3 = [c for c in children if c.nodeName == 'file']
-        self.assertEqual(op.join('basepath','foo bar'),d1.getAttributeNode('path').nodeValue)
-        self.assertEqual(op.join('basepath','bar bleh'),d2.getAttributeNode('path').nodeValue)
-        self.assertEqual(op.join('basepath','foo bleh'),d3.getAttributeNode('path').nodeValue)
-        self.assertEqual('y',d1.getAttributeNode('is_ref').nodeValue)
-        self.assertEqual('n',d2.getAttributeNode('is_ref').nodeValue)
-        self.assertEqual('n',d3.getAttributeNode('is_ref').nodeValue)
-        self.assertEqual('foo,bar',d1.getAttributeNode('words').nodeValue)
-        self.assertEqual('bar,bleh',d2.getAttributeNode('words').nodeValue)
-        self.assertEqual('foo,bleh',d3.getAttributeNode('words').nodeValue)
-        children = [c for c in g2.childNodes if c.localName]
-        self.assertEqual(3,len(children))
-        self.assertEqual(2,len([c for c in children if c.nodeName == 'file']))
-        self.assertEqual(1,len([c for c in children if c.nodeName == 'match']))
-        d1,d2 = [c for c in children if c.nodeName == 'file']
-        self.assertEqual(op.join('basepath','ibabtu'),d1.getAttributeNode('path').nodeValue)
-        self.assertEqual(op.join('basepath','ibabtu'),d2.getAttributeNode('path').nodeValue)
-        self.assertEqual('n',d1.getAttributeNode('is_ref').nodeValue)
-        self.assertEqual('n',d2.getAttributeNode('is_ref').nodeValue)
-        self.assertEqual('ibabtu',d1.getAttributeNode('words').nodeValue)
-        self.assertEqual('ibabtu',d2.getAttributeNode('words').nodeValue)
+        doc = etree.parse(f)
+        root = doc.getroot()
+        self.assertEqual('results', root.tag)
+        self.assertEqual(2, len(root))
+        self.assertEqual(2, len([c for c in root if c.tag == 'group']))
+        g1, g2 = root
+        self.assertEqual(6,len(g1))
+        self.assertEqual(3,len([c for c in g1 if c.tag == 'file']))
+        self.assertEqual(3,len([c for c in g1 if c.tag == 'match']))
+        d1, d2, d3 = [c for c in g1 if c.tag == 'file']
+        self.assertEqual(op.join('basepath','foo bar'),d1.get('path'))
+        self.assertEqual(op.join('basepath','bar bleh'),d2.get('path'))
+        self.assertEqual(op.join('basepath','foo bleh'),d3.get('path'))
+        self.assertEqual('y',d1.get('is_ref'))
+        self.assertEqual('n',d2.get('is_ref'))
+        self.assertEqual('n',d3.get('is_ref'))
+        self.assertEqual('foo,bar',d1.get('words'))
+        self.assertEqual('bar,bleh',d2.get('words'))
+        self.assertEqual('foo,bleh',d3.get('words'))
+        self.assertEqual(3,len(g2))
+        self.assertEqual(2,len([c for c in g2 if c.tag == 'file']))
+        self.assertEqual(1,len([c for c in g2 if c.tag == 'match']))
+        d1, d2 = [c for c in g2 if c.tag == 'file']
+        self.assertEqual(op.join('basepath','ibabtu'),d1.get('path'))
+        self.assertEqual(op.join('basepath','ibabtu'),d2.get('path'))
+        self.assertEqual('n',d1.get('is_ref'))
+        self.assertEqual('n',d2.get('is_ref'))
+        self.assertEqual('ibabtu',d1.get('words'))
+        self.assertEqual('ibabtu',d2.get('words'))
     
     def test_LoadXML(self):
         def get_file(path):
@@ -460,41 +463,41 @@ class TCResultsXML(TestCase):
         def get_file(path):
             return [f for f in self.objects if str(f.path) == path][0]
         
-        doc = xml.dom.minidom.Document()
-        root = doc.appendChild(doc.createElement('foobar')) #The root element shouldn't matter, really.
-        group_node = root.appendChild(doc.createElement('group'))
-        dupe_node = group_node.appendChild(doc.createElement('file')) #Perfectly correct file
-        dupe_node.setAttribute('path',op.join('basepath','foo bar'))
-        dupe_node.setAttribute('is_ref','y')
-        dupe_node.setAttribute('words','foo,bar')
-        dupe_node = group_node.appendChild(doc.createElement('file')) #is_ref missing, default to 'n'
-        dupe_node.setAttribute('path',op.join('basepath','foo bleh'))
-        dupe_node.setAttribute('words','foo,bleh')
-        dupe_node = group_node.appendChild(doc.createElement('file')) #words are missing, invalid.
-        dupe_node.setAttribute('path',op.join('basepath','bar bleh'))
-        dupe_node = group_node.appendChild(doc.createElement('file')) #path is missing, invalid.
-        dupe_node.setAttribute('words','foo,bleh')
-        dupe_node = group_node.appendChild(doc.createElement('foobar')) #Invalid element name
-        dupe_node.setAttribute('path',op.join('basepath','bar bleh'))
-        dupe_node.setAttribute('is_ref','y')
-        dupe_node.setAttribute('words','bar,bleh')
-        match_node = group_node.appendChild(doc.createElement('match')) # match pointing to a bad index
-        match_node.setAttribute('first', '42')
-        match_node.setAttribute('second', '45')
-        match_node = group_node.appendChild(doc.createElement('match')) # match with missing attrs
-        match_node = group_node.appendChild(doc.createElement('match')) # match with non-int values
-        match_node.setAttribute('first', 'foo')
-        match_node.setAttribute('second', 'bar')
-        match_node.setAttribute('percentage', 'baz')
-        group_node = root.appendChild(doc.createElement('foobar')) #invalid group
-        group_node = root.appendChild(doc.createElement('group')) #empty group
+        root = etree.Element('foobar') #The root element shouldn't matter, really.
+        group_node = etree.SubElement(root, 'group')
+        dupe_node = etree.SubElement(group_node, 'file') #Perfectly correct file
+        dupe_node.set('path', op.join('basepath','foo bar'))
+        dupe_node.set('is_ref', 'y')
+        dupe_node.set('words', 'foo,bar')
+        dupe_node = etree.SubElement(group_node, 'file') #is_ref missing, default to 'n'
+        dupe_node.set('path',op.join('basepath','foo bleh'))
+        dupe_node.set('words','foo,bleh')
+        dupe_node = etree.SubElement(group_node, 'file') #words are missing, valid.
+        dupe_node.set('path',op.join('basepath','bar bleh'))
+        dupe_node = etree.SubElement(group_node, 'file') #path is missing, invalid.
+        dupe_node.set('words','foo,bleh')
+        dupe_node = etree.SubElement(group_node, 'foobar') #Invalid element name
+        dupe_node.set('path',op.join('basepath','bar bleh'))
+        dupe_node.set('is_ref','y')
+        dupe_node.set('words','bar,bleh')
+        match_node = etree.SubElement(group_node, 'match') # match pointing to a bad index
+        match_node.set('first', '42')
+        match_node.set('second', '45')
+        match_node = etree.SubElement(group_node, 'match') # match with missing attrs
+        match_node = etree.SubElement(group_node, 'match') # match with non-int values
+        match_node.set('first', 'foo')
+        match_node.set('second', 'bar')
+        match_node.set('percentage', 'baz')
+        group_node = etree.SubElement(root, 'foobar') #invalid group
+        group_node = etree.SubElement(root, 'group') #empty group
         f = StringIO.StringIO()
-        doc.writexml(f,'\t','\t','\n',encoding='utf-8')
+        tree = etree.ElementTree(root)
+        tree.write(f, encoding='utf-8')
         f.seek(0)
         r = Results(data)
-        r.load_from_xml(f,get_file)
+        r.load_from_xml(f, get_file)
         self.assertEqual(1,len(r.groups))
-        self.assertEqual(2,len(r.groups[0]))
+        self.assertEqual(3,len(r.groups[0]))
     
     def test_xml_non_ascii(self):
         def get_file(path):
@@ -567,6 +570,16 @@ class TCResultsXML(TestCase):
         self.results.load_from_xml(f, self.get_file)
         first(self.results.groups[0].matches).percentage
     
+    def test_apply_filter_works_on_paths(self):
+        # apply_filter() searches on the whole path, not just on the filename.
+        self.results.apply_filter(u'basepath')
+        eq_(len(self.results.groups), 2)
+    
+    def test_save_xml_with_invalid_characters(self):
+        # Don't crash when saving files that have invalid xml characters in their path
+        self.objects[0].name = u'foo\x19'
+        self.results.save_to_xml(StringIO.StringIO()) # don't crash
+    
 
 class TCResultsFilter(TestCase):
     def setUp(self):

core/tests/scanner_test.py

@@ -6,10 +6,11 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-from nose.tools import eq_
 
-from hsutil import job, io
+from hscommon import job
+from hsutil import io
 from hsutil.path import Path
+from hsutil.testutil import eq_
 from hsutil.testcase import TestCase
 
 from .. import fs

core_me/app_cocoa.py

@@ -10,7 +10,7 @@ import logging
 from appscript import app, k, CommandError
 import time
 
-from hsutil.cocoa import as_fetch
+from hscommon.cocoa import as_fetch
 
 from core.app_cocoa import JOBID2TITLE, DupeGuru as DupeGuruBase
 

core_me/fs.py

@@ -7,7 +7,7 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-from hsmedia import mpeg, wma, mp4, ogg, flac, aiff
+from hsaudiotag import mpeg, wma, mp4, ogg, flac, aiff
 from hsutil.str import get_file_ext
 from core import fs
 

core_me/tests/conftest.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2010-07-11
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+# 
+# This software is licensed under the "BSD" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/bsd_license
+
+# This unit is required to make tests work with py.test. When running
+
+import py
+
+def get_testunit(item):
+    if hasattr(item, 'obj'):
+        testunit = py.builtin._getimself(item.obj)
+        if hasattr(testunit, 'global_setup'):
+            return testunit
+
+def pytest_runtest_setup(item):
+    testunit = get_testunit(item)
+    if testunit is not None:
+        testunit.global_setup()
+
+def pytest_runtest_teardown(item):
+    testunit = get_testunit(item)
+    if testunit is not None:
+        testunit.global_teardown()

core_pe/app_cocoa.py

@@ -7,17 +7,16 @@
 # http://www.hardcoded.net/licenses/hs_license
 
 import os.path as op
-import logging
 import plistlib
-import re
 
+from lxml import etree
 from appscript import app, k, CommandError
 
 from hsutil import io
 from hsutil.str import get_file_ext
 from hsutil.path import Path
-from hsutil.cocoa import as_fetch
-from hsutil.cocoa.objcmin import NSUserDefaults, NSURL
+from hscommon.cocoa import as_fetch
+from hscommon.cocoa.objcmin import NSUserDefaults, NSURL
 
 from core import fs
 from core import app_cocoa, directories
@@ -68,15 +67,10 @@ def get_iphoto_database_path():
 def get_iphoto_pictures(plistpath):
     if not io.exists(plistpath):
         return []
-    s = io.open(plistpath).read()
-    # There was a case where a guy had 0x10 chars in his plist, causing expat errors on loading
-    s = s.replace('\x10', '')
-    # It seems that iPhoto sometimes doesn't properly escape & chars. The regexp below is to find
-    # any & char that is not a &-based entity (&, ", etc.). based on TextMate's XML
-    # bundle's regexp
-    s, count = re.subn(r'&(?![a-zA-Z0-9_-]+|#[0-9]+|#x[0-9a-fA-F]+;)', '', s)
-    if count:
-        logging.warning("%d invalid XML entities replacement made", count)
+    # We make the xml go through lxml so that it can fix broken xml which iPhoto sometimes produces.
+    parser = etree.XMLParser(recover=True)
+    root = etree.parse(io.open(plistpath), parser=parser).getroot()
+    s = etree.tostring(root)
     plist = plistlib.readPlistFromString(s)
     result = []
     for photo_data in plist['Master Image List'].values():
@@ -152,7 +146,7 @@ class DupeGuruPE(app_cocoa.DupeGuru):
             except (CommandError, RuntimeError):
                 pass
         j.start_job(self.results.mark_count, "Sending dupes to the Trash")
-        self.last_op_error_count = self.results.perform_on_marked(op, True)
+        self.results.perform_on_marked(op, True)
         del self.path2iphoto
     
     def _do_delete_dupe(self, dupe):
@@ -162,14 +156,13 @@ class DupeGuruPE(app_cocoa.DupeGuru):
                 try:
                     a = app('iPhoto')
                     a.remove(photo, timeout=0)
-                    return True
-                except (CommandError, RuntimeError):
-                    return False
+                except (CommandError, RuntimeError) as e:
+                    raise EnvironmentError(unicode(e))
             else:
-                logging.warning(u"Could not find photo %s in iPhoto Library", unicode(dupe.path))
-                return False
+                msg = u"Could not find photo %s in iPhoto Library" % unicode(dupe.path)
+                raise EnvironmentError(msg)
         else:
-            return app_cocoa.DupeGuru._do_delete_dupe(self, dupe)
+            app_cocoa.DupeGuru._do_delete_dupe(self, dupe)
     
     def _do_load(self, j):
         self.directories.load_from_file(op.join(self.appdata, 'last_directories.xml'))

core_pe/matchbase.py

@@ -8,11 +8,9 @@
 
 import logging
 import multiprocessing
-from Queue import Empty
-from collections import defaultdict
+from collections import defaultdict, deque
 
-from hsutil import job
-from hsutil.misc import dedupe
+from hscommon import job
 
 from core.engine import Match
 from .block import avgdiff, DifferentBlockCountError, NoBlocksError
@@ -42,7 +40,7 @@ def prepare_pictures(pictures, cache_path, j=job.nulljob):
                     blocks = picture.get_blocks(BLOCK_COUNT_PER_SIDE)
                     cache[picture.unicode_path] = blocks
                 prepared.append(picture)
-            except IOError as e:
+            except (IOError, ValueError) as e:
                 logging.warning(unicode(e))
             except MemoryError:
                 logging.warning(u'Ran out of memory while reading %s of size %d' % (picture.unicode_path, picture.size))
@@ -76,13 +74,6 @@ def async_compare(ref_id, other_ids, dbname, threshold):
     return results
     
 def getmatches(pictures, cache_path, threshold=75, match_scaled=False, j=job.nulljob):
-    def empty_out_queue(queue, into):
-        try:
-            while True:
-                into.append(queue.get(block=False))
-        except Empty:
-            pass
-    
     j = j.start_subjob([3, 7])
     pictures = prepare_pictures(pictures, cache_path, j)
     j = j.start_subjob([9, 1], 'Preparing for matching')
@@ -100,7 +91,7 @@ def getmatches(pictures, cache_path, threshold=75, match_scaled=False, j=job.nul
     cache.close()
     pictures = [p for p in pictures if hasattr(p, 'cache_id')]
     pool = multiprocessing.Pool()
-    async_results = []
+    async_results = deque()
     matches = []
     pictures_copy = set(pictures)
     for ref in j.iter_with_progress(pictures, 'Matched %d/%d pictures'):
@@ -111,10 +102,17 @@ def getmatches(pictures, cache_path, threshold=75, match_scaled=False, j=job.nul
             others = [pic for pic in others if not pic.is_ref]
         if others:
             cache_ids = [f.cache_id for f in others]
-            args = (ref.cache_id, cache_ids, cache_path, threshold)
-            async_results.append(pool.apply_async(async_compare, args))
-        if len(async_results) > RESULTS_QUEUE_LIMIT:
-            result = async_results.pop(0)
+            # We limit the number of cache_ids we send for multi-processing because otherwise, we
+            # might get an error saying "String or BLOB exceeded size limit"
+            ARG_LIMIT = 1000
+            while cache_ids:
+                args = (ref.cache_id, cache_ids[:ARG_LIMIT], cache_path, threshold)
+                async_results.append(pool.apply_async(async_compare, args))
+                cache_ids = cache_ids[ARG_LIMIT:]
+        # We use a while here because it's possible that more than one result has been added if
+        # ARG_LIMIT has been reached.
+        while len(async_results) > RESULTS_QUEUE_LIMIT:
+            result = async_results.popleft()
             matches.extend(result.get())
     for result in async_results: # process the rest of the results
         matches.extend(result.get())

core_pe/modules/block_osx.m

@@ -150,7 +150,7 @@ static PyObject* block_osx_getblocks(PyObject *self, PyObject *args)
     CGImageSourceRef source;
     CGImageRef image;
     size_t width, height;
-    int block_count, block_width, block_height, block_xcount, block_ycount, i;
+    int block_count, block_width, block_height, i;
     
     width = 0;
     height = 0;
@@ -158,6 +158,11 @@ static PyObject* block_osx_getblocks(PyObject *self, PyObject *args)
         return NULL;
     }
     
+    if (PySequence_Length(path) == 0) {
+        PyErr_SetString(PyExc_ValueError, "empty path");
+        return NULL;
+    }
+    
     image_path = pystring2cfstring(path);
     if (image_path == NULL) {
         return PyErr_NoMemory();
@@ -192,23 +197,24 @@ static PyObject* block_osx_getblocks(PyObject *self, PyObject *args)
     
     block_width = max(width/block_count, 1);
     block_height = max(height/block_count, 1);
-    /* block_count might have changed */
-    block_xcount = (width / block_width);
-    block_ycount = (height / block_height);
     
-    result = PyList_New(block_xcount * block_ycount);
+    result = PyList_New(block_count * block_count);
     if (result == NULL) {
         return NULL;
     }
     
-    for(i=0; i<block_ycount; i++)
-    {
-        int j;
-        for(j=0; j<block_xcount; j++)
-        {
-            PyObject *block = getblock(bitmapData, width, height, j*block_width, i*block_height,
-                block_width, block_height);
-            PyList_SET_ITEM(result, i*block_ycount+j, block);
+    for(i=0; i<block_count; i++) {
+        int j, top;
+        top = min(i*block_height, height-block_height);
+        for(j=0; j<block_count; j++) {
+            int left;
+            left = min(j*block_width, width-block_width);
+            PyObject *block = getblock(bitmapData, width, height, left, top, block_width, block_height);
+            if (block == NULL) {
+                Py_DECREF(result);
+                return NULL;
+            }
+            PyList_SET_ITEM(result, i*block_count+j, block);
         }
     }
     

core_pe/tests/conftest.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2010-07-11
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+# 
+# This software is licensed under the "BSD" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/bsd_license
+
+# This unit is required to make tests work with py.test. When running
+
+import py
+
+def get_testunit(item):
+    if hasattr(item, 'obj'):
+        testunit = py.builtin._getimself(item.obj)
+        if hasattr(testunit, 'global_setup'):
+            return testunit
+
+def pytest_runtest_setup(item):
+    testunit = get_testunit(item)
+    if testunit is not None:
+        testunit.global_setup()
+
+def pytest_runtest_teardown(item):
+    testunit = get_testunit(item)
+    if testunit is not None:
+        testunit.global_teardown()

core_se/app_cocoa.py

@@ -12,7 +12,7 @@ import logging
 
 from hsutil import io
 from hsutil.path import Path
-from hsutil.cocoa.objcmin import NSWorkspace
+from hscommon.cocoa.objcmin import NSWorkspace
 
 from core import fs
 from core.app_cocoa import DupeGuru as DupeGuruBase

core_se/tests/conftest.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2010-07-11
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+# 
+# This software is licensed under the "BSD" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/bsd_license
+
+# This unit is required to make tests work with py.test. When running
+
+import py
+
+def get_testunit(item):
+    if hasattr(item, 'obj'):
+        testunit = py.builtin._getimself(item.obj)
+        if hasattr(testunit, 'global_setup'):
+            return testunit
+
+def pytest_runtest_setup(item):
+    testunit = get_testunit(item)
+    if testunit is not None:
+        testunit.global_setup()
+
+def pytest_runtest_teardown(item):
+    testunit = get_testunit(item)
+    if testunit is not None:
+        testunit.global_teardown()

core_se/tests/fs_test.py

@@ -9,9 +9,8 @@
 
 import hashlib
 
-from nose.tools import eq_
-
 from hsutil.testcase import TestCase
+from hsutil.testutil import eq_
 from core.fs import File
 from core.tests.directories_test import create_fake_fs
 

debian_me/control

@@ -0,0 +1,12 @@
+Source: dupeguru-me
+Section: devel
+Priority: extra
+Maintainer: Virgil Dupras <hsoft@hardcoded.net>
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.8.1
+Homepage: http://www.hardcoded.net
+
+Package: dupeguru-me
+Architecture: any
+Depends: python (>= 2.6), python-qt4 (>= 4.6), python-lxml (>= 2.1)
+Description: dupeGuru Music Edition

debian_me/dirs

@@ -0,0 +1,3 @@
+usr/local/bin
+usr/local/share
+usr/share/applications

debian_me/dupeguru_me.desktop

@@ -0,0 +1,10 @@
+
+[Desktop Entry]
+Encoding=UTF-8
+Name=dupeGuru Music Edition
+Comment=Find duplicate songs in your collection.
+Exec=dupeguru_me
+Icon=/usr/local/share/dupeguru_me/dgme_logo_128.png
+Terminal=false
+Type=Application
+Categories=Utility

debian_me/rules

@@ -0,0 +1,86 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+
+	touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp  
+	dh_testdir
+
+	# Add here commands to compile the package.
+
+	touch $@
+
+clean: 
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep  
+	dh_installdirs
+
+	chmod +x src/start.py
+	cp -R src/ $(CURDIR)/debian/tmp/usr/local/share/dupeguru_me
+	cp $(CURDIR)/debian/dupeguru_me.desktop $(CURDIR)/debian/tmp/usr/share/applications
+	ln -s /usr/local/share/dupeguru_me/start.py $(CURDIR)/debian/tmp/usr/local/bin/dupeguru_me
+
+
+# Build architecture-independent files here.
+binary-indep: install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+	dh_install
+	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

debian_pe/control

@@ -0,0 +1,12 @@
+Source: dupeguru-pe
+Section: devel
+Priority: extra
+Maintainer: Virgil Dupras <hsoft@hardcoded.net>
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.8.1
+Homepage: http://www.hardcoded.net
+
+Package: dupeguru-pe
+Architecture: any
+Depends: python (>= 2.6), python-qt4 (>= 4.6), python-lxml (>= 2.1), python-imaging (>= 1.1.6)
+Description: dupeGuru Picture Edition

debian_pe/dirs

@@ -0,0 +1,3 @@
+usr/local/bin
+usr/local/share
+usr/share/applications

debian_pe/dupeguru_pe.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=dupeGuru Picture Edition
+Comment=Find duplicate pictures in your library.
+Exec=dupeguru_pe
+Icon=/usr/local/share/dupeguru_pe/dgpe_logo_128.png
+Terminal=false
+Type=Application
+Categories=Utility

debian_pe/rules

@@ -0,0 +1,86 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+
+	touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp  
+	dh_testdir
+
+	# Add here commands to compile the package.
+
+	touch $@
+
+clean: 
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep  
+	dh_installdirs
+
+	chmod +x src/start.py
+	cp -R src/ $(CURDIR)/debian/tmp/usr/local/share/dupeguru_pe
+	cp $(CURDIR)/debian/dupeguru_pe.desktop $(CURDIR)/debian/tmp/usr/share/applications
+	ln -s /usr/local/share/dupeguru_pe/start.py $(CURDIR)/debian/tmp/usr/local/bin/dupeguru_pe
+
+
+# Build architecture-independent files here.
+binary-indep: install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+	dh_install
+	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

debian_se/control

@@ -0,0 +1,12 @@
+Source: dupeguru-se
+Section: devel
+Priority: extra
+Maintainer: Virgil Dupras <hsoft@hardcoded.net>
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.8.1
+Homepage: http://www.hardcoded.net
+
+Package: dupeguru-se
+Architecture: any
+Depends: python (>= 2.6), python-qt4 (>= 4.6), python-lxml (>= 2.1)
+Description: dupeGuru

debian_se/dirs

@@ -0,0 +1,3 @@
+usr/local/bin
+usr/local/share
+usr/share/applications

debian_se/dupeguru_se.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=dupeGuru
+Comment=Find duplicate files.
+Exec=dupeguru_se
+Icon=/usr/local/share/dupeguru_se/dgse_logo_128.png
+Terminal=false
+Type=Application
+Categories=Utility

debian_se/rules

@@ -0,0 +1,86 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+
+	touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp  
+	dh_testdir
+
+	# Add here commands to compile the package.
+
+	touch $@
+
+clean: 
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep  
+	dh_installdirs
+
+	chmod +x src/start.py
+	cp -R src/ $(CURDIR)/debian/tmp/usr/local/share/dupeguru_se
+	cp $(CURDIR)/debian/dupeguru_se.desktop $(CURDIR)/debian/tmp/usr/share/applications
+	ln -s /usr/local/share/dupeguru_se/start.py $(CURDIR)/debian/tmp/usr/local/bin/dupeguru_se
+
+
+# Build architecture-independent files here.
+binary-indep: install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+	dh_install
+	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

help_me/changelog.yaml

@@ -1,3 +1,15 @@
+- date: 2010-04-14
+  version: 5.8.0
+  description: |
+    * Improved error messages when files can't be sent to trash, moved or copied.
+    * Added a custom command invocation action. (#12)
+    * Filters are now applied on whole paths. (#4)
+- date: 2010-02-13
+  version: 5.7.2
+  description: |
+    * Fixed a crash upon quitting when support folder is not present. (#83)
+    * Fixed a crash during sorting. (#85)
+    * Fixed selection glitches, especially while renaming. (#93)
 - date: 2010-01-19
   version: 5.7.1
   description: |

help_me/conf.yaml

@@ -0,0 +1,6 @@
+base:
+    pages: en/pages.yaml
+    skeleton: skeleton
+    changelog: changelog.yaml
+    tixurl: "https://hardcoded.lighthouseapp.com/projects/31699-dupeguru/tickets/{0}"
+    firstpage_meta: "<meta name=\"AppleTitle\" content=\"dupeGuru Help\"></meta>"

help_me/en/credits.md

@@ -0,0 +1,26 @@
+Below is the list of people who contributed, directly or indirectly to dupeGuru.
+
+**Virgil Dupras, Developer**<br/>
+<http://www.hardcoded.net>
+
+**Jérôme Cantin, Icon designer**<br/>
+Icons in dupeGuru are from him
+
+**Python, Programming language**<br/>
+The bestest of the bests<br/>
+<http://www.python.org>
+
+**PyObjC, Python-to-Cocoa bridge**<br/>
+Used for the Mac OS X version<br/>
+<http://pyobjc.sourceforge.net>
+
+**PyQt, Python-to-Qt bridge**<br/>
+Used for the Windows version<br/>
+<http://www.riverbankcomputing.co.uk>
+
+**Sparkle, Auto-update library**<br/>
+Used for the Mac OS X version<br/>
+<http://andymatuschak.org/pages/sparkle>
+
+**You, dupeGuru user**<br/>
+You rock.

help_me/en/directories.md

@@ -1,9 +1,3 @@
-<%!
-	title = 'Directories'
-	selected_menu_item = 'Directories'
-%>
-<%inherit file="/base_dg.mako"/>
-
 There is a panel in dupeGuru called **Directories**. You can open it by clicking on the **Directories** button. This directory contains the list of the directories that will be scanned when you click on **Start Scanning**.
 
 This panel is quite straightforward to use. If you want to add a directory, click on **Add**. If you added directories before, a popup menu with a list of recent directories you added will pop. You can click on one of them to add it directly to your list. If you click on the first item of the popup menu, **Add New Directory...**, you will be prompted for a directory to add. If you never added a directory, no menu will pop and you will directly be prompted for a new directory to add.

help_me/en/faq.md

@@ -1,10 +1,3 @@
-<%!
-	title = 'dupeGuru ME F.A.Q.'
-	selected_menu_item = 'F.A.Q.'
-%>
-<%inherit file="/base_dg.mako"/>
-
-<%text filter="md">
 ### What is dupeGuru Music Edition?
 
 dupeGuru Music Edition is a tool to find duplicate songs in your music collection. It can base its scan on filenames, tags or content. The filename and tag scans feature a fuzzy matching algorithm that can find duplicate filenames or tags even when they are not exactly the same.
@@ -72,4 +65,3 @@ Most of the time, the reason why dupeGuru can't send files to Trash is because o
 If dupeGuru still gives you troubles after fixing your permissions, there have been some cases where using "Move Marked to..." as a workaround did the trick. So instead of sending your files to Trash, you send them to a temporary folder with the "Move Marked to..." action, and then you delete that temporary folder manually.
 
 If all of this fail, [contact HS support](http://www.hardcoded.net/support), we'll figure it out.
-</%text>

help_me/en/intro.md

@@ -1,13 +1,5 @@
-<%!
-	title = 'Introduction to dupeGuru ME'
-	selected_menu_item = 'introduction'
-%>
-<%inherit file="/base_dg.mako"/>
-
 dupeGuru Music Edition is a tool to find duplicate files on your computer. It can scan either filenames or contents. The filename scan features a fuzzy matching algorithm that can find duplicate filenames even when they are not exactly the same.
 
 Although dupeGuru can easily be used without documentation, reading this file will help you to master it. If you are looking for guidance for your first duplicate scan, you can take a look at the [Quick Start](quick_start.htm) section.
 
 It is a good idea to keep dupeGuru updated. You can download the latest version on the [dupeGuru ME homepage](http://www.hardcoded.net/dupeguru_me/).
-
-<%def name="meta()"><meta name="AppleTitle" content="dupeGuru ME Help"></meta></%def>

help_me/en/pages.yaml

@@ -0,0 +1,45 @@
+- 
+    name: intro
+    title: Introduction to dupeGuru ME
+    menutitle: Introduction
+    menudesc: Introduction to dupeGuru
+- 
+    name: quick_start
+    title: Quick Start
+    menutitle: Quick Start
+    menudesc: Quickly get into the action
+- 
+    name: directories
+    title: Directories
+    menutitle: Directories
+    menudesc: Managing dupeGuru directories
+- 
+    name: preferences
+    title: Preferences
+    menutitle: Preferences
+    menudesc: Setting dupeGuru preferences
+- 
+    name: results
+    title: Results
+    menutitle: Results
+    menudesc: Time to delete these duplicates!
+- 
+    name: power_marker
+    title: Power Marker
+    menutitle: Power Marker
+    menudesc: Take control of your duplicates
+- 
+    name: faq
+    title: Frequently Asked Questions
+    menutitle: F.A.Q.
+    menudesc: Frequently Asked Questions
+- 
+    name: versions
+    title: Version History
+    menutitle: Version History
+    menudesc: Changes moneyGuru went through
+- 
+    name: credits
+    title: Credits
+    menutitle: Credits
+    menudesc: People who contributed to dupeGuru

help_me/en/power_marker.md

@@ -1,9 +1,3 @@
-<%!
-	title = 'Power Marker'
-	selected_menu_item = 'Power Marker'
-%>
-<%inherit file="/base_dg.mako"/>
-
 You will probably not use the Power Marker feature very often, but if you get into a situation where you need it, you will be pretty happy that this feature exists.
 
 What is it?

help_me/en/preferences.md

@@ -1,9 +1,3 @@
-<%!
-	title = 'Preferences'
-	selected_menu_item = 'Preferences'
-%>
-<%inherit file="/base_dg.mako"/>
-
 **Scan Type:** This option determines what aspect of the files will be compared in the duplicate scan. The nature of the duplicate scan varies greatly depending on what you select for this option.
 
 * **Filename:** Every song will have its filename split into words, and then every word will be compared to compute a matching percentage. If this percentage is higher or equal to the **Filter Hardness** (see below for more details), dupeGuru will consider the 2 songs duplicates.
@@ -34,3 +28,11 @@
 * **Recreate absolute path:** The source file's path will be re-created in the destination directory in it's entirety. For example, if you move "/Users/foobar/Music/Artist/Album/the_song.mp3" to the destination "/Users/foobar/MyDestination", the final destination for the file will be "/Users/foobar/MyDestination/Users/foobar/Music/Artist/Album".
 
 In all cases, dupeGuru nicely handles naming conflicts by prepending a number to the destination filename if the filename already exists in the destination.
+
+**Custom Command:** This preference determines the command that will be invoked by the "Invoke Custom Command" action. You can invoke any external application through this action. This can be useful if, for example, you have a nice diffing application installed.
+
+The format of the command is the same as what you would write in the command line, except that there are 2 placeholders: **%d** and **%r**. These placeholders will be replaced by the path of the selected dupe (%d) and the path of the selected dupe's reference file (%r).
+  
+If the path to your executable contains space characters, you should enclose it in "" quotes. You should also enclose placeholders in quotes because it's very possible that paths to dupes and refs will contain spaces. Here's an example custom command:
+  
+    "C:\Program Files\SuperDiffProg\SuperDiffProg.exe" "%d" "%r"

help_me/en/quick_start.md

@@ -1,9 +1,3 @@
-<%!
-	title = 'Quick Start'
-	selected_menu_item = 'Quick Start'
-%>
-<%inherit file="/base_dg.mako"/>
-			
 To get you quickly started with dupeGuru, let's just make a standard scan using default preferences.
 
 * Click on **Directories**.

help_me/en/results.md

@@ -1,9 +1,3 @@
-<%!
-	title = 'Results'
-	selected_menu_item = 'Results'
-%>
-<%inherit file="/base_dg.mako"/>
-
 When dupeGuru is finished scanning for duplicates, it will show its results in the form of duplicate group list.
 
 About duplicate groups
@@ -70,4 +64,5 @@ Action Menu
 * **Add Selected to Ignore List:** This first removes all selected duplicates from results, and then add the match of that duplicate and the current reference in the ignore list. This match will not come up again in further scan. The duplicate itself might come back, but it will be matched with another reference file. You can clear the ignore list with the Clear Ignore List command.
 * **Open Selected with Default Application:** Open the file with the application associated with selected file's type.
 * **Reveal Selected in Finder:** Open the folder containing selected file.
+* **Invoke Custom Command:** Invokes the external application you've set up in your preferences using the current selection as arguments in the invocation.
 * **Rename Selected:** Prompts you for a new name, and then rename the selected file.

help_me/en/versions.md

@@ -1,9 +1,3 @@
-<%!
-	title = 'dupeGuru ME version history'
-	selected_menu_item = 'Version History'
-%>
-<%inherit file="/base_dg.mako"/>
-
 A large part of this version history is not serious (especially before v3), but it is always interesting to remember that I learnt most of what I know about designing/implementing/supporting a software through that.
 
-${self.output_changelogs(changelog)}
+{changelog}

help_me/templates/base_dg.mako

@@ -1,14 +0,0 @@
-<%inherit file="/base_help.mako"/>
-${next.body()}
-
-<%def name="menu()"><%
-self.menuitem('intro.htm', 'Introduction', 'Introduction to dupeGuru')
-self.menuitem('quick_start.htm', 'Quick Start', 'Quickly get into the action')
-self.menuitem('directories.htm', 'Directories', 'Managing dupeGuru directories')
-self.menuitem('preferences.htm', 'Preferences', 'Setting dupeGuru preferences')
-self.menuitem('results.htm', 'Results', 'Time to delete these duplicates!')
-self.menuitem('power_marker.htm', 'Power Marker', 'Take control of your duplicates')
-self.menuitem('faq.htm', 'F.A.Q.', 'Frequently Asked Questions')
-self.menuitem('versions.htm', 'Version History', 'Changes dupeGuru went through')
-self.menuitem('credits.htm', 'Credits', 'People who contributed to dupeGuru')
-%></%def>