Added PE's "trigger happy" scan type

ref #242

.gitignore

@@ -5,8 +5,6 @@
 *.pyd
 *.waf*
 .lock-waf*
-.idea
-.tox
 
 build
 dist

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014 Hardcoded Software Inc. (http://www.hardcoded.net)
+Copyright 2013 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.md

@@ -3,7 +3,7 @@
 [dupeGuru][dupeguru] is a cross-platform (Linux, OS X, Windows) GUI tool to find duplicate files in
 a system. It's written mostly in Python 3 and has the peculiarity of using
 [multiple GUI toolkits][cross-toolkit], all using the same core Python code. On OS X, the UI layer
-is written in Objective-C and uses Cocoa. On Linux and Windows, it's written in Python and uses Qt5.
+is written in Objective-C and uses Cocoa. On Linux and Windows, it's written in Python and uses Qt4.
 
 dupeGuru comes in 3 editions (standard, music and picture) which are all buildable from this same
 source tree. You choose the edition you want to build in a ``configure.py`` flag.
@@ -18,7 +18,7 @@ This folder contains the source for dupeGuru. Its documentation is in ``help``,
 * 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.
 * images: Images used by the different UI codebases.
-* pkg: Skeleton files required to create different packages
+* debian: Skeleton files required to create a .deb package
 * help: Help document, written for Sphinx.
 * locale: .po files for localisation.
 
@@ -47,11 +47,11 @@ Prerequisites are installed through `pip`. However, some of them are not "pip in
 to be installed manually.
 
 * All systems: [Python 3.3+][python] and [setuptools][setuptools]
-* Mac OS X: The last XCode to have the 10.7 SDK included. Python 3.4+.
+* Mac OS X: The last XCode to have the 10.6 SDK included.
 * Windows: Visual Studio 2010, [PyQt 5.0+][pyqt], [cx_Freeze][cxfreeze] and
   [Advanced Installer][advinst] (you only need the last two if you want to create an installer)
 
-On Ubuntu (14.04+), the apt-get command to install all pre-requisites is:
+On Ubuntu (13.10+), the apt-get command to install all pre-requisites is:
 
     $ apt-get install python3-dev python3-pyqt5 pyqt5-dev-tools
 
@@ -63,12 +63,12 @@ On Arch, it's:
 
 Use Python's built-in `pyvenv` to create a virtual environment in which we're going to install our.
 Python-related dependencies. `pyvenv` is built-in Python but, unlike its `virtualenv` predecessor,
-it doesn't install setuptools and pip (unless you use Python 3.4+), so it has to be installed
+it doesn't install setuptools and pip, so it has to be installed manually:
-manually:
 
     $ pyvenv --system-site-packages env
     $ source env/bin/activate
-    $ python get-pip.py
+    $ wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | python
+    $ easy_install pip
 
 Then, you can install pip requirements in your virtualenv:
 
@@ -96,4 +96,3 @@ You can also package dupeGuru into an installable package with:
 [pyqt]: http://www.riverbankcomputing.com
 [cxfreeze]: http://cx-freeze.sourceforge.net/
 [advinst]: http://www.advancedinstaller.com
-

build.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2009-12-30
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 
@@ -18,12 +18,10 @@ import compileall
 from setuptools import setup, Extension
 
 from hscommon import sphinxgen
-from hscommon.build import (
+from hscommon.build import (add_to_pythonpath, print_and_do, copy_packages, filereplace,
-    add_to_pythonpath, print_and_do, copy_packages, filereplace,
     get_module_version, move_all, copy_all, OSXAppStructure,
     build_cocoalib_xibless, fix_qt_resource_file, build_cocoa_ext, copy_embeddable_python_dylib,
-    collect_stdlib_dependencies, copy
+    collect_stdlib_dependencies, copy)
-)
 from hscommon import loc
 from hscommon.plat import ISOSX, ISLINUX
 from hscommon.util import ensure_folder, delete_files_with_pattern
@@ -31,42 +29,24 @@ from hscommon.util import ensure_folder, delete_files_with_pattern
 def parse_args():
     usage = "usage: %prog [options]"
     parser = OptionParser(usage=usage)
-    parser.add_option(
+    parser.add_option('--clean', action='store_true', dest='clean',
-        '--clean', action='store_true', dest='clean',
+        help="Clean build folder before building")
-        help="Clean build folder before building"
+    parser.add_option('--doc', action='store_true', dest='doc',
-    )
+        help="Build only the help file")
-    parser.add_option(
+    parser.add_option('--loc', action='store_true', dest='loc',
-        '--doc', action='store_true', dest='doc',
+        help="Build only localization")
-        help="Build only the help file"
+    parser.add_option('--cocoa-ext', action='store_true', dest='cocoa_ext',
-    )
+        help="Build only Cocoa extensions")
-    parser.add_option(
+    parser.add_option('--cocoa-compile', action='store_true', dest='cocoa_compile',
-        '--loc', action='store_true', dest='loc',
+        help="Build only Cocoa executable")
-        help="Build only localization"
+    parser.add_option('--xibless', action='store_true', dest='xibless',
-    )
+        help="Build only xibless UIs")
-    parser.add_option(
+    parser.add_option('--updatepot', action='store_true', dest='updatepot',
-        '--cocoa-ext', action='store_true', dest='cocoa_ext',
+        help="Generate .pot files from source code.")
-        help="Build only Cocoa extensions"
+    parser.add_option('--mergepot', action='store_true', dest='mergepot',
-    )
+        help="Update all .po files based on .pot files.")
-    parser.add_option(
+    parser.add_option('--normpo', action='store_true', dest='normpo',
-        '--cocoa-compile', action='store_true', dest='cocoa_compile',
+        help="Normalize all PO files (do this before commit).")
-        help="Build only Cocoa executable"
-    )
-    parser.add_option(
-        '--xibless', action='store_true', dest='xibless',
-        help="Build only xibless UIs"
-    )
-    parser.add_option(
-        '--updatepot', action='store_true', dest='updatepot',
-        help="Generate .pot files from source code."
-    )
-    parser.add_option(
-        '--mergepot', action='store_true', dest='mergepot',
-        help="Update all .po files based on .pot files."
-    )
-    parser.add_option(
-        '--normpo', action='store_true', dest='normpo',
-        help="Normalize all PO files (do this before commit)."
-    )
     (options, args) = parser.parse_args()
     return options
 
@@ -95,20 +75,12 @@ def build_xibless(edition, dest='cocoa/autogen'):
         ('preferences_panel.py', 'PreferencesPanel_UI'),
     ]
     for srcname, dstname in FNPAIRS:
-        xibless.generate(
+        xibless.generate(op.join('cocoa', 'base', 'ui', srcname), op.join(dest, dstname),
-            op.join('cocoa', 'base', 'ui', srcname), op.join(dest, dstname),
+            localizationTable='Localizable', args={'edition': edition})
-            localizationTable='Localizable', args={'edition': edition}
-        )
     if edition == 'pe':
-        xibless.generate(
+        xibless.generate('cocoa/pe/ui/details_panel.py', op.join(dest, 'DetailsPanel_UI'), localizationTable='Localizable')
-            'cocoa/pe/ui/details_panel.py', op.join(dest, 'DetailsPanel_UI'),
-            localizationTable='Localizable'
-        )
     else:
-        xibless.generate(
+        xibless.generate('cocoa/base/ui/details_panel.py', op.join(dest, 'DetailsPanel_UI'), localizationTable='Localizable')
-            'cocoa/base/ui/details_panel.py', op.join(dest, 'DetailsPanel_UI'),
-            localizationTable='Localizable'
-        )
 
 def build_cocoa(edition, dev):
     print("Creating OS X app structure")
@@ -138,16 +110,15 @@ def build_cocoa(edition, dev):
         'me': ['core_me'] + appscript_pkgs + ['hsaudiotag'],
         'pe': ['core_pe'] + appscript_pkgs,
     }[edition]
-    tocopy = [
+    tocopy = ['core', 'hscommon', 'cocoa/inter', 'cocoalib/cocoa', 'jobprogress', 'objp',
-        'core', 'hscommon', 'cocoa/inter', 'cocoalib/cocoa', 'objp', 'send2trash'
+        'send2trash'] + specific_packages
-    ] + specific_packages
     copy_packages(tocopy, pydep_folder, create_links=dev)
     sys.path.insert(0, 'build')
     extra_deps = None
     if edition == 'pe':
         # ModuleFinder can't seem to correctly detect the multiprocessing dependency, so we have
         # to manually specify it.
-        extra_deps = ['multiprocessing']
+        extra_deps=['multiprocessing']
     collect_stdlib_dependencies('build/dg_cocoa.py', pydep_folder, extra_deps=extra_deps)
     del sys.path[0]
     # Views are not referenced by python code, so they're not found by the collector.
@@ -253,10 +224,8 @@ def build_updatepot():
         os.remove(cocoalib_pot)
         loc.strings2pot(op.join('cocoalib', 'en.lproj', 'cocoalib.strings'), cocoalib_pot)
         print("Enhancing ui.pot with Cocoa's strings files")
-        loc.strings2pot(
+        loc.strings2pot(op.join('cocoa', 'base', 'en.lproj', 'Localizable.strings'),
-            op.join('cocoa', 'base', 'en.lproj', 'Localizable.strings'),
+            op.join('locale', 'ui.pot'))
-            op.join('locale', 'ui.pot')
-        )
 
 def build_mergepot():
     print("Updating .po files using .pot files")
@@ -273,15 +242,11 @@ def build_cocoa_proxy_module():
     print("Building Cocoa Proxy")
     import objp.p2o
     objp.p2o.generate_python_proxy_code('cocoalib/cocoa/CocoaProxy.h', 'build/CocoaProxy.m')
-    build_cocoa_ext(
+    build_cocoa_ext("CocoaProxy", 'cocoalib/cocoa',
-        "CocoaProxy", 'cocoalib/cocoa',
+        ['cocoalib/cocoa/CocoaProxy.m', 'build/CocoaProxy.m', 'build/ObjP.m',
-        [
+            'cocoalib/HSErrorReportWindow.m', 'cocoa/autogen/HSErrorReportWindow_UI.m'],
-            'cocoalib/cocoa/CocoaProxy.m', 'build/CocoaProxy.m', 'build/ObjP.m',
-            'cocoalib/HSErrorReportWindow.m', 'cocoa/autogen/HSErrorReportWindow_UI.m'
-        ],
         ['AppKit', 'CoreServices'],
-        ['cocoalib', 'cocoa/autogen']
+        ['cocoalib', 'cocoa/autogen'])
-    )
 
 def build_cocoa_bridging_interfaces(edition):
     print("Building Cocoa Bridging Interfaces")
@@ -289,11 +254,9 @@ def build_cocoa_bridging_interfaces(edition):
     import objp.p2o
     add_to_pythonpath('cocoa')
     add_to_pythonpath('cocoalib')
-    from cocoa.inter import (
+    from cocoa.inter import (PyGUIObject, GUIObjectView, PyColumns, ColumnsView, PyOutline,
-        PyGUIObject, GUIObjectView, PyColumns, ColumnsView, PyOutline,
         OutlineView, PySelectableList, SelectableListView, PyTable, TableView, PyBaseApp,
-        PyTextField, ProgressWindowView, PyProgressWindow
+        PyTextField, ProgressWindowView, PyProgressWindow)
-    )
     from inter.deletion_options import PyDeletionOptions, DeletionOptionsView
     from inter.details_panel import PyDetailsPanel, DetailsPanelView
     from inter.directory_outline import PyDirectoryOutline, DirectoryOutlineView
@@ -305,20 +268,16 @@ def build_cocoa_bridging_interfaces(edition):
     from inter.stats_label import PyStatsLabel, StatsLabelView
     from inter.app import PyDupeGuruBase, DupeGuruView
     appmod = importlib.import_module('inter.app_{}'.format(edition))
-    allclasses = [
+    allclasses = [PyGUIObject, PyColumns, PyOutline, PySelectableList, PyTable, PyBaseApp,
-        PyGUIObject, PyColumns, PyOutline, PySelectableList, PyTable, PyBaseApp,
         PyDetailsPanel, PyDirectoryOutline, PyPrioritizeDialog, PyPrioritizeList, PyProblemDialog,
         PyIgnoreListDialog, PyDeletionOptions, PyResultTable, PyStatsLabel, PyDupeGuruBase,
-        PyTextField, PyProgressWindow, appmod.PyDupeGuru
+        PyTextField, PyProgressWindow, appmod.PyDupeGuru]
-    ]
     for class_ in allclasses:
         objp.o2p.generate_objc_code(class_, 'cocoa/autogen', inherit=True)
-    allclasses = [
+    allclasses = [GUIObjectView, ColumnsView, OutlineView, SelectableListView, TableView,
-        GUIObjectView, ColumnsView, OutlineView, SelectableListView, TableView,
         DetailsPanelView, DirectoryOutlineView, PrioritizeDialogView, PrioritizeListView,
         IgnoreListDialogView, DeletionOptionsView, ResultTableView, StatsLabelView,
-        ProgressWindowView, DupeGuruView
+        ProgressWindowView, DupeGuruView]
-    ]
     clsspecs = [objp.o2p.spec_from_python_class(class_) for class_ in allclasses]
     objp.p2o.generate_python_proxy_code_from_clsspec(clsspecs, 'build/CocoaViews.m')
     build_cocoa_ext('CocoaViews', 'cocoa/inter', ['build/CocoaViews.m', 'build/ObjP.m'])
@@ -337,12 +296,11 @@ def build_pe_modules(ui):
             extra_link_args=[
                 "-framework", "CoreFoundation",
                 "-framework", "Foundation",
-                "-framework", "ApplicationServices",
+                "-framework", "ApplicationServices",]
-            ]
         ))
     setup(
-        script_args=['build_ext', '--inplace'],
+        script_args = ['build_ext', '--inplace'],
-        ext_modules=exts,
+        ext_modules = exts,
     )
     move_all('_block_qt*', op.join('qt', 'pe'))
     move_all('_block*', 'core_pe')

cocoa/base/AppDelegateBase.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/AppDelegateBase.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/Consts.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/DeletionOptions.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/DeletionOptions.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/DetailsPanelBase.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/DetailsPanelBase.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/DirectoryOutline.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/DirectoryOutline.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/DirectoryPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/DirectoryPanel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/IgnoreListDialog.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/IgnoreListDialog.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/PrioritizeDialog.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/PrioritizeDialog.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/PrioritizeList.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/PrioritizeList.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/ProblemDialog.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/ProblemDialog.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/ResultTable.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/ResultTable.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/ResultWindowBase.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/ResultWindowBase.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/StatsLabel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/StatsLabel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/main.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/base/ui/preferences_panel.py

@@ -12,7 +12,7 @@ dialogHeights = {
 scanTypeNames = {
     'se': ["Filename", "Content", "Folders"],
     'me': ["Filename", "Filename - Fields", "Filename - Fields (No Order)", "Tags", "Content", "Audio Content"],
-    'pe': ["Contents", "EXIF Timestamp"],
+    'pe': ["Contents", "EXIF Timestamp", "Trigger-happy mode"],
 }
 
 result = Window(410, dialogHeights[edition], dialogTitles[edition])

cocoa/inter/app_me.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/11/16
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

cocoa/inter/app_pe.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/11/13
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 
@@ -331,6 +331,7 @@ class PyDupeGuru(PyDupeGuruBase):
             self.model.scanner.scan_type = [
                 ScanType.FuzzyBlock,
                 ScanType.ExifTimestamp,
+                ScanType.TriggerHappyMode,
             ][scan_type]
         except IndexError:
             pass

cocoa/inter/app_se.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2009-05-24
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

cocoa/inter/deletion_options.py

@@ -1,5 +1,5 @@
 # Created On: 2012-05-30
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

cocoa/me/AppDelegate.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/me/AppDelegate.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/me/Consts.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/me/DetailsPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/me/DetailsPanel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/me/DirectoryPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/me/DirectoryPanel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/me/InfoTemplate.plist

@@ -31,7 +31,7 @@
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>© Hardcoded Software, 2014</string>
+	<string>© Hardcoded Software, 2013</string>
 	<key>SUFeedURL</key>
 	<string>http://www.hardcoded.net/updates/dupeguru_me.appcast</string>
 	<key>SUPublicDSAKeyFile</key>

cocoa/me/ResultWindow.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/me/ResultWindow.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/me/dg_cocoa.py

@@ -1,4 +1,4 @@
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

cocoa/pe/AppDelegate.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/pe/AppDelegate.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/pe/Consts.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/pe/DetailsPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/pe/DetailsPanel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/pe/DirectoryPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/pe/DirectoryPanel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/pe/InfoTemplate.plist

@@ -31,7 +31,7 @@
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>© Hardcoded Software, 2014</string>
+	<string>© Hardcoded Software, 2013</string>
 	<key>SUFeedURL</key>
 	<string>http://www.hardcoded.net/updates/dupeguru_pe.appcast</string>
 	<key>SUPublicDSAKeyFile</key>

cocoa/pe/ResultWindow.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/pe/ResultWindow.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/pe/dg_cocoa.py

@@ -1,4 +1,4 @@
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

cocoa/se/AppDelegate.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/se/AppDelegate.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/se/DetailsPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/se/DetailsPanel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/se/InfoTemplate.plist

@@ -29,7 +29,7 @@
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>© Hardcoded Software, 2014</string>
+	<string>© Hardcoded Software, 2013</string>
 	<key>SUFeedURL</key>
 	<string>http://www.hardcoded.net/updates/dupeguru.appcast</string>
 	<key>SUPublicDSAKeyFile</key>

cocoa/se/ResultWindow.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/se/ResultWindow.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 which should be included with this package. The terms are also available at 

cocoa/se/dg_cocoa.py

@@ -1,4 +1,4 @@
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

cocoalib/cocoa/__init__.py

@@ -113,6 +113,5 @@ def patch_threaded_job_performer():
     # _async_run, under cocoa, has to be run within an autorelease pool to prevent leaks.
     # You only need this patch is you use one of CocoaProxy's function (which allocate objc
     # structures) inside a threaded job.
-    from hscommon.jobprogress.performer import ThreadedJobPerformer
+    from jobprogress.performer import ThreadedJobPerformer
     ThreadedJobPerformer._async_run = autoreleasepool(ThreadedJobPerformer._async_run)
-

configure.py

@@ -1,11 +1,12 @@
 # Created By: Virgil Dupras
 # Created On: 2009-12-30
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
+import sys
 from optparse import OptionParser
 import json
 
@@ -28,18 +29,11 @@ def main(options):
 if __name__ == '__main__':
     usage = "usage: %prog [options]"
     parser = OptionParser(usage=usage)
-    parser.add_option(
+    parser.add_option('--edition', dest='edition',
-        '--edition', dest='edition',
+        help="dupeGuru edition to build (se, me or pe). Default is se.")
-        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(
+    parser.add_option('--dev', action='store_true', dest='dev', default=False,
-        '--ui', dest='ui',
+        help="If this flag is set, will configure for dev builds.")
-        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)
-

core/app.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/11/11
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 
@@ -15,7 +15,7 @@ import time
 import shutil
 
 from send2trash import send2trash
-from hscommon.jobprogress import job
+from jobprogress import job
 from hscommon.notify import Broadcaster
 from hscommon.path import Path
 from hscommon.conflict import smart_move, smart_copy
@@ -38,10 +38,8 @@ DEBUG_MODE_PREFERENCE = 'DebugMode'
 
 MSG_NO_MARKED_DUPES = tr("There are no marked duplicates. Nothing has been done.")
 MSG_NO_SELECTED_DUPES = tr("There are no selected duplicates. Nothing has been done.")
-MSG_MANY_FILES_TO_OPEN = tr(
+MSG_MANY_FILES_TO_OPEN = tr("You're about to open many files at once. Depending on what those "
-    "You're about to open many files at once. Depending on what those "
+    "files are opened with, doing so can create quite a mess. Continue?")
-    "files are opened with, doing so can create quite a mess. Continue?"
-)
 
 class DestType:
     Direct = 0
@@ -154,8 +152,8 @@ class DupeGuru(Broadcaster):
     # select_dest_folder(prompt: str) --> str
     # select_dest_file(prompt: str, ext: str) --> str
     
+    # in fairware prompts, we don't mention the edition, it's too long.
     PROMPT_NAME = "dupeGuru"
-    SCANNER_CLASS = scanner.Scanner
     
     def __init__(self, view):
         if view.get_default(DEBUG_MODE_PREFERENCE):
@@ -168,7 +166,7 @@ class DupeGuru(Broadcaster):
             os.makedirs(self.appdata)
         self.directories = directories.Directories()
         self.results = results.Results(self)
-        self.scanner = self.SCANNER_CLASS()
+        self.scanner = scanner.Scanner()
         self.options = {
             'escape_filter_regexp': True,
             'clean_empty_dirs': False,
@@ -267,10 +265,8 @@ class DupeGuru(Broadcaster):
             return None
     
     def _get_export_data(self):
-        columns = [
+        columns = [col for col in self.result_table.columns.ordered_columns
-            col for col in self.result_table.columns.ordered_columns
+            if col.visible and col.name != 'marked']
-            if col.visible and col.name != 'marked'
-        ]
         colnames = [col.display for col in columns]
         rows = []
         for group_id, group in enumerate(self.results.groups):
@@ -282,10 +278,8 @@ class DupeGuru(Broadcaster):
         return colnames, rows
     
     def _results_changed(self):
-        self.selected_dupes = [
+        self.selected_dupes = [d for d in self.selected_dupes
-            d for d in self.selected_dupes
+            if self.results.get_group_of_duplicate(d) is not None]
-            if self.results.get_group_of_duplicate(d) is not None
-        ]
         self.notify('results_changed')
     
     def _start_job(self, jobid, func, args=()):
@@ -293,10 +287,7 @@ class DupeGuru(Broadcaster):
         try:
             self.progress_window.run(jobid, title, func, args=args) 
         except job.JobInProgressError:
-            msg = tr(
+            msg = tr("A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again.")
-                "A previous action is still hanging in there. You can't start a new one yet. Wait "
-                "a few seconds, then try again."
-            )
             self.view.show_message(msg)
     
     def _job_completed(self, jobid):
@@ -448,10 +439,8 @@ class DupeGuru(Broadcaster):
             return
         if not self.deletion_options.show(self.results.mark_count):
             return
-        args = [
+        args = [self.deletion_options.link_deleted, self.deletion_options.use_hardlinks,
-            self.deletion_options.link_deleted, self.deletion_options.use_hardlinks,
+            self.deletion_options.direct]
-            self.deletion_options.direct
-        ]
         logging.debug("Starting deletion job with args %r", args)
         self._start_job(JobType.Delete, self._do_delete, args=args)
     
@@ -475,10 +464,7 @@ class DupeGuru(Broadcaster):
         dest_file = self.view.select_dest_file(tr("Select a destination for your exported CSV"), 'csv')
         if dest_file:
             colnames, rows = self._get_export_data()
-            try:
+            export.export_to_csv(dest_file, colnames, rows)
-                export.export_to_csv(dest_file, colnames, rows)
-            except OSError as e:
-                self.view.show_message(tr("Couldn't write to file: {}").format(str(e)))
     
     def get_display_info(self, dupe, group, delta=False):
         def empty_data():
@@ -564,10 +550,8 @@ class DupeGuru(Broadcaster):
         # If no group was changed, however, we don't touch the selection.
         if not self.result_table.power_marker:
             if changed_groups:
-                self.selected_dupes = [
+                self.selected_dupes = [d for d in self.selected_dupes
-                    d for d in self.selected_dupes
+                    if self.results.get_group_of_duplicate(d).ref is d]
-                    if self.results.get_group_of_duplicate(d).ref is d
-                ]
             self.notify('results_changed')
         else:
             # If we're in "Dupes Only" mode (previously called Power Marker), things are a bit
@@ -620,7 +604,7 @@ class DupeGuru(Broadcaster):
     def purge_ignore_list(self):
         """Remove files that don't exist from :attr:`ignore_list`.
         """
-        self.scanner.ignore_list.Filter(lambda f, s: op.exists(f) and op.exists(s))
+        self.scanner.ignore_list.Filter(lambda f,s:op.exists(f) and op.exists(s))
         self.ignore_list_dialog.refresh()
     
     def remove_directories(self, indexes):
@@ -657,7 +641,7 @@ class DupeGuru(Broadcaster):
         msg = tr("You are about to remove %d files from results. Continue?") 
         if not self.view.ask_yes_no(msg % self.results.mark_count):
             return
-        self.results.perform_on_marked(lambda x: None, True)
+        self.results.perform_on_marked(lambda x:None, True)
         self._results_changed()
     
     def remove_selected(self):
@@ -721,10 +705,7 @@ class DupeGuru(Broadcaster):
         
         :param str filename: path of the file to save results (as XML) to.
         """
-        try:
+        self.results.save_to_xml(filename)
-            self.results.save_to_xml(filename)
-        except OSError as e:
-            self.view.show_message(tr("Couldn't write to file: {}").format(str(e)))
     
     def start_scanning(self):
         """Starts an async job to scan for duplicates.

core/directories.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/02/27
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 
@@ -9,7 +9,7 @@
 from xml.etree import ElementTree as ET
 import logging
 
-from hscommon.jobprogress import job
+from jobprogress import job
 from hscommon.path import Path
 from hscommon.util import FileOrPath
 
@@ -62,10 +62,10 @@ class Directories:
                 return True
         return False
     
-    def __delitem__(self, key):
+    def __delitem__(self,key):
         self._dirs.__delitem__(key)
     
-    def __getitem__(self, key):
+    def __getitem__(self,key):
         return self._dirs.__getitem__(key)
     
     def __len__(self):
@@ -95,8 +95,7 @@ class Directories:
                     file.is_ref = state == DirectoryState.Reference
                     filepaths.add(file.path)
                     yield file
-            # it's possible that a folder (bundle) gets into the file list. in that case, we don't
+            # it's possible that a folder (bundle) gets into the file list. in that case, we don't want to recurse into it
-            # want to recurse into it
             subfolders = [p for p in from_path.listdir() if not p.islink() and p.isdir() and p not in filepaths]
             for subfolder in subfolders:
                 for file in self._get_files(subfolder, j):
@@ -145,7 +144,7 @@ class Directories:
         """
         try:
             subpaths = [p for p in path.listdir() if p.isdir()]
-            subpaths.sort(key=lambda x: x.name.lower())
+            subpaths.sort(key=lambda x:x.name.lower())
             return subpaths
         except EnvironmentError:
             return []

core/engine.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/01/29
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 
@@ -15,13 +15,11 @@ from unicodedata import normalize
 
 from hscommon.util import flatten, multi_replace
 from hscommon.trans import tr
-from hscommon.jobprogress import job
+from jobprogress import job
 
-(
+(WEIGHT_WORDS,
-    WEIGHT_WORDS,
+MATCH_SIMILAR_WORDS,
-    MATCH_SIMILAR_WORDS,
+NO_FIELD_ORDER) = range(3)
-    NO_FIELD_ORDER,
-) = range(3)
 
 JOB_REFRESH_RATE = 100
 
@@ -261,7 +259,6 @@ def getmatches_by_contents(files, sizeattr='size', partial=False, j=job.nulljob)
         filesize = getattr(file, sizeattr)
         if filesize:
             size2files[filesize].add(file)
-    del files
     possible_matches = [files for files in size2files.values() if len(files) > 1]
     del size2files
     result = []
@@ -498,10 +495,7 @@ def get_groups(matches, j=job.nulljob):
     matched_files = set(flatten(groups))
     orphan_matches = []
     for group in groups:
-        orphan_matches += {
+        orphan_matches += set(m for m in group.discard_matches() if not any(obj in matched_files for obj in [m.first, m.second]))
-            m for m in group.discard_matches()
-            if not any(obj in matched_files for obj in [m.first, m.second])
-        }
     if groups and orphan_matches:
         groups += get_groups(orphan_matches) # no job, as it isn't supposed to take a long time
     return groups

core/export.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/09/16
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 
@@ -19,26 +19,26 @@ MAIN_TEMPLATE = """
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-        <title>dupeGuru Results</title>
+	<title>dupeGuru Results</title>
-        <style type="text/css">
+	<style type="text/css">
 BODY
 {
-    background-color:white;
+	background-color:white;
 }
 
 BODY,A,P,UL,TABLE,TR,TD
 {
-    font-family:Tahoma,Arial,sans-serif;
+	font-family:Tahoma,Arial,sans-serif;
-    font-size:10pt;
+	font-size:10pt;
-    color: #4477AA;
+	color: #4477AA;
 }
 
 TABLE
 {
-    background-color: #225588;
+	background-color: #225588;
-    margin-left: auto;
+	margin-left: auto;
-    margin-right: auto;
+  	margin-right: auto;
-    width: 90%;
+	width: 90%;
 }
 
 TR 
@@ -48,9 +48,9 @@ TR
 
 TH 
 { 
-    font-weight: bold;
+	font-weight: bold; 
-    color: black;
+	color: black;
-    background-color: #C8D6E5;
+	background-color: #C8D6E5;
 }
 
 TH TD 
@@ -65,10 +65,10 @@ TD
 
 TD.rightelem
 {
-    text-align:right;
+	text-align:right;
-    /*padding-left:0pt;*/
+	/*padding-left:0pt;*/
-    padding-right: 2pt;
+	padding-right: 2pt;
-    width: 17%;
+	width: 17%;
 }
 
 TD.indented
@@ -78,19 +78,19 @@ TD.indented
 
 H1
 {
-    font-family:&quot;Courier New&quot;,monospace;
+	font-family:&quot;Courier New&quot;,monospace;
-    color:#6699CC;
+	color:#6699CC;
     font-size:18pt; 
-    color:#6da500;
+	color:#6da500;
-    border-color: #70A0CF;
+	border-color: #70A0CF;
-    border-width: 1pt;
+	border-width: 1pt;
-    border-style: solid;
+	border-style: solid;
-    margin-top:   16pt;
+	margin-top:   16pt;
-    margin-left:  5%;
+	margin-left:  5%;
-    margin-right: 5%;
+	margin-right: 5%;
-    padding-top:  2pt;
+	padding-top:  2pt;
-    padding-bottom:2pt;
+	padding-bottom:2pt;
-    text-align:   center;
+	text-align:   center;
 }
 </style>
 </head>

core/fs.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2009-10-22
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 
@@ -32,7 +32,6 @@ NOT_SET = object()
 
 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, str):
@@ -209,7 +208,7 @@ class Folder(File):
             # different md5 if a file gets moved in a different subdirectory.
             def get_dir_md5_concat():
                 items = self._all_items()
-                items.sort(key=lambda f: f.path)
+                items.sort(key=lambda f:f.path)
                 md5s = [getattr(f, field) for f in items]
                 return b''.join(md5s)
             

core/gui/__init__.py

@@ -13,4 +13,3 @@ blue, which is supposed to be orange, does the sorting logic, holds selection, e
 
 .. _cross-toolkit: http://www.hardcoded.net/articles/cross-toolkit-software
 """
-

core/gui/base.py

@@ -1,12 +1,13 @@
 # Created By: Virgil Dupras
 # Created On: 2010-02-06
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
 from hscommon.notify import Listener
+from hscommon.gui.base import NoopGUI
 
 class DupeGuruGUIObject(Listener):
     def __init__(self, app):

core/gui/deletion_options.py

@@ -1,5 +1,5 @@
 # Created On: 2012-05-30
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/gui/details_panel.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2010-02-05
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/gui/directory_tree.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2010-02-06
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/gui/ignore_list_dialog.py

@@ -1,5 +1,5 @@
 # Created On: 2012/03/13
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/gui/ignore_list_table.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2012-03-13
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/gui/prioritize_dialog.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2011-09-06
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 
@@ -71,7 +71,6 @@ class PrioritizeDialog(GUIObject):
             return
         crit = self.criteria[self.criteria_list.selected_index]
         self.prioritizations.append(crit)
-        del crit
         self.prioritization_list[:] = [crit.display for crit in self.prioritizations]
     
     def remove_selected(self):

core/gui/problem_dialog.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2010-04-12
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/gui/problem_table.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2010-04-12
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/gui/result_table.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2010-02-11
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/gui/stats_label.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2010-02-11
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/ignore.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/05/02
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 
@@ -22,41 +22,41 @@ class IgnoreList:
         self._count = 0
     
     def __iter__(self):
-        for first, seconds in self._ignored.items():
+        for first,seconds in self._ignored.items():
             for second in seconds:
-                yield (first, second)
+                yield (first,second)
     
     def __len__(self):
         return self._count
     
     #---Public
-    def AreIgnored(self, first, second):
+    def AreIgnored(self,first,second):
-        def do_check(first, second):
+        def do_check(first,second):
             try:
                 matches = self._ignored[first]
                 return second in matches
             except KeyError:
                 return False
         
-        return do_check(first, second) or do_check(second, first)
+        return do_check(first,second) or do_check(second,first)
     
     def Clear(self):
         self._ignored = {}
         self._count = 0
     
-    def Filter(self, func):
+    def Filter(self,func):
         """Applies a filter on all ignored items, and remove all matches where func(first,second)
         doesn't return True.
         """
         filtered = IgnoreList()
-        for first, second in self:
+        for first,second in self:
-            if func(first, second):
+            if func(first,second):
-                filtered.Ignore(first, second)
+                filtered.Ignore(first,second)
         self._ignored = filtered._ignored
         self._count = filtered._count
     
-    def Ignore(self, first, second):
+    def Ignore(self,first,second):
-        if self.AreIgnored(first, second):
+        if self.AreIgnored(first,second):
             return
         try:
             matches = self._ignored[first]

core/markable.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/02/23
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/prioritize.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2011/09/07
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/results.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/02/23
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 
@@ -12,7 +12,7 @@ import os
 import os.path as op
 from xml.etree import ElementTree as ET
 
-from hscommon.jobprogress.job import nulljob
+from jobprogress.job import nulljob
 from hscommon.conflict import get_conflicted_name
 from hscommon.util import flatten, nonone, FileOrPath, format_size
 from hscommon.trans import tr
@@ -96,10 +96,7 @@ class Results(Markable):
             self.__dupes = flatten(group.dupes for group in self.groups)
             if None in self.__dupes:
                 # This is debug logging to try to figure out #44
-                logging.warning(
+                logging.warning("There is a None value in the Results' dupe list. dupes: %r groups: %r", self.__dupes, self.groups)
-                    "There is a None value in the Results' dupe list. dupes: %r groups: %r",
-                    self.__dupes, self.groups
-                )
             if self.__filtered_dupes:
                 self.__dupes = [dupe for dupe in self.__dupes if dupe in self.__filtered_dupes]
             sd = self.__dupes_sort_descriptor
@@ -252,8 +249,7 @@ class Results(Markable):
                     second_file = dupes[int(attrs['second'])]
                     percentage = int(attrs['percentage'])
                     group.add_match(engine.Match(first_file, second_file, percentage))
-                except (IndexError, KeyError, ValueError):
+                except (IndexError, KeyError, ValueError): # Covers missing attr, non-int values and indexes out of bounds
-                    # Covers missing attr, non-int values and indexes out of bounds
                     pass
             if (not group.matches) and (len(dupes) >= 2):
                 do_match(dupes[0], dupes[1:], group)
@@ -397,7 +393,7 @@ class Results(Markable):
             self.__get_dupe_list()
         keyfunc = lambda d: self.app._get_dupe_sort_key(d, lambda: self.get_group_of_duplicate(d), key, delta)
         self.__dupes.sort(key=keyfunc, reverse=not asc)
-        self.__dupes_sort_descriptor = (key, asc, delta)
+        self.__dupes_sort_descriptor = (key,asc,delta)
     
     def sort_groups(self, key, asc=True):
         """Sort :attr:`groups` according to ``key``.
@@ -409,10 +405,9 @@ class Results(Markable):
         """
         keyfunc = lambda g: self.app._get_group_sort_key(g, key)
         self.groups.sort(key=keyfunc, reverse=not asc)
-        self.__groups_sort_descriptor = (key, asc)
+        self.__groups_sort_descriptor = (key,asc)
     
     #---Properties
-    dupes = property(__get_dupe_list)
+    dupes     = property(__get_dupe_list)
-    groups = property(__get_groups, __set_groups)
+    groups    = property(__get_groups, __set_groups)
     stat_line = property(__get_stat_line)
-

core/scanner.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/03/03
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 
@@ -10,7 +10,7 @@ import logging
 import re
 import os.path as op
 
-from hscommon.jobprogress import job
+from jobprogress import job
 from hscommon.util import dedupe, rem_file_ext, get_file_ext
 from hscommon.trans import tr
 
@@ -33,6 +33,7 @@ class ScanType:
     #PE
     FuzzyBlock = 10
     ExifTimestamp = 11
+    TriggerHappyMode = 12
 
 SCANNABLE_TAGS = ['track', 'artist', 'album', 'title', 'genre', 'year']
 
@@ -81,9 +82,7 @@ class Scanner:
             files = [f for f in files if f.size >= self.size_threshold]
         if self.scan_type in {ScanType.Contents, ScanType.ContentsAudio, ScanType.Folders}:
             sizeattr = 'audiosize' if self.scan_type == ScanType.ContentsAudio else 'size'
-            return engine.getmatches_by_contents(
+            return engine.getmatches_by_contents(files, sizeattr, partial=self.scan_type==ScanType.ContentsAudio, j=j)
-                files, sizeattr, partial=self.scan_type == ScanType.ContentsAudio, j=j
-            )
         else:
             j = j.start_subjob([2, 8])
             kw = {}
@@ -96,11 +95,7 @@ class Scanner:
             func = {
                 ScanType.Filename: lambda f: engine.getwords(rem_file_ext(f.name)),
                 ScanType.Fields: lambda f: engine.getfields(rem_file_ext(f.name)),
-                ScanType.Tag: lambda f: [
+                ScanType.Tag: lambda f: [engine.getwords(str(getattr(f, attrname))) for attrname in SCANNABLE_TAGS if attrname in self.scanned_tags],
-                    engine.getwords(str(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, tr("Read metadata of %d/%d files")):
                 logging.debug("Reading metadata of {}".format(str(f.path)))
@@ -158,10 +153,8 @@ class Scanner:
         if self.ignore_list:
             j = j.start_subjob(2)
             iter_matches = j.iter_with_progress(matches, tr("Processed %d/%d matches against the ignore list"))
-            matches = [
+            matches = [m for m in iter_matches 
-                m for m in iter_matches
+                if not self.ignore_list.AreIgnored(str(m.first.path), str(m.second.path))]
-                if not self.ignore_list.AreIgnored(str(m.first.path), str(m.second.path))
-            ]
         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])
@@ -186,11 +179,10 @@ class Scanner:
             g.prioritize(self._key_func, self._tie_breaker)
         return groups
     
-    match_similar_words = False
+    match_similar_words  = False
     min_match_percentage = 80
-    mix_file_kind = True
+    mix_file_kind        = True
-    scan_type = ScanType.Filename
+    scan_type            = ScanType.Filename
-    scanned_tags = {'artist', 'title'}
+    scanned_tags         = {'artist', 'title'}
-    size_threshold = 0
+    size_threshold       = 0
-    word_weighting = False
+    word_weighting       = False
-

core/tests/app_test.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2007-06-23
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 
@@ -15,7 +15,7 @@ from hscommon.path import Path
 import hscommon.conflict
 import hscommon.util
 from hscommon.testutil import CallLogger, eq_, log_calls
-from hscommon.jobprogress.job import Job
+from jobprogress.job import Job
 
 from .base import DupeGuru, TestApp
 from .results_test import GetTestGroups

core/tests/base.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2011/09/07
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 
@@ -10,7 +10,7 @@ from hscommon.testutil import TestApp as TestAppBase, eq_, with_app
 from hscommon.path import Path
 from hscommon.util import get_file_ext, format_size
 from hscommon.gui.column import Column
-from hscommon.jobprogress.job import nulljob, JobCancelled
+from jobprogress.job import nulljob, JobCancelled
 
 from .. import engine
 from .. import prioritize

core/tests/directories_test.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/02/27
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/tests/engine_test.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/01/29
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 
@@ -8,7 +8,7 @@
 
 import sys
 
-from hscommon.jobprogress import job
+from jobprogress import job
 from hscommon.util import first
 from hscommon.testutil import eq_, log_calls
 

core/tests/fs_test.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2009-10-23
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/tests/ignore_test.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/05/02
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/tests/markable_test.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/02/23
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/tests/prioritize_test.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2011/09/07
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/tests/result_table_test.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2013-07-28
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/tests/results_test.py

@@ -1,6 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/02/23
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 

core/tests/scanner_test.py

@@ -1,12 +1,12 @@
 # Created By: Virgil Dupras
 # Created On: 2006/03/03
-# Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
 # 
 # This software is licensed under the "BSD" License as described in the "LICENSE" file, 
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from hscommon.jobprogress import job
+from jobprogress import job
 from hscommon.path import Path
 from hscommon.testutil import eq_