Fixed packaging on windows. It didn't correctly find help files.

--HG--
rename : cocoa/me/py/dg_cocoa.py => cocoa/me/dg_cocoa.py
rename : cocoa/pe/py/dg_cocoa.py => cocoa/pe/dg_cocoa.py
rename : cocoa/se/py/dg_cocoa.py => cocoa/se/dg_cocoa.py

.hgignore

@@ -0,0 +1,21 @@
+syntax: glob
+
+.DS_Store
+*.pyc
+*.so
+*.mode1v3
+*.pbxuser
+*.tm_build_errors
+conf.yaml
+build
+core_pe/modules/block/block.c
+core_pe/modules/cache/cache.c
+cocoa/*/Info.plist
+cocoa/*/build
+cocoa/*/dg_cocoa.plugin
+qt/base/*_rc.py
+qt/base/*_ui.py
+qt/se/*_ui.py
+help_se/dupeguru_help
+help_me/dupeguru_me_help
+help_pe/dupeguru_pe_help

.hgtags

@@ -0,0 +1,7 @@
+0ef0ca83b49ad009c896f55824189acc932bcf22 se2.8.2
+0ef0ca83b49ad009c896f55824189acc932bcf22 me5.6.6
+0ef0ca83b49ad009c896f55824189acc932bcf22 pe1.7.8
+a8f232f880b6f9ada565d472996a627ebf69b6e9 before-tiger-drop
+321d15e818cf9a3f1fc037543090bb2fca2cccd7 me5.7.0
+adc73ccd14b1386cb04dee773c53a2d126800e31 se2.9.0
+cbcf9c80fee4c908ef2efbf1c143c9e47676c9b2 pe1.8.0

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2009 Hardcoded Software Inc. (http://www.hardcoded.net)
+Copyright 2010 Hardcoded Software Inc. (http://www.hardcoded.net)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

README

@@ -0,0 +1,68 @@
+Contents
+=====
+
+This package contains the source for dupeGuru. To learns how to build it, refer to the "Build dupeGuru" section. Below is the description of the various subfolders:
+
+- core: Contains the core logic code for dupeGuru. It's Python code written in TDD style.
+- core_*: Edition-specific-cross-toolkit code written in Python.
+- cocoa: UI code for the Cocoa toolkit. It's Objective-C code.
+- qt: UI code for the Qt toolkit. It's written in Python and uses PyQt. Before redistributing changes in this part of the code, read the "qt/WARNING" file.
+- images: Images used by the different UI codebases.
+
+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.
+- 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.
+
+dupeGuru Dependencies
+=====
+
+Before being able to build dupeGuru, a few dependencies have to be installed:
+
+General dependencies
+-----
+
+- Python 2.6 (http://www.python.org)
+- 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/)
+- Cython to compile a few optimized bottlenecks. (http://www.cython.org/)
+- Python Imaging Library for dupeGuru PE. (http://www.pythonware.com/products/pil/)
+
+OS X prerequisites
+-----
+
+- XCode 3.1 (http://developer.apple.com/TOOLS/xcode/)
+- Sparkle (http://sparkle.andymatuschak.org/)
+- PyObjC. Although Tiger support has been dropped with dupeGuru 1.7, I still use PyObjC 1.4 because funky stuff happens with newer releases. However, it's mostly related to packaging with py2app. (http://pyobjc.sourceforge.net/)
+- py2app (http://svn.pythonmac.org/py2app/py2app/trunk/doc/index.html)
+
+Windows prerequisites
+---
+
+- Visual Studio 2008 (Express is enough) is needed to build the Cython extensions. (http://www.microsoft.com/Express/)
+- PyQt 4.6 (http://www.riverbankcomputing.co.uk/news)
+- PyInstaller, if you want to build a exe. You don't need it if you just want to run dupeGuru. (http://www.pyinstaller.org/)
+- Advanced Installer, if you want to build the installer file. (http://www.advancedinstaller.com/)
+
+Building dupeGuru
+=====
+
+First, make sure you meet the dependencies listed in the section above. Then you need to configure your build with:
+
+	python configure.py
+	
+If you want, you can specify a UI to use with the `--ui` option. So, if you want to build dupeGuru with Qt on OS X, then you have to type `python configure.py --ui=qt`. You can also use the `--dev` flag to indicate a dev build (it will build `mg_cocoa.plugin` in alias mode).
+
+Then, just build the thing and then run it with:
+
+	python build.py
+	python run.py
+
+If you want to create ready-to-upload package, run:
+
+	python package.py

base/cocoa/AppDelegate.m

@@ -1,38 +0,0 @@
-/* 
-Copyright 2009 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 "AppDelegate.h"
-#import "ProgressController.h"
-#import "RegistrationInterface.h"
-#import "Utils.h"
-#import "Consts.h"
-
-@implementation AppDelegateBase
-- (id)init
-{
-    self = [super init];
-    _appName = @"";
-    return self;
-}
-
-- (IBAction)unlockApp:(id)sender
-{
-    if ([[self py] isRegistered])
-        return;
-    RegistrationInterface *ri = [[RegistrationInterface alloc] initWithApp:[self py] name:_appName limitDescription:LIMIT_DESC];
-    if ([ri enterCode] == NSOKButton)
-    {
-        NSString *menuTitle = [NSString stringWithFormat:@"Thanks for buying %@",_appName];
-        [unlockMenuItem setTitle:menuTitle];
-    }
-    [ri release];
-}
-
-- (PyDupeGuruBase *)py { return py; }
-- (RecentDirectories *)recentDirectories { return recentDirectories; }
-@end

base/py/app_se_cocoa.py

@@ -1,70 +0,0 @@
-# Created By: Virgil Dupras
-# Created On: 2009-05-24
-# $Id$
-# Copyright 2009 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 logging
-
-from AppKit import *
-
-from hsfs.phys import Directory as DirectoryBase
-from hsfs.phys.bundle import Bundle
-from hsutil.path import Path
-from hsutil.misc import extract
-from hsutil.str import get_file_ext
-
-from . import app_cocoa, data
-from .directories import Directories as DirectoriesBase, STATE_EXCLUDED
-
-if NSWorkspace.sharedWorkspace().respondsToSelector_('typeOfFile:error:'): # Only from 10.5
-    def is_bundle(str_path):
-        sw = NSWorkspace.sharedWorkspace()
-        uti, error = sw.typeOfFile_error_(str_path)
-        if error is not None:
-            logging.warning(u'There was an error trying to detect the UTI of %s', str_path)
-        return sw.type_conformsToType_(uti, 'com.apple.bundle') or sw.type_conformsToType_(uti, 'com.apple.package')
-else: # Tiger
-    def is_bundle(str_path): # just return a list of a few known bundle extensions.
-        return get_file_ext(str_path) in ('app', 'pages', 'numbers')
-
-class DGDirectory(DirectoryBase):
-    def _create_sub_file(self, name, with_parent=True):
-        if is_bundle(unicode(self.path + name)):
-            parent = self if with_parent else None
-            return Bundle(parent, name)
-        else:
-            return super(DGDirectory, self)._create_sub_file(name, with_parent)
-    
-    def _fetch_subitems(self):
-        subdirs, subfiles = super(DGDirectory, self)._fetch_subitems()
-        apps, normal_dirs = extract(lambda name: is_bundle(unicode(self.path + name)), subdirs)
-        subfiles += apps
-        return normal_dirs, subfiles
-    
-
-class Directories(DirectoriesBase):
-    ROOT_PATH_TO_EXCLUDE = map(Path, ['/Library', '/Volumes', '/System', '/bin', '/sbin', '/opt', '/private', '/dev'])
-    HOME_PATH_TO_EXCLUDE = [Path('Library')]
-    def __init__(self):
-        DirectoriesBase.__init__(self)
-        self.dirclass = DGDirectory
-    
-    def _default_state_for_path(self, path):
-        result = DirectoriesBase._default_state_for_path(self, path)
-        if result is not None:
-            return result
-        if path in self.ROOT_PATH_TO_EXCLUDE:
-            return STATE_EXCLUDED
-        if path[:2] == Path('/Users') and path[3:] in self.HOME_PATH_TO_EXCLUDE:
-            return STATE_EXCLUDED
-    
-
-class DupeGuru(app_cocoa.DupeGuru):
-    def __init__(self):
-        app_cocoa.DupeGuru.__init__(self, data, 'dupeGuru', appid=4)
-        self.directories = Directories()
-    

base/py/tests/scanner_test.py

@@ -1,469 +0,0 @@
-# Created By: Virgil Dupras
-# Created On: 2006/03/03
-# $Id$
-# Copyright 2009 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 nose.tools import eq_
-
-from hsutil import job
-from hsutil.path import Path
-
-from ..engine import getwords, Match
-from ..ignore import IgnoreList
-from ..scanner import *
-
-class NamedObject(object):
-    def __init__(self, name="foobar", size=1):
-        self.name = name
-        self.size = size
-        self.path = Path('')
-        self.words = getwords(name)
-    
-
-no = NamedObject
-
-#--- Scanner
-def test_empty():
-    s = Scanner()
-    r = s.GetDupeGroups([])
-    eq_(r, [])
-
-def test_default_settings():
-    s = Scanner()
-    eq_(s.min_match_percentage, 80)
-    eq_(s.scan_type, SCAN_TYPE_FILENAME)
-    eq_(s.mix_file_kind, True)
-    eq_(s.word_weighting, False)
-    eq_(s.match_similar_words, False)
-    assert isinstance(s.ignore_list, IgnoreList)
-
-def test_simple_with_default_settings():
-    s = Scanner()
-    f = [no('foo bar'), no('foo bar'), no('foo bleh')]
-    r = s.GetDupeGroups(f)
-    eq_(len(r), 1)
-    g = r[0]
-    #'foo bleh' cannot be in the group because the default min match % is 80
-    eq_(len(g), 2)
-    assert g.ref in f[:2]
-    assert g.dupes[0] in f[:2]
-
-def test_simple_with_lower_min_match():
-    s = Scanner()
-    s.min_match_percentage = 50
-    f = [no('foo bar'), no('foo bar'), no('foo bleh')]
-    r = s.GetDupeGroups(f)
-    eq_(len(r), 1)
-    g = r[0]
-    eq_(len(g), 3)
-
-def test_trim_all_ref_groups():
-    # When all files of a group are ref, don't include that group in the results, but also don't
-    # count the files from that group as discarded.
-    s = Scanner()
-    f = [no('foo'), no('foo'), no('bar'), no('bar')]
-    f[2].is_ref = True
-    f[3].is_ref = True
-    r = s.GetDupeGroups(f)
-    eq_(len(r), 1)
-    eq_(s.discarded_file_count, 0)
-
-def test_priorize():
-    s = Scanner()
-    f = [no('foo'), no('foo'), no('bar'), no('bar')]
-    f[1].size = 2
-    f[2].size = 3
-    f[3].is_ref = True
-    r = s.GetDupeGroups(f)
-    g1, g2 = r
-    assert f[1] in (g1.ref,g2.ref)
-    assert f[0] in (g1.dupes[0],g2.dupes[0])
-    assert f[3] in (g1.ref,g2.ref)
-    assert f[2] in (g1.dupes[0],g2.dupes[0])
-
-def test_content_scan():
-    s = Scanner()
-    s.scan_type = SCAN_TYPE_CONTENT
-    f = [no('foo'), no('bar'), no('bleh')]
-    f[0].md5 = f[0].md5partial = 'foobar'
-    f[1].md5 = f[1].md5partial = 'foobar'
-    f[2].md5 = f[2].md5partial = 'bleh'
-    r = s.GetDupeGroups(f)
-    eq_(len(r), 1)
-    eq_(len(r[0]), 2)
-    eq_(s.discarded_file_count, 0) # don't count the different md5 as discarded!
-
-def test_content_scan_compare_sizes_first():
-    class MyFile(no):
-        @property
-        def md5(file):
-            raise AssertionError()
-    
-    s = Scanner()
-    s.scan_type = SCAN_TYPE_CONTENT
-    f = [MyFile('foo', 1), MyFile('bar', 2)]
-    eq_(len(s.GetDupeGroups(f)), 0)
-
-def test_min_match_perc_doesnt_matter_for_content_scan():
-    s = Scanner()
-    s.scan_type = SCAN_TYPE_CONTENT
-    f = [no('foo'), no('bar'), no('bleh')]
-    f[0].md5 = f[0].md5partial = 'foobar'
-    f[1].md5 = f[1].md5partial = 'foobar'
-    f[2].md5 = f[2].md5partial = 'bleh'
-    s.min_match_percentage = 101
-    r = s.GetDupeGroups(f)
-    eq_(len(r), 1)
-    eq_(len(r[0]), 2)
-    s.min_match_percentage = 0
-    r = s.GetDupeGroups(f)
-    eq_(len(r), 1)
-    eq_(len(r[0]), 2)
-
-def test_content_scan_doesnt_put_md5_in_words_at_the_end():
-    s = Scanner()
-    s.scan_type = SCAN_TYPE_CONTENT
-    f = [no('foo'),no('bar')]
-    f[0].md5 = f[0].md5partial = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f'
-    f[1].md5 = f[1].md5partial = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f'
-    r = s.GetDupeGroups(f)
-    g = r[0]
-    eq_(g.ref.words, ['--'])
-    eq_(g.dupes[0].words, ['--'])
-
-def test_extension_is_not_counted_in_filename_scan():
-    s = Scanner()
-    s.min_match_percentage = 100
-    f = [no('foo.bar'), no('foo.bleh')]
-    r = s.GetDupeGroups(f)
-    eq_(len(r), 1)
-    eq_(len(r[0]), 2)
-
-def test_job():
-    def do_progress(progress, desc=''):
-        log.append(progress)
-        return True
-    
-    s = Scanner()
-    log = []
-    f = [no('foo bar'), no('foo bar'), no('foo bleh')]
-    r = s.GetDupeGroups(f, job.Job(1, do_progress))
-    eq_(log[0], 0)
-    eq_(log[-1], 100)
-
-def test_mix_file_kind():
-    s = Scanner()
-    s.mix_file_kind = False
-    f = [no('foo.1'), no('foo.2')]
-    r = s.GetDupeGroups(f)
-    eq_(len(r), 0)
-
-def test_word_weighting():
-    s = Scanner()
-    s.min_match_percentage = 75
-    s.word_weighting = True
-    f = [no('foo bar'), no('foo bar bleh')]
-    r = s.GetDupeGroups(f)
-    eq_(len(r), 1)
-    g = r[0]
-    m = g.get_match_of(g.dupes[0])
-    eq_(m.percentage, 75) # 16 letters, 12 matching
-
-def test_similar_words():
-    s = Scanner()
-    s.match_similar_words = True
-    f = [no('The White Stripes'), no('The Whites Stripe'), no('Limp Bizkit'), no('Limp Bizkitt')]
-    r = s.GetDupeGroups(f)
-    eq_(len(r), 2)
-
-def test_fields():
-    s = Scanner()
-    s.scan_type = SCAN_TYPE_FIELDS
-    f = [no('The White Stripes - Little Ghost'), no('The White Stripes - Little Acorn')]
-    r = s.GetDupeGroups(f)
-    eq_(len(r), 0)
-
-def test_fields_no_order():
-    s = Scanner()
-    s.scan_type = SCAN_TYPE_FIELDS_NO_ORDER
-    f = [no('The White Stripes - Little Ghost'), no('Little Ghost - The White Stripes')]
-    r = s.GetDupeGroups(f)
-    eq_(len(r), 1)
-
-def test_tag_scan():
-    s = Scanner()
-    s.scan_type = SCAN_TYPE_TAG
-    o1 = no('foo')
-    o2 = no('bar')
-    o1.artist = 'The White Stripes'
-    o1.title = 'The Air Near My Fingers'
-    o2.artist = 'The White Stripes'
-    o2.title = 'The Air Near My Fingers'
-    r = s.GetDupeGroups([o1,o2])
-    eq_(len(r), 1)
-
-def test_tag_with_album_scan():
-    s = Scanner()
-    s.scan_type = SCAN_TYPE_TAG
-    s.scanned_tags = set(['artist', 'album', 'title'])
-    o1 = no('foo')
-    o2 = no('bar')
-    o3 = no('bleh')
-    o1.artist = 'The White Stripes'
-    o1.title = 'The Air Near My Fingers'
-    o1.album = 'Elephant'
-    o2.artist = 'The White Stripes'
-    o2.title = 'The Air Near My Fingers'
-    o2.album = 'Elephant'
-    o3.artist = 'The White Stripes'
-    o3.title = 'The Air Near My Fingers'
-    o3.album = 'foobar'
-    r = s.GetDupeGroups([o1,o2,o3])
-    eq_(len(r), 1)
-
-def test_that_dash_in_tags_dont_create_new_fields():
-    s = Scanner()
-    s.scan_type = SCAN_TYPE_TAG
-    s.scanned_tags = set(['artist', 'album', 'title'])
-    s.min_match_percentage = 50
-    o1 = no('foo')
-    o2 = no('bar')
-    o1.artist = 'The White Stripes - a'
-    o1.title = 'The Air Near My Fingers - a'
-    o1.album = 'Elephant - a'
-    o2.artist = 'The White Stripes - b'
-    o2.title = 'The Air Near My Fingers - b'
-    o2.album = 'Elephant - b'
-    r = s.GetDupeGroups([o1,o2])
-    eq_(len(r), 1)
-
-def test_tag_scan_with_different_scanned():
-    s = Scanner()
-    s.scan_type = SCAN_TYPE_TAG
-    s.scanned_tags = set(['track', 'year'])
-    o1 = no('foo')
-    o2 = no('bar')
-    o1.artist = 'The White Stripes'
-    o1.title = 'some title'
-    o1.track = 'foo'
-    o1.year = 'bar'
-    o2.artist = 'The White Stripes'
-    o2.title = 'another title'
-    o2.track = 'foo'
-    o2.year = 'bar'
-    r = s.GetDupeGroups([o1, o2])
-    eq_(len(r), 1)
-
-def test_tag_scan_only_scans_existing_tags():
-    s = Scanner()
-    s.scan_type = SCAN_TYPE_TAG
-    s.scanned_tags = set(['artist', 'foo'])
-    o1 = no('foo')
-    o2 = no('bar')
-    o1.artist = 'The White Stripes'
-    o1.foo = 'foo'
-    o2.artist = 'The White Stripes'
-    o2.foo = 'bar'
-    r = s.GetDupeGroups([o1, o2])
-    eq_(len(r), 1) # Because 'foo' is not scanned, they match
-
-def test_tag_scan_converts_to_str():
-    s = Scanner()
-    s.scan_type = SCAN_TYPE_TAG
-    s.scanned_tags = set(['track'])
-    o1 = no('foo')
-    o2 = no('bar')
-    o1.track = 42
-    o2.track = 42
-    try:
-        r = s.GetDupeGroups([o1, o2])
-    except TypeError:
-        raise AssertionError()
-    eq_(len(r), 1)
-
-def test_tag_scan_non_ascii():
-    s = Scanner()
-    s.scan_type = SCAN_TYPE_TAG
-    s.scanned_tags = set(['title'])
-    o1 = no('foo')
-    o2 = no('bar')
-    o1.title = u'foobar\u00e9'
-    o2.title = u'foobar\u00e9'
-    try:
-        r = s.GetDupeGroups([o1, o2])
-    except UnicodeEncodeError:
-        raise AssertionError()
-    eq_(len(r), 1)
-
-def test_audio_content_scan():
-    s = Scanner()
-    s.scan_type = SCAN_TYPE_CONTENT_AUDIO
-    f = [no('foo'), no('bar'), no('bleh')]
-    f[0].md5 = 'foo'
-    f[1].md5 = 'bar'
-    f[2].md5 = 'bleh'
-    f[0].md5partial = 'foo'
-    f[1].md5partial = 'foo'
-    f[2].md5partial = 'bleh'
-    f[0].audiosize = 1
-    f[1].audiosize = 1
-    f[2].audiosize = 1
-    r = s.GetDupeGroups(f)
-    eq_(len(r), 1)
-    eq_(len(r[0]), 2)
-    
-def test_audio_content_scan_compare_sizes_first():
-    class MyFile(no):
-        @property
-        def md5partial(file):
-            raise AssertionError()
-    
-    s = Scanner()
-    s.scan_type = SCAN_TYPE_CONTENT_AUDIO
-    f = [MyFile('foo'), MyFile('bar')]
-    f[0].audiosize = 1
-    f[1].audiosize = 2
-    eq_(len(s.GetDupeGroups(f)), 0)
-
-def test_ignore_list():
-    s = Scanner()
-    f1 = no('foobar')
-    f2 = no('foobar')
-    f3 = no('foobar')
-    f1.path = Path('dir1/foobar')
-    f2.path = Path('dir2/foobar')
-    f3.path = Path('dir3/foobar')
-    s.ignore_list.Ignore(str(f1.path),str(f2.path))
-    s.ignore_list.Ignore(str(f1.path),str(f3.path))
-    r = s.GetDupeGroups([f1,f2,f3])
-    eq_(len(r), 1)
-    g = r[0]
-    eq_(len(g.dupes), 1)
-    assert f1 not in g
-    assert f2 in g
-    assert f3 in g
-    # Ignored matches are not counted as discarded
-    eq_(s.discarded_file_count, 0)
-
-def test_ignore_list_checks_for_unicode():
-    #scanner was calling path_str for ignore list checks. Since the Path changes, it must
-    #be unicode(path)
-    s = Scanner()
-    f1 = no('foobar')
-    f2 = no('foobar')
-    f3 = no('foobar')
-    f1.path = Path(u'foo1\u00e9')
-    f2.path = Path(u'foo2\u00e9')
-    f3.path = Path(u'foo3\u00e9')
-    s.ignore_list.Ignore(unicode(f1.path),unicode(f2.path))
-    s.ignore_list.Ignore(unicode(f1.path),unicode(f3.path))
-    r = s.GetDupeGroups([f1,f2,f3])
-    eq_(len(r), 1)
-    g = r[0]
-    eq_(len(g.dupes), 1)
-    assert f1 not in g
-    assert f2 in g
-    assert f3 in g
-
-def test_custom_match_factory():
-    class MatchFactory(object):
-        def getmatches(self, objects, j=None):
-            return [Match(objects[0], objects[1], 420)]
-        
-    
-    s = Scanner()
-    s.match_factory = MatchFactory()
-    o1, o2 = no('foo'), no('bar')
-    groups = s.GetDupeGroups([o1, o2])
-    eq_(len(groups), 1)
-    g = groups[0]
-    eq_(len(g), 2)
-    g.switch_ref(o1)
-    m = g.get_match_of(o2)
-    eq_(m, (o1, o2, 420))
-
-def test_file_evaluates_to_false():
-    # A very wrong way to use any() was added at some point, causing resulting group list
-    # to be empty.
-    class FalseNamedObject(NamedObject):
-        def __nonzero__(self):
-            return False
-        
-    
-    s = Scanner()
-    f1 = FalseNamedObject('foobar')
-    f2 = FalseNamedObject('foobar')
-    r = s.GetDupeGroups([f1, f2])
-    eq_(len(r), 1)
-
-def test_size_threshold():
-    # Only file equal or higher than the size_threshold in size are scanned
-    s = Scanner()
-    f1 = no('foo', 1)
-    f2 = no('foo', 2)
-    f3 = no('foo', 3)
-    s.size_threshold = 2
-    groups = s.GetDupeGroups([f1,f2,f3])
-    eq_(len(groups), 1)
-    [group] = groups
-    eq_(len(group), 2)
-    assert f1 not in group
-    assert f2 in group
-    assert f3 in group
-
-def test_tie_breaker_path_deepness():
-    # If there is a tie in prioritization, path deepness is used as a tie breaker
-    s = Scanner()
-    o1, o2 = no('foo'), no('foo')
-    o1.path = Path('foo')
-    o2.path = Path('foo/bar')
-    [group] = s.GetDupeGroups([o1, o2])
-    assert group.ref is o2
-
-def test_tie_breaker_copy():
-    # if copy is in the words used (even if it has a deeper path), it becomes a dupe
-    s = Scanner()
-    o1, o2 = no('foo bar Copy'), no('foo bar')
-    o1.path = Path('deeper/path')
-    o2.path = Path('foo')
-    [group] = s.GetDupeGroups([o1, o2])
-    assert group.ref is o2
-
-def test_tie_breaker_same_name_plus_digit():
-    # if ref has the same words as dupe, but has some just one extra word which is a digit, it
-    # becomes a dupe
-    s = Scanner()
-    o1, o2 = no('foo bar 42'), no('foo bar')
-    o1.path = Path('deeper/path')
-    o2.path = Path('foo')
-    [group] = s.GetDupeGroups([o1, o2])
-    assert group.ref is o2
-
-def test_partial_group_match():
-    # Count the number od discarded matches (when a file doesn't match all other dupes of the 
-    # group) in Scanner.discarded_file_count
-    s = Scanner()
-    o1, o2, o3 = no('a b'), no('a'), no('b')
-    s.min_match_percentage = 50
-    [group] = s.GetDupeGroups([o1, o2, o3])
-    eq_(len(group), 2)
-    assert o1 in group
-    assert o2 in group
-    assert o3 not in group
-    eq_(s.discarded_file_count, 1)
-
-
-#--- Scanner ME
-def test_priorize_me():
-    # in ScannerME, bitrate goes first (right after is_ref) in priorization
-    s = ScannerME()
-    o1, o2 = no('foo'), no('foo')
-    o1.bitrate = 1
-    o2.bitrate = 2
-    [group] = s.GetDupeGroups([o1, o2])
-    assert group.ref is o2
-

base/qt/about_box.py

@@ -1,37 +0,0 @@
-# Created By: Virgil Dupras
-# Created On: 2009-05-09
-# $Id$
-# Copyright 2009 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 PyQt4.QtCore import Qt, QCoreApplication, SIGNAL
-from PyQt4.QtGui import QDialog, QDialogButtonBox, QPixmap
-
-from about_box_ui import Ui_AboutBox
-
-class AboutBox(QDialog, Ui_AboutBox):
-    def __init__(self, parent, app):
-        flags = Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowSystemMenuHint | Qt.MSWindowsFixedSizeDialogHint
-        QDialog.__init__(self, parent, flags)
-        self.app = app
-        self._setupUi()
-        
-        self.connect(self.buttonBox, SIGNAL('clicked(QAbstractButton*)'), self.buttonClicked)
-    
-    def _setupUi(self):
-        self.setupUi(self)
-        # Stuff that can't be done in the Designer
-        self.setWindowTitle(u"About %s" % QCoreApplication.instance().applicationName())
-        self.nameLabel.setText(QCoreApplication.instance().applicationName())
-        self.versionLabel.setText('Version ' + QCoreApplication.instance().applicationVersion())
-        self.logoLabel.setPixmap(QPixmap(':/%s_big' % self.app.LOGO_NAME))
-        self.registerButton = self.buttonBox.addButton("Register", QDialogButtonBox.ActionRole)
-        
-    #--- Events
-    def buttonClicked(self, button):
-        if button is self.registerButton:
-            self.app.ask_for_reg_code()
-    

base/qt/about_box.ui

@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AboutBox</class>
- <widget class="QDialog" name="AboutBox">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>190</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>About dupeGuru</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <item>
-    <widget class="QLabel" name="logoLabel">
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap resource="dg.qrc">:/logo_me_big</pixmap>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <widget class="QLabel" name="nameLabel">
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>dupeGuru</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="versionLabel">
-       <property name="text">
-        <string>Version</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Copyright Hardcoded Software 2009</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Registered To:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="registeredEmailLabel">
-       <property name="text">
-        <string>UNREGISTERED</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Ok</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="dg.qrc"/>
- </resources>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>AboutBox</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>AboutBox</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

base/qt/dg.qrc

@@ -1,17 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file alias="details">images/details32.png</file>
-    <file alias="logo_pe">images/dgpe_logo_32.png</file>
-    <file alias="logo_pe_big">images/dgpe_logo_128.png</file>
-    <file alias="logo_me">images/dgme_logo_32.png</file>
-    <file alias="logo_me_big">images/dgme_logo_128.png</file>
-    <file alias="logo_se">images/dgse_logo_32.png</file>
-    <file alias="logo_se_big">images/dgse_logo_128.png</file>
-    <file alias="folder">images/folderwin32.png</file>
-    <file alias="gear">images/gear.png</file>
-    <file alias="preferences">images/preferences32.png</file>
-    <file alias="actions">images/actions32.png</file>
-    <file alias="delta">images/delta32.png</file>
-    <file alias="power_marker">images/power_marker32.png</file>
-</qresource>
-</RCC>

base/qt/reg.py

@@ -1,36 +0,0 @@
-# Created By: Virgil Dupras
-# Created On: 2009-05-09
-# $Id$
-# Copyright 2009 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 hashlib import md5
-
-from PyQt4.QtGui import QDialog
-
-from reg_submit_dialog import RegSubmitDialog
-from reg_demo_dialog import RegDemoDialog
-
-class Registration(object):
-    def __init__(self, app):
-        self.app = app
-    
-    def ask_for_code(self):
-        dialog = RegSubmitDialog(self.app.main_window, self.app.is_code_valid)
-        result = dialog.exec_()
-        code = unicode(dialog.codeEdit.text())
-        email = unicode(dialog.emailEdit.text())
-        dialog.setParent(None) # free it
-        if result == QDialog.Accepted and self.app.is_code_valid(code, email):
-            self.app.set_registration(code, email)
-            return True
-        return False
-    
-    def show_nag(self):
-        dialog = RegDemoDialog(self.app.main_window, self)
-        dialog.exec_()
-        dialog.setParent(None) # free it
-    

base/qt/reg_demo_dialog.py

@@ -1,47 +0,0 @@
-# Created By: Virgil Dupras
-# Created On: 2009-05-10
-# $Id$
-# Copyright 2009 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 PyQt4.QtCore import SIGNAL, Qt, QUrl, QCoreApplication
-from PyQt4.QtGui import QDialog, QMessageBox, QDesktopServices
-
-from reg_demo_dialog_ui import Ui_RegDemoDialog
-
-class RegDemoDialog(QDialog, Ui_RegDemoDialog):
-    def __init__(self, parent, reg):
-        flags = Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowSystemMenuHint
-        QDialog.__init__(self, parent, flags)
-        self.reg = reg
-        self._setupUi()
-        
-        self.connect(self.enterCodeButton, SIGNAL('clicked()'), self.enterCodeClicked)
-        self.connect(self.purchaseButton, SIGNAL('clicked()'), self.purchaseClicked)
-    
-    def _setupUi(self):
-        self.setupUi(self)
-        # Stuff that can't be setup in the Designer
-        appname = QCoreApplication.instance().applicationName()
-        title = self.windowTitle()
-        title = title.replace('$appname', appname)
-        self.setWindowTitle(title)
-        title = self.titleLabel.text()
-        title = title.replace('$appname', appname)
-        self.titleLabel.setText(title)
-        desc = self.demoDescLabel.text()
-        desc = desc.replace('$appname', appname)
-        self.demoDescLabel.setText(desc)
-    
-    #--- Events
-    def enterCodeClicked(self):
-        if self.reg.ask_for_code():
-            self.accept()
-    
-    def purchaseClicked(self):
-        url = QUrl('http://www.hardcoded.net/purchase.htm')
-        QDesktopServices.openUrl(url)
-    

base/qt/reg_demo_dialog.ui

@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>RegDemoDialog</class>
- <widget class="QDialog" name="RegDemoDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>387</width>
-    <height>161</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>$appname Demo Version</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="titleLabel">
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>$appname Demo Version</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="demoDescLabel">
-     <property name="text">
-      <string>You are currently running a demo version of $appname. This version has limited functionalities, and you need to buy it to have access to these functionalities.</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>In the demo version, only 10 duplicates per session can be sent to the recycle bin, moved or copied.</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="tryButton">
-       <property name="minimumSize">
-        <size>
-         <width>110</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Try Demo</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="enterCodeButton">
-       <property name="minimumSize">
-        <size>
-         <width>110</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Enter Code</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="purchaseButton">
-       <property name="minimumSize">
-        <size>
-         <width>110</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Purchase</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>tryButton</sender>
-   <signal>clicked()</signal>
-   <receiver>RegDemoDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>112</x>
-     <y>161</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>201</x>
-     <y>94</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

base/qt/reg_submit_dialog.py

@@ -1,49 +0,0 @@
-# Created By: Virgil Dupras
-# Created On: 2009-05-09
-# $Id$
-# Copyright 2009 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 PyQt4.QtCore import SIGNAL, Qt, QUrl, QCoreApplication
-from PyQt4.QtGui import QDialog, QMessageBox, QDesktopServices
-
-from reg_submit_dialog_ui import Ui_RegSubmitDialog
-
-class RegSubmitDialog(QDialog, Ui_RegSubmitDialog):
-    def __init__(self, parent, is_valid_func):
-        flags = Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowSystemMenuHint
-        QDialog.__init__(self, parent, flags)
-        self._setupUi()
-        self.is_valid_func = is_valid_func
-        
-        self.connect(self.submitButton, SIGNAL('clicked()'), self.submitClicked)
-        self.connect(self.purchaseButton, SIGNAL('clicked()'), self.purchaseClicked)
-    
-    def _setupUi(self):
-        self.setupUi(self)
-        # Stuff that can't be setup in the Designer
-        appname = QCoreApplication.instance().applicationName()
-        prompt = self.promptLabel.text()
-        prompt = prompt.replace('$appname', appname)
-        self.promptLabel.setText(prompt)
-    
-    #--- Events
-    def purchaseClicked(self):
-        url = QUrl('http://www.hardcoded.net/purchase.htm')
-        QDesktopServices.openUrl(url)
-    
-    def submitClicked(self):
-        code = unicode(self.codeEdit.text())
-        email = unicode(self.emailEdit.text())
-        title = "Registration"
-        if self.is_valid_func(code, email):
-            msg = "This code is valid. Thanks!"
-            QMessageBox.information(self, title, msg)
-            self.accept()
-        else:
-            msg = "This code is invalid"
-            QMessageBox.warning(self, title, msg)
-    

base/qt/reg_submit_dialog.ui

@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>RegSubmitDialog</class>
- <widget class="QDialog" name="RegSubmitDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>365</width>
-    <height>134</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Enter your registration code</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="promptLabel">
-     <property name="text">
-      <string>Please enter your $appname registration code and registered e-mail (the e-mail you used for the purchase), then press &quot;Submit&quot;.</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QFormLayout" name="formLayout">
-     <property name="sizeConstraint">
-      <enum>QLayout::SetNoConstraint</enum>
-     </property>
-     <property name="fieldGrowthPolicy">
-      <enum>QFormLayout::ExpandingFieldsGrow</enum>
-     </property>
-     <property name="labelAlignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-     <property name="formAlignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-     <item row="0" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Registration code:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Registered e-mail:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QLineEdit" name="codeEdit"/>
-     </item>
-     <item row="1" column="1">
-      <widget class="QLineEdit" name="emailEdit"/>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="purchaseButton">
-       <property name="text">
-        <string>Purchase</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="cancelButton">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Cancel</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="submitButton">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Submit</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-       <property name="default">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>cancelButton</sender>
-   <signal>clicked()</signal>
-   <receiver>RegSubmitDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>260</x>
-     <y>159</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>198</x>
-     <y>97</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

build.py

@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2009-12-30
+# 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 sys
+import os
+import os.path as op
+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
+
+def main():
+    conf = yaml.load(open('conf.yaml'))
+    edition = conf['edition']
+    ui = conf['ui']
+    dev = conf['dev']
+    print "Building dupeGuru {0} with UI {1}".format(edition.upper(), ui)
+    if dev:
+        print "Building in Dev mode"
+    add_to_pythonpath('.')
+    print "Generating Help"
+    windows = sys.platform == 'win32'
+    tix = filters.tixgen("https://hardcoded.lighthouseapp.com/projects/31699-dupeguru/tickets/{0}")
+    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)
+    
+    print "Building dupeGuru"
+    if edition == 'pe':
+        os.chdir('core_pe')
+        os.system('python gen.py')
+        os.chdir('..')
+    if ui == 'cocoa':
+        if not dev:
+            print "Building help index"
+            os.system('open -a /Developer/Applications/Utilities/Help\\ Indexer.app {0}'.format(help_destpath))
+        
+        print "Building dg_cocoa.plugin"
+        if op.exists('build'):
+            shutil.rmtree('build')
+        os.mkdir('build')
+        if not dev:
+            specific_packages = {
+                'se': ['core_se'],
+                'me': ['core_me', 'hsmedia'],
+                'pe': ['core_pe'],
+            }[edition]
+            copy_packages(['core', 'hsutil'] + specific_packages, 'build')
+        cocoa_project_path = 'cocoa/{0}'.format(edition)
+        shutil.copy(op.join(cocoa_project_path, 'dg_cocoa.py'), 'build')
+        os.chdir('build')
+        script_args = ['py2app', '-A'] if dev else ['py2app']
+        setup(
+            script_args = script_args,
+            plugin = ['dg_cocoa.py'],
+            setup_requires = ['py2app'],
+        )
+        os.chdir('..')
+        pluginpath = op.join(cocoa_project_path, 'dg_cocoa.plugin')
+        if op.exists(pluginpath):
+            shutil.rmtree(pluginpath)
+        shutil.move('build/dist/dg_cocoa.plugin', pluginpath)
+        if dev:
+            # In alias mode, the tweakings we do to the pythonpath aren't counted in. We have to
+            # manually put a .pth in the plugin
+            pthpath = op.join(pluginpath, 'Contents/Resources/dev.pth')
+            open(pthpath, 'w').write(op.abspath('.'))
+        os.chdir(cocoa_project_path)
+        print "Building the XCode project"
+        os.system('xcodebuild')
+        os.chdir('..')
+    elif ui == 'qt':
+        os.chdir(op.join('qt', edition))
+        os.system('python gen.py')
+        os.chdir(op.join('..', '..'))
+
+if __name__ == '__main__':
+    main()

cocoa/base/AppDelegate.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -9,17 +9,21 @@ http://www.hardcoded.net/licenses/hs_license
 #import <Cocoa/Cocoa.h>
 #import "RecentDirectories.h"
 #import "PyDupeGuru.h"
+#import "ResultWindow.h"
+#import "DetailsPanel.h"
 
 @interface AppDelegateBase : NSObject
 {
     IBOutlet PyDupeGuruBase *py;
     IBOutlet RecentDirectories *recentDirectories;
     IBOutlet NSMenuItem *unlockMenuItem;
+    IBOutlet ResultWindowBase *result;
     
-    NSString *_appName;
+    DetailsPanelBase *_detailsPanel;
 }
 - (IBAction)unlockApp:(id)sender;
 
 - (PyDupeGuruBase *)py;
 - (RecentDirectories *)recentDirectories;
+- (DetailsPanelBase *)detailsPanel; // Virtual
 @end

cocoa/base/AppDelegate.m

@@ -0,0 +1,52 @@
+/* 
+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 "AppDelegate.h"
+#import "ProgressController.h"
+#import "RegistrationInterface.h"
+#import "Utils.h"
+#import "Consts.h"
+
+@implementation AppDelegateBase
+- (IBAction)unlockApp:(id)sender
+{
+    if ([[self py] isRegistered])
+        return;
+    RegistrationInterface *ri = [[RegistrationInterface alloc] initWithApp:[self py]];
+    if ([ri enterCode] == NSOKButton)
+    {
+        NSString *menuTitle = [NSString stringWithFormat:@"Thanks for buying %@!",[py appName]];
+        [unlockMenuItem setTitle:menuTitle];
+    }
+    [ri release];
+}
+
+- (PyDupeGuruBase *)py { return py; }
+- (RecentDirectories *)recentDirectories { return recentDirectories; }
+- (DetailsPanelBase *)detailsPanel { return nil; } // Virtual
+
+/* Delegate */
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+{
+    [[ProgressController mainProgressController] setWorker:py];
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    //Restore Columns
+    NSArray *columnsOrder = [ud arrayForKey:@"columnsOrder"];
+    NSDictionary *columnsWidth = [ud dictionaryForKey:@"columnsWidth"];
+    if ([columnsOrder count])
+        [result restoreColumnsPosition:columnsOrder widths:columnsWidth];
+    else
+        [result resetColumnsToDefault:nil];
+    //Reg stuff
+    if ([RegistrationInterface showNagWithApp:[self py]])
+        [unlockMenuItem setTitle:[NSString stringWithFormat:@"Thanks for buying %@!",[py appName]]];
+    //Restore results
+    [py loadIgnoreList];
+    [py loadResults];
+}
+@end

cocoa/base/Consts.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -25,4 +25,3 @@ http://www.hardcoded.net/licenses/hs_license
 #define jobDelete @"job_delete"
 
 #define DEMO_MAX_ACTION_COUNT 10
-#define LIMIT_DESC @"In the demo version, only 10 duplicates per session can be sent to Trash, moved or copied."

cocoa/base/DetailsPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -18,6 +18,7 @@ http://www.hardcoded.net/licenses/hs_license
 - (id)initWithPy:(PyApp *)aPy;
 
 - (void)refresh;
+- (void)toggleVisibility;
 
 /* Notifications */
 - (void)duplicateSelectionChanged:(NSNotification *)aNotification;

cocoa/base/DetailsPanel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -12,7 +12,7 @@ http://www.hardcoded.net/licenses/hs_license
 @implementation DetailsPanelBase
 - (id)initWithPy:(PyApp *)aPy
 {
-    self = [super initWithWindowNibName:@"Details"];
+    self = [super initWithWindowNibName:@"DetailsPanel"];
     [self window]; //So the detailsTable is initialized.
     [detailsTable setPy:aPy];
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(duplicateSelectionChanged:) name:DuplicateSelectionChangedNotification object:nil];
@@ -24,6 +24,17 @@ http://www.hardcoded.net/licenses/hs_license
     [detailsTable reloadData];
 }
 
+- (void)toggleVisibility
+{
+    if ([[self window] isVisible])
+        [[self window] close];
+    else
+    {
+        [self refresh]; // selection might have changed since last time
+        [[self window] orderFront:nil];
+    }
+}
+
 /* Notifications */
 - (void)duplicateSelectionChanged:(NSNotification *)aNotification
 {

cocoa/base/DirectoryPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -11,10 +11,19 @@ http://www.hardcoded.net/licenses/hs_license
 #import "Outline.h"
 #import "PyDupeGuru.h"
 
+@interface DirectoryOutline : OutlineView
+{
+}
+@end
+
+@protocol DirectoryOutlineDelegate
+- (void)outlineView:(NSOutlineView *)outlineView addDirectory:(NSString *)directory;
+@end
+
 @interface DirectoryPanelBase : NSWindowController
 {
     IBOutlet NSPopUpButton *addButtonPopUp;
-    IBOutlet OutlineView *directories;
+    IBOutlet DirectoryOutline *directories;
     IBOutlet NSButton *removeButton;
     
     PyDupeGuruBase *_py;

cocoa/base/DirectoryPanel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -11,10 +11,52 @@ http://www.hardcoded.net/licenses/hs_license
 #import "Utils.h"
 #import "AppDelegate.h"
 
+@implementation DirectoryOutline
+- (void)doInit
+{
+    [super doInit];
+    [self registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
+}
+
+- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id < NSDraggingInfo >)info proposedItem:(id)item proposedChildIndex:(NSInteger)index
+{
+    NSPasteboard *pboard;
+    NSDragOperation sourceDragMask;
+    sourceDragMask = [info draggingSourceOperationMask];
+    pboard = [info draggingPasteboard];
+    if ([[pboard types] containsObject:NSFilenamesPboardType])
+    {
+        if (sourceDragMask & NSDragOperationLink)
+            return NSDragOperationLink;
+    }
+    return NSDragOperationNone;    
+}
+
+- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id < NSDraggingInfo >)info item:(id)item childIndex:(NSInteger)index
+{
+    NSPasteboard *pboard;
+    NSDragOperation sourceDragMask; 
+    sourceDragMask = [info draggingSourceOperationMask];
+    pboard = [info draggingPasteboard];
+    if ( [[pboard types] containsObject:NSFilenamesPboardType] )
+    {
+        NSArray *filenames = [pboard propertyListForType:NSFilenamesPboardType];
+        if (!(sourceDragMask & NSDragOperationLink))
+            return NO;
+        if (([self delegate] == nil) || (![[self delegate] respondsToSelector:@selector(outlineView:addDirectory:)]))
+            return NO;
+        for (NSString *filename in filenames)
+            [[self delegate] outlineView:self addDirectory:filename];
+    }
+    return YES;
+}
+
+@end
+
 @implementation DirectoryPanelBase
 - (id)initWithParentApp:(id)aParentApp
 {
-    self = [super initWithWindowNibName:@"Directories"];
+    self = [super initWithWindowNibName:@"DirectoryPanel"];
     [self window];
     AppDelegateBase *app = aParentApp;
     _py = [app py];
@@ -104,10 +146,7 @@ http://www.hardcoded.net/licenses/hs_license
 
 - (IBAction)toggleVisible:(id)sender
 {
-    if ([[self window] isVisible])
+    [[self window] makeKeyAndOrderFront:nil];
-        [[self window] close];
-    else
-        [[self window] makeKeyAndOrderFront:nil];
 }
 
 /* Public */
@@ -154,6 +193,11 @@ http://www.hardcoded.net/licenses/hs_license
 
 /* Delegate */
 
+- (void)outlineView:(NSOutlineView *)outlineView addDirectory:(NSString *)directory
+{
+    [self addDirectory:directory];
+}
+
 - (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
 { 
     OVNode *node = item;

cocoa/base/PyDupeGuru.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 

cocoa/base/ResultWindow.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -8,7 +8,6 @@ http://www.hardcoded.net/licenses/hs_license
 
 #import <Cocoa/Cocoa.h>
 #import "Outline.h"
-#import "DirectoryPanel.h"
 #import "PyDupeGuru.h"
 
 @interface MatchesView : OutlineView
@@ -20,29 +19,29 @@ http://www.hardcoded.net/licenses/hs_license
 @protected
     IBOutlet PyDupeGuruBase *py;
     IBOutlet id app;
-    IBOutlet NSView *actionMenuView;
     IBOutlet NSSegmentedControl *deltaSwitch;
-    IBOutlet NSView *deltaSwitchView;
-    IBOutlet NSView *filterFieldView;
     IBOutlet MatchesView *matches;
 	IBOutlet NSSegmentedControl *pmSwitch;
-    IBOutlet NSView *pmSwitchView;
 	IBOutlet NSTextField *stats;
+	IBOutlet NSMenu *columnsMenu;
     
     BOOL _powerMode;
     BOOL _displayDelta;
+    NSMutableArray *_resultColumns;
+    NSWindowController *preferencesPanel;
 }
-/* Override */
-- (NSString *)logoImageName;
-
 /* Helpers */
+- (void)fillColumnsMenu;
+- (NSTableColumn *)getColumnForIdentifier:(int)aIdentifier title:(NSString *)aTitle width:(int)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)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth;
 
 /* Actions */
 - (IBAction)changeDelta:(id)sender;
@@ -52,7 +51,11 @@ http://www.hardcoded.net/licenses/hs_license
 - (IBAction)expandAll:(id)sender;
 - (IBAction)exportToXHTML:(id)sender;
 - (IBAction)moveMarked:(id)sender;
+- (IBAction)resetColumnsToDefault:(id)sender;
+- (IBAction)showPreferencesPanel:(id)sender;
 - (IBAction)switchSelected:(id)sender;
+- (IBAction)toggleColumn:(id)sender;
+- (IBAction)toggleDetailsPanel:(id)sender;
 - (IBAction)togglePowerMarker:(id)sender;
 
 /* Notifications */

cocoa/base/ResultWindow.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -14,15 +14,6 @@ http://www.hardcoded.net/licenses/hs_license
 #import "AppDelegate.h"
 #import "Consts.h"
 
-#define tbbDirectories @"tbbDirectories"
-#define tbbDetails @"tbbDetail"
-#define tbbPreferences @"tbbPreferences"
-#define tbbPowerMarker @"tbbPowerMarker"
-#define tbbScan @"tbbScan"
-#define tbbAction @"tbbAction"
-#define tbbDelta @"tbbDelta"
-#define tbbFilter @"tbbFilter"
-
 @implementation MatchesView
 - (void)keyDown:(NSEvent *)theEvent
 {
@@ -60,6 +51,9 @@ http://www.hardcoded.net/licenses/hs_license
 - (void)awakeFromNib
 {
     [self window];
+    preferencesPanel = [[NSWindowController alloc] initWithWindowNibName:@"Preferences"];
+    [self initResultColumns];
+    [self fillColumnsMenu];
     [[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];
@@ -68,13 +62,42 @@ http://www.hardcoded.net/licenses/hs_license
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsUpdated:) name:ResultsUpdatedNotification object:nil];
 }
 
-/* Virtual */
+- (void)dealloc
-- (NSString *)logoImageName
 {
-    return @"dg_logo32";
+    [preferencesPanel release];
+    [super dealloc];
 }
 
 /* Helpers */
+- (void)fillColumnsMenu
+{
+    // The columns menu is supposed to be empty and initResultColumns must have been called
+    for (NSTableColumn *col in _resultColumns)
+    {
+        NSMenuItem *mi = [columnsMenu addItemWithTitle:[[col headerCell] stringValue] action:@selector(toggleColumn:) keyEquivalent:@""];
+        [mi setTag:[[col identifier] integerValue]];
+        [mi setTarget:self];
+        if ([[matches tableColumns] containsObject:col])
+            [mi setState:NSOnState];
+    }
+    [columnsMenu addItem:[NSMenuItem separatorItem]];
+    NSMenuItem *mi = [columnsMenu addItemWithTitle:@"Reset to Default" action:@selector(resetColumnsToDefault:) keyEquivalent:@""];
+    [mi setTarget:self];
+}
+
+- (NSTableColumn *)getColumnForIdentifier:(int)aIdentifier title:(NSString *)aTitle width:(int)aWidth refCol:(NSTableColumn *)aColumn
+{
+    NSNumber *n = [NSNumber numberWithInt:aIdentifier];
+    NSTableColumn *col = [[NSTableColumn alloc] initWithIdentifier:[n stringValue]];
+    [col setWidth:aWidth];
+    [col setEditable:NO];
+    [[col dataCell] setFont:[[aColumn dataCell] font]];
+    [[col headerCell] setStringValue:aTitle];
+    [col setResizingMask:NSTableColumnUserResizingMask];
+    [col setSortDescriptorPrototype:[[NSSortDescriptor alloc] initWithKey:[n stringValue] ascending:YES]];
+    return col;
+}
+
 //Returns an array of identifiers, in order.
 - (NSArray *)getColumnsOrder
 {
@@ -135,6 +158,40 @@ http://www.hardcoded.net/licenses/hs_license
     return r;
 }
 
+- (void)initResultColumns
+{
+    // Virtual
+}
+
+- (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth
+{
+    NSTableColumn *col;
+    NSString *colId;
+    NSNumber *width;
+    NSMenuItem *mi;
+    //Remove all columns
+    NSEnumerator *e = [[columnsMenu itemArray] objectEnumerator];
+    while (mi = [e nextObject])
+    {
+        if ([mi state] == NSOnState)
+            [self toggleColumn:mi];
+    }
+    //Add columns and set widths
+    e = [aColumnsOrder objectEnumerator];
+    while (colId = [e nextObject])
+    {
+        if (![colId isEqual:@"mark"])
+        {
+            col = [_resultColumns objectAtIndex:[colId intValue]];
+            width = [aColumnsWidth objectForKey:[col identifier]];
+            mi = [columnsMenu itemWithTag:[colId intValue]];
+            if (width)
+                [col setWidth:[width floatValue]];
+            [self toggleColumn:mi];
+        }
+    }
+}
+
 - (void)updatePySelection
 {
 	NSArray *selection;
@@ -242,6 +299,16 @@ http://www.hardcoded.net/licenses/hs_license
     }
 }
 
+- (IBAction)resetColumnsToDefault:(id)sender
+{
+    // Virtual
+}
+
+- (IBAction)showPreferencesPanel:(id)sender
+{
+    [preferencesPanel showWindow:sender];
+}
+
 - (IBAction)switchSelected:(id)sender
 {
     // It might look like a complicated way to get the length of the current dupe list on the py side
@@ -259,6 +326,31 @@ http://www.hardcoded.net/licenses/hs_license
         [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
 }
 
+- (IBAction)toggleColumn:(id)sender
+{
+    NSMenuItem *mi = sender;
+    NSString *colId = [NSString stringWithFormat:@"%d",[mi tag]];
+    NSTableColumn *col = [matches tableColumnWithIdentifier:colId];
+    if (col == nil)
+    {
+        //Add Column
+        col = [_resultColumns objectAtIndex:[mi tag]];
+        [matches addTableColumn:col];
+        [mi setState:NSOnState];
+    }
+    else
+    {
+        //Remove column
+        [matches removeTableColumn:col];
+        [mi setState:NSOffState];
+    }
+}
+
+- (IBAction)toggleDetailsPanel:(id)sender
+{
+    [[(AppDelegateBase *)app detailsPanel] toggleVisibility];
+}
+
 - (IBAction)togglePowerMarker:(id)sender
 {
     if ([pmSwitch selectedSegment] == 1)
@@ -294,27 +386,33 @@ http://www.hardcoded.net/licenses/hs_license
     [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
     int r = n2i([py getOperationalErrorCount]);
     id lastAction = [[ProgressController mainProgressController] jobId];
-    if ([lastAction isEqualTo:jobCopy])
+    if ([lastAction isEqualTo:jobCopy]) {
-    {
         if (r > 0)
             [Dialogs showMessage:[NSString stringWithFormat:@"%d file(s) couldn't be copied.",r]];
         else
             [Dialogs showMessage:@"All marked files were copied sucessfully."];
     }
-    if ([lastAction isEqualTo:jobMove])
+    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
             [Dialogs showMessage:@"All marked files were moved sucessfully."];
     }
-    if ([lastAction isEqualTo:jobDelete])
+    else if ([lastAction isEqualTo:jobDelete]) {
-    {
+        if (r > 0) {
-        if (r > 0)
+            NSString *msg = @"%d file(s) couldn't be sent to Trash. They were kept in the results, "\
-            [Dialogs showMessage:[NSString stringWithFormat:@"%d file(s) couldn't be sent to Trash. They were kept in the results, and still are marked.",r]];
+                "and still are marked. See the F.A.Q. section in the help file for details.";
+            [Dialogs showMessage:[NSString stringWithFormat:msg,r]];
+        }
         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];
+        if (groupCount == 0)
+            [Dialogs showMessage:@"No duplicates found."];
+    }
+    
     // Re-activate toolbar items right after the progress bar stops showing instead of waiting until
     // a mouse-over is performed
     [[[self window] toolbar] validateVisibleItems];
@@ -353,107 +451,7 @@ http://www.hardcoded.net/licenses/hs_license
 - (void)resultsUpdated:(NSNotification *)aNotification
 {
 	[matches invalidateBuffers];
-}
+    [matches invalidateMarkings];
-
-/* Toolbar */
-- (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag
-{
-    NSToolbarItem *tbi = [[[NSToolbarItem alloc] initWithItemIdentifier:itemIdentifier] autorelease];
-    if ([itemIdentifier isEqualTo:tbbDirectories])
-    {
-        [tbi setLabel: @"Directories"];
-        [tbi setToolTip: @"Show/Hide the directories panel."];
-        [tbi setImage: [NSImage imageNamed: @"folder32"]];
-        [tbi setTarget: app];
-        [tbi setAction: @selector(toggleDirectories:)];
-    }
-    else if ([itemIdentifier isEqualTo:tbbDetails])
-    {
-        [tbi setLabel: @"Details"];
-        [tbi setToolTip: @"Show/Hide the details panel."];
-        [tbi setImage: [NSImage imageNamed: @"details32"]];
-        [tbi setTarget: self];
-        [tbi setAction: @selector(toggleDetailsPanel:)];
-    }
-    else if ([itemIdentifier isEqualTo:tbbPreferences])
-    {
-        [tbi setLabel: @"Preferences"];
-        [tbi setToolTip: @"Show the preferences panel."];
-        [tbi setImage: [NSImage imageNamed: @"preferences32"]];
-        [tbi setTarget: self];
-        [tbi setAction: @selector(showPreferencesPanel:)];
-    }
-    else if ([itemIdentifier isEqualTo:tbbPowerMarker])
-    {
-        [tbi setLabel: @"Power Marker"];
-        [tbi setToolTip: @"When enabled, only the duplicates are shown, not the references."];
-        [tbi setView:pmSwitchView];
-        [tbi setMinSize:[pmSwitchView frame].size];
-        [tbi setMaxSize:[pmSwitchView frame].size];        
-    }
-    else if ([itemIdentifier isEqualTo:tbbScan])
-    {
-        [tbi setLabel: @"Start Scanning"];
-        [tbi setToolTip: @"Start scanning for duplicates in the selected directories."];
-        [tbi setImage: [NSImage imageNamed:[self logoImageName]]];
-        [tbi setTarget: self];
-        [tbi setAction: @selector(startDuplicateScan:)];
-    }
-    else if ([itemIdentifier isEqualTo:tbbAction])
-    {
-        [tbi setLabel: @"Action"];
-        [tbi setView:actionMenuView];
-        [tbi setMinSize:[actionMenuView frame].size];
-        [tbi setMaxSize:[actionMenuView frame].size];
-    }
-    else if ([itemIdentifier isEqualTo:tbbDelta])
-    {
-        [tbi setLabel: @"Delta Values"];
-        [tbi setToolTip: @"When enabled, this option makes dupeGuru display, where applicable, delta values instead of absolute values."];
-        [tbi setView:deltaSwitchView];
-        [tbi setMinSize:[deltaSwitchView frame].size];
-        [tbi setMaxSize:[deltaSwitchView frame].size];
-    }
-    else if ([itemIdentifier isEqualTo:tbbFilter])
-    {
-        [tbi setLabel: @"Filter"];
-        [tbi setToolTip: @"Filters the results using regular expression."];
-        [tbi setView:filterFieldView];
-        [tbi setMinSize:[filterFieldView frame].size];
-        [tbi setMaxSize:NSMakeSize(1000, [filterFieldView frame].size.height)];
-    }
-    [tbi setPaletteLabel: [tbi label]];
-    return tbi;
-}
-
-- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar
-{
-    return [NSArray arrayWithObjects:
-        tbbDirectories,
-        tbbDetails,
-        tbbPreferences,
-        tbbPowerMarker,
-        tbbScan,
-        tbbAction,
-        tbbDelta,
-        tbbFilter,
-        NSToolbarSeparatorItemIdentifier,
-        NSToolbarSpaceItemIdentifier, 
-        NSToolbarFlexibleSpaceItemIdentifier,
-        nil];
-}
-
-- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar
-{
-    return [NSArray arrayWithObjects:
-        tbbScan,
-        tbbAction,
-        tbbDirectories,
-        tbbDetails,
-        tbbPowerMarker,
-        tbbDelta,
-        tbbFilter,
-        nil];
 }
 
 - (BOOL)validateToolbarItem:(NSToolbarItem *)theItem

cocoa/me/AppDelegate.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,15 +7,13 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/AppDelegate.h"
+#import "../base/AppDelegate.h"
 #import "ResultWindow.h"
 #import "DirectoryPanel.h"
 #import "PyDupeGuru.h"
 
 @interface AppDelegate : AppDelegateBase
 {   
-    IBOutlet ResultWindow *result;
-    
     DirectoryPanel *_directoryPanel;
 }
 - (IBAction)openWebsite:(id)sender;

cocoa/me/AppDelegate.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,11 +7,12 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import "AppDelegate.h"
-#import "cocoalib/ProgressController.h"
+#import "../../cocoalib/ProgressController.h"
-#import "cocoalib/RegistrationInterface.h"
+#import "../../cocoalib/RegistrationInterface.h"
-#import "cocoalib/Utils.h"
+#import "../../cocoalib/Utils.h"
-#import "cocoalib/ValueTransformers.h"
+#import "../../cocoalib/ValueTransformers.h"
-#import "cocoalib/Dialogs.h"
+#import "../../cocoalib/Dialogs.h"
+#import "DetailsPanel.h"
 #import "Consts.h"
 
 @implementation AppDelegate
@@ -51,7 +52,6 @@ http://www.hardcoded.net/licenses/hs_license
     VTIsIntIn *vtScanTypeIsTag = [[[VTIsIntIn alloc] initWithValues:[NSIndexSet indexSetWithIndex:3] reverse:NO] autorelease];
     [NSValueTransformer setValueTransformer:vtScanTypeIsTag forName:@"vtScanTypeIsTag"];
     _directoryPanel = nil;
-    _appName = APPNAME;
     return self;
 }
 
@@ -60,50 +60,17 @@ http://www.hardcoded.net/licenses/hs_license
     [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.hardcoded.net/dupeguru_me"]];
 }
 
-- (IBAction)popupPresets:(id)sender
-{
-    [presetsPopup selectItem: nil];
-    [[presetsPopup cell] performClickWithFrame:[sender frame] inView:[sender superview]];
-}
-
 - (IBAction)toggleDirectories:(id)sender
 {
     [[self directoryPanel] toggleVisible:sender];
 }
 
-- (IBAction)usePreset:(id)sender
+
+- (DetailsPanelBase *)detailsPanel
 {
-    NSUserDefaultsController *ud = [NSUserDefaultsController sharedUserDefaultsController];
+    if (!_detailsPanel)
-    [ud revertToInitialValues:nil];
+        _detailsPanel = [[DetailsPanel alloc] initWithPy:py];
-    NSUserDefaults *d = [ud defaults];
+    return _detailsPanel;
-    switch ([sender tag])
-    {
-        case 0:
-        {
-            [d setInteger:5 forKey:@"scanType"];
-            break;
-        }
-        //case 1 is defaults
-        case 2:
-        {
-            [d setInteger:2 forKey:@"scanType"];
-            break;
-        }
-        case 3:
-        {
-            [d setInteger:0 forKey:@"scanType"];
-            [d setInteger:50 forKey:@"minMatchPercentage"];
-            break;
-        }
-        case 4:
-        {
-            [d setInteger:0 forKey:@"scanType"];
-            [d setInteger:50 forKey:@"minMatchPercentage"];
-            [d setBool:YES forKey:@"matchSimilarWords"];
-            [d setBool:YES forKey:@"wordWeighting"];
-            break;
-        }
-    }
 }
 
 - (DirectoryPanel *)directoryPanel
@@ -115,23 +82,6 @@ http://www.hardcoded.net/licenses/hs_license
 - (PyDupeGuru *)py { return (PyDupeGuru *)py; }
 
 //Delegate
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
-{
-    [[ProgressController mainProgressController] setWorker:py];
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    //Restore Columns
-    NSArray *columnsOrder = [ud arrayForKey:@"columnsOrder"];
-    NSDictionary *columnsWidth = [ud dictionaryForKey:@"columnsWidth"];
-    if ([columnsOrder count])
-        [result restoreColumnsPosition:columnsOrder widths:columnsWidth];
-    //Reg stuff
-    if ([RegistrationInterface showNagWithApp:[self py] name:APPNAME limitDescription:LIMIT_DESC])
-        [unlockMenuItem setTitle:@"Thanks for buying dupeGuru ME!"];
-    //Restore results
-    [py loadIgnoreList];
-    [py loadResults];
-}
-
 - (void)applicationWillBecomeActive:(NSNotification *)aNotification
 {
     if (![[result window] isVisible])

cocoa/me/Consts.h

@@ -1,13 +1,11 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 "dgbase/Consts.h"
+#import "../base/Consts.h"
-
-#define APPNAME @"dupeGuru ME"
 
 #define jobScanDeadTracks @"jobScanDeadTracks"

cocoa/me/DetailsPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/DetailsPanel.h"
+#import "../base/DetailsPanel.h"
 
 
 @interface DetailsPanel : DetailsPanelBase

cocoa/me/DetailsPanel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 

cocoa/me/DirectoryPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/DirectoryPanel.h"
+#import "../base/DirectoryPanel.h"
 
 @interface DirectoryPanel : DirectoryPanelBase
 {

cocoa/me/DirectoryPanel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 

cocoa/me/Info.plist

@@ -23,11 +23,13 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>5.6.6</string>
+	<string>5.7.0</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>© Hardcoded Software, 2010</string>
 	<key>SUFeedURL</key>
 	<string>http://www.hardcoded.net/updates/dupeguru_me.appcast</string>
 	<key>SUPublicDSAKeyFile</key>

cocoa/me/PyDupeGuru.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/PyDupeGuru.h"
+#import "../base/PyDupeGuru.h"
 
 @interface PyDupeGuru : PyDupeGuruBase
 //Scanning options

cocoa/me/ResultWindow.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,21 +7,15 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "cocoalib/Outline.h"
+#import "../../cocoalib/Outline.h"
-#import "dgbase/ResultWindow.h"
+#import "../base/ResultWindow.h"
-#import "DetailsPanel.h"
 #import "DirectoryPanel.h"
 
 @interface ResultWindow : ResultWindowBase
 {
-    IBOutlet NSPopUpButton *actionMenu;
-    IBOutlet NSMenu *columnsMenu;
     IBOutlet NSSearchField *filterField;
-    IBOutlet NSWindow *preferencesPanel;
     
     NSString *_lastAction;
-    DetailsPanel *_detailsPanel;
-    NSMutableArray *_resultColumns;
     NSMutableIndexSet *_deltaColumns;
 }
 - (IBAction)clearIgnoreList:(id)sender;
@@ -38,15 +32,7 @@ http://www.hardcoded.net/licenses/hs_license
 - (IBAction)removeMarked:(id)sender;
 - (IBAction)removeSelected:(id)sender;
 - (IBAction)renameSelected:(id)sender;
-- (IBAction)resetColumnsToDefault:(id)sender;
 - (IBAction)revealSelected:(id)sender;
-- (IBAction)showPreferencesPanel:(id)sender;
 - (IBAction)startDuplicateScan:(id)sender;
-- (IBAction)toggleColumn:(id)sender;
 - (IBAction)toggleDelta:(id)sender;
-- (IBAction)toggleDetailsPanel:(id)sender;
-
-- (NSTableColumn *)getColumnForIdentifier:(int)aIdentifier title:(NSString *)aTitle width:(int)aWidth refCol:(NSTableColumn *)aColumn;
-- (void)initResultColumns;
-- (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth;
 @end

cocoa/me/ResultWindow.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,10 +7,10 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import "ResultWindow.h"
-#import "cocoalib/Dialogs.h"
+#import "../../cocoalib/Dialogs.h"
-#import "cocoalib/ProgressController.h"
+#import "../../cocoalib/ProgressController.h"
-#import "cocoalib/RegistrationInterface.h"
+#import "../../cocoalib/RegistrationInterface.h"
-#import "cocoalib/Utils.h"
+#import "../../cocoalib/Utils.h"
 #import "AppDelegate.h"
 #import "Consts.h"
 
@@ -19,7 +19,7 @@ http://www.hardcoded.net/licenses/hs_license
 - (void)awakeFromNib
 {
     [super awakeFromNib];
-    _detailsPanel = nil;
+    [[self window] setTitle:@"dupeGuru Music Edition"];
     _displayDelta = NO;
     _powerMode = NO;
     _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,7)] retain];
@@ -29,23 +29,8 @@ http://www.hardcoded.net/licenses/hs_license
     [py setDisplayDeltaValues:b2n(_displayDelta)];
     [matches setTarget:self];
     [matches setDoubleAction:@selector(openSelected:)];
-    [[actionMenu itemAtIndex:0] setImage:[NSImage imageNamed: @"gear"]];
-    [self initResultColumns];
     [self refreshStats];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsMarkingChanged:) name:ResultsMarkingChangedNotification object:nil];
-    
-    NSToolbar *t = [[[NSToolbar alloc] initWithIdentifier:@"ResultWindowToolbar"] autorelease];
-    [t setAllowsUserCustomization:YES];
-    [t setAutosavesConfiguration:YES];
-    [t setDisplayMode:NSToolbarDisplayModeIconAndLabel];
-    [t setDelegate:self];
-    [[self window] setToolbar:t];
-}
-
-/* Overrides */
-- (NSString *)logoImageName
-{
-    return @"dgme_logo_32";
 }
 
 /* Actions */
@@ -182,11 +167,6 @@ http://www.hardcoded.net/licenses/hs_license
     [py revealSelected];
 }
 
-- (IBAction)showPreferencesPanel:(id)sender
-{
-    [preferencesPanel makeKeyAndOrderFront:sender];
-}
-
 - (IBAction)startDuplicateScan:(id)sender
 {
     if ([matches numberOfRows] > 0)
@@ -219,26 +199,6 @@ http://www.hardcoded.net/licenses/hs_license
     }
 }
 
-- (IBAction)toggleColumn:(id)sender
-{
-    NSMenuItem *mi = sender;
-    NSString *colId = [NSString stringWithFormat:@"%d",[mi tag]];
-    NSTableColumn *col = [matches tableColumnWithIdentifier:colId];
-    if (col == nil)
-    {
-        //Add Column
-        col = [_resultColumns objectAtIndex:[mi tag]];
-        [matches addTableColumn:col];
-        [mi setState:NSOnState];
-    }
-    else
-    {
-        //Remove column
-        [matches removeTableColumn:col];
-        [mi setState:NSOffState];
-    }
-}
-
 - (IBAction)toggleDelta:(id)sender
 {
     if ([deltaSwitch selectedSegment] == 1)
@@ -248,39 +208,22 @@ http://www.hardcoded.net/licenses/hs_license
     [self changeDelta:sender];
 }
 
-- (IBAction)toggleDetailsPanel:(id)sender
-{
-    if (!_detailsPanel)
-        _detailsPanel = [[DetailsPanel alloc] initWithPy:py];
-    if ([[_detailsPanel window] isVisible])
-        [[_detailsPanel window] close];
-    else
-        [[_detailsPanel window] orderFront:nil];
-}
-
 /* Public */
-- (NSTableColumn *)getColumnForIdentifier:(int)aIdentifier title:(NSString *)aTitle width:(int)aWidth refCol:(NSTableColumn *)aColumn
-{
-    NSNumber *n = [NSNumber numberWithInt:aIdentifier];
-    NSTableColumn *col = [[NSTableColumn alloc] initWithIdentifier:[n stringValue]];
-    [col setWidth:aWidth];
-    [col setEditable:NO];
-    [[col dataCell] setFont:[[aColumn dataCell] font]];
-    [[col headerCell] setStringValue:aTitle];
-    [col setResizingMask:NSTableColumnUserResizingMask];
-    [col setSortDescriptorPrototype:[[NSSortDescriptor alloc] initWithKey:[n stringValue] ascending:YES]];
-    return col;
-}
-
 - (void)initResultColumns
 {
     NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];
     _resultColumns = [[NSMutableArray alloc] init];
     [_resultColumns addObject:[matches tableColumnWithIdentifier:@"0"]]; // File Name
     [_resultColumns addObject:[self getColumnForIdentifier:1 title:@"Directory" width:120 refCol:refCol]];
-    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"2"]]; // Size
+    NSTableColumn *sizeCol = [self getColumnForIdentifier:2 title:@"Size (MB)" width:63 refCol:refCol];
-    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"3"]]; // Time
+    [[sizeCol dataCell] setAlignment:NSRightTextAlignment];
-    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"4"]]; // Bitrate
+    [_resultColumns addObject:sizeCol];
+    NSTableColumn *timeCol = [self getColumnForIdentifier:3 title:@"Time" width:50 refCol:refCol];
+    [[timeCol dataCell] setAlignment:NSRightTextAlignment];
+    [_resultColumns addObject:timeCol];
+    NSTableColumn *brCol = [self getColumnForIdentifier:4 title:@"Bitrate" width:50 refCol:refCol];
+    [[brCol dataCell] setAlignment:NSRightTextAlignment];
+    [_resultColumns addObject:brCol];
     [_resultColumns addObject:[self getColumnForIdentifier:5 title:@"Sample Rate" width:60 refCol:refCol]];
     [_resultColumns addObject:[self getColumnForIdentifier:6 title:@"Kind" width:40 refCol:refCol]];
     [_resultColumns addObject:[self getColumnForIdentifier:7 title:@"Creation" width:120 refCol:refCol]];
@@ -292,40 +235,11 @@ http://www.hardcoded.net/licenses/hs_license
     [_resultColumns addObject:[self getColumnForIdentifier:13 title:@"Year" width:40 refCol:refCol]];
     [_resultColumns addObject:[self getColumnForIdentifier:14 title:@"Track Number" width:40 refCol:refCol]];
     [_resultColumns addObject:[self getColumnForIdentifier:15 title:@"Comment" width:120 refCol:refCol]];
-    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"16"]]; // Match %
+    [_resultColumns addObject:[self getColumnForIdentifier:16 title:@"Match %" width:57 refCol:refCol]];
     [_resultColumns addObject:[self getColumnForIdentifier:17 title:@"Words Used" width:120 refCol:refCol]];
     [_resultColumns addObject:[self getColumnForIdentifier:18 title:@"Dupe Count" width:80 refCol:refCol]];
 }
 
-- (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth
-{
-    NSTableColumn *col;
-    NSString *colId;
-    NSNumber *width;
-    NSMenuItem *mi;
-    //Remove all columns
-    NSEnumerator *e = [[columnsMenu itemArray] objectEnumerator];
-    while (mi = [e nextObject])
-    {
-        if ([mi state] == NSOnState)
-            [self toggleColumn:mi];
-    }
-    //Add columns and set widths
-    e = [aColumnsOrder objectEnumerator];
-    while (colId = [e nextObject])
-    {
-        if (![colId isEqual:@"mark"])
-        {
-            col = [_resultColumns objectAtIndex:[colId intValue]];
-            width = [aColumnsWidth objectForKey:[col identifier]];
-            mi = [columnsMenu itemWithTag:[colId intValue]];
-            if (width)
-                [col setWidth:[width floatValue]];
-            [self toggleColumn:mi];
-        }
-    }
-}
-
 /* Delegate */
 - (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
 { 

cocoa/me/dg_cocoa.py

@@ -1,5 +1,4 @@
-# $Id$
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# Copyright 2009 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 
@@ -8,12 +7,13 @@
 import objc
 from AppKit import *
 
-from dupeguru import app_me_cocoa, scanner
+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
-from dupeguru import app, app_cocoa, data, directories, engine, export, ignore, results, scanner
+from core_me import app_cocoa, data, fs, scanner
-from hsfs import auto, stats, tree, music
+from core import app, app_cocoa, data, directories, engine, export, ignore, results, scanner, fs
-from hsfs.phys import music
 from hsmedia import aiff, flac, genres, id3v1, id3v2, mp4, mpeg, ogg, wma
 from hsutil import conflict
 
@@ -23,7 +23,7 @@ class PyApp(NSObject):
 class PyDupeGuru(PyApp):
     def init(self):
         self = super(PyDupeGuru,self).init()
-        self.app = app_me_cocoa.DupeGuruME()
+        self.app = DupeGuruME()
         return self
     
     #---Directories
@@ -180,12 +180,12 @@ class PyDupeGuru(PyApp):
     def setScanType_(self, scan_type):
         try:
             self.app.scanner.scan_type = [
-                scanner.SCAN_TYPE_FILENAME,
+                SCAN_TYPE_FILENAME,
-                scanner.SCAN_TYPE_FIELDS,
+                SCAN_TYPE_FIELDS,
-                scanner.SCAN_TYPE_FIELDS_NO_ORDER,
+                SCAN_TYPE_FIELDS_NO_ORDER,
-                scanner.SCAN_TYPE_TAG,
+                SCAN_TYPE_TAG,
-                scanner.SCAN_TYPE_CONTENT,
+                SCAN_TYPE_CONTENT,
-                scanner.SCAN_TYPE_CONTENT_AUDIO
+                SCAN_TYPE_CONTENT_AUDIO
             ][scan_type]
         except IndexError:
             pass
@@ -225,6 +225,12 @@ class PyDupeGuru(PyApp):
         self.app.progress.job_cancelled = True
     
     #---Registration
+    def appName(self):
+        return "dupeGuru Music Edition"
+    
+    def demoLimitDescription(self):
+        return self.app.DEMO_LIMIT_DESC
+    
     @objc.signature('i@:')
     def isRegistered(self):
         return self.app.registered

cocoa/me/dupeguru.xcodeproj/project.pbxproj

@@ -19,8 +19,6 @@
 /* End PBXAppleScriptBuildPhase section */
 
 /* Begin PBXBuildFile section */
-		8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
-		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 		CE073F6309CAE1A3005C1D2F /* dupeguru_me_help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* dupeguru_me_help */; };
@@ -29,9 +27,9 @@
 		CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; };
 		CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9A09914ADF003581CE /* ResultWindow.m */; };
 		CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */ = {isa = PBXBuildFile; fileRef = CE381CF509915304003581CE /* dg_cocoa.plugin */; };
-		CE3AA46709DB207900DB3A21 /* Directories.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE3AA46509DB207900DB3A21 /* Directories.nib */; };
+		CE3FBDD31094637800B72D77 /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE3FBDD11094637800B72D77 /* DetailsPanel.xib */; };
+		CE3FBDD41094637800B72D77 /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE3FBDD21094637800B72D77 /* DirectoryPanel.xib */; };
 		CE49DEF60FDFEB810098617B /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CE49DEF30FDFEB810098617B /* BRSingleLineFormatter.m */; };
-		CE49DEF70FDFEB810098617B /* NSCharacterSet_Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE49DEF50FDFEB810098617B /* NSCharacterSet_Extensions.m */; };
 		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 */; };
@@ -51,13 +49,11 @@
 		CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE68EE6609ABC48000971085 /* DirectoryPanel.m */; };
 		CE6E0E9F1054EB97008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0E9E1054EB97008D9390 /* dsa_pub.pem */; };
 		CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE848A1809DD85810004CB44 /* Consts.h */; };
-		CEA7D2C50FDFED340037CD8C /* dgme_logo_32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEA7D2C40FDFED340037CD8C /* dgme_logo_32.png */; };
+		CE900AD2109B238600754048 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE900AD1109B238600754048 /* Preferences.xib */; };
-		CECA899909DB12CA00A3D774 /* Details.nib in Resources */ = {isa = PBXBuildFile; fileRef = CECA899709DB12CA00A3D774 /* Details.nib */; };
+		CE900AD7109B2A9B00754048 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE900AD6109B2A9B00754048 /* MainMenu.xib */; };
 		CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CECA899A09DB132E00A3D774 /* DetailsPanel.h */; };
 		CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CECA899B09DB132E00A3D774 /* DetailsPanel.m */; };
-		CED2A6880A05102700AC4C3F /* power_marker32.png in Resources */ = {isa = PBXBuildFile; fileRef = CED2A6870A05102600AC4C3F /* power_marker32.png */; };
 		CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; };
-		CEF7823809C8AA0200EF38FF /* gear.png in Resources */ = {isa = PBXBuildFile; fileRef = CEF7823709C8AA0200EF38FF /* gear.png */; };
 		CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; };
 		CEFC295509C89FF200D9F998 /* details32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295309C89FF200D9F998 /* details32.png */; };
 		CEFC295609C89FF200D9F998 /* preferences32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295409C89FF200D9F998 /* preferences32.png */; };
@@ -79,73 +75,68 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
 		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = SOURCE_ROOT; };
-		29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		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; };
-		CE073F5409CAE1A3005C1D2F /* dupeguru_me_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_me_help; path = help/dupeguru_me_help; sourceTree = "<group>"; };
+		CE073F5409CAE1A3005C1D2F /* dupeguru_me_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_me_help; path = ../../help_me/dupeguru_me_help; sourceTree = "<group>"; };
 		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; };
 		CE381C9A09914ADF003581CE /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = ResultWindow.m; sourceTree = SOURCE_ROOT; };
 		CE381C9B09914ADF003581CE /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ResultWindow.h; sourceTree = SOURCE_ROOT; };
-		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dg_cocoa.plugin; path = py/dist/dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
+		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dg_cocoa.plugin; path = dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
-		CE3AA46609DB207900DB3A21 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Directories.nib; sourceTree = "<group>"; };
+		CE3FBDD11094637800B72D77 /* DetailsPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DetailsPanel.xib; path = ../../base/xib/DetailsPanel.xib; sourceTree = "<group>"; };
-		CE49DEF20FDFEB810098617B /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
+		CE3FBDD21094637800B72D77 /* DirectoryPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DirectoryPanel.xib; path = ../../base/xib/DirectoryPanel.xib; sourceTree = "<group>"; };
-		CE49DEF30FDFEB810098617B /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
+		CE49DEF20FDFEB810098617B /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
-		CE49DEF40FDFEB810098617B /* NSCharacterSet_Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSCharacterSet_Extensions.h; path = cocoalib/brsinglelineformatter/NSCharacterSet_Extensions.h; sourceTree = SOURCE_ROOT; };
+		CE49DEF30FDFEB810098617B /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
-		CE49DEF50FDFEB810098617B /* NSCharacterSet_Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSCharacterSet_Extensions.m; path = cocoalib/brsinglelineformatter/NSCharacterSet_Extensions.m; sourceTree = SOURCE_ROOT; };
+		CE515DE00FC6C12E00EC695D /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = ../../cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
-		CE515DE00FC6C12E00EC695D /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
+		CE515DE10FC6C12E00EC695D /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = ../../cocoalib/Dialogs.m; sourceTree = SOURCE_ROOT; };
-		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; };
-		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; };
-		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; };
-		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; };
-		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; };
-		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; };
-		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; };
-		CE515DE80FC6C12E00EC695D /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
+		CE515DE90FC6C12E00EC695D /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = ../../cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
-		CE515DE90FC6C12E00EC695D /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
+		CE515DEA0FC6C12E00EC695D /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = ../../cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
-		CE515DEA0FC6C12E00EC695D /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
+		CE515DEB0FC6C12E00EC695D /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = ../../cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
-		CE515DEB0FC6C12E00EC695D /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
+		CE515DEC0FC6C12E00EC695D /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = ../../cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
-		CE515DEC0FC6C12E00EC695D /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
+		CE515DED0FC6C12E00EC695D /* Table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Table.h; path = ../../cocoalib/Table.h; sourceTree = SOURCE_ROOT; };
-		CE515DED0FC6C12E00EC695D /* Table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Table.h; path = cocoalib/Table.h; sourceTree = SOURCE_ROOT; };
+		CE515DEE0FC6C12E00EC695D /* Table.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Table.m; path = ../../cocoalib/Table.m; sourceTree = SOURCE_ROOT; };
-		CE515DEE0FC6C12E00EC695D /* Table.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Table.m; path = cocoalib/Table.m; sourceTree = SOURCE_ROOT; };
+		CE515DEF0FC6C12E00EC695D /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = ../../cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
-		CE515DEF0FC6C12E00EC695D /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
+		CE515DF00FC6C12E00EC695D /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = ../../cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
-		CE515DF00FC6C12E00EC695D /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
+		CE515DF10FC6C12E00EC695D /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = ../../cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
-		CE515DF10FC6C12E00EC695D /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
+		CE515DF20FC6C12E00EC695D /* ValueTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ValueTransformers.m; path = ../../cocoalib/ValueTransformers.m; sourceTree = SOURCE_ROOT; };
-		CE515DF20FC6C12E00EC695D /* ValueTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ValueTransformers.m; path = cocoalib/ValueTransformers.m; sourceTree = SOURCE_ROOT; };
+		CE515DFD0FC6C13E00EC695D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = ../../cocoalib/English.lproj/ErrorReportWindow.xib; sourceTree = "<group>"; };
-		CE515DFD0FC6C13E00EC695D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = cocoalib/English.lproj/ErrorReportWindow.xib; sourceTree = "<group>"; };
+		CE515DFF0FC6C13E00EC695D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = ../../cocoalib/English.lproj/progress.nib; sourceTree = "<group>"; };
-		CE515DFF0FC6C13E00EC695D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = cocoalib/English.lproj/progress.nib; sourceTree = "<group>"; };
+		CE515E010FC6C13E00EC695D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = ../../cocoalib/English.lproj/registration.nib; sourceTree = "<group>"; };
-		CE515E010FC6C13E00EC695D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = cocoalib/English.lproj/registration.nib; sourceTree = "<group>"; };
+		CE515E150FC6C19300EC695D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ../base/AppDelegate.h; sourceTree = SOURCE_ROOT; };
-		CE515E150FC6C19300EC695D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = dgbase/AppDelegate.h; sourceTree = SOURCE_ROOT; };
+		CE515E160FC6C19300EC695D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = ../base/AppDelegate.m; sourceTree = SOURCE_ROOT; };
-		CE515E160FC6C19300EC695D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = dgbase/AppDelegate.m; sourceTree = SOURCE_ROOT; };
+		CE515E170FC6C19300EC695D /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Consts.h; path = ../base/Consts.h; sourceTree = SOURCE_ROOT; };
-		CE515E170FC6C19300EC695D /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Consts.h; path = dgbase/Consts.h; sourceTree = SOURCE_ROOT; };
+		CE515E180FC6C19300EC695D /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryPanel.h; path = ../base/DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
-		CE515E180FC6C19300EC695D /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryPanel.h; path = dgbase/DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
+		CE515E190FC6C19300EC695D /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryPanel.m; path = ../base/DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
-		CE515E190FC6C19300EC695D /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryPanel.m; path = dgbase/DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
+		CE515E1A0FC6C19300EC695D /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDupeGuru.h; path = ../base/PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
-		CE515E1A0FC6C19300EC695D /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDupeGuru.h; path = dgbase/PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
+		CE515E1B0FC6C19300EC695D /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultWindow.h; path = ../base/ResultWindow.h; sourceTree = SOURCE_ROOT; };
-		CE515E1B0FC6C19300EC695D /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultWindow.h; path = dgbase/ResultWindow.h; sourceTree = SOURCE_ROOT; };
+		CE515E1C0FC6C19300EC695D /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultWindow.m; path = ../base/ResultWindow.m; sourceTree = SOURCE_ROOT; };
-		CE515E1C0FC6C19300EC695D /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultWindow.m; path = dgbase/ResultWindow.m; sourceTree = SOURCE_ROOT; };
+		CE6032BE0FE6784C007E33FF /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = ../base/DetailsPanel.h; sourceTree = SOURCE_ROOT; };
-		CE6032BE0FE6784C007E33FF /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = dgbase/DetailsPanel.h; sourceTree = SOURCE_ROOT; };
+		CE6032BF0FE6784C007E33FF /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = ../base/DetailsPanel.m; sourceTree = SOURCE_ROOT; };
-		CE6032BF0FE6784C007E33FF /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = dgbase/DetailsPanel.m; sourceTree = SOURCE_ROOT; };
 		CE68EE6509ABC48000971085 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
 		CE68EE6609ABC48000971085 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
-		CE6E0E9E1054EB97008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = dgbase/dsa_pub.pem; sourceTree = "<group>"; };
+		CE6E0E9E1054EB97008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = ../base/dsa_pub.pem; sourceTree = "<group>"; };
 		CE848A1809DD85810004CB44 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Consts.h; sourceTree = "<group>"; };
-		CEA7D2C40FDFED340037CD8C /* dgme_logo_32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = dgme_logo_32.png; path = images/dgme_logo_32.png; sourceTree = SOURCE_ROOT; };
+		CE900AD1109B238600754048 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Preferences.xib; sourceTree = "<group>"; };
-		CECA899809DB12CA00A3D774 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Details.nib; 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>"; };
-		CED2A6870A05102600AC4C3F /* power_marker32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = power_marker32.png; path = images/power_marker32.png; sourceTree = SOURCE_ROOT; };
 		CEEB135109C837A2004D2330 /* dupeguru.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = dupeguru.icns; sourceTree = "<group>"; };
-		CEF7823709C8AA0200EF38FF /* gear.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = gear.png; path = images/gear.png; sourceTree = "<group>"; };
+		CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = ../../images/folder32.png; sourceTree = SOURCE_ROOT; };
-		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; };
-		CEFC295309C89FF200D9F998 /* details32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = details32.png; path = images/details32.png; sourceTree = SOURCE_ROOT; };
+		CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = ../../images/preferences32.png; sourceTree = SOURCE_ROOT; };
-		CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = images/preferences32.png; sourceTree = SOURCE_ROOT; };
 		CEFF18A009A4D387005E6321 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
@@ -231,16 +222,13 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				CE3FBDD01094637800B72D77 /* xib */,
 				CE073F5409CAE1A3005C1D2F /* dupeguru_me_help */,
 				CE381CF509915304003581CE /* dg_cocoa.plugin */,
 				CEFC294309C89E0000D9F998 /* images */,
 				CEEB135109C837A2004D2330 /* dupeguru.icns */,
 				8D1107310486CEB800E47090 /* Info.plist */,
-				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
 				CE6E0E9E1054EB97008D9390 /* dsa_pub.pem */,
-				CECA899709DB12CA00A3D774 /* Details.nib */,
-				CE3AA46509DB207900DB3A21 /* Directories.nib */,
-				29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
@@ -254,16 +242,25 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		CE3FBDD01094637800B72D77 /* xib */ = {
+			isa = PBXGroup;
+			children = (
+				CE900AD6109B2A9B00754048 /* MainMenu.xib */,
+				CE3FBDD11094637800B72D77 /* DetailsPanel.xib */,
+				CE3FBDD21094637800B72D77 /* DirectoryPanel.xib */,
+				CE900AD1109B238600754048 /* Preferences.xib */,
+			);
+			path = xib;
+			sourceTree = "<group>";
+		};
 		CE49DEF10FDFEB810098617B /* brsinglelineformatter */ = {
 			isa = PBXGroup;
 			children = (
 				CE49DEF20FDFEB810098617B /* BRSingleLineFormatter.h */,
 				CE49DEF30FDFEB810098617B /* BRSingleLineFormatter.m */,
-				CE49DEF40FDFEB810098617B /* NSCharacterSet_Extensions.h */,
-				CE49DEF50FDFEB810098617B /* NSCharacterSet_Extensions.m */,
 			);
 			name = brsinglelineformatter;
-			path = cocoalib/brsinglelineformatter;
+			path = ../../cocoalib/brsinglelineformatter;
 			sourceTree = SOURCE_ROOT;
 		};
 		CE515DDD0FC6C09400EC695D /* cocoalib */ = {
@@ -316,9 +313,6 @@
 		CEFC294309C89E0000D9F998 /* images */ = {
 			isa = PBXGroup;
 			children = (
-				CEA7D2C40FDFED340037CD8C /* dgme_logo_32.png */,
-				CED2A6870A05102600AC4C3F /* power_marker32.png */,
-				CEF7823709C8AA0200EF38FF /* gear.png */,
 				CEFC295309C89FF200D9F998 /* details32.png */,
 				CEFC295409C89FF200D9F998 /* preferences32.png */,
 				CEFC294509C89E3D00D9F998 /* folder32.png */,
@@ -371,23 +365,20 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */,
-				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
 				CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */,
 				CE073F6309CAE1A3005C1D2F /* dupeguru_me_help in Resources */,
 				CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */,
 				CEFC294609C89E3D00D9F998 /* folder32.png in Resources */,
 				CEFC295509C89FF200D9F998 /* details32.png in Resources */,
 				CEFC295609C89FF200D9F998 /* preferences32.png in Resources */,
-				CEF7823809C8AA0200EF38FF /* gear.png in Resources */,
-				CECA899909DB12CA00A3D774 /* Details.nib in Resources */,
-				CE3AA46709DB207900DB3A21 /* Directories.nib in Resources */,
-				CED2A6880A05102700AC4C3F /* power_marker32.png in Resources */,
 				CE515E020FC6C13E00EC695D /* ErrorReportWindow.xib in Resources */,
 				CE515E030FC6C13E00EC695D /* progress.nib in Resources */,
 				CE515E040FC6C13E00EC695D /* registration.nib in Resources */,
-				CEA7D2C50FDFED340037CD8C /* dgme_logo_32.png in Resources */,
 				CE6E0E9F1054EB97008D9390 /* dsa_pub.pem in Resources */,
+				CE3FBDD31094637800B72D77 /* DetailsPanel.xib in Resources */,
+				CE3FBDD41094637800B72D77 /* DirectoryPanel.xib in Resources */,
+				CE900AD2109B238600754048 /* Preferences.xib in Resources */,
+				CE900AD7109B2A9B00754048 /* MainMenu.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -416,7 +407,6 @@
 				CE515E1E0FC6C19300EC695D /* DirectoryPanel.m in Sources */,
 				CE515E1F0FC6C19300EC695D /* ResultWindow.m in Sources */,
 				CE49DEF60FDFEB810098617B /* BRSingleLineFormatter.m in Sources */,
-				CE49DEF70FDFEB810098617B /* NSCharacterSet_Extensions.m in Sources */,
 				CE6032C00FE6784C007E33FF /* DetailsPanel.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -424,30 +414,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXVariantGroup section */
-		089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				089C165DFE840E0CC02AAC07 /* English */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-		29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				29B97319FDCFA39411CA2CEA /* English */,
-			);
-			name = MainMenu.nib;
-			sourceTree = SOURCE_ROOT;
-		};
-		CE3AA46509DB207900DB3A21 /* Directories.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CE3AA46609DB207900DB3A21 /* English */,
-			);
-			name = Directories.nib;
-			sourceTree = "<group>";
-		};
 		CE515DFC0FC6C13E00EC695D /* ErrorReportWindow.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -472,46 +438,12 @@
 			name = registration.nib;
 			sourceTree = SOURCE_ROOT;
 		};
-		CECA899709DB12CA00A3D774 /* Details.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CECA899809DB12CA00A3D774 /* English */,
-			);
-			name = Details.nib;
-			sourceTree = "<group>";
-		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		C01FCF4B08A954540054247B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(FRAMEWORK_SEARCH_PATHS)",
-					"$(SRCROOT)/../../../cocoalib/build/Release",
-					"\"$(SRCROOT)/../../base/cocoa/build/Release\"",
-				);
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				PRODUCT_NAME = dupeGuru;
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = YES;
-			};
-			name = Debug;
-		};
 		C01FCF4C08A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(FRAMEWORK_SEARCH_PATHS)",
-					"$(SRCROOT)/../../../cocoalib/build/Release",
-					"\"$(SRCROOT)/../../base/cocoa/build/Release\"",
-				);
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G5;
 				INFOPLIST_FILE = Info.plist;
@@ -521,32 +453,16 @@
 			};
 			name = Release;
 		};
-		C01FCF4F08A954540054247B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				PREBINDING = NO;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
-			};
-			name = Debug;
-		};
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
 				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
-				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_VERSION = 4.0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
-				PREBINDING = NO;
+				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
-				STRIP_INSTALLED_PRODUCT = NO;
 			};
 			name = Release;
 		};
@@ -556,7 +472,6 @@
 		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dupeguru" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				C01FCF4B08A954540054247B /* Debug */,
 				C01FCF4C08A954540054247B /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -565,7 +480,6 @@
 		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				C01FCF4F08A954540054247B /* Debug */,
 				C01FCF5008A954540054247B /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;

cocoa/me/main.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 

cocoa/pe/AppDelegate.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,21 +7,15 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/AppDelegate.h"
+#import "../base/AppDelegate.h"
-#import "ResultWindow.h"
 #import "DirectoryPanel.h"
-#import "DetailsPanel.h"
 #import "PyDupeGuru.h"
 
 @interface AppDelegate : AppDelegateBase
 {
-    IBOutlet ResultWindow *result;
-    
-    DetailsPanel *_detailsPanel;
     DirectoryPanel *_directoryPanel;
 }
 - (IBAction)openWebsite:(id)sender;
-- (IBAction)toggleDetailsPanel:(id)sender;
 - (IBAction)toggleDirectories:(id)sender;
 
 - (DirectoryPanel *)directoryPanel;

cocoa/pe/AppDelegate.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -12,6 +12,7 @@ http://www.hardcoded.net/licenses/hs_license
 #import "Utils.h"
 #import "ValueTransformers.h"
 #import "Consts.h"
+#import "DetailsPanel.h"
 
 @implementation AppDelegate
 + (void)initialize
@@ -36,29 +37,21 @@ http://www.hardcoded.net/licenses/hs_license
 {
     self = [super init];
     _directoryPanel = nil;
-    _detailsPanel = nil;
-    _appName = APPNAME;
     return self;
 }
 
+- (DetailsPanelBase *)detailsPanel
+{
+    if (!_detailsPanel)
+        _detailsPanel = [[DetailsPanel alloc] initWithPy:py];
+    return _detailsPanel;
+}
+
 - (IBAction)openWebsite:(id)sender
 {
     [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.hardcoded.net/dupeguru_pe"]];
 }
 
-- (IBAction)toggleDetailsPanel:(id)sender
-{
-    if (!_detailsPanel)
-        _detailsPanel = [[DetailsPanel alloc] initWithPy:py];
-    if ([[_detailsPanel window] isVisible])
-        [[_detailsPanel window] close];
-    else
-    {
-        [[_detailsPanel window] orderFront:nil];
-        [_detailsPanel refresh];
-    }
-}
-
 - (IBAction)toggleDirectories:(id)sender
 {
     [[self directoryPanel] toggleVisible:sender];
@@ -75,19 +68,12 @@ http://www.hardcoded.net/licenses/hs_license
 //Delegate
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
-    [[ProgressController mainProgressController] setWorker:py];
+    NSMenu *actionsMenu = [[[NSApp mainMenu] itemWithTitle:@"Actions"] submenu];
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    // index 2 is just after "Clear Ingore List"
-    //Restore Columns
+    NSMenuItem *mi = [actionsMenu insertItemWithTitle:@"Clear Picture Cache" action:@selector(clearPictureCache:) keyEquivalent:@"P" atIndex:2];
-    NSArray *columnsOrder = [ud arrayForKey:@"columnsOrder"];
+    [mi setTarget:result];
-    NSDictionary *columnsWidth = [ud dictionaryForKey:@"columnsWidth"];
+    [mi setKeyEquivalentModifierMask:NSCommandKeyMask|NSShiftKeyMask];
-    if ([columnsOrder count])
+    [super applicationDidFinishLaunching:aNotification];
-        [result restoreColumnsPosition:columnsOrder widths:columnsWidth];
-    //Reg stuff
-    if ([RegistrationInterface showNagWithApp:[self py] name:APPNAME limitDescription:LIMIT_DESC])
-        [unlockMenuItem setTitle:@"Thanks for buying dupeGuru Picture Edition!"];
-    //Restore results
-    [py loadIgnoreList];
-    [py loadResults];
 }
 
 - (void)applicationWillBecomeActive:(NSNotification *)aNotification

cocoa/pe/Consts.h

@@ -1,12 +1,11 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 "dgbase/Consts.h"
+#import "../base/Consts.h"
 
-#define APPNAME @"dupeGuru PE"
 #define ImageLoadedNotification @"ImageLoadedNotification"

cocoa/pe/DetailsPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/DetailsPanel.h"
+#import "../base/DetailsPanel.h"
 
 @interface DetailsPanel : DetailsPanelBase
 {

cocoa/pe/DetailsPanel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 

cocoa/pe/DirectoryPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/DirectoryPanel.h"
+#import "../base/DirectoryPanel.h"
 
 @interface DirectoryPanel : DirectoryPanelBase
 {

cocoa/pe/DirectoryPanel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 

cocoa/pe/Info.plist

@@ -23,11 +23,13 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>1.7.7</string>
+	<string>1.8.0</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>© Hardcoded Software, 2010</string>
 	<key>SUFeedURL</key>
 	<string>http://www.hardcoded.net/updates/dupeguru_pe.appcast</string>
 	<key>SUPublicDSAKeyFile</key>

cocoa/pe/PictureBlocks.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 

cocoa/pe/PictureBlocks.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 

cocoa/pe/PyDupeGuru.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/PyDupeGuru.h"
+#import "../base/PyDupeGuru.h"
 
 @interface PyDupeGuru : PyDupeGuruBase
 - (void)clearPictureCache;

cocoa/pe/ResultWindow.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -8,17 +8,12 @@ http://www.hardcoded.net/licenses/hs_license
 
 #import <Cocoa/Cocoa.h>
 #import "Outline.h"
-#import "dgbase/ResultWindow.h"
+#import "../base/ResultWindow.h"
-#import "DirectoryPanel.h"
 
 @interface ResultWindow : ResultWindowBase
 {
-    IBOutlet NSPopUpButton *actionMenu;
-    IBOutlet NSMenu *columnsMenu;
     IBOutlet NSSearchField *filterField;
-    IBOutlet NSWindow *preferencesPanel;
     
-    NSMutableArray *_resultColumns;
     NSMutableIndexSet *_deltaColumns;
 }
 - (IBAction)clearIgnoreList:(id)sender;
@@ -35,16 +30,8 @@ http://www.hardcoded.net/licenses/hs_license
 - (IBAction)removeMarked:(id)sender;
 - (IBAction)removeSelected:(id)sender;
 - (IBAction)renameSelected:(id)sender;
-- (IBAction)resetColumnsToDefault:(id)sender;
 - (IBAction)revealSelected:(id)sender;
-- (IBAction)showPreferencesPanel:(id)sender;
 - (IBAction)startDuplicateScan:(id)sender;
-- (IBAction)toggleColumn:(id)sender;
 - (IBAction)toggleDelta:(id)sender;
-- (IBAction)toggleDetailsPanel:(id)sender;
 - (IBAction)toggleDirectories:(id)sender;
-
-- (NSTableColumn *)getColumnForIdentifier:(int)aIdentifier title:(NSString *)aTitle width:(int)aWidth refCol:(NSTableColumn *)aColumn;
-- (void)initResultColumns;
-- (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth;
 @end

cocoa/pe/ResultWindow.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -19,6 +19,7 @@ http://www.hardcoded.net/licenses/hs_license
 - (void)awakeFromNib
 {
     [super awakeFromNib];
+    [[self window] setTitle:@"dupeGuru Picture Edition"];
     _displayDelta = NO;
     _powerMode = NO;
     _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,5)] retain];
@@ -29,23 +30,8 @@ http://www.hardcoded.net/licenses/hs_license
     [py setDisplayDeltaValues:b2n(_displayDelta)];
     [matches setTarget:self];
     [matches setDoubleAction:@selector(openSelected:)];
-    [[actionMenu itemAtIndex:0] setImage:[NSImage imageNamed: @"gear"]];
-    [self initResultColumns];
     [self refreshStats];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsMarkingChanged:) name:ResultsMarkingChangedNotification object:nil];
-    
-    NSToolbar *t = [[[NSToolbar alloc] initWithIdentifier:@"ResultWindowToolbar"] autorelease];
-    [t setAllowsUserCustomization:YES];
-    [t setAutosavesConfiguration:YES];
-    [t setDisplayMode:NSToolbarDisplayModeIconAndLabel];
-    [t setDelegate:self];
-    [[self window] setToolbar:t];
-}
-
-/* Overrides */
-- (NSString *)logoImageName
-{
-    return @"dgpe_logo_32";
 }
 
 /* Actions */
@@ -170,7 +156,7 @@ http://www.hardcoded.net/licenses/hs_license
     [columnsOrder addObject:@"4"];
     [columnsOrder addObject:@"7"];
     NSMutableDictionary *columnsWidth = [NSMutableDictionary dictionary];
-    [columnsWidth setObject:i2n(125) forKey:@"0"];
+    [columnsWidth setObject:i2n(121) forKey:@"0"];
     [columnsWidth setObject:i2n(120) forKey:@"1"];
     [columnsWidth setObject:i2n(63) forKey:@"2"];
     [columnsWidth setObject:i2n(73) forKey:@"4"];
@@ -184,11 +170,6 @@ http://www.hardcoded.net/licenses/hs_license
     [py revealSelected];
 }
 
-- (IBAction)showPreferencesPanel:(id)sender
-{
-    [preferencesPanel makeKeyAndOrderFront:sender];
-}
-
 - (IBAction)startDuplicateScan:(id)sender
 {
     if ([matches numberOfRows] > 0)
@@ -215,26 +196,6 @@ http://www.hardcoded.net/licenses/hs_license
     }
 }
 
-- (IBAction)toggleColumn:(id)sender
-{
-    NSMenuItem *mi = sender;
-    NSString *colId = [NSString stringWithFormat:@"%d",[mi tag]];
-    NSTableColumn *col = [matches tableColumnWithIdentifier:colId];
-    if (col == nil)
-    {
-        //Add Column
-        col = [_resultColumns objectAtIndex:[mi tag]];
-        [matches addTableColumn:col];
-        [mi setState:NSOnState];
-    }
-    else
-    {
-        //Remove column
-        [matches removeTableColumn:col];
-        [mi setState:NSOffState];
-    }
-}
-
 - (IBAction)toggleDelta:(id)sender
 {
     if ([deltaSwitch selectedSegment] == 1)
@@ -244,75 +205,29 @@ http://www.hardcoded.net/licenses/hs_license
     [self changeDelta:sender];
 }
 
-
-- (IBAction)toggleDetailsPanel:(id)sender
-{
-    [(AppDelegate *)app toggleDetailsPanel:sender];
-}
-
 - (IBAction)toggleDirectories:(id)sender
 {
     [(AppDelegate *)app toggleDirectories:sender];
 }
 
 /* Public */
-- (NSTableColumn *)getColumnForIdentifier:(int)aIdentifier title:(NSString *)aTitle width:(int)aWidth refCol:(NSTableColumn *)aColumn
-{
-    NSNumber *n = [NSNumber numberWithInt:aIdentifier];
-    NSTableColumn *col = [[NSTableColumn alloc] initWithIdentifier:[n stringValue]];
-    [col setWidth:aWidth];
-    [col setEditable:NO];
-    [[col dataCell] setFont:[[aColumn dataCell] font]];
-    [[col headerCell] setStringValue:aTitle];
-    [col setResizingMask:NSTableColumnUserResizingMask];
-    [col setSortDescriptorPrototype:[[NSSortDescriptor alloc] initWithKey:[n stringValue] ascending:YES]];
-    return col;
-}
-
 - (void)initResultColumns
 {
     NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];
     _resultColumns = [[NSMutableArray alloc] init];
     [_resultColumns addObject:[matches tableColumnWithIdentifier:@"0"]]; // File Name
-    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"1"]]; // Directory
+    [_resultColumns addObject:[self getColumnForIdentifier:1 title:@"Directory" width:120 refCol:refCol]];
-    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"2"]]; // Size
+    NSTableColumn *sizeCol = [self getColumnForIdentifier:2 title:@"Size (KB)" width:63 refCol:refCol];
+    [[sizeCol dataCell] setAlignment:NSRightTextAlignment];
+    [_resultColumns addObject:sizeCol];
     [_resultColumns addObject:[self getColumnForIdentifier:3 title:@"Kind" width:40 refCol:refCol]];
     [_resultColumns addObject:[self getColumnForIdentifier:4 title:@"Dimensions" width:80 refCol:refCol]];
     [_resultColumns addObject:[self getColumnForIdentifier:5 title:@"Creation" width:120 refCol:refCol]];
     [_resultColumns addObject:[self getColumnForIdentifier:6 title:@"Modification" width:120 refCol:refCol]];
-    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"7"]]; // Match %
+    [_resultColumns addObject:[self getColumnForIdentifier:7 title:@"Match %" width:58 refCol:refCol]];
     [_resultColumns addObject:[self getColumnForIdentifier:8 title:@"Dupe Count" width:80 refCol:refCol]];
 }
 
-- (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth
-{
-    NSTableColumn *col;
-    NSString *colId;
-    NSNumber *width;
-    NSMenuItem *mi;
-    //Remove all columns
-    NSEnumerator *e = [[columnsMenu itemArray] objectEnumerator];
-    while (mi = [e nextObject])
-    {
-        if ([mi state] == NSOnState)
-            [self toggleColumn:mi];
-    }
-    //Add columns and set widths
-    e = [aColumnsOrder objectEnumerator];
-    while (colId = [e nextObject])
-    {
-        if (![colId isEqual:@"mark"])
-        {
-            col = [_resultColumns objectAtIndex:[colId intValue]];
-            width = [aColumnsWidth objectForKey:[col identifier]];
-            mi = [columnsMenu itemWithTag:[colId intValue]];
-            if (width)
-                [col setWidth:[width floatValue]];
-            [self toggleColumn:mi];
-        }
-    }
-}
-
 /* Delegate */
 - (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
 { 

cocoa/pe/dg_cocoa.py

@@ -1,4 +1,4 @@
-# Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+# 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 
@@ -7,12 +7,11 @@
 import objc
 from AppKit import *
 
-from dupeguru_pe import app_cocoa as app_pe_cocoa
+from core_pe import app_cocoa as app_pe_cocoa
 
 # Fix py2app imports which chokes on relative imports
-from dupeguru import app, app_cocoa, data, directories, engine, export, ignore, results, scanner
+from core import app, app_cocoa, data, directories, engine, export, ignore, results, scanner
-from dupeguru_pe import block, cache, matchbase, data
+from core_pe import block, cache, matchbase, data
-from hsfs import auto, stats, tree
 from hsutil import conflict
 
 class PyApp(NSObject):
@@ -39,7 +38,7 @@ class PyDupeGuru(PyApp):
         self.app.scanner.ignore_list.Clear()
     
     def clearPictureCache(self):
-        self.app.scanner.match_factory.cached_blocks.clear()
+        self.app.scanner.cached_blocks.clear()
     
     def doScan(self):
         return self.app.start_scanning()
@@ -172,10 +171,10 @@ class PyDupeGuru(PyApp):
     
     #---Properties
     def setMatchScaled_(self,match_scaled):
-        self.app.scanner.match_factory.match_scaled = match_scaled
+        self.app.scanner.match_scaled = match_scaled
     
     def setMinMatchPercentage_(self,percentage):
-        self.app.scanner.match_factory.threshold = int(percentage)
+        self.app.scanner.threshold = int(percentage)
     
     def setMixFileKind_(self,mix_file_kind):
         self.app.scanner.mix_file_kind = mix_file_kind
@@ -200,6 +199,12 @@ class PyDupeGuru(PyApp):
         self.app.progress.job_cancelled = True
     
     #---Registration
+    def appName(self):
+        return "dupeGuru Picture Edition"
+    
+    def demoLimitDescription(self):
+        return self.app.DEMO_LIMIT_DESC
+    
     @objc.signature('i@:')
     def isRegistered(self):
         return self.app.registered

cocoa/pe/dupeguru.xcodeproj/project.pbxproj

@@ -3,14 +3,14 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 42;
+	objectVersion = 44;
 	objects = {
 
 /* Begin PBXBuildFile section */
-		8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
-		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+		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 */; };
 		CE0C46AA0FA0647E000BE99B /* PictureBlocks.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0C46A90FA0647E000BE99B /* PictureBlocks.m */; };
 		CE15C8A80ADEB8B50061D4A5 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */; };
@@ -18,10 +18,11 @@
 		CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; };
 		CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9A09914ADF003581CE /* ResultWindow.m */; };
 		CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */ = {isa = PBXBuildFile; fileRef = CE381CF509915304003581CE /* dg_cocoa.plugin */; };
-		CE3AA46709DB207900DB3A21 /* Directories.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE3AA46509DB207900DB3A21 /* Directories.nib */; };
 		CE6044EC0FE6796200B71262 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6044EB0FE6796200B71262 /* DetailsPanel.m */; };
 		CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE68EE6609ABC48000971085 /* DirectoryPanel.m */; };
 		CE6E0F3D1054EC62008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0F3C1054EC62008D9390 /* dsa_pub.pem */; };
+		CE77C89E10946C6D0078B0DB /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE77C89C10946C6D0078B0DB /* DirectoryPanel.xib */; };
+		CE77C8A810946CE20078B0DB /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE77C8A710946CE20078B0DB /* DetailsPanel.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 */; };
@@ -41,12 +42,9 @@
 		CE80DB8C0FC1951C0086DCA6 /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB890FC1951C0086DCA6 /* ResultWindow.m */; };
 		CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE848A1809DD85810004CB44 /* Consts.h */; };
 		CEBAE4270FDA97E000B7887D /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBAE4240FDA97E000B7887D /* BRSingleLineFormatter.m */; };
-		CEBAE4280FDA97E000B7887D /* NSCharacterSet_Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBAE4260FDA97E000B7887D /* NSCharacterSet_Extensions.m */; };
-		CECA899909DB12CA00A3D774 /* Details.nib in Resources */ = {isa = PBXBuildFile; fileRef = CECA899709DB12CA00A3D774 /* Details.nib */; };
 		CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CECA899A09DB132E00A3D774 /* DetailsPanel.h */; };
 		CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CECA899B09DB132E00A3D774 /* DetailsPanel.m */; };
 		CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; };
-		CEF7823809C8AA0200EF38FF /* gear.png in Resources */ = {isa = PBXBuildFile; fileRef = CEF7823709C8AA0200EF38FF /* gear.png */; };
 		CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; };
 		CEFC295509C89FF200D9F998 /* details32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295309C89FF200D9F998 /* details32.png */; };
 		CEFC295609C89FF200D9F998 /* preferences32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295409C89FF200D9F998 /* preferences32.png */; };
@@ -69,16 +67,16 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
 		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = SOURCE_ROOT; };
-		29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		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 PE.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "dupeGuru PE.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_pe_help; path = help/dupeguru_pe_help; sourceTree = SOURCE_ROOT; };
+		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; };
 		CE0C46A80FA0647E000BE99B /* PictureBlocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureBlocks.h; sourceTree = "<group>"; };
 		CE0C46A90FA0647E000BE99B /* PictureBlocks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PictureBlocks.m; sourceTree = "<group>"; };
 		CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
@@ -86,61 +84,58 @@
 		CE381C9509914ACE003581CE /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = SOURCE_ROOT; };
 		CE381C9A09914ADF003581CE /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = ResultWindow.m; sourceTree = SOURCE_ROOT; };
 		CE381C9B09914ADF003581CE /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ResultWindow.h; sourceTree = SOURCE_ROOT; };
-		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dg_cocoa.plugin; path = py/dist/dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
+		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dg_cocoa.plugin; path = dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
-		CE3AA46609DB207900DB3A21 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Directories.nib; sourceTree = "<group>"; };
+		CE6044EA0FE6796200B71262 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = ../base/DetailsPanel.h; sourceTree = SOURCE_ROOT; };
-		CE6044EA0FE6796200B71262 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = dgbase/DetailsPanel.h; sourceTree = SOURCE_ROOT; };
+		CE6044EB0FE6796200B71262 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = ../base/DetailsPanel.m; sourceTree = SOURCE_ROOT; };
-		CE6044EB0FE6796200B71262 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = dgbase/DetailsPanel.m; sourceTree = SOURCE_ROOT; };
 		CE68EE6509ABC48000971085 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
 		CE68EE6609ABC48000971085 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
-		CE6E0F3C1054EC62008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = dgbase/dsa_pub.pem; sourceTree = "<group>"; };
+		CE6E0F3C1054EC62008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = ../base/dsa_pub.pem; sourceTree = "<group>"; };
-		CE80DB1B0FC192D60086DCA6 /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
+		CE77C89C10946C6D0078B0DB /* DirectoryPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DirectoryPanel.xib; path = ../../base/xib/DirectoryPanel.xib; sourceTree = "<group>"; };
-		CE80DB1C0FC192D60086DCA6 /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = cocoalib/Dialogs.m; sourceTree = SOURCE_ROOT; };
+		CE77C8A710946CE20078B0DB /* DetailsPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DetailsPanel.xib; sourceTree = "<group>"; };
-		CE80DB1D0FC192D60086DCA6 /* HSErrorReportWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSErrorReportWindow.h; path = cocoalib/HSErrorReportWindow.h; sourceTree = SOURCE_ROOT; };
+		CE80DB1B0FC192D60086DCA6 /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = ../../cocoalib/Dialogs.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; };
+		CE80DB1C0FC192D60086DCA6 /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = ../../cocoalib/Dialogs.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; };
+		CE80DB1D0FC192D60086DCA6 /* HSErrorReportWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSErrorReportWindow.h; path = ../../cocoalib/HSErrorReportWindow.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; };
+		CE80DB1E0FC192D60086DCA6 /* HSErrorReportWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSErrorReportWindow.m; path = ../../cocoalib/HSErrorReportWindow.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; };
+		CE80DB1F0FC192D60086DCA6 /* Outline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Outline.h; path = ../../cocoalib/Outline.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; };
+		CE80DB200FC192D60086DCA6 /* Outline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Outline.m; path = ../../cocoalib/Outline.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; };
+		CE80DB210FC192D60086DCA6 /* ProgressController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressController.h; path = ../../cocoalib/ProgressController.h; sourceTree = SOURCE_ROOT; };
-		CE80DB240FC192D60086DCA6 /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = cocoalib/RecentDirectories.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; };
-		CE80DB250FC192D60086DCA6 /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = cocoalib/RecentDirectories.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; };
-		CE80DB260FC192D60086DCA6 /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
+		CE80DB240FC192D60086DCA6 /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = ../../cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
-		CE80DB270FC192D60086DCA6 /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
+		CE80DB250FC192D60086DCA6 /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = ../../cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
-		CE80DB280FC192D60086DCA6 /* Table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Table.h; path = cocoalib/Table.h; sourceTree = SOURCE_ROOT; };
+		CE80DB260FC192D60086DCA6 /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = ../../cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
-		CE80DB290FC192D60086DCA6 /* Table.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Table.m; path = cocoalib/Table.m; sourceTree = SOURCE_ROOT; };
+		CE80DB270FC192D60086DCA6 /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = ../../cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
-		CE80DB2A0FC192D60086DCA6 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
+		CE80DB280FC192D60086DCA6 /* Table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Table.h; path = ../../cocoalib/Table.h; sourceTree = SOURCE_ROOT; };
-		CE80DB2B0FC192D60086DCA6 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
+		CE80DB290FC192D60086DCA6 /* Table.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Table.m; path = ../../cocoalib/Table.m; sourceTree = SOURCE_ROOT; };
-		CE80DB2C0FC192D60086DCA6 /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
+		CE80DB2A0FC192D60086DCA6 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = ../../cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
-		CE80DB2D0FC192D60086DCA6 /* ValueTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ValueTransformers.m; path = cocoalib/ValueTransformers.m; sourceTree = SOURCE_ROOT; };
+		CE80DB2B0FC192D60086DCA6 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = ../../cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
-		CE80DB450FC193650086DCA6 /* NSNotificationAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSNotificationAdditions.h; path = cocoalib/NSNotificationAdditions.h; sourceTree = SOURCE_ROOT; };
+		CE80DB2C0FC192D60086DCA6 /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = ../../cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
-		CE80DB460FC193650086DCA6 /* NSNotificationAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSNotificationAdditions.m; path = cocoalib/NSNotificationAdditions.m; sourceTree = SOURCE_ROOT; };
+		CE80DB2D0FC192D60086DCA6 /* ValueTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ValueTransformers.m; path = ../../cocoalib/ValueTransformers.m; sourceTree = SOURCE_ROOT; };
-		CE80DB480FC193770086DCA6 /* NSImageAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSImageAdditions.h; path = cocoalib/NSImageAdditions.h; sourceTree = SOURCE_ROOT; };
+		CE80DB450FC193650086DCA6 /* NSNotificationAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSNotificationAdditions.h; path = ../../cocoalib/NSNotificationAdditions.h; sourceTree = SOURCE_ROOT; };
-		CE80DB490FC193770086DCA6 /* NSImageAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSImageAdditions.m; path = cocoalib/NSImageAdditions.m; sourceTree = SOURCE_ROOT; };
+		CE80DB460FC193650086DCA6 /* NSNotificationAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSNotificationAdditions.m; path = ../../cocoalib/NSNotificationAdditions.m; sourceTree = SOURCE_ROOT; };
-		CE80DB710FC194760086DCA6 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = cocoalib/English.lproj/ErrorReportWindow.xib; sourceTree = SOURCE_ROOT; };
+		CE80DB480FC193770086DCA6 /* NSImageAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSImageAdditions.h; path = ../../cocoalib/NSImageAdditions.h; sourceTree = SOURCE_ROOT; };
-		CE80DB730FC194760086DCA6 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = cocoalib/English.lproj/progress.nib; sourceTree = SOURCE_ROOT; };
+		CE80DB490FC193770086DCA6 /* NSImageAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSImageAdditions.m; path = ../../cocoalib/NSImageAdditions.m; sourceTree = SOURCE_ROOT; };
-		CE80DB750FC194760086DCA6 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = cocoalib/English.lproj/registration.nib; sourceTree = SOURCE_ROOT; };
+		CE80DB710FC194760086DCA6 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = ../../cocoalib/English.lproj/ErrorReportWindow.xib; sourceTree = SOURCE_ROOT; };
-		CE80DB820FC1951C0086DCA6 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = dgbase/AppDelegate.h; sourceTree = SOURCE_ROOT; };
+		CE80DB730FC194760086DCA6 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = ../../cocoalib/English.lproj/progress.nib; sourceTree = SOURCE_ROOT; };
-		CE80DB830FC1951C0086DCA6 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = dgbase/AppDelegate.m; sourceTree = SOURCE_ROOT; };
+		CE80DB750FC194760086DCA6 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = ../../cocoalib/English.lproj/registration.nib; sourceTree = SOURCE_ROOT; };
-		CE80DB840FC1951C0086DCA6 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Consts.h; path = dgbase/Consts.h; sourceTree = SOURCE_ROOT; };
+		CE80DB820FC1951C0086DCA6 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ../base/AppDelegate.h; sourceTree = SOURCE_ROOT; };
-		CE80DB850FC1951C0086DCA6 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryPanel.h; path = dgbase/DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
+		CE80DB830FC1951C0086DCA6 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = ../base/AppDelegate.m; sourceTree = SOURCE_ROOT; };
-		CE80DB860FC1951C0086DCA6 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryPanel.m; path = dgbase/DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
+		CE80DB840FC1951C0086DCA6 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Consts.h; path = ../base/Consts.h; sourceTree = SOURCE_ROOT; };
-		CE80DB870FC1951C0086DCA6 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDupeGuru.h; path = dgbase/PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
+		CE80DB850FC1951C0086DCA6 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryPanel.h; path = ../base/DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
-		CE80DB880FC1951C0086DCA6 /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultWindow.h; path = dgbase/ResultWindow.h; sourceTree = SOURCE_ROOT; };
+		CE80DB860FC1951C0086DCA6 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryPanel.m; path = ../base/DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
-		CE80DB890FC1951C0086DCA6 /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultWindow.m; path = dgbase/ResultWindow.m; sourceTree = SOURCE_ROOT; };
+		CE80DB870FC1951C0086DCA6 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDupeGuru.h; path = ../base/PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
+		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>"; };
-		CEBAE4230FDA97E000B7887D /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = cocoalib/brsinglelineformatter/BRSingleLineFormatter.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; };
+		CEBAE4240FDA97E000B7887D /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
-		CEBAE4250FDA97E000B7887D /* NSCharacterSet_Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSCharacterSet_Extensions.h; path = cocoalib/brsinglelineformatter/NSCharacterSet_Extensions.h; sourceTree = SOURCE_ROOT; };
-		CEBAE4260FDA97E000B7887D /* NSCharacterSet_Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSCharacterSet_Extensions.m; path = cocoalib/brsinglelineformatter/NSCharacterSet_Extensions.m; sourceTree = SOURCE_ROOT; };
-		CECA899809DB12CA00A3D774 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Details.nib; 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>"; };
 		CEEB135109C837A2004D2330 /* dupeguru.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = dupeguru.icns; sourceTree = "<group>"; };
-		CEF7823709C8AA0200EF38FF /* gear.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = gear.png; path = images/gear.png; sourceTree = "<group>"; };
+		CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = ../../images/folder32.png; sourceTree = SOURCE_ROOT; };
-		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; };
-		CEFC295309C89FF200D9F998 /* details32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = details32.png; path = images/details32.png; sourceTree = SOURCE_ROOT; };
+		CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = ../../images/preferences32.png; sourceTree = SOURCE_ROOT; };
-		CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = images/preferences32.png; sourceTree = SOURCE_ROOT; };
+		CEFCDE2C0AB0418600C33A93 /* dgpe_logo_32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = dgpe_logo_32.png; path = ../../images/dgpe_logo_32.png; sourceTree = SOURCE_ROOT; };
-		CEFCDE2C0AB0418600C33A93 /* dgpe_logo_32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = dgpe_logo_32.png; path = images/dgpe_logo_32.png; sourceTree = SOURCE_ROOT; };
 		CEFF18A009A4D387005E6321 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
@@ -228,16 +223,13 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				CE77C89A10946C6D0078B0DB /* xib */,
 				CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */,
 				CE381CF509915304003581CE /* dg_cocoa.plugin */,
 				CEFC294309C89E0000D9F998 /* images */,
 				CEEB135109C837A2004D2330 /* dupeguru.icns */,
 				8D1107310486CEB800E47090 /* Info.plist */,
-				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
 				CE6E0F3C1054EC62008D9390 /* dsa_pub.pem */,
-				CECA899709DB12CA00A3D774 /* Details.nib */,
-				CE3AA46509DB207900DB3A21 /* Directories.nib */,
-				29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
@@ -251,6 +243,17 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		CE77C89A10946C6D0078B0DB /* xib */ = {
+			isa = PBXGroup;
+			children = (
+				CE031753109B345200517EE6 /* MainMenu.xib */,
+				CE77C8A710946CE20078B0DB /* DetailsPanel.xib */,
+				CE77C89C10946C6D0078B0DB /* DirectoryPanel.xib */,
+				CE031750109B340A00517EE6 /* Preferences.xib */,
+			);
+			path = xib;
+			sourceTree = "<group>";
+		};
 		CE80DB1A0FC192AB0086DCA6 /* cocoalib */ = {
 			isa = PBXGroup;
 			children = (
@@ -307,18 +310,15 @@
 			children = (
 				CEBAE4230FDA97E000B7887D /* BRSingleLineFormatter.h */,
 				CEBAE4240FDA97E000B7887D /* BRSingleLineFormatter.m */,
-				CEBAE4250FDA97E000B7887D /* NSCharacterSet_Extensions.h */,
-				CEBAE4260FDA97E000B7887D /* NSCharacterSet_Extensions.m */,
 			);
 			name = brsinglelineformatter;
-			path = cocoalib/brsinglelineformatter;
+			path = ../../cocoalib/brsinglelineformatter;
 			sourceTree = SOURCE_ROOT;
 		};
 		CEFC294309C89E0000D9F998 /* images */ = {
 			isa = PBXGroup;
 			children = (
 				CEFCDE2C0AB0418600C33A93 /* dgpe_logo_32.png */,
-				CEF7823709C8AA0200EF38FF /* gear.png */,
 				CEFC295309C89FF200D9F998 /* details32.png */,
 				CEFC295409C89FF200D9F998 /* preferences32.png */,
 				CEFC294509C89E3D00D9F998 /* folder32.png */,
@@ -354,7 +354,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */;
-			compatibilityVersion = "Xcode 2.4";
+			compatibilityVersion = "Xcode 3.0";
 			hasScannedForEncodings = 1;
 			mainGroup = 29B97314FDCFA39411CA2CEA /* dupeguru */;
 			projectDirPath = "";
@@ -370,22 +370,21 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */,
-				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
 				CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */,
 				CE073F6309CAE1A3005C1D2F /* dupeguru_pe_help in Resources */,
 				CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */,
 				CEFC294609C89E3D00D9F998 /* folder32.png in Resources */,
 				CEFC295509C89FF200D9F998 /* details32.png in Resources */,
 				CEFC295609C89FF200D9F998 /* preferences32.png in Resources */,
-				CEF7823809C8AA0200EF38FF /* gear.png in Resources */,
-				CECA899909DB12CA00A3D774 /* Details.nib in Resources */,
-				CE3AA46709DB207900DB3A21 /* Directories.nib in Resources */,
 				CEFCDE2D0AB0418600C33A93 /* dgpe_logo_32.png in Resources */,
 				CE80DB760FC194760086DCA6 /* ErrorReportWindow.xib in Resources */,
 				CE80DB770FC194760086DCA6 /* progress.nib in Resources */,
 				CE80DB780FC194760086DCA6 /* registration.nib in Resources */,
 				CE6E0F3D1054EC62008D9390 /* dsa_pub.pem in Resources */,
+				CE77C89E10946C6D0078B0DB /* DirectoryPanel.xib in Resources */,
+				CE77C8A810946CE20078B0DB /* DetailsPanel.xib in Resources */,
+				CE031751109B340A00517EE6 /* Preferences.xib in Resources */,
+				CE031754109B345200517EE6 /* MainMenu.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -417,7 +416,6 @@
 				CE80DB8B0FC1951C0086DCA6 /* DirectoryPanel.m in Sources */,
 				CE80DB8C0FC1951C0086DCA6 /* ResultWindow.m in Sources */,
 				CEBAE4270FDA97E000B7887D /* BRSingleLineFormatter.m in Sources */,
-				CEBAE4280FDA97E000B7887D /* NSCharacterSet_Extensions.m in Sources */,
 				CE6044EC0FE6796200B71262 /* DetailsPanel.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -425,30 +423,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXVariantGroup section */
-		089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				089C165DFE840E0CC02AAC07 /* English */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-		29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				29B97319FDCFA39411CA2CEA /* English */,
-			);
-			name = MainMenu.nib;
-			sourceTree = SOURCE_ROOT;
-		};
-		CE3AA46509DB207900DB3A21 /* Directories.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CE3AA46609DB207900DB3A21 /* English */,
-			);
-			name = Directories.nib;
-			sourceTree = "<group>";
-		};
 		CE80DB700FC194760086DCA6 /* ErrorReportWindow.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -473,39 +447,9 @@
 			name = registration.nib;
 			sourceTree = SOURCE_ROOT;
 		};
-		CECA899709DB12CA00A3D774 /* Details.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CECA899809DB12CA00A3D774 /* English */,
-			);
-			name = Details.nib;
-			sourceTree = "<group>";
-		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		C01FCF4B08A954540054247B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(FRAMEWORK_SEARCH_PATHS)",
-					"$(SRCROOT)/cocoalib/build/Release",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-				);
-				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/dgbase/build/Release\"";
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				PRODUCT_NAME = dupeGuru;
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = YES;
-			};
-			name = Debug;
-		};
 		C01FCF4C08A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -526,31 +470,16 @@
 			};
 			name = Release;
 		};
-		C01FCF4F08A954540054247B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				PREBINDING = NO;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-			};
-			name = Debug;
-		};
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
 				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
-				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_VERSION = 4.0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
-				PREBINDING = NO;
+				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};
 			name = Release;
 		};
@@ -560,7 +489,6 @@
 		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dupeguru" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				C01FCF4B08A954540054247B /* Debug */,
 				C01FCF4C08A954540054247B /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -569,7 +497,6 @@
 		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				C01FCF4F08A954540054247B /* Debug */,
 				C01FCF5008A954540054247B /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;

cocoa/pe/main.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 

cocoa/se/AppDelegate.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,23 +7,16 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/AppDelegate.h"
+#import "../base/AppDelegate.h"
-#import "ResultWindow.h"
 #import "DirectoryPanel.h"
 #import "PyDupeGuru.h"
 
 @interface AppDelegate : AppDelegateBase
 {
-    IBOutlet NSButton *presetsButton;
-    IBOutlet NSPopUpButton *presetsPopup;
-    IBOutlet ResultWindow *result;
-    
     DirectoryPanel *_directoryPanel;
 }
 - (IBAction)openWebsite:(id)sender;
-- (IBAction)popupPresets:(id)sender;
 - (IBAction)toggleDirectories:(id)sender;
-- (IBAction)usePreset:(id)sender;
 
 - (DirectoryPanel *)directoryPanel;
 - (PyDupeGuru *)py;

cocoa/se/AppDelegate.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,10 +7,11 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import "AppDelegate.h"
-#import "cocoalib/ProgressController.h"
+#import "../../cocoalib/ProgressController.h"
-#import "cocoalib/RegistrationInterface.h"
+#import "../../cocoalib/RegistrationInterface.h"
-#import "cocoalib/Utils.h"
+#import "../../cocoalib/Utils.h"
-#import "cocoalib/ValueTransformers.h"
+#import "../../cocoalib/ValueTransformers.h"
+#import "DetailsPanel.h"
 #import "Consts.h"
 
 @implementation AppDelegate
@@ -42,7 +43,6 @@ http://www.hardcoded.net/licenses/hs_license
     VTIsIntIn *vt = [[[VTIsIntIn alloc] initWithValues:[NSIndexSet indexSetWithIndex:1] reverse:YES] autorelease];
     [NSValueTransformer setValueTransformer:vt forName:@"vtScanTypeIsNotContent"];
     _directoryPanel = nil;
-    _appName = APPNAME;
     return self;
 }
 
@@ -62,26 +62,17 @@ http://www.hardcoded.net/licenses/hs_license
         _directoryPanel = [[DirectoryPanel alloc] initWithParentApp:self];
     return _directoryPanel;
 }
+
+- (DetailsPanelBase *)detailsPanel
+{
+    if (!_detailsPanel)
+        _detailsPanel = [[DetailsPanel alloc] initWithPy:py];
+    return _detailsPanel;
+}
+
 - (PyDupeGuru *)py { return (PyDupeGuru *)py; }
 
 //Delegate
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
-{
-    [[ProgressController mainProgressController] setWorker:py];
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    //Restore Columns
-    NSArray *columnsOrder = [ud arrayForKey:@"columnsOrder"];
-    NSDictionary *columnsWidth = [ud dictionaryForKey:@"columnsWidth"];
-    if ([columnsOrder count])
-        [result restoreColumnsPosition:columnsOrder widths:columnsWidth];
-    //Reg stuff
-    if ([RegistrationInterface showNagWithApp:[self py] name:APPNAME limitDescription:LIMIT_DESC])
-        [unlockMenuItem setTitle:@"Thanks for buying dupeGuru!"];
-    //Restore results
-    [py loadIgnoreList];
-    [py loadResults];
-}
-
 - (void)applicationWillBecomeActive:(NSNotification *)aNotification
 {
     if (![[result window] isVisible])

cocoa/se/DetailsPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/DetailsPanel.h"
+#import "../base/DetailsPanel.h"
 
 @interface DetailsPanel : DetailsPanelBase
 @end

cocoa/se/DetailsPanel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 

cocoa/se/DirectoryPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/DirectoryPanel.h"
+#import "../base/DirectoryPanel.h"
 
 @interface DirectoryPanel : DirectoryPanelBase
 {

cocoa/se/DirectoryPanel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 

cocoa/se/Info.plist

@@ -23,11 +23,13 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>2.8.2</string>
+	<string>2.9.1</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>© Hardcoded Software, 2010</string>
 	<key>SUFeedURL</key>
 	<string>http://www.hardcoded.net/updates/dupeguru.appcast</string>
 	<key>SUPublicDSAKeyFile</key>

cocoa/se/PyDupeGuru.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/PyDupeGuru.h"
+#import "../base/PyDupeGuru.h"
 
 @interface PyDupeGuru : PyDupeGuruBase
 //Scanning options

cocoa/se/ResultWindow.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,21 +7,15 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "cocoalib/Outline.h"
+#import "../../cocoalib/Outline.h"
-#import "dgbase/ResultWindow.h"
+#import "../base/ResultWindow.h"
-#import "DetailsPanel.h"
 #import "DirectoryPanel.h"
 
 @interface ResultWindow : ResultWindowBase
 {
-    IBOutlet NSPopUpButton *actionMenu;
-    IBOutlet NSMenu *columnsMenu;
     IBOutlet NSSearchField *filterField;
-    IBOutlet NSWindow *preferencesPanel;
     
     NSString *_lastAction;
-    DetailsPanel *_detailsPanel;
-    NSMutableArray *_resultColumns;
     NSMutableIndexSet *_deltaColumns;
 }
 - (IBAction)clearIgnoreList:(id)sender;
@@ -39,13 +33,6 @@ http://www.hardcoded.net/licenses/hs_license
 - (IBAction)renameSelected:(id)sender;
 - (IBAction)resetColumnsToDefault:(id)sender;
 - (IBAction)revealSelected:(id)sender;
-- (IBAction)showPreferencesPanel:(id)sender;
 - (IBAction)startDuplicateScan:(id)sender;
-- (IBAction)toggleColumn:(id)sender;
 - (IBAction)toggleDelta:(id)sender;
-- (IBAction)toggleDetailsPanel:(id)sender;
-
-- (NSTableColumn *)getColumnForIdentifier:(int)aIdentifier title:(NSString *)aTitle width:(int)aWidth refCol:(NSTableColumn *)aColumn;
-- (void)initResultColumns;
-- (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth;
 @end

cocoa/se/ResultWindow.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,9 +7,9 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import "ResultWindow.h"
-#import "cocoalib/Dialogs.h"
+#import "../../cocoalib/Dialogs.h"
-#import "cocoalib/ProgressController.h"
+#import "../../cocoalib/ProgressController.h"
-#import "cocoalib/Utils.h"
+#import "../../cocoalib/Utils.h"
 #import "AppDelegate.h"
 #import "Consts.h"
 
@@ -18,7 +18,6 @@ http://www.hardcoded.net/licenses/hs_license
 - (void)awakeFromNib
 {
     [super awakeFromNib];
-    _detailsPanel = nil;
     _displayDelta = NO;
     _powerMode = NO;
     _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,4)] retain];
@@ -28,23 +27,8 @@ http://www.hardcoded.net/licenses/hs_license
     [py setDisplayDeltaValues:b2n(_displayDelta)];
     [matches setTarget:self];
     [matches setDoubleAction:@selector(openSelected:)];
-    [[actionMenu itemAtIndex:0] setImage:[NSImage imageNamed: @"gear"]];
-    [self initResultColumns];
     [self refreshStats];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsMarkingChanged:) name:ResultsMarkingChangedNotification object:nil];
-    
-    NSToolbar *t = [[[NSToolbar alloc] initWithIdentifier:@"ResultWindowToolbar"] autorelease];
-    [t setAllowsUserCustomization:YES];
-    [t setAutosavesConfiguration:YES];
-    [t setDisplayMode:NSToolbarDisplayModeIconAndLabel];
-    [t setDelegate:self];
-    [[self window] setToolbar:t];
-}
-
-/* Override */
-- (NSString *)logoImageName
-{
-    return @"dgse_logo_32";
 }
 
 /* Actions */
@@ -174,11 +158,6 @@ http://www.hardcoded.net/licenses/hs_license
     [py revealSelected];
 }
 
-- (IBAction)showPreferencesPanel:(id)sender
-{
-    [preferencesPanel makeKeyAndOrderFront:sender];
-}
-
 - (IBAction)startDuplicateScan:(id)sender
 {
     if ([matches numberOfRows] > 0)
@@ -211,26 +190,6 @@ http://www.hardcoded.net/licenses/hs_license
 
 }
 
-- (IBAction)toggleColumn:(id)sender
-{
-    NSMenuItem *mi = sender;
-    NSString *colId = [NSString stringWithFormat:@"%d",[mi tag]];
-    NSTableColumn *col = [matches tableColumnWithIdentifier:colId];
-    if (col == nil)
-    {
-        //Add Column
-        col = [_resultColumns objectAtIndex:[mi tag]];
-        [matches addTableColumn:col];
-        [mi setState:NSOnState];
-    }
-    else
-    {
-        //Remove column
-        [matches removeTableColumn:col];
-        [mi setState:NSOffState];
-    }
-}
-
 - (IBAction)toggleDelta:(id)sender
 {
     if ([deltaSwitch selectedSegment] == 1)
@@ -240,74 +199,24 @@ http://www.hardcoded.net/licenses/hs_license
     [self changeDelta:sender];
 }
 
-- (IBAction)toggleDetailsPanel:(id)sender
-{
-    if (!_detailsPanel)
-        _detailsPanel = [[DetailsPanel alloc] initWithPy:py];
-    if ([[_detailsPanel window] isVisible])
-        [[_detailsPanel window] close];
-    else
-        [[_detailsPanel window] orderFront:nil];
-}
-
 /* Public */
-- (NSTableColumn *)getColumnForIdentifier:(int)aIdentifier title:(NSString *)aTitle width:(int)aWidth refCol:(NSTableColumn *)aColumn
-{
-    NSNumber *n = [NSNumber numberWithInt:aIdentifier];
-    NSTableColumn *col = [[NSTableColumn alloc] initWithIdentifier:[n stringValue]];
-    [col setWidth:aWidth];
-    [col setEditable:NO];
-    [[col dataCell] setFont:[[aColumn dataCell] font]];
-    [[col headerCell] setStringValue:aTitle];
-    [col setResizingMask:NSTableColumnUserResizingMask];
-    [col setSortDescriptorPrototype:[[NSSortDescriptor alloc] initWithKey:[n stringValue] ascending:YES]];
-    return col;
-}
-
 - (void)initResultColumns
 {
     NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];
     _resultColumns = [[NSMutableArray alloc] init];
     [_resultColumns addObject:[matches tableColumnWithIdentifier:@"0"]]; // File Name
-    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"1"]]; // Directory
+    [_resultColumns addObject:[self getColumnForIdentifier:1 title:@"Directory" width:120 refCol:refCol]];
-    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"2"]]; // Size
+    NSTableColumn *sizeCol = [self getColumnForIdentifier:2 title:@"Size (KB)" width:63 refCol:refCol];
+    [[sizeCol dataCell] setAlignment:NSRightTextAlignment];
+    [_resultColumns addObject:sizeCol];
     [_resultColumns addObject:[self getColumnForIdentifier:3 title:@"Kind" width:40 refCol:refCol]];
     [_resultColumns addObject:[self getColumnForIdentifier:4 title:@"Creation" width:120 refCol:refCol]];
     [_resultColumns addObject:[self getColumnForIdentifier:5 title:@"Modification" width:120 refCol:refCol]];
-    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"6"]]; // Match %
+    [_resultColumns addObject:[self getColumnForIdentifier:6 title:@"Match %" width:60 refCol:refCol]];
     [_resultColumns addObject:[self getColumnForIdentifier:7 title:@"Words Used" width:120 refCol:refCol]];
     [_resultColumns addObject:[self getColumnForIdentifier:8 title:@"Dupe Count" width:80 refCol:refCol]];
 }
 
-- (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth
-{
-    NSTableColumn *col;
-    NSString *colId;
-    NSNumber *width;
-    NSMenuItem *mi;
-    //Remove all columns
-    NSEnumerator *e = [[columnsMenu itemArray] objectEnumerator];
-    while (mi = [e nextObject])
-    {
-        if ([mi state] == NSOnState)
-            [self toggleColumn:mi];
-    }
-    //Add columns and set widths
-    e = [aColumnsOrder objectEnumerator];
-    while (colId = [e nextObject])
-    {
-        if (![colId isEqual:@"mark"])
-        {
-            col = [_resultColumns objectAtIndex:[colId intValue]];
-            width = [aColumnsWidth objectForKey:[col identifier]];
-            mi = [columnsMenu itemWithTag:[colId intValue]];
-            if (width)
-                [col setWidth:[width floatValue]];
-            [self toggleColumn:mi];
-        }
-    }
-}
-
 /* Delegate */
 - (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
 { 

cocoa/se/dg_cocoa.py

@@ -1,5 +1,4 @@
-# $Id$
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# Copyright 2009 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 
@@ -8,12 +7,12 @@
 import objc
 from AppKit import *
 
-from dupeguru import app_se_cocoa, scanner
+from core_se.app_cocoa import DupeGuru
+from core import scanner
 
 # Fix py2app imports with chokes on relative imports
-from dupeguru import app, app_cocoa, data, directories, engine, export, ignore, results, scanner
+from core_se import fs, data
-from hsfs import auto, stats, tree
+from core import app, app_cocoa, data, directories, engine, export, ignore, results, fs
-from hsfs.phys import bundle
 from hsutil import conflict
 
 class PyApp(NSObject):
@@ -22,7 +21,7 @@ class PyApp(NSObject):
 class PyDupeGuru(PyApp):
     def init(self):
         self = super(PyDupeGuru,self).init()
-        self.app = app_se_cocoa.DupeGuru()
+        self.app = DupeGuru()
         return self
     
     #---Directories
@@ -208,6 +207,12 @@ class PyDupeGuru(PyApp):
         self.app.progress.job_cancelled = True
     
     #---Registration
+    def appName(self):
+        return "dupeGuru"
+    
+    def demoLimitDescription(self):
+        return self.app.DEMO_LIMIT_DESC
+    
     @objc.signature('i@:')
     def isRegistered(self):
         return self.app.registered

cocoa/se/dupeguru.xcodeproj/project.pbxproj

@@ -7,32 +7,28 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
-		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 		CE073F6309CAE1A3005C1D2F /* dupeguru_help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* dupeguru_help */; };
 		CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; };
 		CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9A09914ADF003581CE /* ResultWindow.m */; };
 		CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */ = {isa = PBXBuildFile; fileRef = CE381CF509915304003581CE /* dg_cocoa.plugin */; };
-		CE3AA46709DB207900DB3A21 /* Directories.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE3AA46509DB207900DB3A21 /* Directories.nib */; };
+		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 */; };
 		CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE68EE6609ABC48000971085 /* DirectoryPanel.m */; };
 		CE6E0DFE1054E9EF008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */; };
-		CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE848A1809DD85810004CB44 /* Consts.h */; };
+		CEAC6811109B0B7E00B43C85 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEAC6810109B0B7E00B43C85 /* Preferences.xib */; };
-		CECA899909DB12CA00A3D774 /* Details.nib in Resources */ = {isa = PBXBuildFile; fileRef = CECA899709DB12CA00A3D774 /* Details.nib */; };
 		CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CECA899A09DB132E00A3D774 /* DetailsPanel.h */; };
 		CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CECA899B09DB132E00A3D774 /* DetailsPanel.m */; };
 		CEDD92DA0FDD01640031C7B7 /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */; };
-		CEDD92DB0FDD01640031C7B7 /* NSCharacterSet_Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDD92D90FDD01640031C7B7 /* NSCharacterSet_Extensions.m */; };
 		CEE7EA130FE675C80004E467 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEE7EA120FE675C80004E467 /* DetailsPanel.m */; };
 		CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; };
-		CEF7823809C8AA0200EF38FF /* gear.png in Resources */ = {isa = PBXBuildFile; fileRef = CEF7823709C8AA0200EF38FF /* gear.png */; };
+		CEEFC0F810945D9F001F3A39 /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEEFC0F710945D9F001F3A39 /* DirectoryPanel.xib */; };
+		CEEFC0FB10945E37001F3A39 /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEEFC0FA10945E37001F3A39 /* DetailsPanel.xib */; };
 		CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; };
 		CEFC295509C89FF200D9F998 /* details32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295309C89FF200D9F998 /* details32.png */; };
 		CEFC295609C89FF200D9F998 /* preferences32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295409C89FF200D9F998 /* preferences32.png */; };
-		CEFC295E09C8A0B000D9F998 /* dgse_logo_32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295D09C8A0B000D9F998 /* dgse_logo_32.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 */; };
@@ -59,80 +55,74 @@
 			files = (
 				CE4557B40AE3BC50005A9546 /* Sparkle.framework in CopyFiles */,
 				CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */,
-				CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
 		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		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.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = dupeGuru.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		CE073F5409CAE1A3005C1D2F /* dupeguru_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_help; path = help/dupeguru_help; sourceTree = "<group>"; };
+		CE073F5409CAE1A3005C1D2F /* dupeguru_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_help; path = ../../help_se/dupeguru_help; sourceTree = "<group>"; };
 		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; };
 		CE381C9A09914ADF003581CE /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = ResultWindow.m; sourceTree = SOURCE_ROOT; };
 		CE381C9B09914ADF003581CE /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ResultWindow.h; sourceTree = SOURCE_ROOT; };
-		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dg_cocoa.plugin; path = py/dist/dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
+		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
-		CE3AA46609DB207900DB3A21 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Directories.nib; sourceTree = "<group>"; };
+		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>"; };
 		CE68EE6509ABC48000971085 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
 		CE68EE6609ABC48000971085 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
-		CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = dgbase/dsa_pub.pem; sourceTree = "<group>"; };
+		CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = ../base/dsa_pub.pem; sourceTree = "<group>"; };
-		CE848A1809DD85810004CB44 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Consts.h; sourceTree = "<group>"; };
+		CEAC6810109B0B7E00B43C85 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Preferences.xib; path = xib/Preferences.xib; sourceTree = "<group>"; };
-		CECA899809DB12CA00A3D774 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Details.nib; 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>"; };
-		CEDD92D60FDD01640031C7B7 /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
+		CEDD92D60FDD01640031C7B7 /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
-		CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
+		CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
-		CEDD92D80FDD01640031C7B7 /* NSCharacterSet_Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSCharacterSet_Extensions.h; path = cocoalib/brsinglelineformatter/NSCharacterSet_Extensions.h; sourceTree = SOURCE_ROOT; };
+		CEE7EA110FE675C80004E467 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = ../base/DetailsPanel.h; sourceTree = SOURCE_ROOT; };
-		CEDD92D90FDD01640031C7B7 /* NSCharacterSet_Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSCharacterSet_Extensions.m; path = cocoalib/brsinglelineformatter/NSCharacterSet_Extensions.m; sourceTree = SOURCE_ROOT; };
+		CEE7EA120FE675C80004E467 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = ../base/DetailsPanel.m; sourceTree = SOURCE_ROOT; };
-		CEE7EA110FE675C80004E467 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = dgbase/DetailsPanel.h; sourceTree = SOURCE_ROOT; };
-		CEE7EA120FE675C80004E467 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = dgbase/DetailsPanel.m; sourceTree = SOURCE_ROOT; };
 		CEEB135109C837A2004D2330 /* dupeguru.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = dupeguru.icns; sourceTree = "<group>"; };
-		CEF7823709C8AA0200EF38FF /* gear.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = gear.png; path = images/gear.png; sourceTree = "<group>"; };
+		CEEFC0F710945D9F001F3A39 /* DirectoryPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DirectoryPanel.xib; path = ../base/xib/DirectoryPanel.xib; sourceTree = "<group>"; };
-		CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = images/folder32.png; sourceTree = SOURCE_ROOT; };
+		CEEFC0FA10945E37001F3A39 /* DetailsPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DetailsPanel.xib; path = ../base/xib/DetailsPanel.xib; sourceTree = "<group>"; };
-		CEFC295309C89FF200D9F998 /* details32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = details32.png; path = images/details32.png; sourceTree = SOURCE_ROOT; };
+		CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = ../../images/folder32.png; sourceTree = SOURCE_ROOT; };
-		CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = images/preferences32.png; sourceTree = SOURCE_ROOT; };
+		CEFC295309C89FF200D9F998 /* details32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = details32.png; path = ../../images/details32.png; sourceTree = SOURCE_ROOT; };
-		CEFC295D09C8A0B000D9F998 /* dgse_logo_32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = dgse_logo_32.png; path = images/dgse_logo_32.png; sourceTree = "<group>"; };
+		CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = ../../images/preferences32.png; sourceTree = SOURCE_ROOT; };
-		CEFC7F8A0FC9517500CD5728 /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
+		CEFC7F8A0FC9517500CD5728 /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = ../../cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F8B0FC9517500CD5728 /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = cocoalib/Dialogs.m; sourceTree = SOURCE_ROOT; };
+		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; };
+		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; };
+		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; };
+		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; };
+		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; };
+		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; };
+		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; };
+		CEFC7F920FC9517500CD5728 /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = ../../cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F930FC9517500CD5728 /* PyRegistrable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyRegistrable.h; path = cocoalib/PyRegistrable.h; sourceTree = SOURCE_ROOT; };
+		CEFC7F930FC9517500CD5728 /* PyRegistrable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyRegistrable.h; path = ../../cocoalib/PyRegistrable.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F940FC9517500CD5728 /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
+		CEFC7F940FC9517500CD5728 /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = ../../cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F950FC9517500CD5728 /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
+		CEFC7F950FC9517500CD5728 /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = ../../cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
-		CEFC7F960FC9517500CD5728 /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
+		CEFC7F960FC9517500CD5728 /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = ../../cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F970FC9517500CD5728 /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
+		CEFC7F970FC9517500CD5728 /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = ../../cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
-		CEFC7F980FC9517500CD5728 /* Table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Table.h; path = cocoalib/Table.h; sourceTree = SOURCE_ROOT; };
+		CEFC7F980FC9517500CD5728 /* Table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Table.h; path = ../../cocoalib/Table.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F990FC9517500CD5728 /* Table.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Table.m; path = cocoalib/Table.m; sourceTree = SOURCE_ROOT; };
+		CEFC7F990FC9517500CD5728 /* Table.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Table.m; path = ../../cocoalib/Table.m; sourceTree = SOURCE_ROOT; };
-		CEFC7F9A0FC9517500CD5728 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
+		CEFC7F9A0FC9517500CD5728 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = ../../cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F9B0FC9517500CD5728 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
+		CEFC7F9B0FC9517500CD5728 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = ../../cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
-		CEFC7F9C0FC9517500CD5728 /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
+		CEFC7F9C0FC9517500CD5728 /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = ../../cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F9D0FC9517500CD5728 /* ValueTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ValueTransformers.m; path = cocoalib/ValueTransformers.m; sourceTree = SOURCE_ROOT; };
+		CEFC7F9D0FC9517500CD5728 /* ValueTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ValueTransformers.m; path = ../../cocoalib/ValueTransformers.m; sourceTree = SOURCE_ROOT; };
-		CEFC7FA80FC9518A00CD5728 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = cocoalib/English.lproj/ErrorReportWindow.xib; sourceTree = "<group>"; };
+		CEFC7FA80FC9518A00CD5728 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = ../../cocoalib/English.lproj/ErrorReportWindow.xib; sourceTree = "<group>"; };
-		CEFC7FAA0FC9518A00CD5728 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = cocoalib/English.lproj/progress.nib; sourceTree = "<group>"; };
+		CEFC7FAA0FC9518A00CD5728 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = ../../cocoalib/English.lproj/progress.nib; sourceTree = "<group>"; };
-		CEFC7FAC0FC9518A00CD5728 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = cocoalib/English.lproj/registration.nib; sourceTree = "<group>"; };
+		CEFC7FAC0FC9518A00CD5728 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = ../../cocoalib/English.lproj/registration.nib; sourceTree = "<group>"; };
-		CEFC7FB10FC951A700CD5728 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = dgbase/AppDelegate.h; sourceTree = SOURCE_ROOT; };
+		CEFC7FB10FC951A700CD5728 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ../base/AppDelegate.h; sourceTree = SOURCE_ROOT; };
-		CEFC7FB20FC951A700CD5728 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = dgbase/AppDelegate.m; sourceTree = SOURCE_ROOT; };
+		CEFC7FB20FC951A700CD5728 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = ../base/AppDelegate.m; sourceTree = SOURCE_ROOT; };
-		CEFC7FB30FC951A700CD5728 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Consts.h; path = dgbase/Consts.h; sourceTree = SOURCE_ROOT; };
+		CEFC7FB30FC951A700CD5728 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Consts.h; path = ../base/Consts.h; sourceTree = SOURCE_ROOT; };
-		CEFC7FB40FC951A700CD5728 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryPanel.h; path = dgbase/DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
+		CEFC7FB40FC951A700CD5728 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryPanel.h; path = ../base/DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
-		CEFC7FB50FC951A700CD5728 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryPanel.m; path = dgbase/DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
+		CEFC7FB50FC951A700CD5728 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryPanel.m; path = ../base/DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
-		CEFC7FB60FC951A700CD5728 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDupeGuru.h; path = dgbase/PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
+		CEFC7FB60FC951A700CD5728 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDupeGuru.h; path = ../base/PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
-		CEFC7FB70FC951A700CD5728 /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultWindow.h; path = dgbase/ResultWindow.h; sourceTree = SOURCE_ROOT; };
+		CEFC7FB70FC951A700CD5728 /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultWindow.h; path = ../base/ResultWindow.h; sourceTree = SOURCE_ROOT; };
-		CEFC7FB80FC951A700CD5728 /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultWindow.m; path = dgbase/ResultWindow.m; sourceTree = SOURCE_ROOT; };
+		CEFC7FB80FC951A700CD5728 /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultWindow.m; path = ../base/ResultWindow.m; sourceTree = SOURCE_ROOT; };
 		CEFF18A009A4D387005E6321 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
@@ -154,7 +144,6 @@
 			children = (
 				CE381C9509914ACE003581CE /* AppDelegate.h */,
 				CE381C9409914ACE003581CE /* AppDelegate.m */,
-				CE848A1809DD85810004CB44 /* Consts.h */,
 				CECA899A09DB132E00A3D774 /* DetailsPanel.h */,
 				CECA899B09DB132E00A3D774 /* DetailsPanel.m */,
 				CE68EE6509ABC48000971085 /* DirectoryPanel.h */,
@@ -213,13 +202,10 @@
 				CE073F5409CAE1A3005C1D2F /* dupeguru_help */,
 				CE381CF509915304003581CE /* dg_cocoa.plugin */,
 				CEFC294309C89E0000D9F998 /* images */,
+				CEEFC0CA10943849001F3A39 /* xib */,
 				CEEB135109C837A2004D2330 /* dupeguru.icns */,
 				8D1107310486CEB800E47090 /* Info.plist */,
-				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
 				CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */,
-				CECA899709DB12CA00A3D774 /* Details.nib */,
-				CE3AA46509DB207900DB3A21 /* Directories.nib */,
-				29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
@@ -238,18 +224,25 @@
 			children = (
 				CEDD92D60FDD01640031C7B7 /* BRSingleLineFormatter.h */,
 				CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */,
-				CEDD92D80FDD01640031C7B7 /* NSCharacterSet_Extensions.h */,
-				CEDD92D90FDD01640031C7B7 /* NSCharacterSet_Extensions.m */,
 			);
 			name = brsinglelineformatter;
-			path = cocoalib/brsinglelineformatter;
+			path = ../../cocoalib/brsinglelineformatter;
 			sourceTree = SOURCE_ROOT;
 		};
+		CEEFC0CA10943849001F3A39 /* xib */ = {
+			isa = PBXGroup;
+			children = (
+				CE3A46F9109B212E002ABFD5 /* MainMenu.xib */,
+				CEAC6810109B0B7E00B43C85 /* Preferences.xib */,
+				CEEFC0F710945D9F001F3A39 /* DirectoryPanel.xib */,
+				CEEFC0FA10945E37001F3A39 /* DetailsPanel.xib */,
+			);
+			name = xib;
+			sourceTree = "<group>";
+		};
 		CEFC294309C89E0000D9F998 /* images */ = {
 			isa = PBXGroup;
 			children = (
-				CEF7823709C8AA0200EF38FF /* gear.png */,
-				CEFC295D09C8A0B000D9F998 /* dgse_logo_32.png */,
 				CEFC295309C89FF200D9F998 /* details32.png */,
 				CEFC295409C89FF200D9F998 /* preferences32.png */,
 				CEFC294509C89E3D00D9F998 /* folder32.png */,
@@ -352,22 +345,20 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */,
-				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
 				CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */,
 				CE073F6309CAE1A3005C1D2F /* dupeguru_help in Resources */,
 				CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */,
 				CEFC294609C89E3D00D9F998 /* folder32.png in Resources */,
 				CEFC295509C89FF200D9F998 /* details32.png in Resources */,
 				CEFC295609C89FF200D9F998 /* preferences32.png in Resources */,
-				CEFC295E09C8A0B000D9F998 /* dgse_logo_32.png in Resources */,
-				CEF7823809C8AA0200EF38FF /* gear.png in Resources */,
-				CECA899909DB12CA00A3D774 /* Details.nib in Resources */,
-				CE3AA46709DB207900DB3A21 /* Directories.nib in Resources */,
 				CEFC7FAD0FC9518A00CD5728 /* ErrorReportWindow.xib in Resources */,
 				CEFC7FAE0FC9518A00CD5728 /* progress.nib in Resources */,
 				CEFC7FAF0FC9518A00CD5728 /* registration.nib in Resources */,
 				CE6E0DFE1054E9EF008D9390 /* dsa_pub.pem in Resources */,
+				CEEFC0F810945D9F001F3A39 /* DirectoryPanel.xib in Resources */,
+				CEEFC0FB10945E37001F3A39 /* DetailsPanel.xib in Resources */,
+				CEAC6811109B0B7E00B43C85 /* Preferences.xib in Resources */,
+				CE3A46FA109B212E002ABFD5 /* MainMenu.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -396,7 +387,6 @@
 				CEFC7FBA0FC951A700CD5728 /* DirectoryPanel.m in Sources */,
 				CEFC7FBB0FC951A700CD5728 /* ResultWindow.m in Sources */,
 				CEDD92DA0FDD01640031C7B7 /* BRSingleLineFormatter.m in Sources */,
-				CEDD92DB0FDD01640031C7B7 /* NSCharacterSet_Extensions.m in Sources */,
 				CEE7EA130FE675C80004E467 /* DetailsPanel.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -404,38 +394,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXVariantGroup section */
-		089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				089C165DFE840E0CC02AAC07 /* English */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-		29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				29B97319FDCFA39411CA2CEA /* English */,
-			);
-			name = MainMenu.nib;
-			sourceTree = SOURCE_ROOT;
-		};
-		CE3AA46509DB207900DB3A21 /* Directories.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CE3AA46609DB207900DB3A21 /* English */,
-			);
-			name = Directories.nib;
-			sourceTree = "<group>";
-		};
-		CECA899709DB12CA00A3D774 /* Details.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CECA899809DB12CA00A3D774 /* English */,
-			);
-			name = Details.nib;
-			sourceTree = "<group>";
-		};
 		CEFC7FA70FC9518A00CD5728 /* ErrorReportWindow.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -463,28 +421,6 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		C01FCF4B08A954540054247B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(FRAMEWORK_SEARCH_PATHS)",
-					"$(SRCROOT)/../../../cocoalib/build/Release",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-				);
-				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../base/cocoa/build/Release\"";
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				PRODUCT_NAME = dupeGuru;
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = YES;
-			};
-			name = Debug;
-		};
 		C01FCF4C08A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -492,11 +428,6 @@
 					ppc,
 					i386,
 				);
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(FRAMEWORK_SEARCH_PATHS)",
-					"$(SRCROOT)/../../../cocoalib/build/Release",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-				);
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../base/cocoa/build/Release\"";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G5;
@@ -507,31 +438,16 @@
 			};
 			name = Release;
 		};
-		C01FCF4F08A954540054247B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				PREBINDING = NO;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
-			};
-			name = Debug;
-		};
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
 				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
-				FRAMEWORK_SEARCH_PATHS = "@executable_path/../Frameworks";
 				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_VERSION = 4.0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
-				PREBINDING = NO;
+				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
 			};
 			name = Release;
 		};
@@ -541,7 +457,6 @@
 		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dupeguru" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				C01FCF4B08A954540054247B /* Debug */,
 				C01FCF4C08A954540054247B /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -550,7 +465,6 @@
 		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				C01FCF4F08A954540054247B /* Debug */,
 				C01FCF5008A954540054247B /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;

cocoa/se/main.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 

configure.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2009-12-30
+# 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 sys
+from optparse import OptionParser
+
+import yaml
+
+def main(edition, ui, dev):
+    if edition not in ('se', 'me', 'pe'):
+        edition = 'se'
+    if ui not in ('cocoa', 'qt'):
+        ui = 'cocoa' if sys.platform == 'darwin' else 'qt'
+    build_type = 'Dev' if dev else 'Release'
+    print "Configuring dupeGuru {0} for UI {1} ({2})".format(edition.upper(), ui, build_type)
+    conf = {
+        'edition': edition,
+        'ui': ui,
+        'dev': dev,
+    }
+    yaml.dump(conf, open('conf.yaml', 'w'))
+
+if __name__ == '__main__':
+    usage = "usage: %prog [options]"
+    parser = OptionParser(usage=usage)
+    parser.add_option('--edition', dest='edition',
+        help="dupeGuru edition to build (se, me or pe). Default is se.")
+    parser.add_option('--ui', dest='ui',
+        help="Type of UI to build. 'qt' or 'cocoa'. Default is determined by your system.")
+    parser.add_option('--dev', action='store_true', dest='dev', default=False,
+        help="If this flag is set, will configure for dev builds.")
+    (options, args) = parser.parse_args()
+    main(options.edition, options.ui, options.dev)

core/app.py

@@ -1,8 +1,7 @@
 #!/usr/bin/env python
 # Created By: Virgil Dupras
 # Created On: 2006/11/11
-# $Id$
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# Copyright 2009 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 
@@ -14,13 +13,13 @@ import os
 import os.path as op
 import logging
 
-from hsutil import job, io, files
+from hsutil import io, files
 from hsutil.path import Path
 from hsutil.reg import RegistrableApplication, RegistrationRequired
 from hsutil.misc import flatten, first
 from hsutil.str import escape
 
-from . import directories, results, scanner, export
+from . import directories, results, scanner, export, fs
 
 JOB_SCAN = 'job_scan'
 JOB_LOAD = 'job_load'
@@ -35,6 +34,8 @@ class AllFilesAreRefError(Exception):
     pass
 
 class DupeGuru(RegistrableApplication):
+    DEMO_LIMIT_DESC = "In the demo version, only 10 duplicates per session can be sent to the recycle bin, moved or copied."
+    
     def __init__(self, data_module, appdata, appid):
         RegistrableApplication.__init__(self, appid)
         self.appdata = appdata
@@ -70,12 +71,10 @@ class DupeGuru(RegistrableApplication):
     
     def _do_delete_dupe(self, dupe):
         if not io.exists(dupe.path):
-            dupe.parent = None
             return True
         self._recycle_dupe(dupe)
         self.clean_empty_dirs(dupe.path[:-1])
         if not io.exists(dupe.path):
-            dupe.parent = None
             return True
         logging.warning("Could not send {0} to trash.".format(unicode(dupe.path)))
         return False
@@ -98,13 +97,8 @@ class DupeGuru(RegistrableApplication):
             return ['---'] * len(self.data.COLUMNS)
     
     def _get_file(self, str_path):
-        p = Path(str_path)
+        path = Path(str_path)
-        for d in self.directories:
+        return fs.get_file(path, self.directories.fileclasses)    
-            if p not in d.path:
-                continue
-            result = d.find_path(p[d.path:])
-            if result is not None:
-                return result
     
     @staticmethod
     def _recycle_dupe(dupe):
@@ -150,7 +144,7 @@ class DupeGuru(RegistrableApplication):
                        2 = absolute re-creation.
         """
         source_path = dupe.path
-        location_path = dupe.root.path
+        location_path = first(p for p in self.directories if dupe.path in p)
         dest_path = Path(destination)
         if dest_type == 2:
             dest_path = dest_path + source_path[1:-1] #Remove drive letter and filename

core/app_cocoa.py

@@ -1,24 +1,23 @@
 # Created By: Virgil Dupras
 # Created On: 2006/11/11
-# $Id$
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# Copyright 2009 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 objc
 from Foundation import *
 from AppKit import *
 import logging
 import os.path as op
 
-import hsfs as fs
 from hsutil import io, cocoa, job
 from hsutil.cocoa import install_exception_hook
 from hsutil.misc import stripnone
 from hsutil.reg import RegistrationRequired
 
-import app, data
+from . import app, fs
 
 JOBID2TITLE = {
     app.JOB_SCAN: "Scanning for duplicates",
@@ -43,8 +42,6 @@ class DupeGuru(app.DupeGuru):
         logging.basicConfig(level=LOGGING_LEVEL, format='%(levelname)s %(message)s')
         logging.debug('started in debug mode')
         install_exception_hook()
-        if data_module is None:
-            data_module = data
         appsupport = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, True)[0]
         appdata = op.join(appsupport, appdata_subdir)
         app.DupeGuru.__init__(self, data_module, appdata, appid)
@@ -56,18 +53,14 @@ class DupeGuru(app.DupeGuru):
     #--- Override
     @staticmethod
     def _recycle_dupe(dupe):
-        if not io.exists(dupe.path):
+        directory = unicode(dupe.path[:-1])
-            dupe.parent = None
-            return True
-        directory = unicode(dupe.parent.path)
         filename = dupe.name
-        result, tag = NSWorkspace.sharedWorkspace().performFileOperation_source_destination_files_tag_(
+        if objc.__version__ == '1.4': # For a while, we have to support this.
-            NSWorkspaceRecycleOperation, directory, '', [filename])
+            result, tag = NSWorkspace.sharedWorkspace().performFileOperation_source_destination_files_tag_(
-        if not io.exists(dupe.path):
+                NSWorkspaceRecycleOperation, directory, '', [filename])
-            dupe.parent = None
+        else:
-            return True
+            result, tag = NSWorkspace.sharedWorkspace().performFileOperation_source_destination_files_tag_(
-        logging.warning('Could not send %s to trash. tag: %d' % (unicode(dupe.path), tag))
+                NSWorkspaceRecycleOperation, directory, '', [filename], None)
-        return False
     
     def _start_job(self, jobid, func):
         try:
@@ -91,15 +84,15 @@ class DupeGuru(app.DupeGuru):
         except IndexError:
             return (None,None)
     
-    def GetDirectory(self,node_path,curr_dir=None):
+    def get_folder_path(self, node_path, curr_path=None):
         if not node_path:
-            return curr_dir
+            return curr_path
-        if curr_dir is not None:
+        current_index = node_path[0]
-            l = curr_dir.dirs
+        if curr_path is None:
+            curr_path = self.directories[current_index]
         else:
-            l = self.directories
+            curr_path = self.directories.get_subfolders(curr_path)[current_index]
-        d = l[node_path[0]]
+        return self.get_folder_path(node_path[1:], curr_path)
-        return self.GetDirectory(node_path[1:],d)
     
     def RefreshDetailsTable(self,dupe,group):
         l1 = self._get_display_info(dupe, group, False)
@@ -146,13 +139,13 @@ class DupeGuru(app.DupeGuru):
     def RemoveSelected(self):
         self.results.remove_duplicates(self.selected_dupes)
     
-    def RenameSelected(self,newname):
+    def RenameSelected(self, newname):
         try:
             d = self.selected_dupes[0]
-            d = d.move(d.parent,newname)
+            d.rename(newname)
             return True
-        except (IndexError,fs.FSError),e:
+        except (IndexError, fs.FSError) as e:
-            logging.warning("dupeGuru Warning: %s" % str(e))
+            logging.warning("dupeGuru Warning: %s" % unicode(e))
         return False
     
     def RevealSelected(self):
@@ -214,9 +207,9 @@ class DupeGuru(app.DupeGuru):
             self.results.dupes[row] for row in rows if row in xrange(len(self.results.dupes))
         ]
     
-    def SetDirectoryState(self,node_path,state):
+    def SetDirectoryState(self, node_path, state):
-        d = self.GetDirectory(node_path)
+        p = self.get_folder_path(node_path)
-        self.directories.set_state(d.path,state)
+        self.directories.set_state(p, state)
     
     def sort_dupes(self,key,asc):
         self.results.sort_dupes(key,asc,self.display_delta_values)
@@ -245,8 +238,12 @@ class DupeGuru(app.DupeGuru):
             return [len(g.dupes) for g in self.results.groups]
         elif tag == 1: #Directories
             try:
-                dirs = self.GetDirectory(node_path).dirs if node_path else self.directories
+                if node_path:
-                return [d.dircount for d in dirs]
+                    path = self.get_folder_path(node_path)
+                    subfolders = self.directories.get_subfolders(path)
+                else:
+                    subfolders = self.directories
+                return [len(self.directories.get_subfolders(path)) for path in subfolders]
             except IndexError: # node_path out of range
                 return []
         else: #Power Marker
@@ -270,8 +267,9 @@ class DupeGuru(app.DupeGuru):
             return result
         elif tag == 1: #Directories
             try:
-                d = self.GetDirectory(node_path)
+                path = self.get_folder_path(node_path)
-                return [d.name, self.directories.get_state(d.path)]
+                name = unicode(path) if len(node_path) == 1 else path[-1]
+                return [name, self.directories.get_state(path)]
             except IndexError: # node_path out of range
                 return []
     

core/data.py

@@ -0,0 +1,41 @@
+# Created By: Virgil Dupras
+# Created On: 2006/03/15
+# 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 hsutil.str import format_time, FT_DECIMAL, format_size
+
+import time
+
+def format_path(p):
+    return unicode(p[:-1])
+
+def format_timestamp(t, delta):
+    if delta:
+        return format_time(t, FT_DECIMAL)
+    else:
+        if t > 0:
+            return time.strftime('%Y/%m/%d %H:%M:%S', time.localtime(t))
+        else:
+            return '---'
+
+def format_words(w):
+    def do_format(w):
+        if isinstance(w, list):
+            return '(%s)' % ', '.join(do_format(item) for item in w)
+        else:
+            return w.replace('\n', ' ')
+    
+    return ', '.join(do_format(item) for item in w)
+
+def format_perc(p):
+    return "%0.0f" % p
+
+def format_dupe_count(c):
+    return str(c) if c else '---'
+
+def cmp_value(value):
+    return value.lower() if isinstance(value, basestring) else value

core/directories.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/02/27
-# $Id$
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# Copyright 2009 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 
@@ -9,11 +8,12 @@
 
 import xml.dom.minidom
 
-from hsfs import phys
+from hsutil import io
-import hsfs as fs
 from hsutil.files import FileOrPath
 from hsutil.path import Path
 
+from . import fs
+
 (STATE_NORMAL,
 STATE_REFERENCE,
 STATE_EXCLUDED) = range(3)
@@ -26,15 +26,14 @@ class InvalidPathError(Exception):
 
 class Directories(object):
     #---Override
-    def __init__(self):
+    def __init__(self, fileclasses=[fs.File]):
         self._dirs = []
         self.states = {}
-        self.dirclass = phys.Directory
+        self.fileclasses = fileclasses
-        self.special_dirclasses = {}
     
-    def __contains__(self,path):
+    def __contains__(self, path):
-        for d in self._dirs:
+        for p in self._dirs:
-            if path in d.path:
+            if path in p:
                 return True
         return False
     
@@ -53,8 +52,7 @@ class Directories(object):
         if path[-1].startswith('.'): # hidden
             return STATE_EXCLUDED
     
-    def _get_files(self, from_dir):
+    def _get_files(self, from_path):
-        from_path = from_dir.path
         state = self.get_state(from_path)
         if state == STATE_EXCLUDED:
             # Recursively get files from folders with lots of subfolder is expensive. However, there
@@ -62,14 +60,21 @@ class Directories(object):
             # through self.states and see if we must continue, or we can stop right here to save time
             if not any(p[:len(from_path)] == from_path for p in self.states):
                 return
-        result = []
+        try:
-        for subdir in from_dir.dirs:
+            filepaths = set()
-            for file in self._get_files(subdir):
+            if state != STATE_EXCLUDED:
-                yield file
+                for file in fs.get_files(from_path, fileclasses=self.fileclasses):
-        if state != STATE_EXCLUDED:
+                    file.is_ref = state == STATE_REFERENCE
-            for file in from_dir.files:
+                    filepaths.add(file.path)
-                file.is_ref = state == STATE_REFERENCE
+                    yield file
-                yield file
+            subpaths = [from_path + name for name in io.listdir(from_path)]
+            # it's possible that a folder (bundle) gets into the file list. in that case, we don't want to recurse into it
+            subfolders = [p for p in subpaths if not io.islink(p) and io.isdir(p) and p not in filepaths]
+            for subfolder in subfolders:
+                for file in self._get_files(subfolder):
+                    yield file
+        except (EnvironmentError, fs.InvalidPath):
+            pass
     
     #---Public
     def add_path(self, path):
@@ -80,29 +85,30 @@ class Directories(object):
         under it will be removed. Can also raise InvalidPathError if 'path' does not exist.
         """
         if path in self:
-            raise AlreadyThereError
+            raise AlreadyThereError()
-        self._dirs = [d for d in self._dirs if d.path not in path]
+        if not io.exists(path):
-        try:
-            dirclass = self.special_dirclasses.get(path, self.dirclass)
-            d = dirclass(None, unicode(path))
-            d[:] #If an InvalidPath exception has to be raised, it will be raised here
-            self._dirs.append(d)
-            return d
-        except fs.InvalidPath:
             raise InvalidPathError()
+        self._dirs = [p for p in self._dirs if p not in path]
+        self._dirs.append(path)
+    
+    @staticmethod
+    def get_subfolders(path):
+        """returns a sorted list of paths corresponding to subfolders in `path`"""
+        try:
+            names = [name for name in io.listdir(path) if io.isdir(path + name)]
+            names.sort(key=lambda x:x.lower())
+            return [path + name for name in names]
+        except EnvironmentError:
+            return []
     
     def get_files(self):
         """Returns a list of all files that are not excluded.
         
         Returned files also have their 'is_ref' attr set.
         """
-        for d in self._dirs:
+        for path in self._dirs:
-            d.force_update()
+            for file in self._get_files(path):
-            try:
+                yield file
-                for file in self._get_files(d):
-                    yield file
-            except fs.InvalidPath:
-                pass
     
     def get_state(self, path):
         """Returns the state of 'path' (One of the STATE_* const.)
@@ -123,8 +129,8 @@ class Directories(object):
             doc = xml.dom.minidom.parse(infile)
         except:
             return
-        root_dir_nodes = doc.getElementsByTagName('root_directory')
+        root_path_nodes = doc.getElementsByTagName('root_directory')
-        for rdn in root_dir_nodes:
+        for rdn in root_path_nodes:
             if not rdn.getAttributeNode('path'):
                 continue
             path = rdn.getAttributeNode('path').nodeValue
@@ -144,9 +150,9 @@ class Directories(object):
         with FileOrPath(outfile, 'wb') as fp:
             doc = xml.dom.minidom.Document()
             root = doc.appendChild(doc.createElement('directories'))
-            for root_dir in self:
+            for root_path in self:
-                root_dir_node = root.appendChild(doc.createElement('root_directory'))
+                root_path_node = root.appendChild(doc.createElement('root_directory'))
-                root_dir_node.setAttribute('path', unicode(root_dir.path).encode('utf-8'))
+                root_path_node.setAttribute('path', unicode(root_path).encode('utf-8'))
             for path, state in self.states.iteritems():
                 state_node = root.appendChild(doc.createElement('state'))
                 state_node.setAttribute('path', unicode(path).encode('utf-8'))

core/engine.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/01/29
-# $Id$
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# Copyright 2009 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 
@@ -9,6 +8,7 @@
 
 from __future__ import division
 import difflib
+import itertools
 import logging
 import string
 from collections import defaultdict, namedtuple
@@ -156,58 +156,73 @@ def get_match(first, second, flags=()):
     percentage = compare(first.words, second.words, flags)
     return Match(first, second, percentage)
 
-class MatchFactory(object):
+def getmatches(objects, min_match_percentage=0, match_similar_words=False, weight_words=False, 
-    common_word_threshold = 50
+    no_field_order=False, j=job.nulljob):
-    match_similar_words = False
+    COMMON_WORD_THRESHOLD = 50
-    min_match_percentage = 0
+    LIMIT = 5000000
-    weight_words = False
+    j = j.start_subjob(2)
-    no_field_order = False
+    sj = j.start_subjob(2)
-    limit = 5000000
+    for o in objects:
-    
+        if not hasattr(o, 'words'):
-    def getmatches(self, objects, j=job.nulljob):
+            o.words = getwords(o.name)
-        j = j.start_subjob(2)
+    word_dict = build_word_dict(objects, sj)
-        sj = j.start_subjob(2)
+    reduce_common_words(word_dict, COMMON_WORD_THRESHOLD)
-        for o in objects:
+    if match_similar_words:
-            if not hasattr(o, 'words'):
+        merge_similar_words(word_dict)
-                o.words = getwords(o.name)
+    match_flags = []
-        word_dict = build_word_dict(objects, sj)
+    if weight_words:
-        reduce_common_words(word_dict, self.common_word_threshold)
+        match_flags.append(WEIGHT_WORDS)
-        if self.match_similar_words:
+    if match_similar_words:
-            merge_similar_words(word_dict)
+        match_flags.append(MATCH_SIMILAR_WORDS)
-        match_flags = []
+    if no_field_order:
-        if self.weight_words:
+        match_flags.append(NO_FIELD_ORDER)
-            match_flags.append(WEIGHT_WORDS)
+    j.start_job(len(word_dict), '0 matches found')
-        if self.match_similar_words:
+    compared = defaultdict(set)
-            match_flags.append(MATCH_SIMILAR_WORDS)
+    result = []
-        if self.no_field_order:
+    try:
-            match_flags.append(NO_FIELD_ORDER)
+        # This whole 'popping' thing is there to avoid taking too much memory at the same time.
-        j.start_job(len(word_dict), '0 matches found')
+        while word_dict:
-        compared = defaultdict(set)
+            items = word_dict.popitem()[1]
-        result = []
+            while items:
-        try:
+                ref = items.pop()
-            # This whole 'popping' thing is there to avoid taking too much memory at the same time.
+                compared_already = compared[ref]
-            while word_dict:
+                to_compare = items - compared_already
-                items = word_dict.popitem()[1]
+                compared_already |= to_compare
-                while items:
+                for other in to_compare:
-                    ref = items.pop()
+                    m = get_match(ref, other, match_flags)
-                    compared_already = compared[ref]
+                    if m.percentage >= min_match_percentage:
-                    to_compare = items - compared_already
+                        result.append(m)
-                    compared_already |= to_compare
+                        if len(result) >= LIMIT:
-                    for other in to_compare:
+                            return result
-                        m = get_match(ref, other, match_flags)
+            j.add_progress(desc='%d matches found' % len(result))
-                        if m.percentage >= self.min_match_percentage:
+    except MemoryError:
-                            result.append(m)
+        # This is the place where the memory usage is at its peak during the scan.
-                            if len(result) >= self.limit:
+        # Just continue the process with an incomplete list of matches.
-                                return result
+        del compared # This should give us enough room to call logging.
-                j.add_progress(desc='%d matches found' % len(result))
+        logging.warning('Memory Overflow. Matches: %d. Word dict: %d' % (len(result), len(word_dict)))
-        except MemoryError:
-            # This is the place where the memory usage is at its peak during the scan.
-            # Just continue the process with an incomplete list of matches.
-            del compared # This should give us enough room to call logging.
-            logging.warning('Memory Overflow. Matches: %d. Word dict: %d' % (len(result), len(word_dict)))
-            return result
         return result
+    return result
 
+def getmatches_by_contents(files, sizeattr='size', partial=False, j=job.nulljob):
+    j = j.start_subjob([2, 8])
+    size2files = defaultdict(set)
+    for file in j.iter_with_progress(files, 'Read size of %d/%d files'):
+        filesize = getattr(file, sizeattr)
+        if filesize:
+            size2files[filesize].add(file)
+    possible_matches = [files for files in size2files.values() if len(files) > 1]
+    del size2files
+    result = []
+    j.start_job(len(possible_matches), '0 matches found')
+    for group in possible_matches:
+        for first, second in itertools.combinations(group, 2):
+            if first.is_ref and second.is_ref:
+                continue # Don't spend time comparing two ref pics together.
+            if first.md5partial == second.md5partial:
+                if partial or first.md5 == second.md5:
+                    result.append(Match(first, second, 100))
+        j.add_progress(desc='%d matches found' % len(result))
+    return result
 
 class Group(object):
     #---Override

core/export.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/09/16
-# $Id$
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# Copyright 2009 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 

core/fs.py

@@ -0,0 +1,181 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2009-10-22
+# 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
+
+# This is a fork from hsfs. The reason for this fork is that hsfs has been designed for musicGuru
+# and was re-used for dupeGuru. The problem is that hsfs is way over-engineered for dupeGuru,
+# resulting needless complexity and memory usage. It's been a while since I wanted to do that fork,
+# and I'm doing it now.
+
+from __future__ import unicode_literals
+
+import hashlib
+import logging
+
+from hsutil import io
+from hsutil.misc import nonone, flatten
+from hsutil.str import get_file_ext
+
+class FSError(Exception):
+    cls_message = "An error has occured on '{name}' in '{parent}'"
+    def __init__(self, fsobject, parent=None):
+        message = self.cls_message
+        if isinstance(fsobject, basestring):
+            name = fsobject
+        elif isinstance(fsobject, File):
+            name = fsobject.name
+        else:
+            name = ''
+        parentname = unicode(parent) if parent is not None else ''
+        Exception.__init__(self, message.format(name=name, parent=parentname))
+    
+
+class AlreadyExistsError(FSError):
+    "The directory or file name we're trying to add already exists"
+    cls_message = "'{name}' already exists in '{parent}'"
+
+class InvalidPath(FSError):
+    "The path of self is invalid, and cannot be worked with."
+    cls_message = "'{name}' is invalid."
+
+class InvalidDestinationError(FSError):
+    """A copy/move operation has been called, but the destination is invalid."""
+    cls_message = "'{name}' is an invalid destination for this operation."
+
+class OperationError(FSError):
+    """A copy/move/delete operation has been called, but the checkup after the 
+    operation shows that it didn't work."""
+    cls_message = "Operation on '{name}' failed."
+
+class File(object):
+    INITIAL_INFO = {
+        'size': 0,
+        'ctime': 0,
+        'mtime': 0,
+        'md5': '',
+        'md5partial': '',
+    }
+    
+    def __init__(self, path):
+        self.path = path
+        #This offset is where we should start reading the file to get a partial md5
+        #For audio file, it should be where audio data starts
+        self._md5partial_offset = 0x4000 #16Kb
+        self._md5partial_size   = 0x4000 #16Kb
+    
+    def __getattr__(self, attrname):
+        # Only called when attr is not there
+        if attrname in self.INITIAL_INFO:
+            try:
+                self._read_info(attrname)
+            except Exception as e:
+                logging.warning("An error '%s' was raised while decoding '%s'", e, repr(self.path))
+            try:
+                return self.__dict__[attrname]
+            except KeyError:
+                return self.INITIAL_INFO[attrname]
+        raise AttributeError()
+    
+    def _read_info(self, field):
+        if field in ('size', 'ctime', 'mtime'):
+            stats = io.stat(self.path)
+            self.size = nonone(stats.st_size, 0)
+            self.ctime = nonone(stats.st_ctime, 0)
+            self.mtime = nonone(stats.st_mtime, 0)
+        elif field == 'md5partial':
+            try:
+                fp = io.open(self.path, 'rb')
+                offset = self._md5partial_offset
+                size = self._md5partial_size
+                fp.seek(offset)
+                partialdata = fp.read(size)
+                md5 = hashlib.md5(partialdata)
+                self.md5partial = md5.digest()
+                fp.close()
+            except Exception:
+                pass
+        elif field == 'md5':
+            try:
+                fp = io.open(self.path, 'rb')
+                md5 = hashlib.md5()
+                CHUNK_SIZE = 8192
+                filedata = fp.read(CHUNK_SIZE)
+                while filedata:
+                    md5.update(filedata)
+                    filedata = fp.read(CHUNK_SIZE)
+                self.md5 = md5.digest()
+                fp.close()
+            except Exception:
+                pass
+    
+    def _read_all_info(self, attrnames=None):
+        """Cache all possible info.
+        
+        If `attrnames` is not None, caches only attrnames.
+        """
+        if attrnames is None:
+            attrnames = self.INITIAL_INFO.keys()
+        for attrname in attrnames:
+            if attrname not in self.__dict__:
+                self._read_info(attrname)
+    
+    #--- Public
+    @classmethod
+    def can_handle(cls, path):
+        return not io.islink(path) and io.isfile(path)
+    
+    def rename(self, newname):
+        if newname == self.name:
+            return
+        destpath = self.path[:-1] + newname
+        if io.exists(destpath):
+            raise AlreadyExistsError(newname, self.path[:-1])
+        try:
+            io.rename(self.path, destpath)
+        except EnvironmentError:
+            raise OperationError(self)
+        if not io.exists(destpath):
+            raise OperationError(self)
+        self.path = destpath
+    
+    #--- Properties
+    @property
+    def extension(self):
+        return get_file_ext(self.name)
+    
+    @property
+    def name(self):
+        return self.path[-1]
+    
+
+def get_file(path, fileclasses=[File]):
+    for fileclass in fileclasses:
+        if fileclass.can_handle(path):
+            return fileclass(path)
+
+def get_files(path, fileclasses=[File]):
+    assert all(issubclass(fileclass, File) for fileclass in fileclasses)
+    try:
+        paths = [path + name for name in io.listdir(path)]
+        result = []
+        for path in paths:
+            file = get_file(path, fileclasses=fileclasses)
+            if file is not None:
+                result.append(file)
+        return result
+    except EnvironmentError:
+        raise InvalidPath(path)
+
+def get_all_files(path, fileclasses=[File]):
+    files = get_files(path, fileclasses=fileclasses)
+    filepaths = set(f.path for f in files)
+    subpaths = [path + name for name in io.listdir(path)]
+    # it's possible that a folder (bundle) gets into the file list. in that case, we don't want to recurse into it
+    subfolders = [p for p in subpaths if not io.islink(p) and io.isdir(p) and p not in filepaths]
+    subfiles = flatten(get_all_files(subpath, fileclasses=fileclasses) for subpath in subfolders)
+    return subfiles + files

core/ignore.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/05/02
-# $Id$
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# Copyright 2009 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 

core/results.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/02/23
-# $Id$
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# Copyright 2009 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 

core/scanner.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/03/03
-# $Id$
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# Copyright 2009 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 
@@ -10,7 +9,7 @@
 import logging
 
 
-from hsutil import job
+from hsutil import job, io
 from hsutil.misc import dedupe
 from hsutil.str import get_file_ext, rem_file_ext
 
@@ -32,40 +31,32 @@ class Scanner(object):
         self.ignore_list = IgnoreList()
         self.discarded_file_count = 0
     
-    @staticmethod
-    def _filter_matches_by_content(matches, partial, j):
-        matched_files = dedupe([m.first for m in matches] + [m.second for m in matches])
-        md5attrname = 'md5partial' if partial else 'md5'
-        md5 = lambda f: getattr(f, md5attrname)
-        for matched_file in j.iter_with_progress(matched_files, 'Analyzed %d/%d matching files'):
-            md5(matched_file)
-        j.set_progress(100, 'Removing false matches')
-        return [m for m in matches if md5(m.first) == md5(m.second)]
-    
     def _getmatches(self, files, j):
-        j = j.start_subjob(2)
-        mf = engine.MatchFactory()
-        if self.scan_type != SCAN_TYPE_CONTENT:
-            mf.match_similar_words = self.match_similar_words
-            mf.weight_words = self.word_weighting
-            mf.min_match_percentage = self.min_match_percentage
-        if self.scan_type == SCAN_TYPE_FIELDS_NO_ORDER:
-            self.scan_type = SCAN_TYPE_FIELDS
-            mf.no_field_order = True
-        func = {
-            SCAN_TYPE_FILENAME: lambda f: engine.getwords(rem_file_ext(f.name)),
-            SCAN_TYPE_FIELDS: lambda f: engine.getfields(rem_file_ext(f.name)),
-            SCAN_TYPE_TAG: lambda f: [engine.getwords(unicode(getattr(f, attrname))) for attrname in SCANNABLE_TAGS if attrname in self.scanned_tags],
-            SCAN_TYPE_CONTENT: lambda f: [str(f.size)],
-            SCAN_TYPE_CONTENT_AUDIO: lambda f: [str(f.audiosize)]
-        }[self.scan_type]
-        for f in j.iter_with_progress(files, 'Read metadata of %d/%d files'):
-            if self.size_threshold:
-                f.size # pre-read, makes a smoother progress if read here (especially for bundles)
-            f.words = func(f)
         if self.size_threshold:
+            j = j.start_subjob([2, 8])
+            for f in j.iter_with_progress(files, 'Read size of %d/%d files'):
+                f.size # pre-read, makes a smoother progress if read here (especially for bundles)
             files = [f for f in files if f.size >= self.size_threshold]
-        return mf.getmatches(files, j)
+        if self.scan_type in (SCAN_TYPE_CONTENT, SCAN_TYPE_CONTENT_AUDIO):
+            sizeattr = 'size' if self.scan_type == SCAN_TYPE_CONTENT else 'audiosize'
+            return engine.getmatches_by_contents(files, sizeattr, partial=self.scan_type==SCAN_TYPE_CONTENT_AUDIO, j=j)
+        else:
+            j = j.start_subjob([2, 8])
+            kw = {}
+            kw['match_similar_words'] = self.match_similar_words
+            kw['weight_words'] = self.word_weighting
+            kw['min_match_percentage'] = self.min_match_percentage
+            if self.scan_type == SCAN_TYPE_FIELDS_NO_ORDER:
+                self.scan_type = SCAN_TYPE_FIELDS
+                kw['no_field_order'] = True
+            func = {
+                SCAN_TYPE_FILENAME: lambda f: engine.getwords(rem_file_ext(f.name)),
+                SCAN_TYPE_FIELDS: lambda f: engine.getfields(rem_file_ext(f.name)),
+                SCAN_TYPE_TAG: lambda f: [engine.getwords(unicode(getattr(f, attrname))) for attrname in SCANNABLE_TAGS if attrname in self.scanned_tags],
+            }[self.scan_type]
+            for f in j.iter_with_progress(files, 'Read metadata of %d/%d files'):
+                f.words = func(f)
+            return engine.getmatches(files, j=j, **kw)
     
     @staticmethod
     def _key_func(dupe):
@@ -86,27 +77,17 @@ class Scanner(object):
         for f in [f for f in files if not hasattr(f, 'is_ref')]:
             f.is_ref = False
         logging.info('Getting matches')
-        if self.match_factory is None:
+        matches = self._getmatches(files, j)
-            matches = self._getmatches(files, j)
-        else:
-            matches = self.match_factory.getmatches(files, j)
         logging.info('Found %d matches' % len(matches))
+        j.set_progress(100, 'Removing false matches')
         if not self.mix_file_kind:
-            j.set_progress(100, 'Removing false matches')
             matches = [m for m in matches if get_file_ext(m.first.name) == get_file_ext(m.second.name)]
+        matches = [m for m in matches if io.exists(m.first.path) and io.exists(m.second.path)]
         if self.ignore_list:
             j = j.start_subjob(2)
             iter_matches = j.iter_with_progress(matches, 'Processed %d/%d matches against the ignore list')
             matches = [m for m in iter_matches 
                 if not self.ignore_list.AreIgnored(unicode(m.first.path), unicode(m.second.path))]
-        if self.scan_type in (SCAN_TYPE_CONTENT, SCAN_TYPE_CONTENT_AUDIO):
-            j = j.start_subjob(3 if self.scan_type == SCAN_TYPE_CONTENT else 2)
-            matches = self._filter_matches_by_content(matches, partial=True, j=j)
-            if self.scan_type == SCAN_TYPE_CONTENT:
-                matches = self._filter_matches_by_content(matches, partial=False, j=j)
-            # We compared md5. No words were involved.
-            for m in matches:
-                m.first.words = m.second.words = ['--']
         logging.info('Grouping matches')
         groups = engine.get_groups(matches, j)
         matched_files = dedupe([m.first for m in matches] + [m.second for m in matches])
@@ -118,7 +99,6 @@ class Scanner(object):
             g.prioritize(self._key_func, self._tie_breaker)
         return groups
     
-    match_factory        = None
     match_similar_words  = False
     min_match_percentage = 80
     mix_file_kind        = True
@@ -126,9 +106,3 @@ class Scanner(object):
     scanned_tags         = set(['artist', 'title'])
     size_threshold       = 0
     word_weighting       = False
-
-class ScannerME(Scanner): # Scanner for Music Edition
-    @staticmethod
-    def _key_func(dupe):
-        return (not dupe.is_ref, -dupe.bitrate, -dupe.size)
-    

core/tests/app_cocoa_test.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/11/11
-# $Id$
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# Copyright 2009 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 
@@ -18,10 +17,10 @@ from hsutil.path import Path
 from hsutil.testcase import TestCase
 from hsutil.decorators import log_calls
 from hsutil import io
-import hsfs.phys
 
+from . import data
 from .results_test import GetTestGroups
-from .. import engine, data
+from .. import engine, fs
 try:
     from ..app_cocoa import DupeGuru as DupeGuruBase
 except ImportError:
@@ -35,7 +34,6 @@ class DupeGuru(DupeGuruBase):
     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]
@@ -310,15 +308,15 @@ class TCDupeGuru(TestCase):
 
 class TCDupeGuru_renameSelected(TestCase):
     def setUp(self):
-        p = Path(tempfile.mkdtemp())
+        p = self.tmppath()
-        fp = open(str(p + 'foo bar 1'),mode='w')
+        fp = open(unicode(p + 'foo bar 1'),mode='w')
         fp.close()
-        fp = open(str(p + 'foo bar 2'),mode='w')
+        fp = open(unicode(p + 'foo bar 2'),mode='w')
         fp.close()
-        fp = open(str(p + 'foo bar 3'),mode='w')
+        fp = open(unicode(p + 'foo bar 3'),mode='w')
         fp.close()
-        refdir = hsfs.phys.Directory(None,str(p))
+        files = fs.get_files(p)
-        matches = engine.MatchFactory().getmatches(refdir.files)
+        matches = engine.getmatches(files)
         groups = engine.get_groups(matches)
         g = groups[0]
         g.prioritize(lambda x:x.name)
@@ -327,45 +325,41 @@ class TCDupeGuru_renameSelected(TestCase):
         self.app = app
         self.groups = groups
         self.p = p
-        self.refdir = refdir
+        self.files = files
-    
-    def tearDown(self):
-        shutil.rmtree(str(self.p))
     
     def test_simple(self):
         app = self.app
-        refdir = self.refdir
         g = self.groups[0]
         app.SelectPowerMarkerNodePaths(r2np([0]))
-        self.assert_(app.RenameSelected('renamed'))
+        assert app.RenameSelected('renamed')
-        self.assert_('renamed' in refdir)
+        names = io.listdir(self.p)
-        self.assert_('foo bar 2' not in refdir)
+        assert 'renamed' in names
-        self.assert_(g.dupes[0] is refdir['renamed'])
+        assert 'foo bar 2' not in names
-        self.assert_(g.dupes[0] in refdir)
+        eq_(g.dupes[0].name, 'renamed')
     
     def test_none_selected(self):
         app = self.app
-        refdir = self.refdir
         g = self.groups[0]
         app.SelectPowerMarkerNodePaths([])
         self.mock(logging, 'warning', log_calls(lambda msg: None))
-        self.assert_(not app.RenameSelected('renamed'))
+        assert not app.RenameSelected('renamed')
         msg = logging.warning.calls[0]['msg']
-        self.assertEqual('dupeGuru Warning: list index out of range', msg)
+        eq_('dupeGuru Warning: list index out of range', msg)
-        self.assert_('renamed' not in refdir)
+        names = io.listdir(self.p)
-        self.assert_('foo bar 2' in refdir)
+        assert 'renamed' not in names
-        self.assert_(g.dupes[0] is refdir['foo bar 2'])
+        assert 'foo bar 2' in names
+        eq_(g.dupes[0].name, 'foo bar 2')
     
     def test_name_already_exists(self):
         app = self.app
-        refdir = self.refdir
         g = self.groups[0]
         app.SelectPowerMarkerNodePaths(r2np([0]))
         self.mock(logging, 'warning', log_calls(lambda msg: None))
-        self.assert_(not app.RenameSelected('foo bar 1'))
+        assert not app.RenameSelected('foo bar 1')
         msg = logging.warning.calls[0]['msg']
-        self.assert_(msg.startswith('dupeGuru Warning: \'foo bar 2\' already exists in'))
+        assert msg.startswith('dupeGuru Warning: \'foo bar 1\' already exists in')
-        self.assert_('foo bar 1' in refdir)
+        names = io.listdir(self.p)
-        self.assert_('foo bar 2' in refdir)
+        assert 'foo bar 1' in names
-        self.assert_(g.dupes[0] is refdir['foo bar 2'])
+        assert 'foo bar 2' in names
+        eq_(g.dupes[0].name, 'foo bar 2')
     

core/tests/app_test.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2007-06-23
-# $Id$
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# Copyright 2009 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 
@@ -13,12 +12,11 @@ from hsutil.testcase import TestCase
 from hsutil import io
 from hsutil.path import Path
 from hsutil.decorators import log_calls
-import hsfs as fs
-import hsfs.phys
 import hsutil.files
 from hsutil.job import nulljob
 
-from .. import data, app
+from . import data
+from .. import app, fs
 from ..app import DupeGuru as DupeGuruBase
 
 class DupeGuru(DupeGuruBase):
@@ -59,27 +57,27 @@ class TCDupeGuru(TestCase):
         # The goal here is just to have a test for a previous blowup I had. I know my test coverage
         # for this unit is pathetic. What's done is done. My approach now is to add tests for
         # every change I want to make. The blowup was caused by a missing import.
-        dupe_parent = fs.Directory(None, 'foo')
+        p = self.tmppath()
-        dupe = fs.File(dupe_parent, 'bar')
+        io.open(p + 'foo', 'w').close()
-        dupe.copy = log_calls(lambda dest, newname: None)
         self.mock(hsutil.files, 'copy', log_calls(lambda source_path, dest_path: None))
         self.mock(os, 'makedirs', lambda path: None) # We don't want the test to create that fake directory
-        self.mock(fs.phys, 'Directory', fs.Directory) # We don't want an error because makedirs didn't work
         app = DupeGuru()
-        app.copy_or_move(dupe, True, 'some_destination', 0)
+        app.directories.add_path(p)
+        [f] = app.directories.get_files()
+        app.copy_or_move(f, True, 'some_destination', 0)
         self.assertEqual(1, len(hsutil.files.copy.calls))
         call = hsutil.files.copy.calls[0]
         self.assertEqual('some_destination', call['dest_path'])
-        self.assertEqual(dupe.path, call['source_path'])
+        self.assertEqual(f.path, call['source_path'])
     
     def test_copy_or_move_clean_empty_dirs(self):
         tmppath = Path(self.tmpdir())
         sourcepath = tmppath + 'source'
         io.mkdir(sourcepath)
         io.open(sourcepath + 'myfile', 'w')
-        tmpdir = hsfs.phys.Directory(None, unicode(tmppath))
-        myfile = tmpdir['source']['myfile']
         app = DupeGuru()
+        app.directories.add_path(tmppath)
+        [myfile] = app.directories.get_files()
         self.mock(app, 'clean_empty_dirs', log_calls(lambda path: None))
         app.copy_or_move(myfile, False, tmppath + 'dest', 0)
         calls = app.clean_empty_dirs.calls
@@ -87,9 +85,14 @@ class TCDupeGuru(TestCase):
         self.assertEqual(sourcepath, calls[0]['path'])
     
     def test_Scan_with_objects_evaluating_to_false(self):
+        class FakeFile(fs.File):
+            def __nonzero__(self):
+                return False
+            
+        
         # At some point, any() was used in a wrong way that made Scan() wrongly return 1
         app = DupeGuru()
-        f1, f2 = [fs.File(None, 'foo') for i in range(2)]
+        f1, f2 = [FakeFile('foo') for i in range(2)]
         f1.is_ref, f2.is_ref = (False, False)
         assert not (bool(f1) and bool(f2))
         app.directories.get_files = lambda: [f1, f2]

core/tests/data.py

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2009-10-23
+# 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
+
+# data module for tests
+
+from hsutil.str import format_size
+from ..data import format_path, cmp_value
+
+COLUMNS = [
+    {'attr':'name','display':'Filename'},
+    {'attr':'path','display':'Directory'},
+    {'attr':'size','display':'Size (KB)'},
+    {'attr':'extension','display':'Kind'},
+]
+
+METADATA_TO_READ = ['size']
+
+def GetDisplayInfo(dupe, group, delta):
+    size = dupe.size
+    m = group.get_match_of(dupe)
+    if m and delta:
+        r = group.ref
+        size -= r.size
+    return [
+        dupe.name,
+        format_path(dupe.path),
+        format_size(size, 0, 1, False),
+        dupe.extension,
+    ]
+
+def GetDupeSortKey(dupe, get_group, key, delta):
+    r = cmp_value(getattr(dupe, COLUMNS[key]['attr']))
+    if delta and (key == 2):
+        r -= cmp_value(getattr(get_group().ref, COLUMNS[key]['attr']))
+    return r
+
+def GetGroupSortKey(group, key):
+    return cmp_value(getattr(group.ref, COLUMNS[key]['attr']))

core/tests/directories_test.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/02/27
-# $Id$
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# Copyright 2009 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 
@@ -10,20 +9,43 @@
 import os.path as op
 import os
 import time
-import shutil
 
 from nose.tools import eq_
 
-from hsutil import job, io
+from hsutil import io
 from hsutil.path import Path
 from hsutil.testcase import TestCase
-import hsfs.phys
-from hsfs.tests import phys_test
 
 from ..directories import *
 
 testpath = Path(TestCase.datadirpath())
 
+def create_fake_fs(rootpath):
+    rootpath = rootpath + 'fs'
+    io.mkdir(rootpath)
+    io.mkdir(rootpath + 'dir1')
+    io.mkdir(rootpath + 'dir2')
+    io.mkdir(rootpath + 'dir3')
+    fp = io.open(rootpath + 'file1.test', 'w')
+    fp.write('1')
+    fp.close()
+    fp = io.open(rootpath + 'file2.test', 'w')
+    fp.write('12')
+    fp.close()
+    fp = io.open(rootpath + 'file3.test', 'w')
+    fp.write('123')
+    fp.close()
+    fp = io.open(rootpath + ('dir1', 'file1.test'), 'w')
+    fp.write('1')
+    fp.close()
+    fp = io.open(rootpath + ('dir2', 'file2.test'), 'w')
+    fp.write('12')
+    fp.close()
+    fp = io.open(rootpath + ('dir3', 'file3.test'), 'w')
+    fp.write('123')
+    fp.close()
+    return rootpath
+
 class TCDirectories(TestCase):
     def test_empty(self):
         d = Directories()
@@ -33,13 +55,11 @@ class TCDirectories(TestCase):
     def test_add_path(self):
         d = Directories()
         p = testpath + 'utils'
-        added = d.add_path(p)
+        d.add_path(p)
         self.assertEqual(1,len(d))
         self.assert_(p in d)
         self.assert_((p + 'foobar') in d)
         self.assert_(p[:-1] not in d)
-        self.assertEqual(p,added.path)
-        self.assert_(d[0] is added)
         p = self.tmppath()
         d.add_path(p)
         self.assertEqual(2,len(d))
@@ -53,13 +73,13 @@ class TCDirectories(TestCase):
         self.assertRaises(AlreadyThereError, d.add_path, p + 'foobar')
         self.assertEqual(1, len(d))
     
-    def test_AddPath_containing_paths_already_there(self):
+    def test_add_path_containing_paths_already_there(self):
         d = Directories()
         d.add_path(testpath + 'utils')
         self.assertEqual(1, len(d))
-        added = d.add_path(testpath)
+        d.add_path(testpath)
-        self.assertEqual(1, len(d))
+        eq_(len(d), 1)
-        self.assert_(added is d[0])
+        eq_(d[0], testpath)
     
     def test_AddPath_non_latin(self):
     	p = Path(self.tmpdir())
@@ -114,7 +134,7 @@ class TCDirectories(TestCase):
     
     def test_set_state_keep_state_dict_size_to_minimum(self):
         d = Directories()
-        p = Path(phys_test.create_fake_fs(self.tmpdir()))
+        p = create_fake_fs(self.tmppath())
         d.add_path(p)
         d.set_state(p,STATE_REFERENCE)
         d.set_state(p + 'dir1',STATE_REFERENCE)
@@ -129,17 +149,17 @@ class TCDirectories(TestCase):
     
     def test_get_files(self):
         d = Directories()
-        p = Path(phys_test.create_fake_fs(self.tmpdir()))
+        p = create_fake_fs(self.tmppath())
         d.add_path(p)
         d.set_state(p + 'dir1',STATE_REFERENCE)
         d.set_state(p + 'dir2',STATE_EXCLUDED)
-        files = d.get_files()
+        files = list(d.get_files())
-        self.assertEqual(5, len(list(files)))
+        self.assertEqual(5, len(files))
         for f in files:
-            if f.parent.path == p + 'dir1':
+            if f.path[:-1] == p + 'dir1':
-                self.assert_(f.is_ref)
+                assert f.is_ref
             else:
-                self.assert_(not f.is_ref)
+                assert not f.is_ref
     
     def test_get_files_with_inherited_exclusion(self):
         d = Directories()
@@ -177,52 +197,28 @@ class TCDirectories(TestCase):
         except LookupError:
             self.fail()
     
-    def test_default_dirclass(self):
-        self.assert_(Directories().dirclass is hsfs.phys.Directory)
-    
-    def test_dirclass(self):
-        class MySpecialDirclass(hsfs.phys.Directory): pass
-        d = Directories()
-        d.dirclass = MySpecialDirclass
-        d.add_path(testpath)
-        self.assert_(isinstance(d[0], MySpecialDirclass))
-    
     def test_load_from_file_with_invalid_path(self):
         #This test simulates a load from file resulting in a
         #InvalidPath raise. Other directories must be loaded.
         d1 = Directories()
         d1.add_path(testpath + 'utils')
         #Will raise InvalidPath upon loading
-        d1.add_path(self.tmppath()).name = 'does_not_exist'
+        p = self.tmppath()
+        d1.add_path(p)
+        io.rmdir(p)
         tmpxml = op.join(self.tmpdir(), 'directories_testunit.xml')
         d1.save_to_file(tmpxml)
         d2 = Directories()
         d2.load_from_file(tmpxml)
         self.assertEqual(1, len(d2))
     
-    def test_load_from_file_with_same_paths(self):
-        #This test simulates a load from file resulting in a
-        #AlreadyExists raise. Other directories must be loaded.
-        d1 = Directories()
-        p1 = self.tmppath()
-        p2 = self.tmppath()
-        d1.add_path(p1)
-        d1.add_path(p2)
-        #Will raise AlreadyExists upon loading
-        d1.add_path(self.tmppath()).name = unicode(p1)
-        tmpxml = op.join(self.tmpdir(), 'directories_testunit.xml')
-        d1.save_to_file(tmpxml)
-        d2 = Directories()
-        d2.load_from_file(tmpxml)
-        self.assertEqual(2, len(d2))
-    
     def test_unicode_save(self):
         d = Directories()
         p1 = self.tmppath() + u'hello\xe9'
         io.mkdir(p1)
         io.mkdir(p1 + u'foo\xe9')
         d.add_path(p1)
-        d.set_state(d[0][0].path, STATE_EXCLUDED)
+        d.set_state(p1 + u'foo\xe9', STATE_EXCLUDED)
         tmpxml = op.join(self.tmpdir(), 'directories_testunit.xml')
         try:
             d.save_to_file(tmpxml)
@@ -231,7 +227,7 @@ class TCDirectories(TestCase):
     
     def test_get_files_refreshes_its_directories(self):
         d = Directories()
-        p = Path(phys_test.create_fake_fs(self.tmpdir()))
+        p = create_fake_fs(self.tmppath())
         d.add_path(p)
         files = d.get_files()
         self.assertEqual(6, len(list(files)))
@@ -258,16 +254,6 @@ class TCDirectories(TestCase):
         d.set_state(hidden_dir_path, STATE_NORMAL)
         self.assertEqual(d.get_state(hidden_dir_path), STATE_NORMAL)
     
-    def test_special_dirclasses(self):
-        # if a path is in special_dirclasses, use this class instead
-        class MySpecialDirclass(hsfs.phys.Directory): pass
-        d = Directories()
-        p1 = self.tmppath()
-        p2 = self.tmppath()
-        d.special_dirclasses[p1] = MySpecialDirclass
-        self.assert_(isinstance(d.add_path(p2), hsfs.phys.Directory))
-        self.assert_(isinstance(d.add_path(p1), MySpecialDirclass))
-    
     def test_default_path_state_override(self):
         # It's possible for a subclass to override the default state of a path
         class MyDirectories(Directories):

core/tests/engine_test.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/01/29
-# $Id$
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# Copyright 2009 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 
@@ -15,16 +14,21 @@ from hsutil import job
 from hsutil.decorators import log_calls
 from hsutil.testcase import TestCase
 
-from .. import engine
+from .. import engine, fs
 from ..engine import *
 
 class NamedObject(object):
-    def __init__(self, name="foobar", with_words=False):
+    def __init__(self, name="foobar", with_words=False, size=1):
         self.name = name
+        self.size = size
+        self.md5partial = name
+        self.md5 = name
         if with_words:
             self.words = getwords(name)
     
 
+no = NamedObject
+
 def get_match_triangle():
     o1 = NamedObject(with_words=True)
     o2 = NamedObject(with_words=True)
@@ -340,21 +344,13 @@ class TCget_match(TestCase):
         self.assertEqual(int((6.0 / 13.0) * 100),get_match(NamedObject("foo bar",True),NamedObject("bar bleh",True),(WEIGHT_WORDS,)).percentage)
     
 
-class TCMatchFactory(TestCase):
+class GetMatches(TestCase):
     def test_empty(self):
-        self.assertEqual([],MatchFactory().getmatches([]))
+        eq_(getmatches([]), [])
-    
-    def test_defaults(self):
-        mf = MatchFactory()
-        self.assertEqual(50,mf.common_word_threshold)
-        self.assertEqual(False,mf.weight_words)
-        self.assertEqual(False,mf.match_similar_words)
-        self.assertEqual(False,mf.no_field_order)
-        self.assertEqual(0,mf.min_match_percentage)
     
     def test_simple(self):
         l = [NamedObject("foo bar"),NamedObject("bar bleh"),NamedObject("a b c foo")]
-        r = MatchFactory().getmatches(l)
+        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]
@@ -367,7 +363,7 @@ class TCMatchFactory(TestCase):
     
     def test_null_and_unrelated_objects(self):
         l = [NamedObject("foo bar"),NamedObject("bar bleh"),NamedObject(""),NamedObject("unrelated object")]
-        r = MatchFactory().getmatches(l)
+        r = getmatches(l)
         self.assertEqual(1,len(r))
         m = r[0]
         self.assertEqual(50,m.percentage)
@@ -376,34 +372,33 @@ class TCMatchFactory(TestCase):
     
     def test_twice_the_same_word(self):
         l = [NamedObject("foo foo bar"),NamedObject("bar bleh")]
-        r = MatchFactory().getmatches(l)
+        r = getmatches(l)
         self.assertEqual(1,len(r))
     
     def test_twice_the_same_word_when_preworded(self):
         l = [NamedObject("foo foo bar",True),NamedObject("bar bleh",True)]
-        r = MatchFactory().getmatches(l)
+        r = getmatches(l)
         self.assertEqual(1,len(r))
     
     def test_two_words_match(self):
         l = [NamedObject("foo bar"),NamedObject("foo bar bleh")]
-        r = MatchFactory().getmatches(l)
+        r = getmatches(l)
         self.assertEqual(1,len(r))
     
     def test_match_files_with_only_common_words(self):
         #If a word occurs more than 50 times, it is excluded from the matching process
         #The problem with the common_word_threshold is that the files containing only common
         #words will never be matched together. We *should* match them.
-        mf = MatchFactory()
+        # This test assumes that the common word threashold const is 50
-        mf.common_word_threshold = 50
         l = [NamedObject("foo") for i in range(50)]
-        r = mf.getmatches(l)
+        r = getmatches(l)
         self.assertEqual(1225,len(r))
     
     def test_use_words_already_there_if_there(self):
         o1 = NamedObject('foo')
         o2 = NamedObject('bar')
         o2.words = ['foo']
-        self.assertEqual(1,len(MatchFactory().getmatches([o1,o2])))
+        eq_(1, len(getmatches([o1,o2])))
     
     def test_job(self):
         def do_progress(p,d=''):
@@ -413,75 +408,62 @@ class TCMatchFactory(TestCase):
         j = job.Job(1,do_progress)
         self.log = []
         s = "foo bar"
-        MatchFactory().getmatches([NamedObject(s),NamedObject(s),NamedObject(s)],j)
+        getmatches([NamedObject(s), NamedObject(s), NamedObject(s)], j=j)
         self.assert_(len(self.log) > 2)
         self.assertEqual(0,self.log[0])
         self.assertEqual(100,self.log[-1])
     
     def test_weight_words(self):
-        mf = MatchFactory()
-        mf.weight_words = True
         l = [NamedObject("foo bar"),NamedObject("bar bleh")]
-        m = mf.getmatches(l)[0]
+        m = getmatches(l, weight_words=True)[0]
         self.assertEqual(int((6.0 / 13.0) * 100),m.percentage)
     
     def test_similar_word(self):
-        mf = MatchFactory()
-        mf.match_similar_words = True
         l = [NamedObject("foobar"),NamedObject("foobars")]
-        self.assertEqual(1,len(mf.getmatches(l)))
+        eq_(len(getmatches(l, match_similar_words=True)), 1)
-        self.assertEqual(100,mf.getmatches(l)[0].percentage)
+        eq_(getmatches(l, match_similar_words=True)[0].percentage, 100)
         l = [NamedObject("foobar"),NamedObject("foo")]
-        self.assertEqual(0,len(mf.getmatches(l))) #too far
+        eq_(len(getmatches(l, match_similar_words=True)), 0) #too far
         l = [NamedObject("bizkit"),NamedObject("bizket")]
-        self.assertEqual(1,len(mf.getmatches(l)))
+        eq_(len(getmatches(l, match_similar_words=True)), 1)
         l = [NamedObject("foobar"),NamedObject("foosbar")]
-        self.assertEqual(1,len(mf.getmatches(l)))
+        eq_(len(getmatches(l, match_similar_words=True)), 1)
     
     def test_single_object_with_similar_words(self):
-        mf = MatchFactory()
-        mf.match_similar_words = True
         l = [NamedObject("foo foos")]
-        self.assertEqual(0,len(mf.getmatches(l)))
+        eq_(len(getmatches(l, match_similar_words=True)), 0)
     
     def test_double_words_get_counted_only_once(self):
-        mf = MatchFactory()
         l = [NamedObject("foo bar foo bleh"),NamedObject("foo bar bleh bar")]
-        m = mf.getmatches(l)[0]
+        m = getmatches(l)[0]
         self.assertEqual(75,m.percentage)
     
     def test_with_fields(self):
-        mf = MatchFactory()
         o1 = NamedObject("foo bar - foo bleh")
         o2 = NamedObject("foo bar - bleh bar")
         o1.words = getfields(o1.name)
         o2.words = getfields(o2.name)
-        m = mf.getmatches([o1, o2])[0]
+        m = getmatches([o1, o2])[0]
         self.assertEqual(50, m.percentage)
     
     def test_with_fields_no_order(self):
-        mf = MatchFactory()
-        mf.no_field_order = True
         o1 = NamedObject("foo bar - foo bleh")
         o2 = NamedObject("bleh bang - foo bar")
         o1.words = getfields(o1.name)
         o2.words = getfields(o2.name)
-        m = mf.getmatches([o1, o2])[0]
+        m = getmatches([o1, o2], no_field_order=True)[0]
-        self.assertEqual(50 ,m.percentage)
+        eq_(m.percentage, 50)
     
     def test_only_match_similar_when_the_option_is_set(self):
-        mf = MatchFactory()
-        mf.match_similar_words = False
         l = [NamedObject("foobar"),NamedObject("foobars")]
-        self.assertEqual(0,len(mf.getmatches(l)))
+        eq_(len(getmatches(l, match_similar_words=False)), 0)
     
     def test_dont_recurse_do_match(self):
         # with nosetests, the stack is increased. The number has to be high enough not to be failing falsely
         sys.setrecursionlimit(100)
-        mf = MatchFactory()
         files = [NamedObject('foo bar') for i in range(101)]
         try:
-            mf.getmatches(files)
+            getmatches(files)
         except RuntimeError:
             self.fail()
         finally:
@@ -489,18 +471,9 @@ class TCMatchFactory(TestCase):
     
     def test_min_match_percentage(self):
         l = [NamedObject("foo bar"),NamedObject("bar bleh"),NamedObject("a b c foo")]
-        mf = MatchFactory()
+        r = getmatches(l, min_match_percentage=50)
-        mf.min_match_percentage = 50
-        r = mf.getmatches(l)
         self.assertEqual(1,len(r)) #Only "foo bar" / "bar bleh" should match
     
-    def test_limit(self):
-        l = [NamedObject(),NamedObject(),NamedObject()]
-        mf = MatchFactory()
-        mf.limit = 2
-        r = mf.getmatches(l)
-        self.assertEqual(2,len(r))
-    
     def test_MemoryError(self):
         @log_calls
         def mocked_match(first, second, flags):
@@ -510,14 +483,19 @@ class TCMatchFactory(TestCase):
         
         objects = [NamedObject() for i in range(10)] # results in 45 matches
         self.mock(engine, 'get_match', mocked_match)
-        mf = MatchFactory()
         try:
-            r = mf.getmatches(objects)
+            r = getmatches(objects)
         except MemoryError:
             self.fail('MemorryError must be handled')
         self.assertEqual(42, len(r))
     
 
+class GetMatchesByContents(TestCase):
+    def test_dont_compare_empty_files(self):
+        o1, o2 = no(size=0), no(size=0)
+        assert not getmatches_by_contents([o1, o2])
+    
+
 class TCGroup(TestCase):
     def test_empy(self):
         g = Group()
@@ -738,7 +716,7 @@ class TCget_groups(TestCase):
     
     def test_simple(self):
         l = [NamedObject("foo bar"),NamedObject("bar bleh")]
-        matches = MatchFactory().getmatches(l)
+        matches = getmatches(l)
         m = matches[0]
         r = get_groups(matches)
         self.assertEqual(1,len(r))
@@ -749,7 +727,7 @@ class TCget_groups(TestCase):
     def test_group_with_multiple_matches(self):
         #This results in 3 matches
         l = [NamedObject("foo"),NamedObject("foo"),NamedObject("foo")]
-        matches = MatchFactory().getmatches(l)
+        matches = getmatches(l)
         r = get_groups(matches)
         self.assertEqual(1,len(r))
         g = r[0]
@@ -759,7 +737,7 @@ class TCget_groups(TestCase):
         l = [NamedObject("a b"),NamedObject("a b"),NamedObject("b c"),NamedObject("c d"),NamedObject("c d")]
         #There will be 2 groups here: group "a b" and group "c d"
         #"b c" can go either of them, but not both.
-        matches = MatchFactory().getmatches(l)
+        matches = getmatches(l)
         r = get_groups(matches)
         self.assertEqual(2,len(r))
         self.assertEqual(5,len(r[0])+len(r[1]))
@@ -768,7 +746,7 @@ class TCget_groups(TestCase):
         l = [NamedObject("a b"),NamedObject("a b"),NamedObject("a b"),NamedObject("a b")]
         #There will be 2 groups here: group "a b" and group "c d"
         #"b c" can fit in both, but it must be in only one of them
-        matches = MatchFactory().getmatches(l)
+        matches = getmatches(l)
         r = get_groups(matches)
         self.assertEqual(1,len(r))
     
@@ -788,7 +766,7 @@ class TCget_groups(TestCase):
     
     def test_four_sized_group(self):
         l = [NamedObject("foobar") for i in xrange(4)]
-        m = MatchFactory().getmatches(l)
+        m = getmatches(l)
         r = get_groups(m)
         self.assertEqual(1,len(r))
         self.assertEqual(4,len(r[0]))

core/tests/ignore_test.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/05/02
-# $Id$
+# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# Copyright 2009 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 

core/tests/results_test.py

@@ -1,7 +1,7 @@
 # Created By: Virgil Dupras
 # Created On: 2006/02/23
 # $Id$                                  
-# Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+# 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 
@@ -16,12 +16,11 @@ from hsutil.path import Path
 from hsutil.testcase import TestCase
 from hsutil.misc import first
 
-from . import engine_test
+from . import engine_test, data
-from .. import data, engine
+from .. import engine
 from ..results import *
 
 class NamedObject(engine_test.NamedObject):
-    size = 1
     path = property(lambda x:Path('basepath') + x.name)
     is_ref = False
     
@@ -37,7 +36,7 @@ class NamedObject(engine_test.NamedObject):
 def GetTestGroups():
     objects = [NamedObject("foo bar"),NamedObject("bar bleh"),NamedObject("foo bleh"),NamedObject("ibabtu"),NamedObject("ibabtu")]
     objects[1].size = 1024
-    matches = engine.MatchFactory().getmatches(objects) #we should have 5 matches
+    matches = engine.getmatches(objects) #we should have 5 matches
     groups = engine.get_groups(matches) #We should have 2 groups
     for g in groups:
         g.prioritize(lambda x:objects.index(x)) #We want the dupes to be in the same order as the list is
@@ -505,7 +504,7 @@ class TCResultsXML(TestCase):
                 return objects[1]
         
         objects = [NamedObject(u"\xe9foo bar",True),NamedObject("bar bleh",True)]
-        matches = engine.MatchFactory().getmatches(objects) #we should have 5 matches
+        matches = engine.getmatches(objects) #we should have 5 matches
         groups = engine.get_groups(matches) #We should have 2 groups
         for g in groups:
             g.prioritize(lambda x:objects.index(x)) #We want the dupes to be in the same order as the list is