Remove RC from changelog version

Adding RC would require updating other scripts to support it.  For the
purpose of the changelog just using 4.0.4 should suffice.  Might Add
support for this later.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,24 @@
+# Instructions 
+1. Provide a short descriptive title for the issue. A good example is 'Results window appears off screen.', a non-optimal example is 'Problem with App'.
+2. Please fill out either the 'Bug / Issue' or the 'Feature Request' section. Replace values in ` `.
+3. Delete these instructions and the unused sections.
+
+# Bug / issue Report
+System Information:
+ - DupeGuru Version: `version`
+ - Operating System: `Windows/Linux/OSX` `distribution` `version` 
+
+If using the source distribution and building yourself also provide (otherwise remove):
+ - Python Version: `version ex. 3.6.6` `32/64bit`  
+ - Complier: `gcc/llvm/msvc` `version`
+
+## Description
+`Provide a detailed description of the issue to help reproduce it.  If it happens after a specific sequence of events provide them here.`
+
+## Debug Log
+```
+If reporting an error provide the debug log and/or the error message information.  If the debug log is short < 40 lines you can provide it here, otherwise attach the text file to this issue.
+```
+
+# Feature Requests
+`Provide a detailed description of the feature.`

.gitignore

@@ -9,7 +9,7 @@ __pycache__
 
 build
 dist
-env
+env*
 /deps
 cocoa/autogen
 
@@ -19,3 +19,7 @@ cocoa/autogen
 /qt/*_rc.py
 /help/*/conf.py
 /help/*/changelog.rst
+
+*.pyd
+*.exe
+*.spec

.gitmodules

@@ -4,9 +4,3 @@
 [submodule "hscommon"]
 	path = hscommon
 	url = https://github.com/hsoft/hscommon.git
-[submodule "cocoalib"]
-	path = cocoalib
-	url = https://github.com/hsoft/cocoalib.git
-[submodule "cocoa/Sparkle"]
-	path = cocoa/Sparkle
-	url = https://github.com/sparkle-project/Sparkle.git

.travis.yml

@@ -0,0 +1,11 @@
+sudo: false
+dist: xenial
+language: python
+python:
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+install: pip install tox-travis
+script: tox
+

CREDITS

@@ -0,0 +1,19 @@
+To know who contributed to dupeGuru, you can look at the commit log, but not all contributions
+result in a commit. This file lists contributors who don't necessarily appear in the commit log.
+
+* Jérôme Cantin, Main icon
+* Gregor Tätzner, German localization
+* Frank Weber, German localization
+* Eric Dee, Chinese localization
+* Aleš Nehyba, Czech localization
+* Paolo Rossi, Italian localization
+* Hrant Ohanyan, Armenian localization
+* Igor Pavlov, Russian localization
+* Kyrill Detinov, Russian localization
+* Yuri Petrashko, Ukrainian localization
+* Nickolas Pohilets, Ukrainian localization
+* Victor Figueiredo, Brazilian localization
+* Phan Anh, Vietnamese localization
+* Gabriel Koutilellis, Greek localization
+
+Thanks!

Makefile

@@ -0,0 +1,143 @@
+PYTHON ?= python3
+PYTHON_VERSION_MINOR := $(shell ${PYTHON} -c "import sys; print(sys.version_info.minor)")
+PYRCC5 ?= pyrcc5
+REQ_MINOR_VERSION = 4
+PREFIX ?= /usr/local
+
+# Window compatability via Msys2 
+# - venv creates Scripts instead of bin
+# - compile generates .pyd instead of .so
+# - venv with --sytem-site-packages has issues on windows as well...
+
+ifeq ($(shell uname -o), Msys)
+	BIN = Scripts
+	SO = *.pyd
+	VENV_OPTIONS = 
+else
+	BIN = bin
+	SO = cpython-3$(PYTHON_VERSION_MINOR)m*.so
+	VENV_OPTIONS = --system-site-packages
+endif
+
+# Set this variable if all dependencies are already met on the system. We will then avoid the
+# whole vitualenv creation and pip install dance.
+NO_VENV ?=
+
+ifdef NO_VENV
+	VENV_PYTHON = $(PYTHON)
+else
+	VENV_PYTHON = ./env/$(BIN)/python
+endif
+
+# If you're installing into a path that is not going to be the final path prefix (such as a
+# sandbox), set DESTDIR to that path.
+
+# Our build scripts are not very "make like" yet and perform their task in a bundle. For now, we
+# use one of each file to act as a representative, a target, of these groups.
+submodules_target = hscommon/__init__.py
+
+packages = hscommon qtlib core qt
+localedirs = $(wildcard locale/*/LC_MESSAGES)
+pofiles = $(wildcard locale/*/LC_MESSAGES/*.po)
+mofiles = $(patsubst %.po,%.mo,$(pofiles))
+
+vpath %.po $(localedirs)
+vpath %.mo $(localedirs)
+
+all : | env i18n modules qt/dg_rc.py
+	@echo "Build complete! You can run dupeGuru with 'make run'"
+
+run:
+	$(VENV_PYTHON) run.py
+
+pyc:
+	${PYTHON} -m compileall ${packages}
+
+reqs :
+ifneq ($(shell test $(PYTHON_VERSION_MINOR) -gt $(REQ_MINOR_VERSION); echo $$?),0)
+	$(error "Python 3.${REQ_MINOR_VERSION}+ required. Aborting.")
+endif
+ifndef NO_VENV
+	@${PYTHON} -m venv -h > /dev/null || \
+		echo "Creation of our virtualenv failed. If you're on Ubuntu, you probably need python3-venv."
+endif
+	@${PYTHON} -c 'import PyQt5' >/dev/null 2>&1 || \
+		{ echo "PyQt 5.4+ required. Install it and try again. Aborting"; exit 1; }
+
+# Ensure that submodules are initialized
+$(submodules_target) :
+	git submodule init
+	git submodule update
+
+env : | $(submodules_target) reqs
+ifndef NO_VENV
+	@echo "Creating our virtualenv"
+	${PYTHON} -m venv env
+	$(VENV_PYTHON) -m pip install -r requirements.txt
+# We can't use the "--system-site-packages" flag on creation because otherwise we end up with
+# the system's pip and that messes up things in some cases (notably in Gentoo).
+	${PYTHON} -m venv --upgrade ${VENV_OPTIONS} env
+endif
+
+build/help : | env
+	$(VENV_PYTHON) build.py --doc
+
+qt/dg_rc.py : qt/dg.qrc
+	$(PYRCC5) qt/dg.qrc > qt/dg_rc.py
+
+i18n: $(mofiles)
+
+%.mo : %.po
+	msgfmt -o $@ $<	
+
+core/pe/_block.$(SO) : core/pe/modules/block.c core/pe/modules/common.c
+	$(PYTHON) hscommon/build_ext.py $^ _block
+	mv _block.$(SO) core/pe
+
+core/pe/_cache.$(SO) : core/pe/modules/cache.c core/pe/modules/common.c
+	$(PYTHON) hscommon/build_ext.py $^ _cache
+	mv _cache.$(SO) core/pe
+
+qt/pe/_block_qt.$(SO) : qt/pe/modules/block.c
+	$(PYTHON) hscommon/build_ext.py $^ _block_qt
+	mv _block_qt.$(SO) qt/pe
+
+modules : core/pe/_block.$(SO) core/pe/_cache.$(SO) qt/pe/_block_qt.$(SO)
+
+mergepot :
+	$(VENV_PYTHON) build.py --mergepot
+
+normpo :
+	$(VENV_PYTHON) build.py --normpo
+
+srcpkg :
+	./scripts/srcpkg.sh
+
+install: all pyc
+	mkdir -p ${DESTDIR}${PREFIX}/share/dupeguru
+	cp -rf ${packages} locale ${DESTDIR}${PREFIX}/share/dupeguru
+	cp -f run.py ${DESTDIR}${PREFIX}/share/dupeguru/run.py
+	chmod 755 ${DESTDIR}${PREFIX}/share/dupeguru/run.py
+	mkdir -p ${DESTDIR}${PREFIX}/bin
+	ln -sf ${PREFIX}/share/dupeguru/run.py ${DESTDIR}${PREFIX}/bin/dupeguru
+	mkdir -p ${DESTDIR}${PREFIX}/share/applications
+	cp -f pkg/dupeguru.desktop ${DESTDIR}${PREFIX}/share/applications
+	mkdir -p ${DESTDIR}${PREFIX}/share/pixmaps
+	cp -f images/dgse_logo_128.png ${DESTDIR}${PREFIX}/share/pixmaps/dupeguru.png
+
+installdocs: build/help
+	mkdir -p ${DESTDIR}${PREFIX}/share/dupeguru
+	cp -rf build/help ${DESTDIR}${PREFIX}/share/dupeguru
+
+uninstall :
+	rm -rf "${DESTDIR}${PREFIX}/share/dupeguru"
+	rm -f "${DESTDIR}${PREFIX}/bin/dupeguru"
+	rm -f "${DESTDIR}${PREFIX}/share/applications/dupeguru.desktop"
+	rm -f "${DESTDIR}${PREFIX}/share/pixmaps/dupeguru.png"
+
+clean:
+	-rm -rf build
+	-rm locale/*/LC_MESSAGES/*.mo
+	-rm core/pe/*.$(SO) qt/pe/*.$(SO)
+
+.PHONY : clean srcpkg normpo mergepot modules i18n reqs run pyc install uninstall all

README.md

@@ -1,47 +1,27 @@
 # dupeGuru
 
-[dupeGuru][dupeguru] is a cross-platform (Linux and OS X) GUI tool to find duplicate files in
+[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, it's written in Python and uses Qt5.
 
-## Current status: People wanted
+The Cocoa UI of dupeGuru is hosted in a separate repo: https://github.com/hsoft/dupeguru-cocoa
 
-dupeGuru has currently only one maintainer, me. This is a dangerous situation that needs to be
+## Current status: Additional Maintainers Wanted (/ Note on Things in General)
-corrected.
 
-The goal is to eventually have another active maintainer, but before we can get there, the project
+When I started contributing to dupeGuru, it was to help provide an updated Windows build for dupeGuru.  I hoped to contribute more over time and help work through some of the general issues as well.  Since Virgil Dupras left as the lead maintainer, I have not been able to devote enough time to work through as many issues as I had hoped.  Now I am going to be devoting a more consistent amount of time each month to work on dupeGuru, however I will not be able to get to all issues.  Additionally there are a few specific areas where additional help would be appreciated:
-needs more contributors. It is very much lacking on that side right now.
 
-Whatever your skills, if you are remotely interestested in being a contributor, I'm interested in
+- OSX maintenance
-mentoring you. If that's the case, please refer to [the open ticket on the subject][contrib-issue]
+  - UI issues (I have no experience with cocoa)
-and let's get started.
+  - General issues & releases (I lack OSX environments / hardware to develop and test on, looking into doing builds through Travis CI.)
+- Linux maintenance
+  - Packaging (I have not really done much linux packaging yet, although will be spending some time trying to get at least .deb and potentially ppa's updated.)
 
-### Slowed development
+I am still working to update the new site & update links within the help and the repository to use the new urls.  Additionally, hoping to get a 4.0.4 release out this year for at least Windows and Linux.
 
-Until I manage to find contributors, I'm slowing the development pace of dupeGuru. I'm not much
+Thanks,
-interested in maintaining it alone, I personally have no use for this app (it's been a *loooong*,
-time since I had dupe problems :) )
 
-I don't want to let it die, however, so I will still do normal maintainership, that is, issue
+Andrew Senetar
-triaging, code review, critical bugfixes, releases management.
-
-But anything non-critical, I'm not going to implement it myself because I see every issue as a
-contribution opportunity.
-
-### Windows maintainer wanted
-
-As [described on my website][nowindows], v3.9.x/6.8.x/2.10.x series of dupeGuru are the last ones
-to support Windows unless someone steps up to maintain it. If you're a Windows developer and are
-interested in taking this task, [don't hesitate to let me know][contrib-issue].
-
-### OS X maintainer wanted
-
-My Mac Mini is already a couple of years old and is likely to be my last Apple purchase. When it
-dies, I will be unable maintain the OS X version of moneyGuru. I've already stopped paying for the
-Mac Developer membership so I can't sign the apps anymore (in the "official way" I mean. The
-download is still PGP signed) If you're a Mac developer and are interested in taking this task,
-[don't hesitate to let me know][contrib-issue].
 
 ## Contents of this folder
 
@@ -49,7 +29,6 @@ This folder contains the source for dupeGuru. Its documentation is in `help`, bu
 [available online][documentation] in its built form. Here's how this source tree is organised:
 
 * core: Contains the core logic code for dupeGuru. It's Python code.
-* 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
@@ -59,73 +38,25 @@ This folder contains the source for dupeGuru. Its documentation is in `help`, bu
 There are also other sub-folder that comes from external repositories and are part of this repo as
 git submodules:
 
-* Sparkle: An auto-update library for the OS X version.
 * hscommon: A collection of helpers used across HS applications.
-* 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.
 
 ## How to build dupeGuru from source
 
-There's a bootstrap script that will make building very easy. There might be some things that you
+### Windows
-need to install manually on your system, but the bootstrap script will tell you when what you need
+For windows instructions see the [Windows Instructions](Windows.md).
-to install. You can run the bootstrap with:
 
-    ./bootstrap.sh
+### Prerequisites
 
-and follow instructions from the script.
+* [Python 3.4+][python]
+* PyQt5
 
-### Prerequisites installation
+### make
 
-Prerequisites are installed through `pip`. However, some of them are not "pip installable" and have
+dupeGuru is built with "make":
-to be installed manually.
-
-* All systems: [Python 3.4+][python]
-* Mac OS X: OS X 10.10+ with XCode command line tools.
-* Linux: PyQt5
-
-On Ubuntu (14.04+), the apt-get command to install all pre-requisites is:
-
-    $ apt-get install python3-dev python3-pyqt5 pyqt5-dev-tools python3-venv
-
-### OS X and pyenv
-
-[pyenv][pyenv] is a popular way to manage multiple python versions. However, be aware that dupeGuru
-will not compile with a pyenv's python unless it's been built with `--enable-framework`. You can do
-this with:
-
-    $ env PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install 3.4.3
-
-### Setting up the virtual environment
-
-*This is done automatically by the bootstrap script. This is a reference in case you need to do it
-manually.*
-
-Use Python's built-in `pyvenv` to create a virtual environment in which we're going to install our.
-Python-related dependencies. In that environment, we then install our requirements with pip.
-
-For Linux (`--system-site-packages` is to be able to import PyQt):
-
-    $ pyvenv --system-site-packages env
-    $ source env/bin/activate
-    $ pip install -r requirements.txt
-
-For OS X:
-
-    $ pyvenv  env
-    $ source env/bin/activate
-    $ pip install -r requirements-osx.txt
-
-### Actual building and running
-
-With your virtualenv activated, you can build and run dupeGuru with these commands:
-
-    $ python build.py
-    $ python run.py
-
-You can also package dupeGuru into an installable package with:
-
-    $ python package.py
 
+    $ make
+    $ make run
 
 ### Generate Ubuntu packages
 
@@ -133,7 +64,7 @@ You can also package dupeGuru into an installable package with:
 
 ### Running tests
 
-The complete test suite is ran with [Tox 1.7+][tox]. If you have it installed system-wide, you
+The complete test suite is run with [Tox 1.7+][tox]. If you have it installed system-wide, you
 don't even need to set up a virtualenv. Just `cd` into the root project folder and run `tox`.
 
 If you don't have Tox system-wide, install it in your virtualenv with `pip install tox` and then
@@ -143,13 +74,9 @@ You can also run automated tests without Tox. Extra requirements for running tes
 `requirements-extra.txt`. So, you can do `pip install -r requirements-extra.txt` inside your
 virtualenv and then `py.test core hscommon`
 
-[dupeguru]: http://www.hardcoded.net/dupeguru/
+[dupeguru]: https://dupeguru.voltaicideas.net/
 [cross-toolkit]: http://www.hardcoded.net/articles/cross-toolkit-software
-[contrib-issue]: https://github.com/hsoft/dupeguru/issues/300
+[documentation]: http://dupeguru.voltaicideas.net/help/en/
-[nowindows]: https://www.hardcoded.net/archive2015#2015-11-01
-[documentation]: http://www.hardcoded.net/dupeguru/help/en/
 [python]: http://www.python.org/
 [pyqt]: http://www.riverbankcomputing.com
-[pyenv]: https://github.com/yyuu/pyenv
 [tox]: https://tox.readthedocs.org/en/latest/
-

Windows.md

@@ -0,0 +1,59 @@
+## How to build dupeGuru for Windows
+
+### Prerequisites
+
+- [Python 3.5+][python]
+- [Visual Studio 2017][vs] or [Visual Studio Build Tools 2017][vsBuildTools] with the Windows 10 SDK
+- [nsis][nsis] (for installer creation)
+- [msys2][msys2] (for using makefile method)
+
+When installing Visual Studio or the Visual Studio Build Tools with the Windows 10 SDK on versions of Windows below 10 be sure to make sure that the Universal CRT is installed before installing Visual studio as noted in the [Windows 10 SDK Notes][win10sdk] and found at [KB2999226][KB2999226].
+
+After installing python it is recommended to update setuptools before compiling packages.  To update run (example is for python launcher and 3.5):
+
+    $ py -3.5 -m pip install --upgrade setuptools
+
+More details on setting up python for compiling packages on windows can be found on the [python wiki][pythonWindowsCompilers]
+
+### With build.py (preferred)
+To build with a different python version 3.5 vs 3.6 or 32 bit vs 64 bit specify that version instead of -3.5 to the `py` command below.  If you want to build additional versions while keeping all virtual environments setup use a different location for each vritual environment.
+
+    $ cd <dupeGuru directory>
+    $ git submodule init
+    $ git submodule update
+    $ py -3.5 -m venv .\env
+    $ .\env\Scripts\activate
+    $ pip install -r requirements.txt -r requirements-windows.txt
+    $ python build.py
+    $ python run.py
+
+### With makefile
+It is possible to build dupeGuru with the makefile on windows using a compatable POSIX environment.  The following steps have been tested using [msys2][msys2]. Before running make:
+1. Install msys2 or other POSIX environment
+2. Install PyQt5 globally via pip
+3. Use the respective console for msys2 it is `msys2 msys` 
+
+Then the following execution of the makefile should work.  Pass the correct value for PYTHON to the makefile if not on the path as python3.
+
+    $ cd <dupeGuru directory>
+    $ make PYTHON='py -3.5'
+    $ make run
+
+NOTE: Install PyQt5 & cx-Freeze with requirements-windows.txt into the venv before runing the packaging scripts in the section below.
+
+### Generate Windows Installer Packages
+You need to use the respective x86 or x64 version of python to build the 32 bit and 64 bit versions.  The build scripts will automatically detect the python architecture for you. When using build.py make sure the resulting python works before continuing to package.py.  NOTE: package.py looks for the 'makensis' executable in the default location for a 64 bit windows system.  Run the following in the respective virtual environment.
+
+    $ python package.py
+
+### Running tests
+The complete test suite can be run with tox just like on linux.
+
+[python]: http://www.python.org/
+[nsis]: http://nsis.sourceforge.net/Main_Page
+[vs]: https://www.visualstudio.com/downloads/#visual-studio-community-2017
+[vsBuildTools]: https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
+[win10sdk]: https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk
+[KB2999226]: https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows
+[pythonWindowsCompilers]: https://wiki.python.org/moin/WindowsCompilers
+[msys2]: http://www.msys2.org/

bootstrap.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-
-PYTHON=python3
-ret=`$PYTHON -c "import sys; print(int(sys.version_info[:2] >= (3, 4)))"`
-if [ $ret -ne 1 ]; then
-    echo "Python 3.4+ required. Aborting."
-    exit 1
-fi
-
-
-if [ -d ".git" ]; then
-    git submodule init
-    git submodule update
-fi
-
-if [ ! -d "env" ]; then
-    echo "No virtualenv. Creating one"
-    # We need a "system-site-packages" env to have PyQt, but we also need to ensure a local pip
-    # install. To achieve our latter goal, we start with a normal venv, which we later upgrade to
-    # a system-site-packages once pip is installed.
-    if ! $PYTHON -m venv env ; then
-        echo "Creation of our virtualenv failed. If you're on Ubuntu, you probably need python3-venv."
-        exit 1
-    fi
-    if [ "$(uname)" != "Darwin" ]; then
-        $PYTHON -m venv env --upgrade --system-site-packages
-    fi
-fi
-
-source env/bin/activate
-
-echo "Installing pip requirements"
-if [ "$(uname)" == "Darwin" ]; then
-    ./env/bin/pip install -r requirements-osx.txt
-else
-    ./env/bin/python -c "import PyQt5" >/dev/null 2>&1 || { echo >&2 "PyQt 5.4+ required. Install it and try again. Aborting"; exit 1; }
-    ./env/bin/pip install -r requirements.txt
-fi
-
-echo "Bootstrapping complete! You can now configure, build and run dupeGuru with:"
-echo ". env/bin/activate && python build.py && python run.py"

build.py

@@ -1,28 +1,21 @@
-# Copyright 2016 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2017 Virgil Dupras
 #
 # This software is licensed under the "GPLv3" License as described in the "LICENSE" file,
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-import sys
 import os
 import os.path as op
 from optparse import OptionParser
 import shutil
-import compileall
 
 from setuptools import setup, Extension
 
 from hscommon import sphinxgen
 from hscommon.build import (
-    add_to_pythonpath, print_and_do, copy_packages, filereplace,
+    add_to_pythonpath, print_and_do, move_all, fix_qt_resource_file,
-    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
 )
 from hscommon import loc
-from hscommon.plat import ISOSX
-from hscommon.util import ensure_folder, delete_files_with_pattern
 
 def parse_args():
     usage = "usage: %prog [options]"
@@ -35,30 +28,10 @@ def parse_args():
         '--doc', action='store_true', dest='doc',
         help="Build only the help file"
     )
-    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."
-    )
     parser.add_option(
         '--loc', action='store_true', dest='loc',
         help="Build only localization"
     )
-    parser.add_option(
-        '--cocoa-ext', action='store_true', dest='cocoa_ext',
-        help="Build only Cocoa extensions"
-    )
-    parser.add_option(
-        '--cocoa-compile', action='store_true', dest='cocoa_compile',
-        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."
@@ -74,108 +47,6 @@ def parse_args():
     (options, args) = parser.parse_args()
     return options
 
-def cocoa_app():
-    app_path = 'build/dupeGuru.app'
-    return OSXAppStructure(app_path)
-
-def build_xibless(dest='cocoa/autogen'):
-    import xibless
-    ensure_folder(dest)
-    FNPAIRS = [
-        ('ignore_list_dialog.py', 'IgnoreListDialog_UI'),
-        ('deletion_options.py', 'DeletionOptions_UI'),
-        ('problem_dialog.py', 'ProblemDialog_UI'),
-        ('directory_panel.py', 'DirectoryPanel_UI'),
-        ('prioritize_dialog.py', 'PrioritizeDialog_UI'),
-        ('result_window.py', 'ResultWindow_UI'),
-        ('main_menu.py', 'MainMenu_UI'),
-        ('details_panel.py', 'DetailsPanel_UI'),
-        ('details_panel_picture.py', 'DetailsPanelPicture_UI'),
-    ]
-    for srcname, dstname in FNPAIRS:
-        xibless.generate(
-            op.join('cocoa', 'ui', srcname), op.join(dest, dstname),
-            localizationTable='Localizable'
-        )
-    for appmode in ('standard', 'music', 'picture'):
-        xibless.generate(
-            op.join('cocoa', 'ui', 'preferences_panel.py'),
-            op.join(dest, 'PreferencesPanel%s_UI' % appmode.capitalize()),
-            localizationTable='Localizable',
-            args={'appmode': appmode},
-        )
-
-def build_cocoa(dev):
-    sparkle_framework_path = op.join('cocoa', 'Sparkle', 'build', 'Release', 'Sparkle.framework')
-    if not op.exists(sparkle_framework_path):
-        print("Building Sparkle")
-        os.chdir(op.join('cocoa', 'Sparkle'))
-        print_and_do('make build')
-        os.chdir(op.join('..', '..'))
-    print("Creating OS X app structure")
-    app = cocoa_app()
-    app_version = get_module_version('core')
-    cocoa_project_path = 'cocoa'
-    filereplace(op.join(cocoa_project_path, 'InfoTemplate.plist'), op.join('build', 'Info.plist'), version=app_version)
-    app.create(op.join('build', 'Info.plist'))
-    print("Building localizations")
-    build_localizations('cocoa')
-    print("Building xibless UIs")
-    build_cocoalib_xibless()
-    build_xibless()
-    print("Building Python extensions")
-    build_cocoa_proxy_module()
-    build_cocoa_bridging_interfaces()
-    print("Building the cocoa layer")
-    copy_embeddable_python_dylib('build')
-    pydep_folder = op.join(app.resources, 'py')
-    if not op.exists(pydep_folder):
-        os.mkdir(pydep_folder)
-    shutil.copy(op.join(cocoa_project_path, 'dg_cocoa.py'), 'build')
-    tocopy = [
-        'core', 'hscommon', 'cocoa/inter', 'cocoalib/cocoa', 'objp', 'send2trash', 'hsaudiotag',
-    ]
-    copy_packages(tocopy, pydep_folder, create_links=dev)
-    sys.path.insert(0, 'build')
-    # ModuleFinder can't seem to correctly detect the multiprocessing dependency, so we have
-    # to manually specify it.
-    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.
-    copy_all('build/inter/*.so', op.join(pydep_folder, 'inter'))
-    if not dev:
-        # Important: Don't ever run delete_files_with_pattern('*.py') on dev builds because you'll
-        # be deleting all py files in symlinked folders.
-        compileall.compile_dir(pydep_folder, force=True, legacy=True)
-        delete_files_with_pattern(pydep_folder, '*.py')
-        delete_files_with_pattern(pydep_folder, '__pycache__')
-    print("Compiling with WAF")
-    os.chdir('cocoa')
-    print_and_do('{0} waf configure && {0} waf'.format(sys.executable))
-    os.chdir('..')
-    app.copy_executable('cocoa/build/dupeGuru')
-    build_help()
-    print("Copying resources and frameworks")
-    image_path = 'cocoa/dupeguru.icns'
-    resources = [image_path, 'cocoa/dsa_pub.pem', 'build/dg_cocoa.py', 'build/help']
-    app.copy_resources(*resources, use_symlinks=dev)
-    app.copy_frameworks('build/Python', sparkle_framework_path)
-    print("Creating the run.py file")
-    tmpl = open('cocoa/run_template.py', 'rt').read()
-    run_contents = tmpl.replace('{{app_path}}', app.dest)
-    open('run.py', 'wt').write(run_contents)
-
-def build_qt(dev):
-    print("Building localizations")
-    build_localizations('qt')
-    print("Building Qt stuff")
-    print_and_do("pyrcc5 {0} > {1}".format(op.join('qt', 'dg.qrc'), op.join('qt', 'dg_rc.py')))
-    fix_qt_resource_file(op.join('qt', 'dg_rc.py'))
-    build_help()
-    print("Creating the run.py file")
-    shutil.copy(op.join('qt', 'run_template.py'), 'run.py')
-
 def build_help():
     print("Generating Help")
     current_path = op.abspath('.')
@@ -192,13 +63,8 @@ def build_qt_localizations():
     loc.compile_all_po(op.join('qtlib', 'locale'))
     loc.merge_locale_dir(op.join('qtlib', 'locale'), 'locale')
 
-def build_localizations(ui):
+def build_localizations():
     loc.compile_all_po('locale')
-    if ui == 'cocoa':
-        app = cocoa_app()
-        loc.build_cocoa_localizations(app, en_stringsfile=op.join('cocoa', 'en.lproj', 'Localizable.strings'))
-        locale_dest = op.join(app.resources, 'locale')
-    elif ui == 'qt':
     build_qt_localizations()
     locale_dest = op.join('build', 'locale')
     if op.exists(locale_dest):
@@ -206,12 +72,6 @@ def build_localizations(ui):
     shutil.copytree('locale', locale_dest, ignore=shutil.ignore_patterns('*.po', '*.pot'))
 
 def build_updatepot():
-    if ISOSX:
-        print("Updating Cocoa strings file.")
-        build_cocoalib_xibless('cocoalib/autogen')
-        loc.generate_cocoa_strings_from_code('cocoalib', 'cocoalib/en.lproj')
-        build_xibless('se', op.join('cocoa', 'autogen', 'se'))
-        loc.generate_cocoa_strings_from_code('cocoa', 'cocoa/en.lproj')
     print("Building .pot files from source files")
     print("Building core.pot")
     loc.generate_pot(['core'], op.join('locale', 'core.pot'), ['tr'])
@@ -221,19 +81,9 @@ def build_updatepot():
     # When we're not under OS X, we don't want to overwrite ui.pot because it contains Cocoa locs
     # We want to merge the generated pot with the old pot in the most preserving way possible.
     ui_packages = ['qt', op.join('cocoa', 'inter')]
-    loc.generate_pot(ui_packages, op.join('locale', 'ui.pot'), ['tr'], merge=(not ISOSX))
+    loc.generate_pot(ui_packages, op.join('locale', 'ui.pot'), ['tr'], merge=True)
     print("Building qtlib.pot")
     loc.generate_pot(['qtlib'], op.join('qtlib', 'locale', 'qtlib.pot'), ['tr'])
-    if ISOSX:
-        print("Building cocoalib.pot")
-        cocoalib_pot = op.join('cocoalib', 'locale', 'cocoalib.pot')
-        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(
-            op.join('cocoa', 'en.lproj', 'Localizable.strings'),
-            op.join('locale', 'ui.pot')
-        )
 
 def build_mergepot():
     print("Updating .po files using .pot files")
@@ -246,60 +96,7 @@ def build_normpo():
     loc.normalize_all_pos(op.join('qtlib', 'locale'))
     loc.normalize_all_pos(op.join('cocoalib', 'locale'))
 
-def build_cocoa_proxy_module():
+def build_pe_modules():
-    print("Building Cocoa Proxy")
-    import objp.p2o
-    objp.p2o.generate_python_proxy_code('cocoalib/cocoa/CocoaProxy.h', 'build/CocoaProxy.m')
-    build_cocoa_ext(
-        "CocoaProxy", 'cocoalib/cocoa',
-        [
-            'cocoalib/cocoa/CocoaProxy.m', 'build/CocoaProxy.m', 'build/ObjP.m',
-            'cocoalib/HSErrorReportWindow.m', 'cocoa/autogen/HSErrorReportWindow_UI.m'
-        ],
-        ['AppKit', 'CoreServices'],
-        ['cocoalib', 'cocoa/autogen']
-    )
-
-def build_cocoa_bridging_interfaces():
-    print("Building Cocoa Bridging Interfaces")
-    import objp.o2p
-    import objp.p2o
-    add_to_pythonpath('cocoa')
-    add_to_pythonpath('cocoalib')
-    from cocoa.inter import (
-        PyGUIObject, GUIObjectView, PyColumns, ColumnsView, PyOutline,
-        OutlineView, PySelectableList, SelectableListView, PyTable, TableView, PyBaseApp,
-        PyTextField, ProgressWindowView, PyProgressWindow
-    )
-    from inter.deletion_options import PyDeletionOptions, DeletionOptionsView
-    from inter.details_panel import PyDetailsPanel, DetailsPanelView
-    from inter.directory_outline import PyDirectoryOutline, DirectoryOutlineView
-    from inter.prioritize_dialog import PyPrioritizeDialog, PrioritizeDialogView
-    from inter.prioritize_list import PyPrioritizeList, PrioritizeListView
-    from inter.problem_dialog import PyProblemDialog
-    from inter.ignore_list_dialog import PyIgnoreListDialog, IgnoreListDialogView
-    from inter.result_table import PyResultTable, ResultTableView
-    from inter.stats_label import PyStatsLabel, StatsLabelView
-    from inter.app import PyDupeGuru, DupeGuruView
-    allclasses = [
-        PyGUIObject, PyColumns, PyOutline, PySelectableList, PyTable, PyBaseApp,
-        PyDetailsPanel, PyDirectoryOutline, PyPrioritizeDialog, PyPrioritizeList, PyProblemDialog,
-        PyIgnoreListDialog, PyDeletionOptions, PyResultTable, PyStatsLabel, PyDupeGuru,
-        PyTextField, PyProgressWindow
-    ]
-    for class_ in allclasses:
-        objp.o2p.generate_objc_code(class_, 'cocoa/autogen', inherit=True)
-    allclasses = [
-        GUIObjectView, ColumnsView, OutlineView, SelectableListView, TableView,
-        DetailsPanelView, DirectoryOutlineView, PrioritizeDialogView, PrioritizeListView,
-        IgnoreListDialogView, DeletionOptionsView, ResultTableView, StatsLabelView,
-        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'])
-
-def build_pe_modules(ui):
     print("Building PE Modules")
     exts = [
         Extension(
@@ -311,18 +108,7 @@ def build_pe_modules(ui):
             [op.join('core', 'pe', 'modules', 'cache.c'), op.join('core', 'pe', 'modules', 'common.c')]
         ),
     ]
-    if ui == 'qt':
     exts.append(Extension("_block_qt", [op.join('qt', 'pe', 'modules', 'block.c')]))
-    elif ui == 'cocoa':
-        exts.append(Extension(
-            "_block_osx",
-            [op.join('core', 'pe', 'modules', 'block_osx.m'), op.join('core', 'pe', 'modules', 'common.c')],
-            extra_link_args=[
-                "-framework", "CoreFoundation",
-                "-framework", "Foundation",
-                "-framework", "ApplicationServices",
-            ]
-        ))
     setup(
         script_args=['build_ext', '--inplace'],
         ext_modules=exts,
@@ -331,52 +117,34 @@ def build_pe_modules(ui):
     move_all('_block*', op.join('core', 'pe'))
     move_all('_cache*', op.join('core', 'pe'))
 
-def build_normal(ui, dev):
+def build_normal():
-    print("Building dupeGuru with UI {}".format(ui))
+    print("Building dupeGuru with UI qt")
     add_to_pythonpath('.')
     print("Building dupeGuru")
-    build_pe_modules(ui)
+    build_pe_modules()
-    if ui == 'cocoa':
+    print("Building localizations")
-        build_cocoa(dev)
+    build_localizations()
-    elif ui == 'qt':
+    print("Building Qt stuff")
-        build_qt(dev)
+    print_and_do("pyrcc5 {0} > {1}".format(op.join('qt', 'dg.qrc'), op.join('qt', 'dg_rc.py')))
+    fix_qt_resource_file(op.join('qt', 'dg_rc.py'))
+    build_help()
 
 def main():
     options = parse_args()
-    ui = options.ui
-    if ui not in ('cocoa', 'qt'):
-        ui = 'cocoa' if ISOSX else 'qt'
-    if options.dev:
-        print("Building in Dev mode")
-    if options.clean:
-        for path in ['build', op.join('cocoa', 'build'), op.join('cocoa', 'autogen')]:
-            if op.exists(path):
-                shutil.rmtree(path)
     if not op.exists('build'):
         os.mkdir('build')
     if options.doc:
         build_help()
     elif options.loc:
-        build_localizations(ui)
+        build_localizations()
     elif options.updatepot:
         build_updatepot()
     elif options.mergepot:
         build_mergepot()
     elif options.normpo:
         build_normpo()
-    elif options.cocoa_ext:
-        build_cocoa_proxy_module()
-        build_cocoa_bridging_interfaces()
-    elif options.cocoa_compile:
-        os.chdir('cocoa')
-        print_and_do('{0} waf configure && {0} waf'.format(sys.executable))
-        os.chdir('..')
-        cocoa_app().copy_executable('cocoa/build/dupeGuru')
-    elif options.xibless:
-        build_cocoalib_xibless()
-        build_xibless()
     else:
-        build_normal(ui, options.dev)
+        build_normal()
 
 if __name__ == '__main__':
     main()

cocoa/AppDelegate.h

@@ -1,82 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import <Cocoa/Cocoa.h>
-#import <Sparkle/SUUpdater.h>
-#import "PyDupeGuru.h"
-#import "ResultWindow.h"
-#import "ResultTable.h"
-#import "DetailsPanel.h"
-#import "DirectoryPanel.h"
-#import "IgnoreListDialog.h"
-#import "ProblemDialog.h"
-#import "DeletionOptions.h"
-#import "HSAboutBox.h"
-#import "HSRecentFiles.h"
-#import "HSProgressWindow.h"
-
-@interface AppDelegate : NSObject <NSFileManagerDelegate>
-{
-    NSMenu *recentResultsMenu;
-    NSMenu *columnsMenu;
-    SUUpdater *updater;
-    
-    PyDupeGuru *model;
-    ResultWindow *_resultWindow;
-    DirectoryPanel *_directoryPanel;
-    DetailsPanel *_detailsPanel;
-    IgnoreListDialog *_ignoreListDialog;
-    ProblemDialog *_problemDialog;
-    DeletionOptions *_deletionOptions;
-    HSProgressWindow *_progressWindow;
-    NSWindowController *_preferencesPanel;
-    HSAboutBox *_aboutBox;
-    HSRecentFiles *_recentResults;
-}
-
-@property (readwrite, retain) NSMenu *recentResultsMenu;
-@property (readwrite, retain) NSMenu *columnsMenu;
-@property (readwrite, retain) SUUpdater *updater;
-
-/* Virtual */
-+ (NSDictionary *)defaultPreferences;
-- (PyDupeGuru *)model;
-- (DetailsPanel *)createDetailsPanel;
-- (void)setScanOptions;
-
-/* Public */
-- (void)finalizeInit;
-- (ResultWindow *)resultWindow;
-- (DirectoryPanel *)directoryPanel;
-- (DetailsPanel *)detailsPanel;
-- (HSRecentFiles *)recentResults;
-- (NSInteger)getAppMode;
-- (void)setAppMode:(NSInteger)appMode;
-
-/* Delegate */
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification;
-- (void)applicationWillBecomeActive:(NSNotification *)aNotification;
-- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;
-- (void)applicationWillTerminate:(NSNotification *)aNotification;
-- (void)recentFileClicked:(NSString *)path;
-
-/* Actions */
-- (void)clearPictureCache;
-- (void)loadResults;
-- (void)openWebsite;
-- (void)openHelp;
-- (void)showAboutBox;
-- (void)showDirectoryWindow;
-- (void)showPreferencesPanel;
-- (void)showResultWindow;
-- (void)showIgnoreList;
-- (void)startScanning;
-
-/* model --> view */
-- (void)showMessage:(NSString *)msg;
-@end

cocoa/AppDelegate.m

@@ -1,398 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import "AppDelegate.h"
-#import "ProgressController.h"
-#import "HSPyUtil.h"
-#import "Consts.h"
-#import "Dialogs.h"
-#import "Utils.h"
-#import "ValueTransformers.h"
-#import "DetailsPanelPicture.h"
-#import "PreferencesPanelStandard_UI.h"
-#import "PreferencesPanelMusic_UI.h"
-#import "PreferencesPanelPicture_UI.h"
-
-@implementation AppDelegate
-
-@synthesize recentResultsMenu;
-@synthesize columnsMenu;
-@synthesize updater;
-
-+ (NSDictionary *)defaultPreferences
-{
-    NSMutableDictionary *d = [NSMutableDictionary dictionary];
-    [d setObject:i2n(1) forKey:@"scanTypeStandard"];
-    [d setObject:i2n(3) forKey:@"scanTypeMusic"];
-    [d setObject:i2n(0) forKey:@"scanTypePicture"];
-    [d setObject:i2n(95) forKey:@"minMatchPercentage"];
-    [d setObject:i2n(30) forKey:@"smallFileThreshold"];
-    [d setObject:b2n(YES) forKey:@"wordWeighting"];
-    [d setObject:b2n(NO) forKey:@"matchSimilarWords"];
-    [d setObject:b2n(YES) forKey:@"ignoreSmallFiles"];
-    [d setObject:b2n(NO) forKey:@"scanTagTrack"];
-    [d setObject:b2n(YES) forKey:@"scanTagArtist"];
-    [d setObject:b2n(YES) forKey:@"scanTagAlbum"];
-    [d setObject:b2n(YES) forKey:@"scanTagTitle"];
-    [d setObject:b2n(NO) forKey:@"scanTagGenre"];
-    [d setObject:b2n(NO) forKey:@"scanTagYear"];
-    [d setObject:b2n(NO) forKey:@"matchScaled"];
-    [d setObject:i2n(1) forKey:@"recreatePathType"];
-    [d setObject:i2n(11) forKey:TableFontSize];
-    [d setObject:b2n(YES) forKey:@"mixFileKind"];
-    [d setObject:b2n(NO) forKey:@"useRegexpFilter"];
-    [d setObject:b2n(NO) forKey:@"ignoreHardlinkMatches"];
-    [d setObject:b2n(NO) forKey:@"removeEmptyFolders"];
-    [d setObject:b2n(NO) forKey:@"DebugMode"];
-    [d setObject:@"" forKey:@"CustomCommand"];
-    [d setObject:[NSArray array] forKey:@"recentDirectories"];
-    [d setObject:[NSArray array] forKey:@"columnsOrder"];
-    [d setObject:[NSDictionary dictionary] forKey:@"columnsWidth"];
-    return d;
-}
-
-+ (void)initialize
-{
-    HSVTAdd *vt = [[[HSVTAdd alloc] initWithValue:4] autorelease];
-    [NSValueTransformer setValueTransformer:vt forName:@"vtRowHeightOffset"];
-    NSDictionary *d = [self defaultPreferences];
-    [[NSUserDefaultsController sharedUserDefaultsController] setInitialValues:d];
-    [[NSUserDefaults standardUserDefaults] registerDefaults:d];
-}
-
-- (id)init
-{
-    self = [super init];
-    model = [[PyDupeGuru alloc] init];
-    [model bindCallback:createCallback(@"DupeGuruView", self)];
-    [self setUpdater:[SUUpdater sharedUpdater]];
-    NSMutableIndexSet *contentsIndexes = [NSMutableIndexSet indexSet];
-    [contentsIndexes addIndex:1];
-    [contentsIndexes addIndex:2];
-    VTIsIntIn *vt = [[[VTIsIntIn alloc] initWithValues:contentsIndexes reverse:YES] autorelease];
-    [NSValueTransformer setValueTransformer:vt forName:@"vtScanTypeIsNotContent"];
-    NSMutableIndexSet *i = [NSMutableIndexSet indexSetWithIndex:0];
-    VTIsIntIn *vtScanTypeIsFuzzy = [[[VTIsIntIn alloc] initWithValues:i reverse:NO] autorelease];
-    [NSValueTransformer setValueTransformer:vtScanTypeIsFuzzy forName:@"vtScanTypeIsFuzzy"];
-    i = [NSMutableIndexSet indexSetWithIndex:4];
-    VTIsIntIn *vtScanTypeIsNotContent = [[[VTIsIntIn alloc] initWithValues:i reverse:YES] autorelease];
-    [NSValueTransformer setValueTransformer:vtScanTypeIsNotContent forName:@"vtScanTypeMusicIsNotContent"];
-    VTIsIntIn *vtScanTypeIsTag = [[[VTIsIntIn alloc] initWithValues:[NSIndexSet indexSetWithIndex:3] reverse:NO] autorelease];
-    [NSValueTransformer setValueTransformer:vtScanTypeIsTag forName:@"vtScanTypeIsTag"];
-    return self;
-}
-
-- (void)finalizeInit
-{
-    // We can only finalize initialization once the main menu has been created, which cannot happen
-    // before AppDelegate is created.
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    /* Because the pref pane is lazily loaded, we have to manually do the update check if the
-       preference is set.
-    */
-    if ([ud boolForKey:@"SUEnableAutomaticChecks"]) {
-        [[SUUpdater sharedUpdater] checkForUpdatesInBackground];
-    }
-    _recentResults = [[HSRecentFiles alloc] initWithName:@"recentResults" menu:recentResultsMenu];
-    [_recentResults setDelegate:self];
-    _directoryPanel = [[DirectoryPanel alloc] initWithParentApp:self];
-    _ignoreListDialog = [[IgnoreListDialog alloc] initWithPyRef:[model ignoreListDialog]];
-    _problemDialog = [[ProblemDialog alloc] initWithPyRef:[model problemDialog]];
-    _deletionOptions = [[DeletionOptions alloc] initWithPyRef:[model deletionOptions]];
-    _progressWindow = [[HSProgressWindow alloc] initWithPyRef:[[self model] progressWindow] view:nil];
-    [_progressWindow setParentWindow:[_directoryPanel window]];
-     // Lazily loaded
-    _aboutBox = nil;
-    _preferencesPanel = nil;
-    _resultWindow = nil;
-    _detailsPanel = nil;
-    [[[self directoryPanel] window] makeKeyAndOrderFront:self];
-}
-
-/* Virtual */
-
-- (PyDupeGuru *)model
-{
-    return model;
-}
-
-- (DetailsPanel *)createDetailsPanel
-{
-    NSInteger appMode = [self getAppMode];
-    if (appMode == AppModePicture) {
-        return [[DetailsPanelPicture alloc] initWithApp:model];
-    }
-    else {
-        return [[DetailsPanel alloc] initWithPyRef:[model detailsPanel]];
-    }
-}
-
-- (void)setScanOptions
-{
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    NSString *scanTypeOptionName;
-    NSInteger appMode = [self getAppMode];
-    if (appMode == AppModePicture) {
-        scanTypeOptionName = @"scanTypePicture";
-    }
-    else if (appMode == AppModeMusic) {
-        scanTypeOptionName = @"scanTypeMusic";
-    }
-    else {
-        scanTypeOptionName = @"scanTypeStandard";
-    }
-    [model setScanType:n2i([ud objectForKey:scanTypeOptionName])];
-    [model setMinMatchPercentage:n2i([ud objectForKey:@"minMatchPercentage"])];
-    [model setWordWeighting:n2b([ud objectForKey:@"wordWeighting"])];
-    [model setMixFileKind:n2b([ud objectForKey:@"mixFileKind"])];
-    [model setIgnoreHardlinkMatches:n2b([ud objectForKey:@"ignoreHardlinkMatches"])];
-    [model setMatchSimilarWords:n2b([ud objectForKey:@"matchSimilarWords"])];
-    int smallFileThreshold = [ud integerForKey:@"smallFileThreshold"]; // In KB
-    int sizeThreshold = [ud boolForKey:@"ignoreSmallFiles"] ? smallFileThreshold * 1024 : 0; // The py side wants bytes
-    [model setSizeThreshold:sizeThreshold];
-    [model enable:n2b([ud objectForKey:@"scanTagTrack"]) scanForTag:@"track"];
-    [model enable:n2b([ud objectForKey:@"scanTagArtist"]) scanForTag:@"artist"];
-    [model enable:n2b([ud objectForKey:@"scanTagAlbum"]) scanForTag:@"album"];
-    [model enable:n2b([ud objectForKey:@"scanTagTitle"]) scanForTag:@"title"];
-    [model enable:n2b([ud objectForKey:@"scanTagGenre"]) scanForTag:@"genre"];
-    [model enable:n2b([ud objectForKey:@"scanTagYear"]) scanForTag:@"year"];
-    [model setMatchScaled:n2b([ud objectForKey:@"matchScaled"])];
-}
-
-/* Public */
-- (ResultWindow *)resultWindow
-{
-    return _resultWindow;
-}
-
-- (DirectoryPanel *)directoryPanel
-{
-    return _directoryPanel;
-}
-
-- (DetailsPanel *)detailsPanel
-{
-    return _detailsPanel;
-}
-
-- (HSRecentFiles *)recentResults
-{
-    return _recentResults;
-}
-
-- (NSInteger)getAppMode
-{
-    return [model getAppMode];
-}
-
-- (void)setAppMode:(NSInteger)appMode
-{
-    [model setAppMode:appMode];
-    if (_preferencesPanel != nil) {
-        [_preferencesPanel release];
-        _preferencesPanel = nil;
-    }
-}
-
-/* Actions */
-- (void)clearPictureCache
-{
-    NSString *msg = NSLocalizedString(@"Do you really want to remove all your cached picture analysis?", @"");
-    if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
-        return;
-    [model clearPictureCache];
-}
-
-- (void)loadResults
-{
-    NSOpenPanel *op = [NSOpenPanel openPanel];
-    [op setCanChooseFiles:YES];
-    [op setCanChooseDirectories:NO];
-    [op setCanCreateDirectories:NO];
-    [op setAllowsMultipleSelection:NO];
-    [op setAllowedFileTypes:[NSArray arrayWithObject:@"dupeguru"]];
-    [op setTitle:NSLocalizedString(@"Select a results file to load", @"")];
-    if ([op runModal] == NSOKButton) {
-        NSString *filename = [[[op URLs] objectAtIndex:0] path];
-        [model loadResultsFrom:filename];
-        [[self recentResults] addFile:filename];
-    }
-}
-
-- (void)openWebsite
-{
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.hardcoded.net/dupeguru/"]];
-}
-
-- (void)openHelp
-{
-    NSBundle *b = [NSBundle mainBundle];
-    NSString *p = [b pathForResource:@"index" ofType:@"html" inDirectory:@"help"];
-    NSURL *u = [NSURL fileURLWithPath:p];
-    [[NSWorkspace sharedWorkspace] openURL:u];
-}
-
-- (void)showAboutBox
-{
-    if (_aboutBox == nil) {
-        _aboutBox = [[HSAboutBox alloc] initWithApp:model];
-    }
-    [[_aboutBox window] makeKeyAndOrderFront:nil];
-}
-
-- (void)showDirectoryWindow
-{
-    [[[self directoryPanel] window] makeKeyAndOrderFront:nil];
-}
-
-- (void)showPreferencesPanel
-{
-    if (_preferencesPanel == nil) {
-        NSWindow *window;
-        NSInteger appMode = [model getAppMode];
-        if (appMode == AppModePicture) {
-            window = createPreferencesPanelPicture_UI(nil);
-        }
-        else if (appMode == AppModeMusic) {
-            window = createPreferencesPanelMusic_UI(nil);
-        }
-        else {
-            window = createPreferencesPanelStandard_UI(nil);
-        }
-        _preferencesPanel = [[NSWindowController alloc] initWithWindow:window];
-    }
-    [_preferencesPanel showWindow:nil];
-}
-
-- (void)showResultWindow
-{
-    [[[self resultWindow] window] makeKeyAndOrderFront:nil];
-}
-
-- (void)showIgnoreList
-{
-    [model showIgnoreList];
-}
-
-- (void)startScanning
-{
-    [[self directoryPanel] startDuplicateScan];
-}
-
-
-/* Delegate */
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
-{
-    [model loadSession];
-}
-
-- (void)applicationWillBecomeActive:(NSNotification *)aNotification
-{
-    if (![[[self directoryPanel] window] isVisible]) {
-        [[self directoryPanel] showWindow:NSApp];
-    }
-}
-
-- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
-{
-    if ([model resultsAreModified]) {
-        NSString *msg = NSLocalizedString(@"You have unsaved results, do you really want to quit?", @"");
-        if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) { // NO
-            return NSTerminateCancel;
-        }
-    }
-    return NSTerminateNow;
-}
-
-- (void)applicationWillTerminate:(NSNotification *)aNotification
-{
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    NSInteger sc = [ud integerForKey:@"sessionCountSinceLastIgnorePurge"];
-    if (sc >= 10) {
-        sc = -1;
-        [model purgeIgnoreList];
-    }
-    sc++;
-    [model saveSession];
-    [ud setInteger:sc forKey:@"sessionCountSinceLastIgnorePurge"];
-    // NSApplication does not release nib instances objects, we must do it manually
-    // Well, it isn't needed because the memory is freed anyway (we are quitting the application
-    // But I need to release HSRecentFiles so it saves the user defaults
-    [_directoryPanel release];
-    [_recentResults release];
-}
-
-- (void)recentFileClicked:(NSString *)path
-{
-    [model loadResultsFrom:path];
-}
-
-
-/* model --> view */
-- (void)showMessage:(NSString *)msg
-{
-    [Dialogs showMessage:msg];
-}
-
-- (BOOL)askYesNoWithPrompt:(NSString *)prompt
-{
-    return [Dialogs askYesNo:prompt] == NSAlertFirstButtonReturn;
-}
-
-- (void)createResultsWindow
-{
-    if (_resultWindow != nil) {
-        [_resultWindow release];
-    }
-    if (_detailsPanel != nil) {
-        [_detailsPanel release];
-    }
-    _resultWindow = [[ResultWindow alloc] initWithParentApp:self];
-    _detailsPanel = [self createDetailsPanel];
-}
-- (void)showResultsWindow
-{
-    [[[self resultWindow] window] makeKeyAndOrderFront:nil];
-}
-
-- (void)showProblemDialog
-{
-    [_problemDialog showWindow:self];
-}
-
-- (NSString *)selectDestFolderWithPrompt:(NSString *)prompt
-{
-    NSOpenPanel *op = [NSOpenPanel openPanel];
-    [op setCanChooseFiles:NO];
-    [op setCanChooseDirectories:YES];
-    [op setCanCreateDirectories:YES];
-    [op setAllowsMultipleSelection:NO];
-    [op setTitle:prompt];
-    if ([op runModal] == NSOKButton) {
-        return [[[op URLs] objectAtIndex:0] path];
-    }
-    else {
-        return nil;
-    }
-}
-
-- (NSString *)selectDestFileWithPrompt:(NSString *)prompt extension:(NSString *)extension
-{
-    NSSavePanel *sp = [NSSavePanel savePanel];
-    [sp setCanCreateDirectories:YES];
-    [sp setAllowedFileTypes:[NSArray arrayWithObject:extension]];
-    [sp setTitle:prompt];
-    if ([sp runModal] == NSOKButton) {
-        return [[sp URL] path];
-    }
-    else {
-        return nil;
-    }
-}
-
-@end

cocoa/Consts.h

@@ -1,24 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#define JobStarted @"JobStarted"
-#define JobInProgress @"JobInProgress"
-#define TableFontSize @"TableFontSize"
-
-#define jobLoad @"job_load"
-#define jobScan @"job_scan"
-#define jobCopy @"job_copy"
-#define jobMove @"job_move"
-#define jobDelete @"job_delete"
-
-#define DGPrioritizeIndexPasteboardType @"DGPrioritizeIndexPasteboardType"
-#define ImageLoadedNotification @"ImageLoadedNotification"
-
-#define AppModeStandard 0
-#define AppModeMusic 1
-#define AppModePicture 2

cocoa/DeletionOptions.h

@@ -1,33 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "PyDeletionOptions.h"
-
-@interface DeletionOptions : NSWindowController
-{
-    
-    PyDeletionOptions *model;
-    
-    NSTextField *messageTextField;
-    NSButton *linkButton;
-    NSMatrix *linkTypeRadio;
-    NSButton *directButton;
-}
-
-@property (readwrite, retain) NSTextField *messageTextField;
-@property (readwrite, retain) NSButton *linkButton;
-@property (readwrite, retain) NSMatrix *linkTypeRadio;
-@property (readwrite, retain) NSButton *directButton;
-
-- (id)initWithPyRef:(PyObject *)aPyRef;
-
-- (void)updateOptions;
-- (void)proceed;
-- (void)cancel;
-@end

cocoa/DeletionOptions.m

@@ -1,72 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import "DeletionOptions.h"
-#import "DeletionOptions_UI.h"
-#import "HSPyUtil.h"
-
-@implementation DeletionOptions
-
-@synthesize messageTextField;
-@synthesize linkButton;
-@synthesize linkTypeRadio;
-@synthesize directButton;
-
-- (id)initWithPyRef:(PyObject *)aPyRef
-{
-    self = [super initWithWindow:nil];
-    model = [[PyDeletionOptions alloc] initWithModel:aPyRef];
-    [self setWindow:createDeletionOptions_UI(self)];
-    [model bindCallback:createCallback(@"DeletionOptionsView", self)];
-    return self;
-}
-
-- (void)dealloc
-{
-    [model release];
-    [super dealloc];
-}
-
-- (void)updateOptions
-{
-    [model setLinkDeleted:[linkButton state] == NSOnState];
-    [model setUseHardlinks:[linkTypeRadio selectedColumn] == 1];
-    [model setDirect:[directButton state] == NSOnState];
-}
-
-- (void)proceed
-{
-    [NSApp stopModalWithCode:NSOKButton];
-}
-
-- (void)cancel
-{
-    [NSApp stopModalWithCode:NSCancelButton];
-}
-
-/* model --> view */
-- (void)updateMsg:(NSString *)msg
-{
-    [messageTextField setStringValue:msg];
-}
-
-- (BOOL)show
-{
-    [linkButton setState:NSOffState];
-    [directButton setState:NSOffState];
-    [linkTypeRadio selectCellAtRow:0 column:0];
-    NSInteger r = [NSApp runModalForWindow:[self window]];
-    [[self window] close];
-    return r == NSOKButton;
-}
-
-- (void)setHardlinkOptionEnabled:(BOOL)enabled
-{
-    [linkTypeRadio setEnabled:enabled];
-}
-@end

cocoa/DetailsPanel.h

@@ -1,31 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import <Cocoa/Cocoa.h>
-#import <Python.h>
-#import "PyDetailsPanel.h"
-
-@interface DetailsPanel : NSWindowController <NSTableViewDataSource>
-{
-    NSTableView *detailsTable;
-    
-    PyDetailsPanel *model;
-}
-
-@property (readwrite, retain) NSTableView *detailsTable;
-
-- (id)initWithPyRef:(PyObject *)aPyRef;
-- (PyDetailsPanel *)model;
-
-- (NSWindow *)createWindow;
-- (BOOL)isVisible;
-- (void)toggleVisibility;
-
-/* Python --> Cocoa */
-- (void)refresh;
-@end

cocoa/DetailsPanel.m

@@ -1,81 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import "DetailsPanel.h"
-#import "HSPyUtil.h"
-#import "DetailsPanel_UI.h"
-
-@implementation DetailsPanel
-
-@synthesize detailsTable;
-
-- (id)initWithPyRef:(PyObject *)aPyRef
-{
-    self = [super initWithWindow:nil];
-    [self setWindow:[self createWindow]];
-    model = [[PyDetailsPanel alloc] initWithModel:aPyRef];
-    [model bindCallback:createCallback(@"DetailsPanelView", self)];
-    return self;
-}
-
-- (void)dealloc
-{
-    [model release];
-    [super dealloc];
-}
-
-- (PyDetailsPanel *)model
-{
-    return (PyDetailsPanel *)model;
-}
-
-- (NSWindow *)createWindow
-{
-    return createDetailsPanel_UI(self);
-}
-
-- (void)refreshDetails
-{
-    [detailsTable reloadData];
-}
-
-- (BOOL)isVisible
-{
-    return [[self window] isVisible];
-}
-
-- (void)toggleVisibility
-{
-    if ([self isVisible]) {
-        [[self window] close];
-    }
-    else {
-        [self refreshDetails]; // selection might have changed since last time
-        [[self window] orderFront:nil];
-    }
-}
-
-/* NSTableView Delegate */
-- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView
-{
-    return [[self model] numberOfRows];
-}
-
-- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)column row:(NSInteger)row
-{
-    return [[self model] valueForColumn:[column identifier] row:row];
-}
-
-/* Python --> Cocoa */
-- (void)refresh
-{
-    if ([[self window] isVisible]) {
-        [self refreshDetails];
-    }
-}
-@end

cocoa/DetailsPanelPicture.h

@@ -1,32 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "DetailsPanel.h"
-#import "PyDupeGuru.h"
-
-@interface DetailsPanelPicture : DetailsPanel
-{
-    NSImageView *dupeImage;
-    NSProgressIndicator *dupeProgressIndicator;
-    NSImageView *refImage;
-    NSProgressIndicator *refProgressIndicator;
-    
-    PyDupeGuru *pyApp;
-    BOOL _needsRefresh;
-    NSString *_dupePath;
-    NSString *_refPath;
-}
-
-@property (readwrite, retain) NSImageView *dupeImage;
-@property (readwrite, retain) NSProgressIndicator *dupeProgressIndicator;
-@property (readwrite, retain) NSImageView *refImage;
-@property (readwrite, retain) NSProgressIndicator *refProgressIndicator;
-
-- (id)initWithApp:(PyDupeGuru *)aApp;
-@end

cocoa/DetailsPanelPicture.m

@@ -1,96 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import "Utils.h"
-#import "NSNotificationAdditions.h"
-#import "NSImageAdditions.h"
-#import "PyDupeGuru.h"
-#import "DetailsPanelPicture.h"
-#import "Consts.h"
-#import "DetailsPanelPicture_UI.h"
-
-@implementation DetailsPanelPicture
-
-@synthesize dupeImage;
-@synthesize dupeProgressIndicator;
-@synthesize refImage;
-@synthesize refProgressIndicator;
-
-- (id)initWithApp:(PyDupeGuru *)aApp
-{
-    self = [super initWithPyRef:[aApp detailsPanel]];
-    pyApp = aApp;
-    _needsRefresh = YES;
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(imageLoaded:) name:ImageLoadedNotification object:self];
-    return self;
-}
-
-- (NSWindow *)createWindow
-{
-    return createDetailsPanelPicture_UI(self);
-}
-
-- (void)loadImageAsync:(NSString *)imagePath
-{
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    NSImage *image = [[NSImage alloc] initByReferencingFile:imagePath];
-    NSImage *thumbnail = [image imageByScalingProportionallyToSize:NSMakeSize(512,512)];
-    [image release];
-    NSMutableDictionary *params = [NSMutableDictionary dictionary];
-    [params setValue:imagePath forKey:@"imagePath"];
-    [params setValue:thumbnail forKey:@"image"];
-    [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:ImageLoadedNotification object:self userInfo:params waitUntilDone:YES];
-    [pool release];
-}
-
-- (void)refreshDetails
-{
-    if (!_needsRefresh)
-        return;
-    [detailsTable reloadData];
-    
-    NSString *refPath = [pyApp getSelectedDupeRefPath];
-    if (_refPath != nil)
-        [_refPath autorelease];
-    _refPath = [refPath retain];
-    [NSThread detachNewThreadSelector:@selector(loadImageAsync:) toTarget:self withObject:refPath];
-    NSString *dupePath = [pyApp getSelectedDupePath];
-    if (_dupePath != nil)
-        [_dupePath autorelease];
-    _dupePath = [dupePath retain];
-    if (![dupePath isEqual: refPath])
-        [NSThread detachNewThreadSelector:@selector(loadImageAsync:) toTarget:self withObject:dupePath];
-    [refProgressIndicator startAnimation:nil];
-    [dupeProgressIndicator startAnimation:nil];
-    _needsRefresh = NO;
-}
-
-/* Notifications */
-- (void)imageLoaded:(NSNotification *)aNotification
-{
-    NSString *imagePath = [[aNotification userInfo] valueForKey:@"imagePath"];
-    NSImage *image = [[aNotification userInfo] valueForKey:@"image"];
-    if ([imagePath isEqual: _refPath])
-    {
-        [refImage setImage:image];
-        [refProgressIndicator stopAnimation:nil];
-    }
-    if ([imagePath isEqual: _dupePath])
-    {
-        [dupeImage setImage:image];
-        [dupeProgressIndicator stopAnimation:nil];
-    }
-}
-
-/* Python --> Cocoa */
-- (void)refresh
-{
-    _needsRefresh = YES;
-    [super refresh];
-}
-@end

cocoa/DirectoryOutline.h

@@ -1,21 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import <Cocoa/Cocoa.h>
-#import <Python.h>
-#import "HSOutline.h"
-#import "PyDirectoryOutline.h"
-
-#define DGAddedFoldersNotification @"DGAddedFoldersNotification"
-
-@interface DirectoryOutline : HSOutline {}
-- (id)initWithPyRef:(PyObject *)aPyRef outlineView:(HSOutlineView *)aOutlineView;
-- (PyDirectoryOutline *)model;
-
-- (void)selectAll;
-@end;

cocoa/DirectoryOutline.m

@@ -1,87 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import "DirectoryOutline.h"
-
-@implementation DirectoryOutline
-- (id)initWithPyRef:(PyObject *)aPyRef outlineView:(HSOutlineView *)aOutlineView
-{
-    self = [super initWithPyRef:aPyRef wrapperClass:[PyDirectoryOutline class]
-        callbackClassName:@"DirectoryOutlineView" view:aOutlineView];
-    [[self view] registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
-    return self;
-}
-
-- (PyDirectoryOutline *)model
-{
-    return (PyDirectoryOutline *)model;
-}
-
-/* Public */
-- (void)selectAll
-{
-    [[self model] selectAll];
-}
-
-/* Delegate */
-- (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 *foldernames = [pboard propertyListForType:NSFilenamesPboardType];
-        if (!(sourceDragMask & NSDragOperationLink))
-            return NO;
-        for (NSString *foldername in foldernames) {
-            [[self model] addDirectory:foldername];
-        }
-        NSDictionary *userInfo = [NSDictionary dictionaryWithObject:foldernames forKey:@"foldernames"];
-        [[NSNotificationCenter defaultCenter] postNotificationName:DGAddedFoldersNotification
-            object:self userInfo:userInfo];
-    }
-    return YES;
-}
-
-- (void)outlineView:(NSOutlineView *)aOutlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
-{ 
-    if ([cell isKindOfClass:[NSTextFieldCell class]]) {
-        NSTextFieldCell *textCell = cell;
-        NSIndexPath *path = item;
-        BOOL selected = [path isEqualTo:[[self view] selectedPath]];
-        if (selected) {
-            [textCell setTextColor:[NSColor blackColor]];
-            return;
-        }
-        NSInteger state = [self intProperty:@"state" valueAtPath:path];
-        if (state == 1) {
-            [textCell setTextColor:[NSColor blueColor]];
-        }
-        else if (state == 2) {
-            [textCell setTextColor:[NSColor redColor]];
-        }
-        else {
-            [textCell setTextColor:[NSColor blackColor]];
-        }
-    }
-}
-@end

cocoa/DirectoryPanel.h

@@ -1,57 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "HSOutlineView.h"
-#import "HSRecentFiles.h"
-#import "DirectoryOutline.h"
-#import "PyDupeGuru.h"
-
-@class AppDelegate;
-
-@interface DirectoryPanel : NSWindowController <NSOpenSavePanelDelegate>
-{
-    AppDelegate *_app;
-    PyDupeGuru *model;
-    HSRecentFiles *_recentDirectories;
-    DirectoryOutline *outline;
-    BOOL _alwaysShowPopUp;
-    NSSegmentedControl *appModeSelector;
-    NSPopUpButton *scanTypePopup;
-    NSPopUpButton *addButtonPopUp;
-    NSPopUpButton *loadRecentButtonPopUp;
-    HSOutlineView *outlineView;
-    NSButton *removeButton;
-    NSButton *loadResultsButton;
-}
-
-@property (readwrite, retain) NSSegmentedControl *appModeSelector;
-@property (readwrite, retain) NSPopUpButton *scanTypePopup;
-@property (readwrite, retain) NSPopUpButton *addButtonPopUp;
-@property (readwrite, retain) NSPopUpButton *loadRecentButtonPopUp;
-@property (readwrite, retain) HSOutlineView *outlineView;
-@property (readwrite, retain) NSButton *removeButton;
-@property (readwrite, retain) NSButton *loadResultsButton;
-
-- (id)initWithParentApp:(AppDelegate *)aParentApp;
-
-- (void)fillPopUpMenu;
-- (void)fillScanTypeMenu;
-- (void)adjustUIToLocalization;
-
-- (void)askForDirectory;
-- (void)popupAddDirectoryMenu:(id)sender;
-- (void)popupLoadRecentMenu:(id)sender;
-- (void)removeSelectedDirectory;
-- (void)startDuplicateScan;
-
-- (void)addDirectory:(NSString *)directory;
-- (void)refreshRemoveButtonText;
-- (void)markAll;
-
-@end

cocoa/DirectoryPanel.m

@@ -1,256 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import "DirectoryPanel.h"
-#import "DirectoryPanel_UI.h"
-#import "Dialogs.h"
-#import "Utils.h"
-#import "AppDelegate.h"
-#import "Consts.h"
-
-@implementation DirectoryPanel
-
-@synthesize appModeSelector;
-@synthesize scanTypePopup;
-@synthesize addButtonPopUp;
-@synthesize loadRecentButtonPopUp;
-@synthesize outlineView;
-@synthesize removeButton;
-@synthesize loadResultsButton;
-
-- (id)initWithParentApp:(AppDelegate *)aParentApp
-{
-    self = [super initWithWindow:nil];
-    [self setWindow:createDirectoryPanel_UI(self)];
-    _app = aParentApp;
-    model = [_app model];
-    [[self window] setTitle:[model appName]];
-    self.appModeSelector.selectedSegment = 0;
-    [self fillScanTypeMenu];
-    _alwaysShowPopUp = NO;
-    [self fillPopUpMenu];
-    _recentDirectories = [[HSRecentFiles alloc] initWithName:@"recentDirectories" menu:[addButtonPopUp menu]];
-    [_recentDirectories setDelegate:self];
-    outline = [[DirectoryOutline alloc] initWithPyRef:[model directoryTree] outlineView:outlineView];
-    [self refreshRemoveButtonText];
-    [self adjustUIToLocalization];
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(directorySelectionChanged:)
-        name:NSOutlineViewSelectionDidChangeNotification object:outlineView];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(outlineAddedFolders:)
-        name:DGAddedFoldersNotification object:outline];
-    return self;
-}
-
-- (void)dealloc
-{
-    [outline release];
-    [_recentDirectories release];
-    [super dealloc];
-}
-
-/* Private */
-
-- (void)fillPopUpMenu
-{
-    NSMenu *m = [addButtonPopUp menu];
-    NSMenuItem *mi = [m addItemWithTitle:NSLocalizedString(@"Add New Folder...", @"") action:@selector(askForDirectory) keyEquivalent:@""];
-    [mi setTarget:self];
-    [m addItem:[NSMenuItem separatorItem]];
-}
-
-- (void)fillScanTypeMenu
-{
-    [[self scanTypePopup] unbind:@"selectedIndex"];
-    [[self scanTypePopup] removeAllItems];
-    [[self scanTypePopup] addItemsWithTitles:[[_app model] getScanOptions]];
-    NSString *keypath;
-    NSInteger appMode = [_app getAppMode];
-    if (appMode == AppModePicture) {
-        keypath = @"values.scanTypePicture";
-    }
-    else if (appMode == AppModeMusic) {
-        keypath = @"values.scanTypeMusic";
-    }
-    else {
-        keypath = @"values.scanTypeStandard";
-    }
-    [[self scanTypePopup] bind:@"selectedIndex" toObject:[NSUserDefaultsController sharedUserDefaultsController] withKeyPath:keypath options:nil];
-}
-
-- (void)adjustUIToLocalization
-{
-    NSString *lang = [[NSBundle preferredLocalizationsFromArray:[[NSBundle mainBundle] localizations]] objectAtIndex:0];
-    NSInteger loadResultsWidthDelta = 0;
-    if ([lang isEqual:@"ru"]) {
-        loadResultsWidthDelta = 50;
-    }
-    else if ([lang isEqual:@"uk"]) {
-        loadResultsWidthDelta = 70;
-    }
-    else if ([lang isEqual:@"hy"]) {
-        loadResultsWidthDelta = 30;
-    }
-    if (loadResultsWidthDelta) {
-        NSRect r = [loadResultsButton frame];
-        r.size.width += loadResultsWidthDelta;
-        r.origin.x -= loadResultsWidthDelta;
-        [loadResultsButton setFrame:r];
-    }
-}
-
-/* Actions */
-
-- (void)askForDirectory
-{
-    NSOpenPanel *op = [NSOpenPanel openPanel];
-    [op setCanChooseFiles:YES];
-    [op setCanChooseDirectories:YES];
-    [op setAllowsMultipleSelection:YES];
-    [op setTitle:NSLocalizedString(@"Select a folder to add to the scanning list", @"")];
-    [op setDelegate:self];
-    if ([op runModal] == NSOKButton) {
-        for (NSURL *directoryURL in [op URLs]) {
-            [self addDirectory:[directoryURL path]];
-        }
-    }
-}
-
-- (void)changeAppMode:(id)sender
-{
-    NSInteger appMode;
-    NSUInteger selectedSegment = self.appModeSelector.selectedSegment;
-    if (selectedSegment == 2) {
-        appMode = AppModePicture;
-    }
-    else if (selectedSegment == 1) {
-        appMode = AppModeMusic;
-    }
-    else {
-        appMode = AppModeStandard;
-    }
-    [_app setAppMode:appMode];
-    [self fillScanTypeMenu];
-}
-
-- (void)popupAddDirectoryMenu:(id)sender
-{
-    if ((!_alwaysShowPopUp) && ([[_recentDirectories filepaths] count] == 0)) {
-        [self askForDirectory];
-    }
-    else {
-        [addButtonPopUp selectItem:nil];
-        [[addButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
-    }
-}
-
-- (void)popupLoadRecentMenu:(id)sender
-{
-    if ([[[_app recentResults] filepaths] count] > 0) {
-        NSMenu *m = [loadRecentButtonPopUp menu];
-        while ([m numberOfItems] > 0) {
-            [m removeItemAtIndex:0];
-        }
-        NSMenuItem *mi = [m addItemWithTitle:NSLocalizedString(@"Load from file...", @"") action:@selector(loadResults) keyEquivalent:@""];
-        [mi setTarget:_app];
-        [m addItem:[NSMenuItem separatorItem]];
-        [[_app recentResults] fillMenu:m];
-        [loadRecentButtonPopUp selectItem:nil];
-        [[loadRecentButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
-    }
-    else {
-        [_app loadResults];
-    }
-}
-
-- (void)removeSelectedDirectory
-{
-    [[self window] makeKeyAndOrderFront:nil];
-    [[outline model] removeSelectedDirectory];
-    [self refreshRemoveButtonText];
-}
-
-- (void)startDuplicateScan
-{
-    if ([model resultsAreModified]) {
-        if ([Dialogs askYesNo:NSLocalizedString(@"You have unsaved results, do you really want to continue?", @"")] == NSAlertSecondButtonReturn) // NO
-            return;
-    }
-    [_app setScanOptions];
-    [model doScan];
-}
-
-/* Public */
-- (void)addDirectory:(NSString *)directory
-{
-    [model addDirectory:directory];
-    [_recentDirectories addFile:directory];
-    [[self window] makeKeyAndOrderFront:nil];
-}
-
-- (void)refreshRemoveButtonText
-{
-    if ([outlineView selectedRow] < 0) {
-        [removeButton setEnabled:NO];
-        return;
-    }
-    [removeButton setEnabled:YES];
-    NSIndexPath *path = [outline selectedIndexPath];
-    if (path != nil) {
-        NSInteger state = [outline intProperty:@"state" valueAtPath:path];
-        BOOL shouldDisplayArrow = ([path length] > 1) && (state == 2);
-        NSString *imgName = shouldDisplayArrow ? @"NSGoLeftTemplate" : @"NSRemoveTemplate";
-        [removeButton setImage:[NSImage imageNamed:imgName]];
-    }
-}
-
-- (void)markAll
-{
-    /* markAll isn't very descriptive of what we do, but since we re-use the Mark All button from
-       the result window, we don't have much choice.
-    */
-    [outline selectAll];
-}
-
-/* Delegate */
-- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)path
-{
-    BOOL isdir;
-    [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isdir];
-    return isdir;
-}
-
-- (void)recentFileClicked:(NSString *)path
-{
-    [self addDirectory:path];
-}
-
-- (BOOL)validateMenuItem:(NSMenuItem *)item
-{
-    if ([item action] == @selector(markAll)) {
-        [item setTitle:NSLocalizedString(@"Select All", @"")];
-    }
-    return YES;
-}
-
-/* Notifications */
-
-- (void)directorySelectionChanged:(NSNotification *)aNotification
-{
-    [self refreshRemoveButtonText];
-}
-
-- (void)outlineAddedFolders:(NSNotification *)aNotification
-{
-    NSArray *foldernames = [[aNotification userInfo] objectForKey:@"foldernames"];
-    for (NSString *foldername in foldernames) {
-        [_recentDirectories addFile:foldername];
-    }
-}
-
-@end

cocoa/IgnoreListDialog.h

@@ -1,25 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "PyIgnoreListDialog.h"
-#import "HSTable.h"
-
-@interface IgnoreListDialog : NSWindowController
-{
-    PyIgnoreListDialog *model;
-    HSTable *ignoreListTable;
-    NSTableView *ignoreListTableView;
-}
-
-@property (readwrite, retain) PyIgnoreListDialog *model;
-@property (readwrite, retain) NSTableView *ignoreListTableView;
-
-- (id)initWithPyRef:(PyObject *)aPyRef;
-- (void)initializeColumns;
-@end

cocoa/IgnoreListDialog.m

@@ -1,51 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import "IgnoreListDialog.h"
-#import "IgnoreListDialog_UI.h"
-#import "HSPyUtil.h"
-
-@implementation IgnoreListDialog
-
-@synthesize model;
-@synthesize ignoreListTableView;
-
-- (id)initWithPyRef:(PyObject *)aPyRef
-{
-    self = [super initWithWindow:nil];
-    self.model = [[[PyIgnoreListDialog alloc] initWithModel:aPyRef] autorelease];
-    [self.model bindCallback:createCallback(@"IgnoreListDialogView", self)];
-    [self setWindow:createIgnoreListDialog_UI(self)];
-    ignoreListTable = [[HSTable alloc] initWithPyRef:[model ignoreListTable] tableView:ignoreListTableView];
-    [self initializeColumns];
-    return self;
-}
-
-- (void)dealloc
-{
-    [ignoreListTable release];
-    [super dealloc];
-}
-
-- (void)initializeColumns
-{
-    HSColumnDef defs[] = {
-        {@"path1", 240, 40, 0, NO, nil},
-        {@"path2", 240, 40, 0, NO, nil},
-        nil
-    };
-    [[ignoreListTable columns] initializeColumns:defs];
-    [[ignoreListTable columns] setColumnsAsReadOnly];
-}
-
-/* model --> view */
-- (void)show
-{
-    [self showWindow:self];
-}
-@end

cocoa/InfoTemplate.plist

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>dupeGuru</string>
-	<key>CFBundleHelpBookFolder</key>
-	<string>dupeguru_help</string>
-	<key>CFBundleHelpBookName</key>
-	<string>dupeGuru Help</string>
-	<key>CFBundleIconFile</key>
-	<string>dupeguru</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.hardcoded-software.dupeguru</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>dupeGuru</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>hsft</string>
-    <key>CFBundleShortVersionString</key>
-    <string>{version}</string>
-	<key>CFBundleVersion</key>
-	<string>{version}</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>© Hardcoded Software, 2016</string>
-	<key>SUFeedURL</key>
-	<string>https://www.hardcoded.net/updates/dupeguru.appcast</string>
-	<key>SUPublicDSAKeyFile</key>
-	<string>dsa_pub.pem</string>
-</dict>
-</plist>

cocoa/PrioritizeDialog.h

@@ -1,37 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "PyPrioritizeDialog.h"
-#import "HSPopUpList.h"
-#import "HSSelectableList.h"
-#import "PrioritizeList.h"
-#import "PyDupeGuru.h"
-
-@interface PrioritizeDialog : NSWindowController
-{
-    NSPopUpButton *categoryPopUpView;
-    NSTableView *criteriaTableView;
-    NSTableView *prioritizationTableView;
-    
-    PyPrioritizeDialog *model;
-    HSPopUpList *categoryPopUp;
-    HSSelectableList *criteriaList;
-    PrioritizeList *prioritizationList;
-}
-
-@property (readwrite, retain) NSPopUpButton *categoryPopUpView;
-@property (readwrite, retain) NSTableView *criteriaTableView;
-@property (readwrite, retain) NSTableView *prioritizationTableView;
-
-- (id)initWithApp:(PyDupeGuru *)aApp;
-- (PyPrioritizeDialog *)model;
-
-- (void)ok;
-- (void)cancel;
-@end;

cocoa/PrioritizeDialog.m

@@ -1,56 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import "PrioritizeDialog.h"
-#import "PrioritizeDialog_UI.h"
-#import "HSPyUtil.h"
-
-@implementation PrioritizeDialog
-
-@synthesize categoryPopUpView;
-@synthesize criteriaTableView;
-@synthesize prioritizationTableView;
-
-- (id)initWithApp:(PyDupeGuru *)aApp
-{
-    self = [super initWithWindowNibName:@"PrioritizeDialog"];
-    model = [[PyPrioritizeDialog alloc] initWithApp:[aApp pyRef]];
-    [self setWindow:createPrioritizeDialog_UI(self)];
-    categoryPopUp = [[HSPopUpList alloc] initWithPyRef:[[self model] categoryList] popupView:categoryPopUpView];
-    criteriaList = [[HSSelectableList alloc] initWithPyRef:[[self model] criteriaList] tableView:criteriaTableView];
-    prioritizationList = [[PrioritizeList alloc] initWithPyRef:[[self model] prioritizationList] tableView:prioritizationTableView];
-    [model bindCallback:createCallback(@"PrioritizeDialogView", self)];
-    return self;
-}
-
-- (void)dealloc
-{
-    [categoryPopUp release];
-    [criteriaList release];
-    [prioritizationList release];
-    [model release];
-    [super dealloc];
-}
-
-- (PyPrioritizeDialog *)model
-{
-    return (PyPrioritizeDialog *)model;
-}
-
-- (void)ok
-{
-    [NSApp stopModal];
-    [self close];
-}
-
-- (void)cancel
-{
-    [NSApp abortModal];
-    [self close];
-}
-@end

cocoa/PrioritizeList.h

@@ -1,16 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "HSSelectableList.h"
-#import "PyPrioritizeList.h"
-
-@interface PrioritizeList : HSSelectableList {}
-- (id)initWithPyRef:(PyObject *)aPyRef tableView:(NSTableView *)aTableView;
-- (PyPrioritizeList *)model;
-@end

cocoa/PrioritizeList.m

@@ -1,58 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import "PrioritizeList.h"
-#import "Utils.h"
-#import "Consts.h"
-
-@implementation PrioritizeList
-- (id)initWithPyRef:(PyObject *)aPyRef tableView:(NSTableView *)aTableView
-{
-    self = [super initWithPyRef:aPyRef wrapperClass:[PyPrioritizeList class]
-        callbackClassName:@"PrioritizeListView" view:aTableView];
-    return self;
-}
-
-- (PyPrioritizeList *)model
-{
-    return (PyPrioritizeList *)model;
-}
-
-- (void)setView:(NSTableView *)aTableView
-{
-    [super setView:aTableView];
-    [[self view] registerForDraggedTypes:[NSArray arrayWithObject:DGPrioritizeIndexPasteboardType]];
-}
-
-- (BOOL)tableView:(NSTableView *)tv writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard*)pboard
-{
-    NSData *data = [NSKeyedArchiver archivedDataWithRootObject:rowIndexes];
-    [pboard declareTypes:[NSArray arrayWithObject:DGPrioritizeIndexPasteboardType] owner:self];
-    [pboard setData:data forType:DGPrioritizeIndexPasteboardType];
-    return YES;
-}
-
-- (NSDragOperation)tableView:(NSTableView*)tv validateDrop:(id <NSDraggingInfo>)info proposedRow:(NSInteger)row 
-       proposedDropOperation:(NSTableViewDropOperation)op
-{
-    if (op == NSTableViewDropAbove) {
-        return NSDragOperationMove;
-    }
-    return NSDragOperationNone;
-}
-
-- (BOOL)tableView:(NSTableView *)aTableView acceptDrop:(id <NSDraggingInfo>)info
-              row:(NSInteger)row dropOperation:(NSTableViewDropOperation)operation
-{
-    NSPasteboard* pboard = [info draggingPasteboard];
-    NSData* rowData = [pboard dataForType:DGPrioritizeIndexPasteboardType];
-    NSIndexSet* rowIndexes = [NSKeyedUnarchiver unarchiveObjectWithData:rowData];
-    [[self model] moveIndexes:[Utils indexSet2Array:rowIndexes] toIndex:row];
-    return YES;
-}
-@end

cocoa/ProblemDialog.h

@@ -1,26 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "PyProblemDialog.h"
-#import "HSTable.h"
-
-@interface ProblemDialog : NSWindowController
-{
-    PyProblemDialog *model;
-    HSTable *problemTable;
-    NSTableView *problemTableView;
-}
-
-@property (readwrite, retain) PyProblemDialog *model;
-@property (readwrite, retain) NSTableView *problemTableView;
-
-- (id)initWithPyRef:(PyObject *)aPyRef;
-
-- (void)initializeColumns;
-@end

cocoa/ProblemDialog.m

@@ -1,44 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import "ProblemDialog.h"
-#import "ProblemDialog_UI.h"
-#import "Utils.h"
-
-@implementation ProblemDialog
-
-@synthesize model;
-@synthesize problemTableView;
-
-- (id)initWithPyRef:(PyObject *)aPyRef
-{
-    self = [super initWithWindow:nil];
-    self.model = [[PyProblemDialog alloc] initWithModel:aPyRef];
-    [self setWindow:createProblemDialog_UI(self)];
-    problemTable = [[HSTable alloc] initWithPyRef:[self.model problemTable] tableView:problemTableView];
-    [self initializeColumns];
-    return self;
-}
-
-- (void)dealloc
-{
-    [problemTable release];
-    [super dealloc];
-}
-
-- (void)initializeColumns
-{
-    HSColumnDef defs[] = {
-        {@"path", 202, 40, 0, NO, nil},
-        {@"msg", 228, 40, 0, NO, nil},
-        nil
-    };
-    [[problemTable columns] initializeColumns:defs];
-    [[problemTable columns] setColumnsAsReadOnly];
-}
-@end

cocoa/ResultTable.h

@@ -1,23 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import <Cocoa/Cocoa.h>
-#import <Quartz/Quartz.h>
-#import "HSTable.h"
-#import "PyResultTable.h"
-
-@interface ResultTable : HSTable <QLPreviewPanelDataSource, QLPreviewPanelDelegate>
-{
-}
-- (id)initWithPyRef:(PyObject *)aPyRef view:(NSTableView *)aTableView;
-- (PyResultTable *)model;
-- (BOOL)powerMarkerMode;
-- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode;
-- (BOOL)deltaValuesMode;
-- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode;
-@end;

cocoa/ResultTable.m

@@ -1,180 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import "ResultTable.h"
-#import "Dialogs.h"
-#import "Utils.h"
-#import "HSQuicklook.h"
-
-@interface HSTable (private)
-- (void)setPySelection;
-- (void)setViewSelection;
-@end
-
-@implementation ResultTable
-- (id)initWithPyRef:(PyObject *)aPyRef view:(NSTableView *)aTableView
-{
-    self = [super initWithPyRef:aPyRef wrapperClass:[PyResultTable class] callbackClassName:@"ResultTableView" view:aTableView];
-    return self;
-}
-
-- (PyResultTable *)model
-{
-    return (PyResultTable *)model;
-}
-
-/* Private */
-- (void)updateQuicklookIfNeeded
-{
-    if ([[QLPreviewPanel sharedPreviewPanel] dataSource] == self) { 
-        [[QLPreviewPanel sharedPreviewPanel] reloadData];
-    }
-}
-
-- (void)setPySelection
-{
-    [super setPySelection];
-    [self updateQuicklookIfNeeded];
-}
-
-- (void)setViewSelection
-{
-    [super setViewSelection];
-    [self updateQuicklookIfNeeded];
-}
-
-/* Public */
-- (BOOL)powerMarkerMode
-{
-    return [[self model] powerMarkerMode];
-}
-
-- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode
-{
-    [[self model] setPowerMarkerMode:aPowerMarkerMode];
-}
-
-- (BOOL)deltaValuesMode
-{
-    return [[self model] deltaValuesMode];
-}
-
-- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode
-{
-    [[self model] setDeltaValuesMode:aDeltaValuesMode];
-}
-
-/* Datasource */
-- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)column row:(NSInteger)row
-{
-    NSString *identifier = [column identifier];
-    if ([identifier isEqual:@"marked"]) {
-        return [[self model] valueForColumn:@"marked" row:row];
-    }
-    return [[self model] valueForRow:row column:identifier];
-}
-
-- (void)tableView:(NSTableView *)aTableView setObjectValue:(id)object forTableColumn:(NSTableColumn *)column row:(NSInteger)row
-{
-    NSString *identifier = [column identifier];
-    if ([identifier isEqual:@"marked"]) {
-        [[self model] setValue:object forColumn:identifier row:row];
-    }
-    else if ([identifier isEqual:@"name"]) {
-        NSString *oldName = [[self model] valueForRow:row column:identifier];
-        NSString *newName = object;
-        if (![newName isEqual:oldName]) {
-            BOOL renamed = [[self model] renameSelected:newName];
-            if (!renamed) {
-                [Dialogs showMessage:[NSString stringWithFormat:NSLocalizedString(@"The name '%@' already exists.", @""), newName]];
-            }
-            else {
-                [[self view] setNeedsDisplay:YES];
-            }
-        }
-    }
-}
-
-/* Delegate */
-- (void)tableView:(NSTableView *)aTableView didClickTableColumn:(NSTableColumn *)tableColumn
-{
-    if ([[[self view] sortDescriptors] count] < 1)
-        return;
-    NSSortDescriptor *sd = [[[self view] sortDescriptors] objectAtIndex:0];
-    [[self model] sortBy:[sd key] ascending:[sd ascending]];
-}
-
-- (void)tableView:(NSTableView *)aTableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)column row:(NSInteger)row
-{
-    BOOL isSelected = [[self view] isRowSelected:row];
-    BOOL isMarkable = n2b([[self model] valueForColumn:@"markable" row:row]);
-    if ([[column identifier] isEqual:@"marked"]) {
-        [cell setEnabled:isMarkable];
-        // Low-tech solution, for indentation, but it works...
-        NSCellImagePosition pos = isMarkable ? NSImageRight : NSImageLeft;
-        [cell setImagePosition:pos];
-    }
-    if ([cell isKindOfClass:[NSTextFieldCell class]]) {
-        NSColor *color = [NSColor textColor];
-        if (isSelected) {
-            color = [NSColor selectedTextColor];
-        }
-        else if (isMarkable) {
-            if ([[self model] isDeltaAtRow:row column:[column identifier]]) {
-                color = [NSColor orangeColor];
-            }
-        }
-        else {
-            color = [NSColor blueColor];
-        }
-        [(NSTextFieldCell *)cell setTextColor:color];
-    }
-}
-
-- (BOOL)tableViewHadDeletePressed:(NSTableView *)tableView
-{
-    [[self model] removeSelected];
-    return YES;
-}
-
-- (BOOL)tableViewHadSpacePressed:(NSTableView *)tableView
-{
-    [[self model] markSelected];
-    return YES;
-}
-
-/* Quicklook */
-- (NSInteger)numberOfPreviewItemsInPreviewPanel:(QLPreviewPanel *)panel
-{
-    return [[[self model] selectedRows] count];
-}
-
-- (id <QLPreviewItem>)previewPanel:(QLPreviewPanel *)panel previewItemAtIndex:(NSInteger)index
-{
-    NSArray *selectedRows = [[self model] selectedRows];
-    NSInteger absIndex = n2i([selectedRows objectAtIndex:index]);
-    NSString *path = [[self model] pathAtIndex:absIndex];
-    return [[HSQLPreviewItem alloc] initWithUrl:[NSURL fileURLWithPath:path] title:path];
-}
-
-- (BOOL)previewPanel:(QLPreviewPanel *)panel handleEvent:(NSEvent *)event
-{
-    // redirect all key down events to the table view
-    if ([event type] == NSKeyDown) {
-        [[self view] keyDown:event];
-        return YES;
-    }
-    return NO;
-}
-
-/* Python --> Cocoa */
-- (void)invalidateMarkings
-{
-    [[self view] setNeedsDisplay:YES];
-}
-@end

cocoa/ResultWindow.h

@@ -1,76 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import <Cocoa/Cocoa.h>
-#import <Quartz/Quartz.h>
-#import "StatsLabel.h"
-#import "ResultTable.h"
-#import "HSTableView.h"
-#import "PyDupeGuru.h"
-
-@class AppDelegate;
-
-@interface ResultWindow : NSWindowController
-{
-@protected
-    NSSegmentedControl *optionsSwitch;
-    NSToolbarItem *optionsToolbarItem;
-    HSTableView *matches;
-    NSTextField *stats;
-    NSSearchField *filterField;
-    
-    AppDelegate *app;
-    PyDupeGuru *model;
-    ResultTable *table;
-    StatsLabel *statsLabel;
-    QLPreviewPanel* previewPanel;
-}
-
-@property (readwrite, retain) NSSegmentedControl *optionsSwitch;
-@property (readwrite, retain) NSToolbarItem *optionsToolbarItem;
-@property (readwrite, retain) HSTableView *matches;
-@property (readwrite, retain) NSTextField *stats;
-@property (readwrite, retain) NSSearchField *filterField;
-
-- (id)initWithParentApp:(AppDelegate *)app;
-
-/* Helpers */
-- (void)fillColumnsMenu;
-- (void)updateOptionSegments;
-- (void)adjustUIToLocalization;
-- (void)initResultColumns:(ResultTable *)aTable;
-
-/* Actions */
-- (void)changeOptions;
-- (void)copyMarked;
-- (void)trashMarked;
-- (void)filter;
-- (void)focusOnFilterField;
-- (void)ignoreSelected;
-- (void)invokeCustomCommand;
-- (void)markAll;
-- (void)markInvert;
-- (void)markNone;
-- (void)markSelected;
-- (void)moveMarked;
-- (void)openClicked;
-- (void)openSelected;
-- (void)removeMarked;
-- (void)removeSelected;
-- (void)renameSelected;
-- (void)reprioritizeResults;
-- (void)resetColumnsToDefault;
-- (void)revealSelected;
-- (void)saveResults;
-- (void)switchSelected;
-- (void)toggleColumn:(id)sender;
-- (void)toggleDelta;
-- (void)toggleDetailsPanel;
-- (void)togglePowerMarker;
-- (void)toggleQuicklookPanel;
-@end

cocoa/ResultWindow.m

@@ -1,406 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import "ResultWindow.h"
-#import "ResultWindow_UI.h"
-#import "Dialogs.h"
-#import "ProgressController.h"
-#import "Utils.h"
-#import "AppDelegate.h"
-#import "Consts.h"
-#import "PrioritizeDialog.h"
-
-@implementation ResultWindow
-
-@synthesize optionsSwitch;
-@synthesize optionsToolbarItem;
-@synthesize matches;
-@synthesize stats;
-@synthesize filterField;
-
-- (id)initWithParentApp:(AppDelegate *)aApp;
-{
-    self = [super initWithWindow:nil];
-    app = aApp;
-    model = [app model];
-    [self setWindow:createResultWindow_UI(self)];
-    [[self window] setTitle:fmt(NSLocalizedString(@"%@ Results", @""), [model appName])];
-    /* Put a cute iTunes-like bottom bar */
-    [[self window] setContentBorderThickness:28 forEdge:NSMinYEdge];
-    table = [[ResultTable alloc] initWithPyRef:[model resultTable] view:matches];
-    statsLabel = [[StatsLabel alloc] initWithPyRef:[model statsLabel] view:stats];
-    [self initResultColumns:table];
-    [[table columns] setColumnsAsReadOnly];
-    [self fillColumnsMenu];
-    [matches setTarget:self];
-    [matches setDoubleAction:@selector(openClicked)];
-    [self adjustUIToLocalization];
-    return self;
-}
-
-- (void)dealloc
-{
-    [table release];
-    [statsLabel release];
-    [super dealloc];
-}
-
-/* Helpers */
-- (void)fillColumnsMenu
-{
-    [[app columnsMenu] removeAllItems];
-    NSArray *menuItems = [[[table columns] model] menuItems];
-    for (NSInteger i=0; i < [menuItems count]; i++) {
-        NSArray *pair = [menuItems objectAtIndex:i];
-        NSString *display = [pair objectAtIndex:0];
-        BOOL marked = n2b([pair objectAtIndex:1]);
-        NSMenuItem *mi = [[app columnsMenu] addItemWithTitle:display action:@selector(toggleColumn:) keyEquivalent:@""];
-        [mi setTarget:self];
-        [mi setState:marked ? NSOnState : NSOffState];
-        [mi setTag:i];
-    }
-    [[app columnsMenu] addItem:[NSMenuItem separatorItem]];
-    NSMenuItem *mi = [[app columnsMenu] addItemWithTitle:NSLocalizedString(@"Reset to Default", @"")
-        action:@selector(resetColumnsToDefault) keyEquivalent:@""];
-    [mi setTarget:self];
-}
-
-- (void)updateOptionSegments
-{
-    [optionsSwitch setSelected:[[app detailsPanel] isVisible] forSegment:0];
-    [optionsSwitch setSelected:[table powerMarkerMode] forSegment:1];
-    [optionsSwitch setSelected:[table deltaValuesMode] forSegment:2];
-}
-
-- (void)adjustUIToLocalization
-{
-    NSString *lang = [[NSBundle preferredLocalizationsFromArray:[[NSBundle mainBundle] localizations]] objectAtIndex:0];
-    NSInteger seg1delta = 0;
-    NSInteger seg2delta = 0;
-    if ([lang isEqual:@"ru"]) {
-        seg2delta = 20;
-    }
-    else if ([lang isEqual:@"uk"]) {
-        seg2delta = 20;
-    }
-    else if ([lang isEqual:@"hy"]) {
-        seg1delta = 20;
-    }
-    if (seg1delta || seg2delta) {
-        [optionsSwitch setWidth:[optionsSwitch widthForSegment:0]+seg1delta forSegment:0];
-        [optionsSwitch setWidth:[optionsSwitch widthForSegment:1]+seg2delta forSegment:1];
-        NSSize s = [optionsToolbarItem maxSize];
-        s.width += seg1delta + seg2delta;
-        [optionsToolbarItem setMaxSize:s];
-        [optionsToolbarItem setMinSize:s];
-    }
-}
-
-- (void)initResultColumns:(ResultTable *)aTable
-{
-    NSInteger appMode = [app getAppMode];
-    if (appMode == AppModePicture) {
-        HSColumnDef defs[] = {
-            {@"marked", 26, 26, 26, YES, [NSButtonCell class]},
-            {@"name", 162, 16, 0, YES, nil},
-            {@"folder_path", 142, 16, 0, YES, nil},
-            {@"size", 63, 16, 0, YES, nil},
-            {@"extension", 40, 16, 0, YES, nil},
-            {@"dimensions", 73, 16, 0, YES, nil},
-            {@"exif_timestamp", 120, 16, 0, YES, nil},
-            {@"mtime", 120, 16, 0, YES, nil},
-            {@"percentage", 58, 16, 0, YES, nil},
-            {@"dupe_count", 80, 16, 0, YES, nil},
-            nil
-        };
-        [[aTable columns] initializeColumns:defs];
-        NSTableColumn *c = [[aTable view] tableColumnWithIdentifier:@"marked"];
-        [[c dataCell] setButtonType:NSSwitchButton];
-        [[c dataCell] setControlSize:NSSmallControlSize];
-        c = [[aTable view] tableColumnWithIdentifier:@"size"];
-        [[c dataCell] setAlignment:NSRightTextAlignment];
-    }
-    else if (appMode == AppModeMusic) {
-        HSColumnDef defs[] = {
-            {@"marked", 26, 26, 26, YES, [NSButtonCell class]},
-            {@"name", 235, 16, 0, YES, nil},
-            {@"folder_path", 120, 16, 0, YES, nil},
-            {@"size", 63, 16, 0, YES, nil},
-            {@"duration", 50, 16, 0, YES, nil},
-            {@"bitrate", 50, 16, 0, YES, nil},
-            {@"samplerate", 60, 16, 0, YES, nil},
-            {@"extension", 40, 16, 0, YES, nil},
-            {@"mtime", 120, 16, 0, YES, nil},
-            {@"title", 120, 16, 0, YES, nil},
-            {@"artist", 120, 16, 0, YES, nil},
-            {@"album", 120, 16, 0, YES, nil},
-            {@"genre", 80, 16, 0, YES, nil},
-            {@"year", 40, 16, 0, YES, nil},
-            {@"track", 40, 16, 0, YES, nil},
-            {@"comment", 120, 16, 0, YES, nil},
-            {@"percentage", 57, 16, 0, YES, nil},
-            {@"words", 120, 16, 0, YES, nil},
-            {@"dupe_count", 80, 16, 0, YES, nil},
-            nil
-        };
-        [[aTable columns] initializeColumns:defs];
-        NSTableColumn *c = [[aTable view] tableColumnWithIdentifier:@"marked"];
-        [[c dataCell] setButtonType:NSSwitchButton];
-        [[c dataCell] setControlSize:NSSmallControlSize];
-        c = [[aTable view] tableColumnWithIdentifier:@"size"];
-        [[c dataCell] setAlignment:NSRightTextAlignment];
-        c = [[aTable view] tableColumnWithIdentifier:@"duration"];
-        [[c dataCell] setAlignment:NSRightTextAlignment];
-        c = [[aTable view] tableColumnWithIdentifier:@"bitrate"];
-        [[c dataCell] setAlignment:NSRightTextAlignment];
-    }
-    else {
-        HSColumnDef defs[] = {
-            {@"marked", 26, 26, 26, YES, [NSButtonCell class]},
-            {@"name", 195, 16, 0, YES, nil},
-            {@"folder_path", 183, 16, 0, YES, nil},
-            {@"size", 63, 16, 0, YES, nil},
-            {@"extension", 40, 16, 0, YES, nil},
-            {@"mtime", 120, 16, 0, YES, nil},
-            {@"percentage", 60, 16, 0, YES, nil},
-            {@"words", 120, 16, 0, YES, nil},
-            {@"dupe_count", 80, 16, 0, YES, nil},
-            nil
-        };
-        [[aTable columns] initializeColumns:defs];
-        NSTableColumn *c = [[aTable view] tableColumnWithIdentifier:@"marked"];
-        [[c dataCell] setButtonType:NSSwitchButton];
-        [[c dataCell] setControlSize:NSSmallControlSize];
-        c = [[aTable view] tableColumnWithIdentifier:@"size"];
-        [[c dataCell] setAlignment:NSRightTextAlignment];
-    }
-    [[aTable columns] restoreColumns];
-}
-
-/* Actions */
-- (void)changeOptions
-{
-    NSInteger seg = [optionsSwitch selectedSegment];
-    if (seg == 0) {
-        [self toggleDetailsPanel];
-    }
-    else if (seg == 1) {
-        [self togglePowerMarker];
-    }
-    else if (seg == 2) {
-        [self toggleDelta];
-    }
-}
-
-- (void)copyMarked
-{
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [model setRemoveEmptyFolders:n2b([ud objectForKey:@"removeEmptyFolders"])];
-    [model setCopyMoveDestType:n2i([ud objectForKey:@"recreatePathType"])];
-    [model copyMarked];
-}
-
-- (void)trashMarked
-{
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [model setRemoveEmptyFolders:n2b([ud objectForKey:@"removeEmptyFolders"])];
-    [model deleteMarked];
-}
-
-- (void)filter
-{
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [model setEscapeFilterRegexp:!n2b([ud objectForKey:@"useRegexpFilter"])];
-    [model applyFilter:[filterField stringValue]];
-}
-
-- (void)focusOnFilterField
-{
-    [[self window] makeFirstResponder:filterField];
-}
-
-- (void)ignoreSelected
-{
-    [model addSelectedToIgnoreList];
-}
-
-- (void)invokeCustomCommand
-{
-    [model invokeCustomCommand];
-}
-
-- (void)markAll
-{
-    [model markAll];
-}
-
-- (void)markInvert
-{
-    [model markInvert];
-}
-
-- (void)markNone
-{
-    [model markNone];
-}
-
-- (void)markSelected
-{
-    [model toggleSelectedMark];
-}
-
-- (void)moveMarked
-{
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [model setRemoveEmptyFolders:n2b([ud objectForKey:@"removeEmptyFolders"])];
-    [model setCopyMoveDestType:n2i([ud objectForKey:@"recreatePathType"])];
-    [model moveMarked];
-}
-
-- (void)openClicked
-{
-    if ([matches clickedRow] < 0) {
-        return;
-    }
-    [matches selectRowIndexes:[NSIndexSet indexSetWithIndex:[matches clickedRow]] byExtendingSelection:NO];
-    [model openSelected];
-}
-
-- (void)openSelected
-{
-    [model openSelected];
-}
-
-- (void)removeMarked
-{
-    [model removeMarked];
-}
-
-- (void)removeSelected
-{
-    [model removeSelected];
-}
-
-- (void)renameSelected
-{
-    NSInteger col = [matches columnWithIdentifier:@"name"];
-    NSInteger row = [matches selectedRow];
-    [matches editColumn:col row:row withEvent:[NSApp currentEvent] select:YES];
-}
-
-- (void)reprioritizeResults
-{
-    PrioritizeDialog *dlg = [[PrioritizeDialog alloc] initWithApp:model];
-    NSInteger result = [NSApp runModalForWindow:[dlg window]];
-    if (result == NSRunStoppedResponse) {
-        [[dlg model] performReprioritization];
-    }
-    [dlg release];
-    [[self window] makeKeyAndOrderFront:nil];
-}
-
-- (void)resetColumnsToDefault
-{
-    [[[table columns] model] resetToDefaults];
-    [self fillColumnsMenu];
-}
-
-- (void)revealSelected
-{
-    [model revealSelected];
-}
-
-- (void)saveResults
-{
-    NSSavePanel *sp = [NSSavePanel savePanel];
-    [sp setCanCreateDirectories:YES];
-    [sp setAllowedFileTypes:[NSArray arrayWithObject:@"dupeguru"]];
-    [sp setTitle:NSLocalizedString(@"Select a file to save your results to", @"")];
-    if ([sp runModal] == NSOKButton) {
-        [model saveResultsAs:[[sp URL] path]];
-        [[app recentResults] addFile:[[sp URL] path]];
-    }
-}
-
-- (void)switchSelected
-{
-    [model makeSelectedReference];
-}
-
-- (void)toggleColumn:(id)sender
-{
-    NSMenuItem *mi = sender;
-    BOOL checked = [[[table columns] model] toggleMenuItem:[mi tag]];
-    [mi setState:checked ? NSOnState : NSOffState];
-}
-
-- (void)toggleDetailsPanel
-{
-    [[app detailsPanel] toggleVisibility];
-    [self updateOptionSegments];
-}
-
-- (void)toggleDelta
-{
-    [table setDeltaValuesMode:![table deltaValuesMode]];
-    [self updateOptionSegments];
-}
-
-- (void)togglePowerMarker
-{
-    [table setPowerMarkerMode:![table powerMarkerMode]];
-    [self updateOptionSegments];
-}
-
-- (void)toggleQuicklookPanel
-{
-    if ([QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible]) {
-        [[QLPreviewPanel sharedPreviewPanel] orderOut:nil];
-    } 
-    else {
-        [[QLPreviewPanel sharedPreviewPanel] makeKeyAndOrderFront:nil];
-    }
-}
-
-/* Quicklook */
-- (BOOL)acceptsPreviewPanelControl:(QLPreviewPanel *)panel;
-{
-    return YES;
-}
-
-- (void)beginPreviewPanelControl:(QLPreviewPanel *)panel
-{
-    // This document is now responsible of the preview panel
-    // It is allowed to set the delegate, data source and refresh panel.
-    previewPanel = [panel retain];
-    panel.delegate = table;
-    panel.dataSource = table;
-}
-
-- (void)endPreviewPanelControl:(QLPreviewPanel *)panel
-{
-    // This document loses its responsisibility on the preview panel
-    // Until the next call to -beginPreviewPanelControl: it must not
-    // change the panel's delegate, data source or refresh it.
-    [previewPanel release];
-    previewPanel = nil;
-}
-
-- (BOOL)validateToolbarItem:(NSToolbarItem *)theItem
-{
-    return ![[ProgressController mainProgressController] isShown];
-}
-
-- (BOOL)validateMenuItem:(NSMenuItem *)item
-{
-    if ([item action] == @selector(markAll)) {
-        [item setTitle:NSLocalizedString(@"Mark All", @"")];
-    }
-    return ![[ProgressController mainProgressController] isShown];
-}
-@end

cocoa/StatsLabel.h

@@ -1,17 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "HSGUIController.h"
-#import "PyStatsLabel.h"
-
-@interface StatsLabel : HSGUIController {}
-- (id)initWithPyRef:(PyObject *)aPyRef view:(NSTextField *)aLabelView;
-- (PyStatsLabel *)model;
-- (NSTextField *)labelView;
-@end

cocoa/StatsLabel.m

@@ -1,34 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import "StatsLabel.h"
-#import "Utils.h"
-
-@implementation StatsLabel
-- (id)initWithPyRef:(PyObject *)aPyRef view:(NSTextField *)aLabelView
-{
-    return [super initWithPyRef:aPyRef wrapperClass:[PyStatsLabel class]
-        callbackClassName:@"StatsLabelView" view:aLabelView];
-}
-
-- (PyStatsLabel *)model
-{
-    return (PyStatsLabel *)model;
-}
-
-- (NSTextField *)labelView
-{
-    return (NSTextField *)view;
-}
-
-/* Python --> Cocoa */
-- (void)refresh
-{
-    [[self labelView] setStringValue:[[self model] display]];
-}
-@end

cocoa/dg_cocoa.py

@@ -1,17 +0,0 @@
-# Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-# 
-# This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-# which should be included with this package. The terms are also available at 
-# http://www.gnu.org/licenses/gpl-3.0.html
-
-from hscommon.trans import install_gettext_trans_under_cocoa
-install_gettext_trans_under_cocoa()
-
-from cocoa.inter import PySelectableList, PyColumns, PyTable
-
-from inter.all import *
-from inter.app import PyDupeGuru
-
-# When built under virtualenv, the dependency collector misses this module, so we have to force it
-# to see the module.
-import distutils.sysconfig

cocoa/dsa_pub.pem

@@ -1,20 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIDOjCCAi0GByqGSM44BAEwggIgAoIBAQDSurIL+HKbw+jsppG6tp3+WOcA4W71
-nhwR/DD2Se076AtCXJcssAhuCDUm+AVkQ3l34D++aYWtLR575rCrwU4lZXfQe+b9
-plHK02oOuqAY8lO5y02xoHEh7XeGunZ0u8wOVZw8MI999vIJ8rtCdvIF3r26wkjx
-9sieSxVpzJHDV5JHVdK3ObkXp/ts99dOD5B3CWGS8UiroMgS0FmRl7uPuADRRn2G
-srHTBYMwJvq8HFzQmDxcLldGQMAKvRKchtH+nH6ci1unSnpDUyrsCd+7qv1cSTse
-qc4OgXBDQ94MfVEh6Bs0S9stYfJf8cp6iV18J0sqMb9rbP4qC56iBsXfAhUAj6tx
-gwima7VaNI4YiC69jpLod3MCggEAYx+/mbU8P/xGooV9MgA3nI2v2vVNkwZVFcPa
-ROLQHg+R7bAftF3+1M9AnSP2O+PnXL65DwyTOab/Z/zM/vof3LLCGLYCmzPL+xvB
-6PxlqO374kFsKHEaaw66nnFWzPSdks/il0rauAiEbO8Gn/a8F2HFdA/OCCzq83l6
-cOhya7kGXZxdjeIfpfiNjDqZXi+8VRNDcDXx5u/T4vpkliQ+4O8ZXjwE4z2dPHfu
-Bw/N7DUalkzhZygYqcgx3tUxu3x/Pso+inmIBbk/As0uZv2nEll2CkEI6CSJIpfn
-pLKNQb4E4G7h+u+8kfHcwQ59RU1uGh0PU5uM+DOPg6HsC41RwgOCAQUAAoIBABLY
-T8gN8KdxWheESorvgksdG+Fizhkafpac08MCwJFF24v5a8AvZbhcCMLhChrloKcQ
-19qHshRIuWbSma/OqCmQKH752PTOKxRKsmqAfO0Rej2aDJrd0s7YBMY72DqeSYPP
-peLlwv0gkgRW7/EbDvBI18iTbrQLZtdqs9Xajc3dyIG5wrMtAf/Gta2oWChHlBLZ
-S45++Y9ou+LtW7dMc7c+aTxbzeLG36S57kAenRzjfP8zOi3P+Cc+5b9+SZgqfFrz
-/ch/HjB2zYAKq9AZSmgp9qIlOIuXnctJUD9hHivuEXFDr6xi1cxj7Q8WnX4+C58/
-QyGS4lebbLQ35x6fTQ8=
------END PUBLIC KEY-----

cocoa/en.lproj/Localizable.strings

@@ -1,151 +0,0 @@
-
-"%@ Results" = "%@ Results";
-"About dupeGuru" = "About dupeGuru";
-"Action" = "Action";
-"Actions" = "Actions";
-"Add Aperture Library" = "Add Aperture Library";
-"Add criteria to the right box and click OK to send the dupes that correspond the best to these criteria to their respective group's reference position. Read the help file for more information." = "Add criteria to the right box and click OK to send the dupes that correspond the best to these criteria to their respective group's reference position. Read the help file for more information.";
-"Add iPhoto Library" = "Add iPhoto Library";
-"Add iTunes Library" = "Add iTunes Library";
-"Add New Folder..." = "Add New Folder...";
-"Add Selected to Ignore List" = "Add Selected to Ignore List";
-"Advanced" = "Advanced";
-"After having deleted a duplicate, place a link targeting the reference file to replace the deleted file." = "After having deleted a duplicate, place a link targeting the reference file to replace the deleted file.";
-"Album" = "Album";
-"Artist" = "Artist";
-"Attribute" = "Attribute";
-"Audio Content" = "Audio Content";
-"Automatically check for updates" = "Automatically check for updates";
-"Basic" = "Basic";
-"Bring All to Front" = "Bring All to Front";
-"Can mix file kind" = "Can mix file kind";
-"Cancel" = "Cancel";
-"Check for update..." = "Check for update...";
-"Clear" = "Clear";
-"Clear Picture Cache" = "Clear Picture Cache";
-"Close" = "Close";
-"Close Window" = "Close Window";
-"Columns" = "Columns";
-"Content" = "Content";
-"Contents" = "Contents";
-"Copy" = "Copy";
-"Copy and Move:" = "Copy and Move:";
-"Copy Marked to..." = "Copy Marked to...";
-"Custom command (arguments: %d for dupe, %r for ref):" = "Custom command (arguments: %d for dupe, %r for ref):";
-"Cut" = "Cut";
-"Debug mode (restart required)" = "Debug mode (restart required)";
-"Deletion Options" = "Deletion Options";
-"Delta" = "Delta";
-"Details" = "Details";
-"Details of Selected File" = "Details of Selected File";
-"Details Panel" = "Details Panel";
-"Directly delete files" = "Directly delete files";
-"Directories" = "Directories";
-"Do you really want to remove all your cached picture analysis?" = "Do you really want to remove all your cached picture analysis?";
-"dupeGuru" = "dupeGuru";
-"dupeGuru Help" = "dupeGuru Help";
-"dupeGuru ME Preferences" = "dupeGuru ME Preferences";
-"dupeGuru PE Preferences" = "dupeGuru PE Preferences";
-"dupeGuru Preferences" = "dupeGuru Preferences";
-"dupeGuru Results" = "dupeGuru Results";
-"dupeGuru Website" = "dupeGuru Website";
-"Dupes Only" = "Dupes Only";
-"Edit" = "Edit";
-"Excluded" = "Excluded";
-"EXIF Timestamp" = "EXIF Timestamp";
-"Export Results to CSV" = "Export Results to CSV";
-"Export Results to XHTML" = "Export Results to XHTML";
-"Fewer results" = "Fewer results";
-"File" = "File";
-"Filename" = "Filename";
-"Filename - Fields" = "Filename - Fields";
-"Filename - Fields (No Order)" = "Filename - Fields (No Order)";
-"Filter" = "Filter";
-"Filter hardness:" = "Filter hardness:";
-"Filter Results..." = "Filter Results...";
-"Folder Selection Window" = "Folder Selection Window";
-"Folders" = "Folders";
-"Font Size:" = "Font Size:";
-"Genre" = "Genre";
-"Help" = "Help";
-"Hide dupeGuru" = "Hide dupeGuru";
-"Hide Others" = "Hide Others";
-"Ignore duplicates hardlinking to the same file" = "Ignore duplicates hardlinking to the same file";
-"Ignore files smaller than:" = "Ignore files smaller than:";
-"Ignore List" = "Ignore List";
-"Instead of sending files to trash, delete them directly. This option is usually used as a workaround when the normal deletion method doesn't work." = "Instead of sending files to trash, delete them directly. This option is usually used as a workaround when the normal deletion method doesn't work.";
-"Invert Marking" = "Invert Marking";
-"Invoke Custom Command" = "Invoke Custom Command";
-"KB" = "KB";
-"Link deleted files" = "Link deleted files";
-"Load from file..." = "Load from file...";
-"Load Recent Results" = "Load Recent Results";
-"Load Results" = "Load Results";
-"Load Results..." = "Load Results...";
-"Make Selected into Reference" = "Make Selected into Reference";
-"Mark All" = "Mark All";
-"Mark None" = "Mark None";
-"Mark Selected" = "Mark Selected";
-"Match pictures of different dimensions" = "Match pictures of different dimensions";
-"Match similar words" = "Match similar words";
-"Minimize" = "Minimize";
-"Mode" = "Mode";
-"More results" = "More results";
-"Move Marked to..." = "Move Marked to...";
-"Name" = "Name";
-"Normal" = "Normal";
-"Ok" = "Ok";
-"Open Selected with Default Application" = "Open Selected with Default Application";
-"Options" = "Options";
-"Paste" = "Paste";
-"Preferences..." = "Preferences...";
-"Problems!" = "Problems!";
-"Proceed" = "Proceed";
-"Quick Look" = "Quick Look";
-"Quit dupeGuru" = "Quit dupeGuru";
-"Re-Prioritize duplicates" = "Re-Prioritize duplicates";
-"Re-Prioritize Results..." = "Re-Prioritize Results...";
-"Recreate absolute path" = "Recreate absolute path";
-"Recreate relative path" = "Recreate relative path";
-"Reference" = "Reference";
-"Remove Dead Tracks in iTunes" = "Remove Dead Tracks in iTunes";
-"Remove empty folders on delete or move" = "Remove empty folders on delete or move";
-"Remove Marked from Results" = "Remove Marked from Results";
-"Remove Selected" = "Remove Selected";
-"Remove Selected from Results" = "Remove Selected from Results";
-"Rename Selected" = "Rename Selected";
-"Reset to Default" = "Reset to Default";
-"Reset To Defaults" = "Reset To Defaults";
-"Results Window" = "Results Window";
-"Reveal" = "Reveal";
-"Reveal Selected in Finder" = "Reveal Selected in Finder";
-"Right in destination" = "Right in destination";
-"Save Results..." = "Save Results...";
-"Scan" = "Scan";
-"Scan Type:" = "Scan Type:";
-"Select a file to save your results to" = "Select a file to save your results to";
-"Select a folder to add to the scanning list" = "Select a folder to add to the scanning list";
-"Select a results file to load" = "Select a results file to load";
-"Select All" = "Select All";
-"Select folders to scan and press \"Scan\"." = "Select folders to scan and press \"Scan\".";
-"Selected" = "Selected";
-"Send Marked to Trash..." = "Send Marked to Trash...";
-"Services" = "Services";
-"Show All" = "Show All";
-"Show Delta Values" = "Show Delta Values";
-"Show Dupes Only" = "Show Dupes Only";
-"Start Duplicate Scan" = "Start Duplicate Scan";
-"State" = "State";
-"Tags" = "Tags";
-"Tags to scan:" = "Tags to scan:";
-"The name '%@' already exists." = "The name '%@' already exists.";
-"There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results." = "There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results.";
-"Title" = "Title";
-"Track" = "Track";
-"Use regular expressions when filtering" = "Use regular expressions when filtering";
-"Window" = "Window";
-"Word weighting" = "Word weighting";
-"Year" = "Year";
-"You have unsaved results, do you really want to continue?" = "You have unsaved results, do you really want to continue?";
-"You have unsaved results, do you really want to quit?" = "You have unsaved results, do you really want to quit?";
-"Zoom" = "Zoom";

cocoa/inter/all.py

@@ -1,10 +0,0 @@
-from cocoa.inter import PyTextField, PyProgressWindow
-from .deletion_options import PyDeletionOptions
-from .details_panel import PyDetailsPanel
-from .directory_outline import PyDirectoryOutline
-from .prioritize_dialog import PyPrioritizeDialog
-from .prioritize_list import PyPrioritizeList
-from .problem_dialog import PyProblemDialog
-from .ignore_list_dialog import PyIgnoreListDialog
-from .result_table import PyResultTable
-from .stats_label import PyStatsLabel

cocoa/inter/app.py

@@ -1,251 +0,0 @@
-import logging
-
-from objp.util import pyref, dontwrap
-from hscommon.path import Path, pathify
-from cocoa import install_exception_hook, install_cocoa_logger, patch_threaded_job_performer
-from cocoa.inter import PyBaseApp, BaseAppView
-
-import core.pe.photo
-from core.app import DupeGuru as DupeGuruBase, AppMode
-from .directories import Directories, Bundle
-from .photo import Photo
-
-class DupeGuru(DupeGuruBase):
-    def __init__(self, view):
-        DupeGuruBase.__init__(self, view)
-        self.directories = Directories()
-    
-    def selected_dupe_path(self):
-        if not self.selected_dupes:
-            return None
-        return self.selected_dupes[0].path
-    
-    def selected_dupe_ref_path(self):
-        if not self.selected_dupes:
-            return None
-        ref = self.results.get_group_of_duplicate(self.selected_dupes[0]).ref
-        if ref is self.selected_dupes[0]: # we don't want the same pic to be displayed on both sides
-            return None
-        return ref.path
-    
-    def _get_fileclasses(self):
-        result = DupeGuruBase._get_fileclasses(self)
-        if self.app_mode == AppMode.Standard:
-            result = [Bundle] + result
-        return result
-
-class DupeGuruView(BaseAppView):
-    def askYesNoWithPrompt_(self, prompt: str) -> bool: pass
-    def createResultsWindow(self): pass
-    def showResultsWindow(self): pass
-    def showProblemDialog(self): pass
-    def selectDestFolderWithPrompt_(self, prompt: str) -> str: pass
-    def selectDestFileWithPrompt_extension_(self, prompt: str, extension: str) -> str: pass
-
-class PyDupeGuru(PyBaseApp):
-    @dontwrap
-    def __init__(self):
-        core.pe.photo.PLAT_SPECIFIC_PHOTO_CLASS = Photo
-        logging.basicConfig(level=logging.WARNING, format='%(levelname)s %(message)s')
-        install_exception_hook('https://github.com/hsoft/dupeguru/issues')
-        install_cocoa_logger()
-        patch_threaded_job_performer()
-        self.model = DupeGuru(self)
-    
-    #---Sub-proxies
-    def detailsPanel(self) -> pyref:
-        return self.model.details_panel
-    
-    def directoryTree(self) -> pyref:
-        return self.model.directory_tree
-    
-    def problemDialog(self) -> pyref:
-        return self.model.problem_dialog
-    
-    def statsLabel(self) -> pyref:
-        return self.model.stats_label
-    
-    def resultTable(self) -> pyref:
-        return self.model.result_table
-    
-    def ignoreListDialog(self) -> pyref:
-        return self.model.ignore_list_dialog
-    
-    def progressWindow(self) -> pyref:
-        return self.model.progress_window
-    
-    def deletionOptions(self) -> pyref:
-        return self.model.deletion_options
-    
-    #---Directories
-    def addDirectory_(self, directory: str):
-        self.model.add_directory(directory)
-    
-    #---Results
-    def doScan(self):
-        self.model.start_scanning()
-    
-    def exportToXHTML(self):
-        self.model.export_to_xhtml()
-    
-    def exportToCSV(self):
-        self.model.export_to_csv()
-    
-    def loadSession(self):
-        self.model.load()
-    
-    def loadResultsFrom_(self, filename: str):
-        self.model.load_from(filename)
-    
-    def markAll(self):
-        self.model.mark_all()
-    
-    def markNone(self):
-        self.model.mark_none()
-    
-    def markInvert(self):
-        self.model.mark_invert()
-    
-    def purgeIgnoreList(self):
-        self.model.purge_ignore_list()
-    
-    def toggleSelectedMark(self):
-        self.model.toggle_selected_mark_state()
-    
-    def saveSession(self):
-        self.model.save()
-    
-    def saveResultsAs_(self, filename: str):
-        self.model.save_as(filename)
-    
-    #---Actions
-    def addSelectedToIgnoreList(self):
-        self.model.add_selected_to_ignore_list()
-    
-    def deleteMarked(self):
-        self.model.delete_marked()
-    
-    def applyFilter_(self, filter: str):
-        self.model.apply_filter(filter)
-    
-    def makeSelectedReference(self):
-        self.model.make_selected_reference()
-    
-    def copyMarked(self):
-        self.model.copy_or_move_marked(copy=True)
-    
-    def moveMarked(self):
-        self.model.copy_or_move_marked(copy=False)
-    
-    def openSelected(self):
-        self.model.open_selected()
-    
-    def removeMarked(self):
-        self.model.remove_marked()
-    
-    def removeSelected(self):
-        self.model.remove_selected()
-    
-    def revealSelected(self):
-        self.model.reveal_selected()
-
-    def invokeCustomCommand(self):
-        self.model.invoke_custom_command()
-    
-    def showIgnoreList(self):
-        self.model.ignore_list_dialog.show()
-    
-    def clearPictureCache(self):
-        self.model.clear_picture_cache()
-    
-    #---Information
-    def getScanOptions(self) -> list:
-        return [o.label for o in self.model.SCANNER_CLASS.get_scan_options()]
-    
-    def resultsAreModified(self) -> bool:
-        return self.model.results.is_modified
-    
-    def getSelectedDupePath(self) -> str:
-        return str(self.model.selected_dupe_path())
-    
-    def getSelectedDupeRefPath(self) -> str:
-        return str(self.model.selected_dupe_ref_path())
-    
-    #---Properties
-    def getAppMode(self) -> int:
-        return self.model.app_mode
-
-    def setAppMode_(self, app_mode: int):
-        self.model.app_mode = app_mode
-    
-    def setScanType_(self, scan_type_index: int):
-        scan_options = self.model.SCANNER_CLASS.get_scan_options()
-        try:
-            so = scan_options[scan_type_index]
-            self.model.options['scan_type'] = so.scan_type
-        except IndexError:
-            pass
-
-    def setMinMatchPercentage_(self, percentage: int):
-        self.model.options['min_match_percentage'] = int(percentage)
-    
-    def setWordWeighting_(self, words_are_weighted: bool):
-        self.model.options['word_weighting'] = words_are_weighted
-    
-    def setMatchSimilarWords_(self, match_similar_words: bool):
-        self.model.options['match_similar_words'] = match_similar_words
-    
-    def setSizeThreshold_(self, size_threshold: int):
-        self.model.options['size_threshold'] = size_threshold
-
-    def enable_scanForTag_(self, enable: bool, scan_tag: str):
-        if 'scanned_tags' not in self.model.options:
-            self.model.options['scanned_tags'] = set()
-        if enable:
-            self.model.options['scanned_tags'].add(scan_tag)
-        else:
-            self.model.options['scanned_tags'].discard(scan_tag)
-
-    def setMatchScaled_(self, match_scaled: bool):
-        self.model.options['match_scaled'] = match_scaled
-    
-    def setMixFileKind_(self, mix_file_kind: bool):
-        self.model.options['mix_file_kind'] = mix_file_kind
-    
-    def setEscapeFilterRegexp_(self, escape_filter_regexp: bool):
-        self.model.options['escape_filter_regexp'] = escape_filter_regexp
-    
-    def setRemoveEmptyFolders_(self, remove_empty_folders: bool):
-        self.model.options['clean_empty_dirs'] = remove_empty_folders
-    
-    def setIgnoreHardlinkMatches_(self, ignore_hardlink_matches: bool):
-        self.model.options['ignore_hardlink_matches'] = ignore_hardlink_matches
-    
-    def setCopyMoveDestType_(self, copymove_dest_type: int):
-        self.model.options['copymove_dest_type'] = copymove_dest_type
-    
-    #--- model --> view
-    @dontwrap
-    def ask_yes_no(self, prompt):
-        return self.callback.askYesNoWithPrompt_(prompt)
-    
-    @dontwrap
-    def create_results_window(self):
-        self.callback.createResultsWindow()
-    
-    @dontwrap
-    def show_results_window(self):
-        self.callback.showResultsWindow()
-    
-    @dontwrap
-    def show_problem_dialog(self):
-        self.callback.showProblemDialog()
-    
-    @dontwrap
-    def select_dest_folder(self, prompt):
-        return self.callback.selectDestFolderWithPrompt_(prompt)
-    
-    @dontwrap
-    def select_dest_file(self, prompt, extension):
-        return self.callback.selectDestFileWithPrompt_extension_(prompt, extension)
-    

cocoa/inter/deletion_options.py

@@ -1,37 +0,0 @@
-# Created On: 2012-05-30
-# Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-# 
-# This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-# which should be included with this package. The terms are also available at 
-# http://www.gnu.org/licenses/gpl-3.0.html
-
-from objp.util import dontwrap
-from cocoa.inter import PyGUIObject, GUIObjectView
-
-class DeletionOptionsView(GUIObjectView):
-    def updateMsg_(self, msg: str): pass
-    def show(self) -> bool: pass
-    def setHardlinkOptionEnabled_(self, enabled: bool): pass
-
-class PyDeletionOptions(PyGUIObject):
-    def setLinkDeleted_(self, link_deleted: bool):
-        self.model.link_deleted = link_deleted
-    
-    def setUseHardlinks_(self, use_hardlinks: bool):
-        self.model.use_hardlinks = use_hardlinks
-    
-    def setDirect_(self, direct: bool):
-        self.model.direct = direct
-    
-    #--- model --> view
-    @dontwrap
-    def update_msg(self, msg):
-        self.callback.updateMsg_(msg)
-    
-    @dontwrap
-    def show(self):
-        return self.callback.show()
-    
-    @dontwrap
-    def set_hardlink_option_enabled(self, enabled):
-        self.callback.setHardlinkOptionEnabled_(enabled)

cocoa/inter/details_panel.py

@@ -1,11 +0,0 @@
-from cocoa.inter import PyGUIObject, GUIObjectView
-
-class DetailsPanelView(GUIObjectView):
-    pass
-
-class PyDetailsPanel(PyGUIObject):
-    def numberOfRows(self) -> int:
-        return self.model.row_count()
-    
-    def valueForColumn_row_(self, column: str, row: int) -> object:
-        return self.model.row(row)[int(column)]

cocoa/inter/directories.py

@@ -1,53 +0,0 @@
-# Copyright 2016 Hardcoded Software (http://www.hardcoded.net)
-# 
-# This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-# which should be included with this package. The terms are also available at 
-# http://www.gnu.org/licenses/gpl-3.0.html
-
-from cocoa import proxy
-from hscommon.path import Path, pathify
-from core.se import fs
-from core.directories import Directories as DirectoriesBase, DirectoryState
-
-def is_bundle(str_path):
-    uti = proxy.getUTI_(str_path)
-    if uti is None:
-        logging.warning('There was an error trying to detect the UTI of %s', str_path)
-    return proxy.type_conformsToType_(uti, 'com.apple.bundle') or proxy.type_conformsToType_(uti, 'com.apple.package')
-
-class Bundle(fs.Folder):
-    @classmethod
-    @pathify
-    def can_handle(cls, path: Path):
-        return not path.islink() and path.isdir() and is_bundle(str(path))
-
-class Directories(DirectoriesBase):
-    ROOT_PATH_TO_EXCLUDE = list(map(Path, ['/Library', '/Volumes', '/System', '/bin', '/sbin', '/opt', '/private', '/dev']))
-    HOME_PATH_TO_EXCLUDE = [Path('Library')]
-
-    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 DirectoryState.Excluded
-        if path[:2] == Path('/Users') and path[3:] in self.HOME_PATH_TO_EXCLUDE:
-            return DirectoryState.Excluded
-    
-    def _get_folders(self, from_folder, j):
-        # We don't want to scan bundle's subfolder even in Folders mode. Bundle's integrity has to
-        # stay intact.
-        if is_bundle(str(from_folder.path)):
-            # just yield the current folder and bail
-            state = self.get_state(from_folder.path)
-            if state != DirectoryState.Excluded:
-                from_folder.is_ref = state == DirectoryState.Reference
-                yield from_folder
-            return
-        else:
-            yield from DirectoriesBase._get_folders(self, from_folder, j)
-    
-    @staticmethod
-    def get_subfolders(path):
-        result = DirectoriesBase.get_subfolders(path)
-        return [p for p in result if not is_bundle(str(p))]

cocoa/inter/directory_outline.py

@@ -1,21 +0,0 @@
-from objp.util import dontwrap
-from cocoa.inter import PyOutline, GUIObjectView
-
-class DirectoryOutlineView(GUIObjectView):
-    pass
-
-class PyDirectoryOutline(PyOutline):
-    def addDirectory_(self, path: str):
-        self.model.add_directory(path)
-    
-    def removeSelectedDirectory(self):
-        self.model.remove_selected()
-    
-    def selectAll(self):
-        self.model.select_all()
-    
-    # python --> cocoa
-    @dontwrap
-    def refresh_states(self):
-        # Under cocoa, both refresh() and refresh_states() do the same thing.
-        self.callback.refresh()

cocoa/inter/ignore_list_dialog.py

@@ -1,21 +0,0 @@
-from objp.util import pyref, dontwrap
-from cocoa.inter import PyGUIObject, GUIObjectView
-
-class IgnoreListDialogView(GUIObjectView):
-    def show(self): pass
-
-class PyIgnoreListDialog(PyGUIObject):
-    def ignoreListTable(self) -> pyref:
-        return self.model.ignore_list_table
-    
-    def removeSelected(self):
-        self.model.remove_selected()
-    
-    def clear(self):
-        self.model.clear()
-    
-    #--- model --> view
-    @dontwrap
-    def show(self):
-        self.callback.show()
-    

cocoa/inter/photo.py

@@ -1,35 +0,0 @@
-# Copyright 2016 Hardcoded Software (http://www.hardcoded.net)
-# 
-# This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-# which should be included with this package. The terms are also available at 
-# http://www.gnu.org/licenses/gpl-3.0.html
-
-from cocoa import proxy
-from core.pe import _block_osx
-from core.pe.photo import Photo as PhotoBase
-
-class Photo(PhotoBase):
-    HANDLED_EXTS = PhotoBase.HANDLED_EXTS.copy()
-    HANDLED_EXTS.update({'psd', 'nef', 'cr2', 'orf'})
-    
-    def _plat_get_dimensions(self):
-        return _block_osx.get_image_size(str(self.path))
-    
-    def _plat_get_blocks(self, block_count_per_side, orientation):
-        try:
-            blocks = _block_osx.getblocks(str(self.path), block_count_per_side, orientation)
-        except Exception as e:
-            raise IOError('The reading of "%s" failed with "%s"' % (str(self.path), str(e)))
-        if not blocks:
-            raise IOError('The picture %s could not be read' % str(self.path))
-        return blocks
-    
-    def _get_exif_timestamp(self):
-        exifdata = proxy.readExifData_(str(self.path))
-        if exifdata:
-            try:
-                return exifdata['{Exif}']['DateTimeOriginal']
-            except KeyError:
-                return ''
-        else:
-            return ''

cocoa/inter/prioritize_dialog.py

@@ -1,29 +0,0 @@
-from objp.util import pyref
-from cocoa.inter import PyGUIObject, GUIObjectView
-from core.gui.prioritize_dialog import PrioritizeDialog
-
-class PrioritizeDialogView(GUIObjectView):
-    pass
-
-class PyPrioritizeDialog(PyGUIObject):
-    def __init__(self, app: pyref):
-        model = PrioritizeDialog(app.model)
-        PyGUIObject.__init__(self, model)
-    
-    def categoryList(self) -> pyref:
-        return self.model.category_list
-    
-    def criteriaList(self) -> pyref:
-        return self.model.criteria_list
-    
-    def prioritizationList(self) -> pyref:
-        return self.model.prioritization_list
-    
-    def addSelected(self):
-        self.model.add_selected()
-    
-    def removeSelected(self):
-        self.model.remove_selected()
-    
-    def performReprioritization(self):
-        self.model.perform_reprioritization()

cocoa/inter/prioritize_list.py

@@ -1,8 +0,0 @@
-from cocoa.inter import PySelectableList, SelectableListView
-
-class PrioritizeListView(SelectableListView):
-    pass
-
-class PyPrioritizeList(PySelectableList):
-    def moveIndexes_toIndex_(self, indexes: list, dest_index: int):
-        self.model.move_indexes(indexes, dest_index)

cocoa/inter/problem_dialog.py

@@ -1,9 +0,0 @@
-from objp.util import pyref
-from cocoa.inter import PyGUIObject
-
-class PyProblemDialog(PyGUIObject):
-    def problemTable(self) -> pyref:
-        return self.model.problem_table
-    
-    def revealSelected(self):
-        self.model.reveal_selected_dupe()

cocoa/inter/result_table.py

@@ -1,50 +0,0 @@
-from objp.util import dontwrap
-from cocoa.inter import PyTable, TableView
-
-class ResultTableView(TableView):
-    def invalidateMarkings(self): pass
-
-class PyResultTable(PyTable):
-    def powerMarkerMode(self) -> bool:
-        return self.model.power_marker
-    
-    def setPowerMarkerMode_(self, value: bool):
-        self.model.power_marker = value
-    
-    def deltaValuesMode(self) -> bool:
-        return self.model.delta_values
-    
-    def setDeltaValuesMode_(self, value: bool):
-        self.model.delta_values = value
-    
-    def valueForRow_column_(self, row_index: int, column: str) -> object:
-        return self.model.get_row_value(row_index, column)
-    
-    def isDeltaAtRow_column_(self, row_index: int, column: str) -> bool:
-        row = self.model[row_index]
-        return row.is_cell_delta(column)
-    
-    def renameSelected_(self, newname: str) -> bool:
-        return self.model.rename_selected(newname)
-    
-    def sortBy_ascending_(self, key: str, asc: bool):
-        self.model.sort(key, asc)
-    
-    def markSelected(self):
-        self.model.app.toggle_selected_mark_state()
-    
-    def removeSelected(self):
-        self.model.app.remove_selected()
-    
-    def selectedDupeCount(self) -> int:
-        return self.model.selected_dupe_count
-    
-    def pathAtIndex_(self, index: int) -> str:
-        row = self.model[index]
-        return str(row._dupe.path)
-    
-    # python --> cocoa
-    @dontwrap
-    def invalidate_markings(self):
-        self.callback.invalidateMarkings()
-    

cocoa/inter/stats_label.py

@@ -1,9 +0,0 @@
-from cocoa.inter import PyGUIObject, GUIObjectView
-
-class StatsLabelView(GUIObjectView):
-    pass
-
-class PyStatsLabel(PyGUIObject):
-    
-    def display(self) -> str:
-        return self.model.display

cocoa/main.m

@@ -1,49 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import <Cocoa/Cocoa.h>
-#import <Python.h>
-#import <wchar.h>
-#import <locale.h>
-#import "AppDelegate.h"
-#import "MainMenu_UI.h"
-
-int main(int argc, char *argv[])
-{
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    /* We have to set the locate to UTF8 for mbstowcs() to correctly convert non-ascii chars in paths */
-    setlocale(LC_ALL, "en_US.UTF-8");
-    NSString *respath = [[NSBundle mainBundle] resourcePath];
-    NSString *mainpy = [respath stringByAppendingPathComponent:@"dg_cocoa.py"];
-    wchar_t wPythonPath[PATH_MAX+1];
-    NSString *pypath = [respath stringByAppendingPathComponent:@"py"];
-    mbstowcs(wPythonPath, [pypath fileSystemRepresentation], PATH_MAX+1);
-    Py_SetPath(wPythonPath);
-    Py_SetPythonHome(wPythonPath);
-    Py_Initialize();
-    PyEval_InitThreads();
-    PyGILState_STATE gilState = PyGILState_Ensure();
-    FILE* fp = fopen([mainpy UTF8String], "r");
-    PyRun_SimpleFile(fp, [mainpy UTF8String]);
-    fclose(fp);
-    PyGILState_Release(gilState);
-    if (gilState == PyGILState_LOCKED) {
-        PyThreadState_Swap(NULL);
-        PyEval_ReleaseLock();
-    }
-    
-    [NSApplication sharedApplication];
-    AppDelegate *appDelegate = [[AppDelegate alloc] init];
-    [NSApp setDelegate:appDelegate];
-    [NSApp setMainMenu:createMainMenu_UI(appDelegate)];
-    [appDelegate finalizeInit];
-    [pool release];
-    [NSApp run];
-    Py_Finalize();
-    return 0;
-}

cocoa/run_template.py

@@ -1,10 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-import os
-
-def main():
-    return os.system('open "{{app_path}}"')
-
-if __name__ == '__main__':
-    sys.exit(main())

cocoa/ui/deletion_options.py

@@ -1,49 +0,0 @@
-ownerclass = 'DeletionOptions'
-ownerimport = 'DeletionOptions.h'
-
-result = Window(450, 240, "Deletion Options")
-messageLabel = Label(result, "")
-linkCheckbox = Checkbox(result, "Link deleted files")
-linkLabel = Label(result, "After having deleted a duplicate, place a link targeting the "
-    "reference file to replace the deleted file.")
-linkTypeChoice = RadioButtons(result, ["Symlink", "Hardlink"], columns=2)
-directCheckbox = Checkbox(result, "Directly delete files")
-directLabel = Label(result, "Instead of sending files to trash, delete them directly. This option "
-    "is usually used as a workaround when the normal deletion method doesn't work.")
-proceedButton = Button(result, "Proceed")
-cancelButton = Button(result, "Cancel")
-
-owner.linkButton = linkCheckbox
-owner.linkTypeRadio = linkTypeChoice
-owner.directButton = directCheckbox
-owner.messageTextField = messageLabel
-
-result.canMinimize = False
-result.canResize = False
-linkLabel.controlSize = ControlSize.Small
-directLabel.controlSize = ControlSize.Small
-linkTypeChoice.controlSize = ControlSize.Small
-proceedButton.keyEquivalent = '\\r'
-cancelButton.keyEquivalent = '\\e'
-linkCheckbox.action = directCheckbox.action = linkTypeChoice.action = Action(owner, 'updateOptions')
-proceedButton.action = Action(owner, 'proceed')
-cancelButton.action = Action(owner, 'cancel')
-
-linkLabel.height *= 2 # 2 lines
-directLabel.height *= 3 # 3 lines
-proceedButton.width = 92
-cancelButton.width = 92
-
-mainLayout = VLayout([messageLabel, linkCheckbox, linkLabel, linkTypeChoice, directCheckbox,
-    directLabel])
-mainLayout.packToCorner(Pack.UpperLeft)
-mainLayout.fill(Pack.Right)
-buttonLayout = HLayout([cancelButton, proceedButton])
-buttonLayout.packToCorner(Pack.LowerRight)
-
-# indent the labels under checkboxes a little bit to the right
-for indentedView in (linkLabel, directLabel, linkTypeChoice):
-    indentedView.x += 20
-    indentedView.width -= 20
-# We actually don't want the link choice radio buttons to take all the width, it looks weird.
-linkTypeChoice.width = 170

cocoa/ui/details_panel.py

@@ -1,32 +0,0 @@
-ownerclass = 'DetailsPanel'
-ownerimport = 'DetailsPanel.h'
-
-result = Panel(451, 146, "Details of Selected File")
-table = TableView(result)
-
-owner.detailsTable = table
-
-result.style = PanelStyle.Utility
-result.xProportion = 0.2
-result.yProportion = 0.4
-result.canMinimize = False
-result.autosaveName = 'DetailsPanel'
-result.minSize = Size(result.width, result.height)
-
-table.dataSource = owner
-table.allowsColumnReordering = False
-table.allowsColumnSelection = False
-table.allowsMultipleSelection = False
-table.font = Font(FontFamily.System, FontSize.SmallSystem)
-table.rowHeight = 14
-table.editable = False
-col = table.addColumn('0', "Attribute", 70)
-col.autoResizable = True
-col = table.addColumn('1', "Selected", 198)
-col.autoResizable = True
-col = table.addColumn('2', "Reference", 172)
-col.autoResizable = True
-
-table.packToCorner(Pack.UpperLeft, margin=0)
-table.fill(Pack.LowerRight, margin=0)
-table.setAnchor(Pack.UpperLeft, growX=True, growY=True)

cocoa/ui/details_panel_picture.py

@@ -1,70 +0,0 @@
-ownerclass = 'DetailsPanelPicture'
-ownerimport = 'DetailsPanelPicture.h'
-
-result = Panel(593, 398, "Details of Selected File")
-table = TableView(result)
-split = SplitView(result, 2, vertical=True)
-leftSplit, rightSplit = split.subviews
-selectedLabel = Label(leftSplit, "Selected")
-selectedImage = ImageView(leftSplit, 'NSApplicationIcon')
-leftSpinner = ProgressIndicator(leftSplit)
-referenceLabel = Label(rightSplit, "Reference")
-referenceImage = ImageView(rightSplit, 'NSApplicationIcon')
-rightSpinner = ProgressIndicator(rightSplit)
-
-owner.detailsTable = table
-owner.dupeImage = selectedImage
-owner.dupeProgressIndicator = leftSpinner
-owner.refImage = referenceImage
-owner.refProgressIndicator = rightSpinner
-table.dataSource = owner
-
-result.style = PanelStyle.Utility
-result.xProportion = 0.6
-result.yProportion = 0.6
-result.canMinimize = False
-result.autosaveName = 'DetailsPanel'
-result.minSize = Size(451, 240)
-
-table.allowsColumnReordering = False
-table.allowsColumnSelection = False
-table.allowsMultipleSelection = False
-table.font = Font(FontFamily.System, FontSize.SmallSystem)
-table.rowHeight = 14
-table.editable = False
-col = table.addColumn('0', "Attribute", 70)
-col.autoResizable = True
-col = table.addColumn('1', "Selected", 198)
-col.autoResizable = True
-col = table.addColumn('2', "Reference", 172)
-col.autoResizable = True
-table.height = 165
-
-sides = [
-    (leftSplit, selectedLabel, selectedImage, leftSpinner),
-    (rightSplit, referenceLabel, referenceImage, rightSpinner),
-]
-for subSplit, label, image, spinner in sides:
-    label.alignment = TextAlignment.Center
-    spinner.style = const.NSProgressIndicatorSpinningStyle
-    spinner.controlSize = const.NSSmallControlSize
-    spinner.displayedWhenStopped = False
-    
-    label.packToCorner(Pack.UpperLeft, margin=0)
-    label.fill(Pack.Right, margin=0)
-    label.setAnchor(Pack.UpperLeft, growX=True)
-    image.packRelativeTo(label, Pack.Below)
-    image.fill(Pack.LowerRight, margin=0)
-    image.setAnchor(Pack.UpperLeft, growX=True, growY=True)
-    spinner.y = label.y
-    spinner.x = subSplit.width - 30
-    spinner.setAnchor(Pack.UpperRight)
-
-table.packToCorner(Pack.UpperLeft, margin=0)
-table.fill(Pack.Right, margin=0)
-table.setAnchor(Pack.UpperLeft, growX=True)
-
-split.packRelativeTo(table, Pack.Below)
-split.fill(Pack.LowerRight, margin=0)
-split.setAnchor(Pack.UpperLeft, growX=True, growY=True)
-

cocoa/ui/directory_panel.py

@@ -1,76 +0,0 @@
-ownerclass = 'DirectoryPanel'
-ownerimport = 'DirectoryPanel.h'
-
-result = Window(425, 300, "dupeGuru")
-promptLabel = Label(result, "Select folders to scan and press \"Scan\".")
-directoryOutline = OutlineView(result)
-directoryOutline.OBJC_CLASS = 'HSOutlineView'
-appModeSelector = SegmentedControl(result)
-appModeLabel = Label(result, "Application Mode:")
-scanTypePopup = Popup(result)
-scanTypeLabel = Label(result, "Scan Type:")
-addButton = Button(result, "")
-removeButton = Button(result, "")
-loadResultsButton = Button(result, "Load Results")
-scanButton = Button(result, "Scan")
-addPopup = Popup(None)
-loadRecentPopup = Popup(None)
-
-owner.outlineView = directoryOutline
-owner.appModeSelector = appModeSelector
-owner.scanTypePopup = scanTypePopup
-owner.removeButton = removeButton
-owner.loadResultsButton = loadResultsButton
-owner.addButtonPopUp = addPopup
-owner.loadRecentButtonPopUp = loadRecentPopup
-
-result.autosaveName = 'DirectoryPanel'
-result.canMinimize = False
-result.minSize = Size(400, 270)
-for label in ["Standard", "Music", "Picture"]:
-    appModeSelector.addSegment(label, 80)
-addButton.bezelStyle = removeButton.bezelStyle = const.NSTexturedRoundedBezelStyle
-addButton.image = 'NSAddTemplate'
-removeButton.image = 'NSRemoveTemplate'
-for button in (addButton, removeButton):
-    button.style = const.NSTexturedRoundedBezelStyle
-    button.imagePosition = const.NSImageOnly
-scanButton.keyEquivalent = '\\r'
-appModeSelector.action = Action(owner, 'changeAppMode:')
-addButton.action = Action(owner, 'popupAddDirectoryMenu:')
-removeButton.action = Action(owner, 'removeSelectedDirectory')
-loadResultsButton.action = Action(owner, 'popupLoadRecentMenu:')
-scanButton.action = Action(None, 'startScanning')
-
-directoryOutline.font = Font(FontFamily.System, FontSize.SmallSystem)
-col = directoryOutline.addColumn('name', "Name", 100)
-col.editable = False
-col.autoResizable = True
-col = directoryOutline.addColumn('state', "State", 85)
-col.editable = True
-col.autoResizable = False
-col.dataCell = Popup(None, ["Normal", "Reference", "Excluded"])
-col.dataCell.controlSize = const.NSSmallControlSize
-directoryOutline.allowsColumnReordering = False
-directoryOutline.allowsColumnSelection = False
-directoryOutline.allowsMultipleSelection = True
-
-appModeLabel.width = scanTypeLabel.width = 110
-scanTypePopup.width = 248
-appModeLayout = HLayout([appModeLabel, appModeSelector])
-scanTypeLayout = HLayout([scanTypeLabel, scanTypePopup])
-
-for button in (addButton, removeButton):
-    button.width = 28
-for button in (loadResultsButton, scanButton):
-    button.width = 118
-
-buttonLayout = HLayout([addButton, removeButton, None, loadResultsButton, scanButton])
-mainLayout = VLayout([appModeLayout, scanTypeLayout, promptLabel, directoryOutline, buttonLayout], filler=directoryOutline)
-mainLayout.packToCorner(Pack.UpperLeft)
-mainLayout.fill(Pack.LowerRight)
-directoryOutline.packRelativeTo(promptLabel, Pack.Below)
-
-promptLabel.setAnchor(Pack.UpperLeft, growX=True)
-directoryOutline.setAnchor(Pack.UpperLeft, growX=True, growY=True)
-buttonLayout.setAnchor(Pack.Below)

cocoa/ui/ignore_list_dialog.py

@@ -1,30 +0,0 @@
-ownerclass = 'IgnoreListDialog'
-ownerimport = 'IgnoreListDialog.h'
-
-result = Window(550, 350, "Ignore List")
-table = TableView(result)
-removeSelectedButton = Button(result, "Remove Selected")
-clearButton = Button(result, "Clear")
-closeButton = Button(result, "Close")
-
-owner.ignoreListTableView = table
-
-result.canMinimize = False
-removeSelectedButton.action = Action(owner.model, 'removeSelected')
-clearButton.action = Action(owner.model, 'clear')
-closeButton.action = Action(result, 'performClose:')
-closeButton.keyEquivalent = '\\r'
-table.allowsColumnReordering = False
-table.allowsColumnSelection = False
-table.allowsMultipleSelection = True
-
-removeSelectedButton.width = 142
-clearButton.width = 142
-closeButton.width = 84
-buttonLayout = HLayout([removeSelectedButton, clearButton, None, closeButton])
-buttonLayout.packToCorner(Pack.LowerLeft)
-buttonLayout.fill(Pack.Right)
-buttonLayout.setAnchor(Pack.Below)
-table.packRelativeTo(buttonLayout, Pack.Above)
-table.fill(Pack.UpperRight)
-table.setAnchor(Pack.UpperLeft, growX=True, growY=True)

cocoa/ui/main_menu.py

@@ -1,78 +0,0 @@
-ownerclass = 'AppDelegate'
-ownerimport = 'AppDelegate.h'
-
-result = Menu("")
-appMenu = result.addMenu("dupeGuru")
-fileMenu = result.addMenu("File")
-editMenu = result.addMenu("Edit")
-actionMenu = result.addMenu("Actions")
-owner.columnsMenu = result.addMenu("Columns")
-modeMenu = result.addMenu("Mode")
-windowMenu = result.addMenu("Window")
-helpMenu = result.addMenu("Help")
-
-appMenu.addItem("About dupeGuru", Action(owner, 'showAboutBox'))
-appMenu.addItem("Check for update...", Action(owner.updater, 'checkForUpdates:'))
-appMenu.addSeparator()
-appMenu.addItem("Preferences...", Action(owner, 'showPreferencesPanel'), 'cmd+,')
-appMenu.addSeparator()
-NSApp.servicesMenu = appMenu.addMenu("Services")
-appMenu.addSeparator()
-appMenu.addItem("Hide dupeGuru", Action(NSApp, 'hide:'), 'cmd+h')
-appMenu.addItem("Hide Others", Action(NSApp, 'hideOtherApplications:'), 'cmd+alt+h')
-appMenu.addItem("Show All", Action(NSApp, 'unhideAllApplications:'))
-appMenu.addSeparator()
-appMenu.addItem("Quit dupeGuru", Action(NSApp, 'terminate:'), 'cmd+q')
-
-fileMenu.addItem("Load Results...", Action(None, 'loadResults'), 'cmd+o')
-owner.recentResultsMenu = fileMenu.addMenu("Load Recent Results")
-fileMenu.addItem("Save Results...", Action(None, 'saveResults'), 'cmd+s')
-fileMenu.addItem("Export Results to XHTML", Action(owner.model, 'exportToXHTML'), 'cmd+shift+e')
-fileMenu.addItem("Export Results to CSV", Action(owner.model, 'exportToCSV'))
-fileMenu.addItem("Clear Picture Cache", Action(owner, 'clearPictureCache'), 'cmd+shift+p')
-
-editMenu.addItem("Mark All", Action(None, 'markAll'), 'cmd+a')
-editMenu.addItem("Mark None", Action(None, 'markNone'), 'cmd+shift+a')
-editMenu.addItem("Invert Marking", Action(None, 'markInvert'), 'cmd+alt+a')
-editMenu.addItem("Mark Selected", Action(None, 'markSelected'), 'ctrl+cmd+a')
-editMenu.addSeparator()
-editMenu.addItem("Cut", Action(None, 'cut:'), 'cmd+x')
-editMenu.addItem("Copy", Action(None, 'copy:'), 'cmd+c')
-editMenu.addItem("Paste", Action(None, 'paste:'), 'cmd+v')
-editMenu.addSeparator()
-editMenu.addItem("Filter Results...", Action(None, 'focusOnFilterField'), 'cmd+alt+f')
-
-actionMenu.addItem("Start Duplicate Scan", Action(owner, 'startScanning'), 'cmd+d')
-actionMenu.addSeparator()
-actionMenu.addItem("Send Marked to Trash...", Action(None, 'trashMarked'), 'cmd+t')
-actionMenu.addItem("Move Marked to...", Action(None, 'moveMarked'), 'cmd+m')
-actionMenu.addItem("Copy Marked to...", Action(None, 'copyMarked'), 'cmd+alt+m')
-actionMenu.addItem("Remove Marked from Results", Action(None, 'removeMarked'), 'cmd+r')
-actionMenu.addItem("Re-Prioritize Results...", Action(None, 'reprioritizeResults'))
-actionMenu.addSeparator()
-actionMenu.addItem("Remove Selected from Results", Action(None, 'removeSelected'), 'cmd+backspace')
-actionMenu.addItem("Add Selected to Ignore List", Action(None, 'ignoreSelected'), 'cmd+g')
-actionMenu.addItem("Make Selected into Reference", Action(None, 'switchSelected'), 'cmd+arrowup')
-actionMenu.addSeparator()
-actionMenu.addItem("Open Selected with Default Application", Action(None, 'openSelected'), 'cmd+return')
-actionMenu.addItem("Reveal Selected in Finder", Action(None, 'revealSelected'), 'cmd+alt+return')
-actionMenu.addItem("Invoke Custom Command", Action(None, 'invokeCustomCommand'), 'cmd+shift+c')
-actionMenu.addItem("Rename Selected", Action(None, 'renameSelected'), 'enter')
-
-modeMenu.addItem("Show Dupes Only", Action(None, 'togglePowerMarker'), 'cmd+1')
-modeMenu.addItem("Show Delta Values", Action(None, 'toggleDelta'), 'cmd+2')
-
-windowMenu.addItem("Results Window", Action(owner, 'showResultWindow'))
-windowMenu.addItem("Folder Selection Window", Action(owner, 'showDirectoryWindow'))
-windowMenu.addItem("Ignore List", Action(owner, 'showIgnoreList'))
-windowMenu.addItem("Details Panel", Action(None, 'toggleDetailsPanel'), 'cmd+i')
-windowMenu.addItem("Quick Look", Action(None, 'toggleQuicklookPanel'), 'cmd+l')
-windowMenu.addSeparator()
-windowMenu.addItem("Minimize", Action(None, 'performMinimize:'))
-windowMenu.addItem("Zoom", Action(None, 'performZoom:'))
-windowMenu.addItem("Close Window", Action(None, 'performClose:'), 'cmd+w')
-windowMenu.addSeparator()
-windowMenu.addItem("Bring All to Front", Action(None, 'arrangeInFront:'))
-
-helpMenu.addItem("dupeGuru Help", Action(owner, 'openHelp'), 'cmd+?')
-helpMenu.addItem("dupeGuru Website", Action(owner, 'openWebsite'))

cocoa/ui/preferences_panel.py

@@ -1,173 +0,0 @@
-appmode = args.get('appmode', 'standard')
-dialogHeights = {
-    'standard': 325,
-    'music': 345,
-    'picture': 255,
-}
-
-result = Window(410, dialogHeights[appmode], "dupeGuru Preferences")
-tabView = TabView(result)
-basicTab = tabView.addTab("Basic")
-advancedTab = tabView.addTab("Advanced")
-thresholdSlider = Slider(basicTab.view, 1, 100, 80)
-thresholdLabel = Label(basicTab.view, "Filter hardness:")
-moreResultsLabel = Label(basicTab.view, "More results")
-fewerResultsLabel = Label(basicTab.view, "Fewer results")
-thresholdValueLabel = Label(basicTab.view, "")
-fontSizeCombo = Combobox(basicTab.view, ["11", "12", "13", "14", "18", "24"])
-fontSizeLabel = Label(basicTab.view, "Font Size:")
-if appmode in ('standard', 'music'):
-    wordWeightingBox = Checkbox(basicTab.view, "Word weighting")
-    matchSimilarWordsBox = Checkbox(basicTab.view, "Match similar words")
-elif appmode == 'picture':
-    matchDifferentDimensionsBox = Checkbox(basicTab.view, "Match pictures of different dimensions")
-mixKindBox = Checkbox(basicTab.view, "Can mix file kind")
-removeEmptyFoldersBox = Checkbox(basicTab.view, "Remove empty folders on delete or move")
-checkForUpdatesBox = Checkbox(basicTab.view, "Automatically check for updates")
-if appmode == 'standard':
-    ignoreSmallFilesBox = Checkbox(basicTab.view, "Ignore files smaller than:")
-    smallFilesThresholdText = TextField(basicTab.view, "")
-    smallFilesThresholdSuffixLabel = Label(basicTab.view, "KB")
-elif appmode == 'music':
-    tagsToScanLabel = Label(basicTab.view, "Tags to scan:")
-    trackBox = Checkbox(basicTab.view, "Track")
-    artistBox = Checkbox(basicTab.view, "Artist")
-    albumBox = Checkbox(basicTab.view, "Album")
-    titleBox = Checkbox(basicTab.view, "Title")
-    genreBox = Checkbox(basicTab.view, "Genre")
-    yearBox = Checkbox(basicTab.view, "Year")
-    tagBoxes = [trackBox, artistBox, albumBox, titleBox, genreBox, yearBox]
-
-regexpCheckbox = Checkbox(advancedTab.view, "Use regular expressions when filtering")
-ignoreHardlinksBox = Checkbox(advancedTab.view, "Ignore duplicates hardlinking to the same file")
-debugModeCheckbox = Checkbox(advancedTab.view, "Debug mode (restart required)")
-customCommandLabel = Label(advancedTab.view, "Custom command (arguments: %d for dupe, %r for ref):")
-customCommandText = TextField(advancedTab.view, "")
-copyMoveLabel = Label(advancedTab.view, "Copy and Move:")
-copyMovePopup = Popup(advancedTab.view, ["Right in destination", "Recreate relative path", "Recreate absolute path"])
-
-resetToDefaultsButton = Button(result, "Reset To Defaults")
-thresholdSlider.bind('value', defaults, 'values.minMatchPercentage')
-thresholdValueLabel.bind('value', defaults, 'values.minMatchPercentage')
-fontSizeCombo.bind('value', defaults, 'values.TableFontSize')
-mixKindBox.bind('value', defaults, 'values.mixFileKind')
-removeEmptyFoldersBox.bind('value', defaults, 'values.removeEmptyFolders')
-checkForUpdatesBox.bind('value', defaults, 'values.SUEnableAutomaticChecks')
-regexpCheckbox.bind('value', defaults, 'values.useRegexpFilter')
-ignoreHardlinksBox.bind('value', defaults, 'values.ignoreHardlinkMatches')
-debugModeCheckbox.bind('value', defaults, 'values.DebugMode')
-customCommandText.bind('value', defaults, 'values.CustomCommand')
-copyMovePopup.bind('selectedIndex', defaults, 'values.recreatePathType')
-if appmode in ('standard', 'music'):
-    wordWeightingBox.bind('value', defaults, 'values.wordWeighting')
-    matchSimilarWordsBox.bind('value', defaults, 'values.matchSimilarWords')
-    disableWhenContentScan = [thresholdSlider, wordWeightingBox, matchSimilarWordsBox]
-    for control in disableWhenContentScan:
-        vtname = 'vtScanTypeMusicIsNotContent' if appmode == 'music' else 'vtScanTypeIsNotContent'
-        prefname = 'values.scanTypeMusic' if appmode == 'music' else 'values.scanTypeStandard'
-        control.bind('enabled', defaults, prefname, valueTransformer=vtname)
-    if appmode == 'standard':
-        ignoreSmallFilesBox.bind('value', defaults, 'values.ignoreSmallFiles')
-        smallFilesThresholdText.bind('value', defaults, 'values.smallFileThreshold')
-    elif appmode == 'music':
-        for box in tagBoxes:
-            box.bind('enabled', defaults, 'values.scanTypeMusic', valueTransformer='vtScanTypeIsTag')
-        trackBox.bind('value', defaults, 'values.scanTagTrack')
-        artistBox.bind('value', defaults, 'values.scanTagArtist')
-        albumBox.bind('value', defaults, 'values.scanTagAlbum')
-        titleBox.bind('value', defaults, 'values.scanTagTitle')
-        genreBox.bind('value', defaults, 'values.scanTagGenre')
-        yearBox.bind('value', defaults, 'values.scanTagYear')
-elif appmode == 'picture':
-    matchDifferentDimensionsBox.bind('value', defaults, 'values.matchScaled')
-    thresholdSlider.bind('enabled', defaults, 'values.scanTypePicture', valueTransformer='vtScanTypeIsFuzzy')
-
-result.canResize = False
-result.canMinimize = False
-thresholdValueLabel.formatter = NumberFormatter(NumberStyle.Decimal)
-thresholdValueLabel.formatter.maximumFractionDigits = 0
-allLabels = [thresholdValueLabel, moreResultsLabel, fewerResultsLabel,
-    thresholdLabel, fontSizeLabel, customCommandLabel, copyMoveLabel]
-allCheckboxes = [mixKindBox, removeEmptyFoldersBox, checkForUpdatesBox, regexpCheckbox,
-    ignoreHardlinksBox, debugModeCheckbox]
-if appmode == 'standard':
-    allLabels += [smallFilesThresholdSuffixLabel]
-    allCheckboxes += [ignoreSmallFilesBox, wordWeightingBox, matchSimilarWordsBox]
-elif appmode == 'music':
-    allLabels += [tagsToScanLabel]
-    allCheckboxes += tagBoxes + [wordWeightingBox, matchSimilarWordsBox]
-elif appmode == 'picture':
-    allCheckboxes += [matchDifferentDimensionsBox]
-for label in allLabels:
-    label.controlSize = ControlSize.Small
-fewerResultsLabel.alignment = TextAlignment.Right
-for checkbox in allCheckboxes:
-    checkbox.font = thresholdValueLabel.font
-resetToDefaultsButton.action = Action(defaults, 'revertToInitialValues:')
-
-thresholdLabel.width = fontSizeLabel.width = 94
-fontSizeCombo.width = 66
-thresholdValueLabel.width = 25
-resetToDefaultsButton.width = 136
-if appmode == 'standard':
-    smallFilesThresholdText.width = 60
-    smallFilesThresholdSuffixLabel.width = 40
-elif appmode == 'music':
-    for box in tagBoxes:
-        box.width = 70
-
-tabView.packToCorner(Pack.UpperLeft)
-tabView.fill(Pack.Right)
-resetToDefaultsButton.packRelativeTo(tabView, Pack.Below, align=Pack.Right)
-tabView.fill(Pack.Below, margin=14)
-tabView.setAnchor(Pack.UpperLeft, growX=True, growY=True)
-thresholdLayout = HLayout([thresholdLabel, thresholdSlider, thresholdValueLabel], filler=thresholdSlider)
-thresholdLayout.packToCorner(Pack.UpperLeft)
-thresholdLayout.fill(Pack.Right)
-# We want to give the labels as much space as possible, and we only "know" how much is available
-# after the slider's fill operation.
-moreResultsLabel.width = fewerResultsLabel.width = thresholdSlider.width // 2
-moreResultsLabel.packRelativeTo(thresholdSlider, Pack.Below, align=Pack.Left, margin=6)
-fewerResultsLabel.packRelativeTo(thresholdSlider, Pack.Below, align=Pack.Right, margin=6)
-fontSizeCombo.packRelativeTo(moreResultsLabel, Pack.Below)
-fontSizeLabel.packRelativeTo(fontSizeCombo, Pack.Left)
-
-if appmode == 'music':
-    tagsToScanLabel.packRelativeTo(fontSizeCombo, Pack.Below)
-    tagsToScanLabel.fill(Pack.Left)
-    tagsToScanLabel.fill(Pack.Right)
-    trackBox.packRelativeTo(tagsToScanLabel, Pack.Below)
-    trackBox.x += 10
-    artistBox.packRelativeTo(trackBox, Pack.Right)
-    albumBox.packRelativeTo(artistBox, Pack.Right)
-    titleBox.packRelativeTo(trackBox, Pack.Below)
-    genreBox.packRelativeTo(titleBox, Pack.Right)
-    yearBox.packRelativeTo(genreBox, Pack.Right)
-    viewToPackCheckboxesUnder = titleBox
-else:
-    viewToPackCheckboxesUnder = fontSizeCombo
-
-if appmode == 'standard':
-    checkboxesToLayout = [wordWeightingBox, matchSimilarWordsBox, mixKindBox, removeEmptyFoldersBox,
-        ignoreSmallFilesBox]
-elif appmode == 'music':
-    checkboxesToLayout = [wordWeightingBox, matchSimilarWordsBox, mixKindBox, removeEmptyFoldersBox,
-        checkForUpdatesBox]
-elif appmode == 'picture':
-    checkboxesToLayout = [matchDifferentDimensionsBox, mixKindBox, removeEmptyFoldersBox,
-        checkForUpdatesBox]
-checkboxLayout = VLayout(checkboxesToLayout)
-checkboxLayout.packRelativeTo(viewToPackCheckboxesUnder, Pack.Below)
-checkboxLayout.fill(Pack.Left)
-checkboxLayout.fill(Pack.Right)
-
-if appmode == 'standard':
-    smallFilesThresholdText.packRelativeTo(ignoreSmallFilesBox, Pack.Below, margin=4)
-    checkForUpdatesBox.packRelativeTo(smallFilesThresholdText, Pack.Below, margin=4)
-    checkForUpdatesBox.fill(Pack.Right)
-    smallFilesThresholdText.x += 20
-    smallFilesThresholdSuffixLabel.packRelativeTo(smallFilesThresholdText, Pack.Right)
-
-advancedLayout = VLayout(advancedTab.view.subviews[:])
-advancedLayout.packToCorner(Pack.UpperLeft)
-advancedLayout.fill(Pack.Right)

cocoa/ui/prioritize_dialog.py

@@ -1,65 +0,0 @@
-ownerclass = 'PrioritizeDialog'
-ownerimport = 'PrioritizeDialog.h'
-
-result = Window(610, 400, "Re-Prioritize duplicates")
-promptLabel = Label(result, "Add criteria to the right box and click OK to send the dupes that "
-    "correspond the best to these criteria to their respective group's reference position. Read "
-    "the help file for more information.")
-split = SplitView(result, 2, vertical=True)
-categoryPopup = Popup(split.subviews[0])
-criteriaTable = ListView(split.subviews[0])
-prioritizationTable = ListView(split.subviews[1])
-addButton = Button(split.subviews[1], NLSTR("-->"))
-removeButton = Button(split.subviews[1], NLSTR("<--"))
-okButton = Button(result, "Ok")
-cancelButton = Button(result, "Cancel")
-
-owner.categoryPopUpView = categoryPopup
-owner.criteriaTableView = criteriaTable
-owner.prioritizationTableView = prioritizationTable
-
-result.canMinimize = False
-result.canClose = False
-result.minSize = Size(result.width, result.height)
-addButton.action = Action(owner.model, 'addSelected')
-removeButton.action = Action(owner.model, 'removeSelected')
-okButton.action = Action(owner, 'ok')
-cancelButton.action = Action(owner, 'cancel')
-okButton.keyEquivalent = '\\r'
-cancelButton.keyEquivalent = '\\e'
-
-# For layouts to correctly work, subviews need to have the dimensions they'll approximately have
-# at runtime.
-split.subviews[0].width = 260
-split.subviews[0].height = 260
-split.subviews[1].width = 340
-split.subviews[1].height = 260
-promptLabel.height *= 3 # 3 lines
-
-leftLayout = VLayout([categoryPopup, criteriaTable], filler=criteriaTable)
-middleLayout = VLayout([addButton, removeButton], width=41)
-buttonLayout = HLayout([None, cancelButton, okButton])
-
-#pack split subview 0
-leftLayout.fillAll()
-
-#pack split subview 1
-prioritizationTable.fillAll()
-prioritizationTable.width -= 48
-prioritizationTable.moveTo(Pack.Right)
-middleLayout.moveNextTo(prioritizationTable, Pack.Left, align=Pack.Middle)
-
-# Main layout
-promptLabel.packToCorner(Pack.UpperLeft)
-promptLabel.fill(Pack.Right)
-split.moveNextTo(promptLabel, Pack.Below)
-buttonLayout.moveNextTo(split, Pack.Below)
-buttonLayout.fill(Pack.Right)
-split.fill(Pack.LowerRight)
-
-promptLabel.setAnchor(Pack.UpperLeft, growX=True)
-prioritizationTable.setAnchor(Pack.UpperLeft, growX=True, growY=True)
-categoryPopup.setAnchor(Pack.UpperLeft, growX=True)
-criteriaTable.setAnchor(Pack.UpperLeft, growX=True, growY=True)
-split.setAnchor(Pack.UpperLeft, growX=True, growY=True)
-buttonLayout.setAnchor(Pack.Below)

cocoa/ui/problem_dialog.py

@@ -1,35 +0,0 @@
-ownerclass = 'ProblemDialog'
-ownerimport = 'ProblemDialog.h'
-
-result = Window(480, 310, "Problems!")
-messageLabel = Label(result, "There were problems processing some (or all) of the files. The cause "
-    "of these problems are described in the table below. Those files were not removed from your "
-    "results.")
-problemTable = TableView(result)
-revealButton = Button(result, "Reveal")
-closeButton = Button(result, "Close")
-
-owner.problemTableView = problemTable
-
-result.canMinimize = False
-result.minSize = Size(300, 300)
-closeButton.keyEquivalent = '\\r'
-revealButton.action = Action(owner.model, 'revealSelected')
-closeButton.action = Action(result, 'performClose:')
-
-messageLabel.height *= 3 # 3 lines
-revealButton.width = 150
-closeButton.width = 98
-
-messageLabel.packToCorner(Pack.UpperLeft)
-messageLabel.fill(Pack.Right)
-problemTable.packRelativeTo(messageLabel, Pack.Below)
-problemTable.fill(Pack.Right)
-revealButton.packRelativeTo(problemTable, Pack.Below)
-closeButton.packRelativeTo(problemTable, Pack.Below, align=Pack.Right)
-problemTable.fill(Pack.Below)
-
-messageLabel.setAnchor(Pack.UpperLeft, growX=True)
-problemTable.setAnchor(Pack.UpperLeft, growX=True, growY=True)
-revealButton.setAnchor(Pack.LowerLeft)
-closeButton.setAnchor(Pack.LowerRight)

cocoa/ui/result_window.py

@@ -1,97 +0,0 @@
-ownerclass = 'ResultWindow'
-ownerimport = 'ResultWindow.h'
-
-result = Window(557, 400, "dupeGuru Results")
-toolbar = result.createToolbar('ResultsToolbar')
-table = TableView(result)
-table.OBJC_CLASS = 'HSTableView'
-statsLabel = Label(result, "")
-contextMenu = Menu("")
-
-#Setup toolbar items
-toolbar.displayMode = const.NSToolbarDisplayModeIconOnly
-directoriesToolItem = toolbar.addItem('Directories', "Directories", image='folder32')
-actionToolItem = toolbar.addItem('Action', "Action")
-filterToolItem = toolbar.addItem('Filter', "Filter")
-optionsToolItem = toolbar.addItem('Options', "Options")
-quicklookToolItem = toolbar.addItem('QuickLook', "Quick Look")
-toolbar.defaultItems = [actionToolItem, optionsToolItem, quicklookToolItem, directoriesToolItem,
-    toolbar.flexibleSpace(), filterToolItem]
-actionPopup = Popup(None)
-actionPopup.pullsdown = True
-actionPopup.bezelStyle = const.NSTexturedRoundedBezelStyle
-actionPopup.arrowPosition = const.NSPopUpArrowAtBottom
-item = actionPopup.menu.addItem("") # First item is invisible
-item.hidden = True
-item.image = 'NSActionTemplate'
-actionPopup.width = 44
-actionToolItem.view = actionPopup
-filterField = SearchField(None, "Filter")
-filterField.action = Action(owner, 'filter')
-filterField.sendsWholeSearchString = True
-filterToolItem.view = filterField
-filterToolItem.minSize = Size(80, 22)
-filterToolItem.maxSize = Size(300, 22)
-quickLookButton = Button(None, "")
-quickLookButton.bezelStyle = const.NSTexturedRoundedBezelStyle
-quickLookButton.image = 'NSQuickLookTemplate'
-quickLookButton.width = 44
-quickLookButton.action = Action(owner, 'toggleQuicklookPanel')
-quicklookToolItem.view = quickLookButton
-optionsSegments = SegmentedControl(None)
-optionsSegments.segmentStyle = const.NSSegmentStyleCapsule
-optionsSegments.trackingMode = const.NSSegmentSwitchTrackingSelectAny
-optionsSegments.font = Font(FontFamily.System, 11)
-optionsSegments.addSegment("Details", 57)
-optionsSegments.addSegment("Dupes Only", 82)
-optionsSegments.addSegment("Delta", 48)
-optionsSegments.action = Action(owner, 'changeOptions')
-optionsToolItem.view = optionsSegments
-
-# Popuplate menus
-actionPopup.menu.addItem("Send Marked to Trash...", action=Action(owner, 'trashMarked'))
-actionPopup.menu.addItem("Move Marked to...", action=Action(owner, 'moveMarked'))
-actionPopup.menu.addItem("Copy Marked to...", action=Action(owner, 'copyMarked'))
-actionPopup.menu.addItem("Remove Marked from Results", action=Action(owner, 'removeMarked'))
-actionPopup.menu.addSeparator()
-for menu in (actionPopup.menu, contextMenu):
-    menu.addItem("Remove Selected from Results", action=Action(owner, 'removeSelected'))
-    menu.addItem("Add Selected to Ignore List", action=Action(owner, 'ignoreSelected'))
-    menu.addItem("Make Selected into Reference", action=Action(owner, 'switchSelected'))
-    menu.addSeparator()
-    menu.addItem("Open Selected with Default Application", action=Action(owner, 'openSelected'))
-    menu.addItem("Reveal Selected in Finder", action=Action(owner, 'revealSelected'))
-    menu.addItem("Rename Selected", action=Action(owner, 'renameSelected'))
-
-# Doing connections
-owner.filterField = filterField
-owner.matches = table
-owner.optionsSwitch = optionsSegments
-owner.optionsToolbarItem = optionsToolItem
-owner.stats = statsLabel
-table.bind('rowHeight', defaults, 'values.TableFontSize', valueTransformer='vtRowHeightOffset')
-
-# Rest of the setup
-result.minSize = Size(340, 340)
-result.autosaveName = 'MainWindow'
-statsLabel.alignment = TextAlignment.Center
-table.alternatingRows = True
-table.menu = contextMenu
-table.allowsColumnReordering = True
-table.allowsColumnResizing = True
-table.allowsColumnSelection = False
-table.allowsEmptySelection = False
-table.allowsMultipleSelection = True
-table.allowsTypeSelect = True
-table.gridStyleMask = const.NSTableViewSolidHorizontalGridLineMask
-table.setAnchor(Pack.UpperLeft, growX=True, growY=True)
-statsLabel.setAnchor(Pack.LowerLeft, growX=True)
-
-# Layout
-# It's a little weird to pack with a margin of -1, but if I don't do that, I get too thick of a
-# border on the upper side of the table.
-table.packToCorner(Pack.UpperLeft, margin=-1)
-table.fill(Pack.Right, margin=0)
-statsLabel.packRelativeTo(table, Pack.Below, margin=6)
-statsLabel.fill(Pack.Right, margin=0)
-table.fill(Pack.Below, margin=5)

cocoa/wscript

@@ -1,73 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import os
-import os.path as op
-
-top = '.'
-out = 'build'
-
-def options(opt):
-    opt.load('compiler_c python')
-
-def configure(conf):
-    # We use clang to compile our app
-    conf.env.CC = 'clang'
-    # WAF has a "pyembed" feature allowing us to automatically find Python and compile by linking
-    # to it. The problem is that because we made a copy of the Python library to mangle with its
-    # "install name", we don't actually want to link to our installed python, but to our mangled
-    # Python. The line below tells the "pyembed" WAF feature to look in ../build for Python.
-    conf.env.LIBPATH_PYEMBED = op.abspath('../build')
-    # I did a lot of fiddling-around, but I didn't find how to tell WAF the Python library name
-    # to look for without making the whole compilation process fail, so I just create a symlink
-    # with the name WAF is looking for. 
-    versioned_dylib_path = '../build/libpython{}m.dylib'.format(sys.version[:3])
-    if not op.exists(versioned_dylib_path):
-        os.symlink('../build/Python', versioned_dylib_path)
-    # The rest is standard WAF code that you can find the the python and macapp demos.
-    conf.load('compiler_c python')
-    conf.check_python_version((3,4,0))
-    conf.check_python_headers()
-    conf.env.FRAMEWORK_COCOA = 'Cocoa'
-    conf.env.ARCH_COCOA = ['x86_64']
-    conf.env.MACOSX_DEPLOYMENT_TARGET = '10.8'
-    conf.env.CFLAGS = ['-F'+op.abspath('Sparkle/build/Release')]
-    conf.env.LINKFLAGS = ['-F'+op.abspath('Sparkle/build/Release')]
-
-def build(ctx):
-    # What do we compile?
-    cocoalib_node = ctx.srcnode.find_dir('..').find_dir('cocoalib')
-    cocoalib_folders = ['controllers', 'views']
-    cocoalib_includes = [cocoalib_node] + [cocoalib_node.find_dir(folder) for folder in cocoalib_folders]
-    cocoalib_uses = ['NSEventAdditions', 'Dialogs', 'HSAboutBox', 'Utils',
-        'HSPyUtil', 'ProgressController', 'HSRecentFiles', 'HSQuicklook', 'ValueTransformers',
-        'NSImageAdditions', 'NSNotificationAdditions',
-        'views/HSTableView', 'views/HSOutlineView', 'views/NSIndexPathAdditions',
-        'views/NSTableViewAdditions',
-        'controllers/HSColumns', 'controllers/HSGUIController', 'controllers/HSTable',
-        'controllers/HSOutline', 'controllers/HSPopUpList', 'controllers/HSSelectableList',
-        'controllers/HSTextField', 'controllers/HSProgressWindow']
-    cocoalib_src = [cocoalib_node.find_node(usename + '.m') for usename in cocoalib_uses] + cocoalib_node.ant_glob('autogen/*.m')
-    project_folders = [ctx.srcnode, ctx.srcnode.find_dir('autogen')]
-    project_src = ctx.srcnode.ant_glob('autogen/*.m') + ctx.srcnode.ant_glob('*.m')
-    
-    # Compile
-    ctx.program(
-        # "pyembed" takes care of the include and linking stuff to compile an app that embed Python.
-        features      = 'c cprogram pyembed',
-        target        = ctx.bldnode.make_node("dupeGuru"),
-        source        = cocoalib_src + project_src,
-        includes      = project_folders + cocoalib_includes,
-        use           = 'COCOA',
-        # Because our python lib's install name is "@rpath/Python", we need to set the executable's
-        # rpath. Fortunately, WAF supports it and we just need to supply the "rpath" argument.
-        rpath         = '@executable_path/../Frameworks',
-        framework     = ['Sparkle', 'Quartz'],
-    )
-
-from waflib import TaskGen
-@TaskGen.extension('.m')
-def m_hook(self, node):
-    """Alias .m files to be compiled the same as .c files, gcc will do the right thing."""
-    return self.create_compiled_task('c', node)
-

core/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '4.0.0'
+__version__ = '4.0.4 RC'
 __appname__ = 'dupeGuru'
 

core/app.py

@@ -116,6 +116,8 @@ class DupeGuru(Broadcaster):
 
     NAME = PROMPT_NAME = "dupeGuru"
 
+    PICTURE_CACHE_TYPE = 'sqlite' # set to 'shelve' for a ShelveCache
+
     def __init__(self, view):
         if view.get_default(DEBUG_MODE_PREFERENCE):
             logging.getLogger().setLevel(logging.DEBUG)
@@ -138,7 +140,7 @@ class DupeGuru(Broadcaster):
             'clean_empty_dirs': False,
             'ignore_hardlink_matches': False,
             'copymove_dest_type': DestType.Relative,
-            'cache_path': op.join(self.appdata, 'cached_pictures.db'),
+            'picture_cache_type': self.PICTURE_CACHE_TYPE
         }
         self.selected_dupes = []
         self.details_panel = DetailsPanel(self)
@@ -166,6 +168,11 @@ class DupeGuru(Broadcaster):
         self.result_table.connect()
         self.view.create_results_window()
 
+    def _get_picture_cache_path(self):
+        cache_type = self.options['picture_cache_type']
+        cache_name = 'cached_pictures.shelve' if cache_type == 'shelve' else 'cached_pictures.db'
+        return op.join(self.appdata, cache_name)
+
     def _get_dupe_sort_key(self, dupe, get_group, key, delta):
         if self.app_mode in (AppMode.Music, AppMode.Picture):
             if key == 'folder_path':
@@ -405,9 +412,10 @@ class DupeGuru(Broadcaster):
                 path = path.parent()
 
     def clear_picture_cache(self):
-        cache = pe.cache.Cache(self.options['cache_path'])
+        try:
-        cache.clear()
+            os.remove(self._get_picture_cache_path())
-        cache.close()
+        except FileNotFoundError:
+            pass # we don't care
 
     def copy_or_move(self, dupe, copy: bool, destination: str, dest_type: DestType):
         source_path = dupe.path
@@ -754,6 +762,8 @@ class DupeGuru(Broadcaster):
         for k, v in self.options.items():
             if hasattr(scanner, k):
                 setattr(scanner, k, v)
+        if self.app_mode == AppMode.Picture:
+            scanner.cache_path = self._get_picture_cache_path()
         self.results.groups = []
         self._recreate_result_table()
         self._results_changed()

core/directories.py

@@ -1,11 +1,10 @@
-# Created By: Virgil Dupras
+# Copyright 2017 Virgil Dupras
-# Created On: 2006/02/27
-# Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
 #
 # This software is licensed under the "GPLv3" License as described in the "LICENSE" file,
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
+import os
 from xml.etree import ElementTree as ET
 import logging
 
@@ -76,28 +75,31 @@ class Directories:
             return DirectoryState.Excluded
 
     def _get_files(self, from_path, fileclasses, j):
+        for root, dirs, files in os.walk(str(from_path)):
             j.check_if_cancelled()
-        state = self.get_state(from_path)
+            root = Path(root)
+            state = self.get_state(root)
             if state == DirectoryState.Excluded:
                 # Recursively get files from folders with lots of subfolder is expensive. However, there
                 # might be a subfolder in this path that is not excluded. What we want to do is to skim
                 # 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):
+                if not any(p[:len(root)] == root for p in self.states):
-                return
+                    del dirs[:]
             try:
-            filepaths = set()
                 if state != DirectoryState.Excluded:
-                found_files = fs.get_files(from_path, fileclasses=fileclasses)
+                    found_files = [fs.get_file(root + f, fileclasses=fileclasses) for f in files]
+                    found_files = [f for f in found_files if f is not None]
+                    # In some cases, directories can be considered as files by dupeGuru, which is
+                    # why we have this line below. In fact, there only one case: Bundle files under
+                    # OS X... In other situations, this forloop will do nothing.
+                    for d in dirs[:]:
+                        f = fs.get_file(root + d, fileclasses=fileclasses)
+                        if f is not None:
+                            found_files.append(f)
+                            dirs.remove(d)
                     logging.debug("Collected %d files in folder %s", len(found_files), str(from_path))
                     for file in found_files:
                         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
-            # 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, fileclasses=fileclasses, j=j):
                         yield file
             except (EnvironmentError, fs.InvalidPath):
                 pass
@@ -176,16 +178,17 @@ class Directories:
 
         :rtype: :class:`DirectoryState`
         """
+        # direct match? easy result.
         if path in self.states:
             return self.states[path]
-        default_state = self._default_state_for_path(path)
+        state = self._default_state_for_path(path) or DirectoryState.Normal
-        if default_state is not None:
+        prevlen = 0
-            return default_state
+        # we loop through the states to find the longest matching prefix
-        parent = path.parent()
+        for p, s in self.states.items():
-        if parent in self:
+            if p.is_parent_of(path) and len(p) > prevlen:
-            return self.get_state(parent)
+                prevlen = len(p)
-        else:
+                state = s
-            return DirectoryState.Normal
+        return state
 
     def has_any_file(self):
         """Returns whether selected folders contain any file.

core/pe/cache.py

@@ -1,17 +1,10 @@
-# Created By: Virgil Dupras
+# Copyright 2016 Virgil Dupras
-# Created On: 2006/09/14
-# Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
 #
 # This software is licensed under the "GPLv3" License as described in the "LICENSE" file,
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-import os
+from ._cache import string_to_colors # noqa
-import os.path as op
-import logging
-import sqlite3 as sqlite
-
-from ._cache import string_to_colors
 
 def colors_to_string(colors):
     """Transform the 3 sized tuples 'colors' into a hex string.
@@ -19,7 +12,7 @@ def colors_to_string(colors):
     [(0,100,255)] --> 0064ff
     [(1,2,3),(4,5,6)] --> 010203040506
     """
-    return ''.join(['%02x%02x%02x' % (r, g, b) for r, g, b in colors])
+    return ''.join('%02x%02x%02x' % (r, g, b) for r, g, b in colors)
 
 # This function is an important bottleneck of dupeGuru PE. It has been converted to C.
 # def string_to_colors(s):
@@ -31,132 +24,3 @@ def colors_to_string(colors):
 #         result.append((number >> 16, (number >> 8) & 0xff, number & 0xff))
 #     return result
 
-class Cache:
-    """A class to cache picture blocks.
-    """
-    def __init__(self, db=':memory:'):
-        self.dbname = db
-        self.con = None
-        self._create_con()
-
-    def __contains__(self, key):
-        sql = "select count(*) from pictures where path = ?"
-        result = self.con.execute(sql, [key]).fetchall()
-        return result[0][0] > 0
-
-    def __delitem__(self, key):
-        if key not in self:
-            raise KeyError(key)
-        sql = "delete from pictures where path = ?"
-        self.con.execute(sql, [key])
-
-    # Optimized
-    def __getitem__(self, key):
-        if isinstance(key, int):
-            sql = "select blocks from pictures where rowid = ?"
-        else:
-            sql = "select blocks from pictures where path = ?"
-        result = self.con.execute(sql, [key]).fetchone()
-        if result:
-            result = string_to_colors(result[0])
-            return result
-        else:
-            raise KeyError(key)
-
-    def __iter__(self):
-        sql = "select path from pictures"
-        result = self.con.execute(sql)
-        return (row[0] for row in result)
-
-    def __len__(self):
-        sql = "select count(*) from pictures"
-        result = self.con.execute(sql).fetchall()
-        return result[0][0]
-
-    def __setitem__(self, path_str, blocks):
-        blocks = colors_to_string(blocks)
-        if op.exists(path_str):
-            mtime = int(os.stat(path_str).st_mtime)
-        else:
-            mtime = 0
-        if path_str in self:
-            sql = "update pictures set blocks = ?, mtime = ? where path = ?"
-        else:
-            sql = "insert into pictures(blocks,mtime,path) values(?,?,?)"
-        try:
-            self.con.execute(sql, [blocks, mtime, path_str])
-        except sqlite.OperationalError:
-            logging.warning('Picture cache could not set value for key %r', path_str)
-        except sqlite.DatabaseError as e:
-            logging.warning('DatabaseError while setting value for key %r: %s', path_str, str(e))
-
-    def _create_con(self, second_try=False):
-        def create_tables():
-            logging.debug("Creating picture cache tables.")
-            self.con.execute("drop table if exists pictures")
-            self.con.execute("drop index if exists idx_path")
-            self.con.execute("create table pictures(path TEXT, mtime INTEGER, blocks TEXT)")
-            self.con.execute("create index idx_path on pictures (path)")
-
-        self.con = sqlite.connect(self.dbname, isolation_level=None)
-        try:
-            self.con.execute("select path, mtime, blocks from pictures where 1=2")
-        except sqlite.OperationalError: # new db
-            create_tables()
-        except sqlite.DatabaseError as e: # corrupted db
-            if second_try:
-                raise # Something really strange is happening
-            logging.warning('Could not create picture cache because of an error: %s', str(e))
-            self.con.close()
-            os.remove(self.dbname)
-            self._create_con(second_try=True)
-
-    def clear(self):
-        self.close()
-        if self.dbname != ':memory:':
-            os.remove(self.dbname)
-        self._create_con()
-
-    def close(self):
-        if self.con is not None:
-            self.con.close()
-        self.con = None
-
-    def filter(self, func):
-        to_delete = [key for key in self if not func(key)]
-        for key in to_delete:
-            del self[key]
-
-    def get_id(self, path):
-        sql = "select rowid from pictures where path = ?"
-        result = self.con.execute(sql, [path]).fetchone()
-        if result:
-            return result[0]
-        else:
-            raise ValueError(path)
-
-    def get_multiple(self, rowids):
-        sql = "select rowid, blocks from pictures where rowid in (%s)" % ','.join(map(str, rowids))
-        cur = self.con.execute(sql)
-        return ((rowid, string_to_colors(blocks)) for rowid, blocks in cur)
-
-    def purge_outdated(self):
-        """Go through the cache and purge outdated records.
-
-        A record is outdated if the picture doesn't exist or if its mtime is greater than the one in
-        the db.
-        """
-        todelete = []
-        sql = "select rowid, path, mtime from pictures"
-        cur = self.con.execute(sql)
-        for rowid, path_str, mtime in cur:
-            if mtime and op.exists(path_str):
-                picture_mtime = os.stat(path_str).st_mtime
-                if int(picture_mtime) <= mtime:
-                    # not outdated
-                    continue
-            todelete.append(rowid)
-        if todelete:
-            sql = "delete from pictures where rowid in (%s)" % ','.join(map(str, todelete))
-            self.con.execute(sql)
-

core/pe/cache_shelve.py

@@ -0,0 +1,136 @@
+# Copyright 2016 Virgil Dupras
+#
+# This software is licensed under the "GPLv3" License as described in the "LICENSE" file,
+# which should be included with this package. The terms are also available at
+# http://www.gnu.org/licenses/gpl-3.0.html
+
+import os
+import os.path as op
+import shelve
+import tempfile
+from collections import namedtuple
+
+from .cache import string_to_colors, colors_to_string
+
+def wrap_path(path):
+    return 'path:{}'.format(path)
+
+def unwrap_path(key):
+    return key[5:]
+
+def wrap_id(path):
+    return 'id:{}'.format(path)
+
+def unwrap_id(key):
+    return int(key[3:])
+
+CacheRow = namedtuple('CacheRow', 'id path blocks mtime')
+
+class ShelveCache:
+    """A class to cache picture blocks in a shelve backend.
+    """
+    def __init__(self, db=None, readonly=False):
+        self.istmp = db is None
+        if self.istmp:
+            self.dtmp = tempfile.mkdtemp()
+            self.ftmp = db = op.join(self.dtmp, 'tmpdb')
+        flag = 'r' if readonly else 'c'
+        self.shelve = shelve.open(db, flag)
+        self.maxid = self._compute_maxid()
+
+    def __contains__(self, key):
+        return wrap_path(key) in self.shelve
+
+    def __delitem__(self, key):
+        row = self.shelve[wrap_path(key)]
+        del self.shelve[wrap_path(key)]
+        del self.shelve[wrap_id(row.id)]
+
+    def __getitem__(self, key):
+        if isinstance(key, int):
+            skey = self.shelve[wrap_id(key)]
+        else:
+            skey = wrap_path(key)
+        return string_to_colors(self.shelve[skey].blocks)
+
+    def __iter__(self):
+        return (unwrap_path(k) for k in self.shelve if k.startswith('path:'))
+
+    def __len__(self):
+        return sum(1 for k in self.shelve if k.startswith('path:'))
+
+    def __setitem__(self, path_str, blocks):
+        blocks = colors_to_string(blocks)
+        if op.exists(path_str):
+            mtime = int(os.stat(path_str).st_mtime)
+        else:
+            mtime = 0
+        if path_str in self:
+            rowid = self.shelve[wrap_path(path_str)].id
+        else:
+            rowid = self._get_new_id()
+        row = CacheRow(rowid, path_str, blocks, mtime)
+        self.shelve[wrap_path(path_str)] = row
+        self.shelve[wrap_id(rowid)] = wrap_path(path_str)
+
+    def _compute_maxid(self):
+        return max((unwrap_id(k) for k in self.shelve if k.startswith('id:')), default=1)
+
+    def _get_new_id(self):
+        self.maxid += 1
+        return self.maxid
+
+    def clear(self):
+        self.shelve.clear()
+
+    def close(self):
+        if self.shelve is not None:
+            self.shelve.close()
+            if self.istmp:
+                os.remove(self.ftmp)
+                os.rmdir(self.dtmp)
+        self.shelve = None
+
+    def filter(self, func):
+        to_delete = [key for key in self if not func(key)]
+        for key in to_delete:
+            del self[key]
+
+    def get_id(self, path):
+        if path in self:
+            return self.shelve[wrap_path(path)].id
+        else:
+            raise ValueError(path)
+
+    def get_multiple(self, rowids):
+        for rowid in rowids:
+            try:
+                skey = self.shelve[wrap_id(rowid)]
+            except KeyError:
+                continue
+            yield (rowid, string_to_colors(self.shelve[skey].blocks))
+
+    def purge_outdated(self):
+        """Go through the cache and purge outdated records.
+
+        A record is outdated if the picture doesn't exist or if its mtime is greater than the one in
+        the db.
+        """
+        todelete = []
+        for path in self:
+            row = self.shelve[wrap_path(path)]
+            if row.mtime and op.exists(path):
+                picture_mtime = os.stat(path).st_mtime
+                if int(picture_mtime) <= row.mtime:
+                    # not outdated
+                    continue
+            todelete.append(path)
+        for path in todelete:
+            try:
+                del self[path]
+            except KeyError:
+                # I have no idea why a KeyError sometimes happen, but it does, as we can see in
+                # #402 and #439. I don't think it hurts to silently ignore the error, so that's
+                # what we do
+                pass
+

core/pe/cache_sqlite.py

@@ -0,0 +1,143 @@
+# Copyright 2016 Virgil Dupras
+#
+# This software is licensed under the "GPLv3" License as described in the "LICENSE" file,
+# which should be included with this package. The terms are also available at
+# http://www.gnu.org/licenses/gpl-3.0.html
+
+import os
+import os.path as op
+import logging
+import sqlite3 as sqlite
+
+from .cache import string_to_colors, colors_to_string
+
+class SqliteCache:
+    """A class to cache picture blocks in a sqlite backend.
+    """
+    def __init__(self, db=':memory:', readonly=False):
+        # readonly is not used in the sqlite version of the cache
+        self.dbname = db
+        self.con = None
+        self._create_con()
+
+    def __contains__(self, key):
+        sql = "select count(*) from pictures where path = ?"
+        result = self.con.execute(sql, [key]).fetchall()
+        return result[0][0] > 0
+
+    def __delitem__(self, key):
+        if key not in self:
+            raise KeyError(key)
+        sql = "delete from pictures where path = ?"
+        self.con.execute(sql, [key])
+
+    # Optimized
+    def __getitem__(self, key):
+        if isinstance(key, int):
+            sql = "select blocks from pictures where rowid = ?"
+        else:
+            sql = "select blocks from pictures where path = ?"
+        result = self.con.execute(sql, [key]).fetchone()
+        if result:
+            result = string_to_colors(result[0])
+            return result
+        else:
+            raise KeyError(key)
+
+    def __iter__(self):
+        sql = "select path from pictures"
+        result = self.con.execute(sql)
+        return (row[0] for row in result)
+
+    def __len__(self):
+        sql = "select count(*) from pictures"
+        result = self.con.execute(sql).fetchall()
+        return result[0][0]
+
+    def __setitem__(self, path_str, blocks):
+        blocks = colors_to_string(blocks)
+        if op.exists(path_str):
+            mtime = int(os.stat(path_str).st_mtime)
+        else:
+            mtime = 0
+        if path_str in self:
+            sql = "update pictures set blocks = ?, mtime = ? where path = ?"
+        else:
+            sql = "insert into pictures(blocks,mtime,path) values(?,?,?)"
+        try:
+            self.con.execute(sql, [blocks, mtime, path_str])
+        except sqlite.OperationalError:
+            logging.warning('Picture cache could not set value for key %r', path_str)
+        except sqlite.DatabaseError as e:
+            logging.warning('DatabaseError while setting value for key %r: %s', path_str, str(e))
+
+    def _create_con(self, second_try=False):
+        def create_tables():
+            logging.debug("Creating picture cache tables.")
+            self.con.execute("drop table if exists pictures")
+            self.con.execute("drop index if exists idx_path")
+            self.con.execute("create table pictures(path TEXT, mtime INTEGER, blocks TEXT)")
+            self.con.execute("create index idx_path on pictures (path)")
+
+        self.con = sqlite.connect(self.dbname, isolation_level=None)
+        try:
+            self.con.execute("select path, mtime, blocks from pictures where 1=2")
+        except sqlite.OperationalError: # new db
+            create_tables()
+        except sqlite.DatabaseError as e: # corrupted db
+            if second_try:
+                raise # Something really strange is happening
+            logging.warning('Could not create picture cache because of an error: %s', str(e))
+            self.con.close()
+            os.remove(self.dbname)
+            self._create_con(second_try=True)
+
+    def clear(self):
+        self.close()
+        if self.dbname != ':memory:':
+            os.remove(self.dbname)
+        self._create_con()
+
+    def close(self):
+        if self.con is not None:
+            self.con.close()
+        self.con = None
+
+    def filter(self, func):
+        to_delete = [key for key in self if not func(key)]
+        for key in to_delete:
+            del self[key]
+
+    def get_id(self, path):
+        sql = "select rowid from pictures where path = ?"
+        result = self.con.execute(sql, [path]).fetchone()
+        if result:
+            return result[0]
+        else:
+            raise ValueError(path)
+
+    def get_multiple(self, rowids):
+        sql = "select rowid, blocks from pictures where rowid in (%s)" % ','.join(map(str, rowids))
+        cur = self.con.execute(sql)
+        return ((rowid, string_to_colors(blocks)) for rowid, blocks in cur)
+
+    def purge_outdated(self):
+        """Go through the cache and purge outdated records.
+
+        A record is outdated if the picture doesn't exist or if its mtime is greater than the one in
+        the db.
+        """
+        todelete = []
+        sql = "select rowid, path, mtime from pictures"
+        cur = self.con.execute(sql)
+        for rowid, path_str, mtime in cur:
+            if mtime and op.exists(path_str):
+                picture_mtime = os.stat(path_str).st_mtime
+                if int(picture_mtime) <= mtime:
+                    # not outdated
+                    continue
+            todelete.append(rowid)
+        if todelete:
+            sql = "delete from pictures where rowid in (%s)" % ','.join(map(str, todelete))
+            self.con.execute(sql)
+

core/pe/matchblock.py

@@ -16,7 +16,6 @@ from hscommon.jobprogress import job
 
 from core.engine import Match
 from .block import avgdiff, DifferentBlockCountError, NoBlocksError
-from .cache import Cache
 
 # OPTIMIZATION NOTES:
 # The bottleneck of the matching phase is CPU, which is why we use multiprocessing. However, another
@@ -49,12 +48,20 @@ except Exception:
     logging.warning("Had problems to determine cpu count on launch.")
     RESULTS_QUEUE_LIMIT = 8
 
+def get_cache(cache_path, readonly=False):
+    if cache_path.endswith('shelve'):
+        from .cache_shelve import ShelveCache
+        return ShelveCache(cache_path, readonly=readonly)
+    else:
+        from .cache_sqlite import SqliteCache
+        return SqliteCache(cache_path, readonly=readonly)
+
 def prepare_pictures(pictures, cache_path, with_dimensions, j=job.nulljob):
     # The MemoryError handlers in there use logging without first caring about whether or not
     # there is enough memory left to carry on the operation because it is assumed that the
     # MemoryError happens when trying to read an image file, which is freed from memory by the
     # time that MemoryError is raised.
-    cache = Cache(cache_path)
+    cache = get_cache(cache_path)
     cache.purge_outdated()
     prepared = [] # only pictures for which there was no error getting blocks
     try:
@@ -109,7 +116,7 @@ def async_compare(ref_ids, other_ids, dbname, threshold, picinfo):
     # The list of ids in ref_ids have to be compared to the list of ids in other_ids. other_ids
     # can be None. In this case, ref_ids has to be compared with itself
     # picinfo is a dictionary {pic_id: (dimensions, is_ref)}
-    cache = Cache(dbname)
+    cache = get_cache(dbname, readonly=True)
     limit = 100 - threshold
     ref_pairs = list(cache.get_multiple(ref_ids))
     if other_ids is not None:
@@ -135,7 +142,7 @@ def async_compare(ref_ids, other_ids, dbname, threshold, picinfo):
     cache.close()
     return results
 
-def getmatches(pictures, cache_path, threshold=75, match_scaled=False, j=job.nulljob):
+def getmatches(pictures, cache_path, threshold, match_scaled=False, j=job.nulljob):
     def get_picinfo(p):
         if match_scaled:
             return (None, p.is_ref)
@@ -159,7 +166,7 @@ def getmatches(pictures, cache_path, threshold=75, match_scaled=False, j=job.nul
     j = j.start_subjob([3, 7])
     pictures = prepare_pictures(pictures, cache_path, with_dimensions=not match_scaled, j=j)
     j = j.start_subjob([9, 1], tr("Preparing for matching"))
-    cache = Cache(cache_path)
+    cache = get_cache(cache_path)
     id2picture = {}
     for picture in pictures:
         try:

core/pe/scanner.py

@@ -13,7 +13,6 @@ from . import matchblock, matchexif
 class ScannerPE(Scanner):
     cache_path = None
     match_scaled = False
-    threshold = 75
 
     @staticmethod
     def get_scan_options():
@@ -24,7 +23,13 @@ class ScannerPE(Scanner):
 
     def _getmatches(self, files, j):
         if self.scan_type == ScanType.FuzzyBlock:
-            return matchblock.getmatches(files, self.cache_path, self.threshold, self.match_scaled, j)
+            return matchblock.getmatches(
+                files,
+                cache_path=self.cache_path,
+                threshold=self.min_match_percentage,
+                match_scaled=self.match_scaled,
+                j=j
+            )
         elif self.scan_type == ScanType.ExifTimestamp:
             return matchexif.getmatches(files, self.match_scaled, j)
         else:

core/tests/app_test.py

@@ -43,7 +43,7 @@ class TestCaseDupeGuru:
         eq_('\\(\\)\\[\\]\\\\\\.\\|\\+\\?\\^abc', call['filter_str'])
         dgapp.apply_filter('(*)') # In "simple mode", we want the * to behave as a wilcard
         call = dgapp.results.apply_filter.calls[3]
-        eq_('\(.*\)', call['filter_str'])
+        eq_(r'\(.*\)', call['filter_str'])
         dgapp.options['escape_filter_regexp'] = False
         dgapp.apply_filter('(abc)')
         call = dgapp.results.apply_filter.calls[5]

core/tests/cache_test.py

@@ -1,4 +1,4 @@
-# Copyright 2016 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2016 Virgil Dupras
 #
 # This software is licensed under the "GPLv3" License as described in the "LICENSE" file,
 # which should be included with this package. The terms are also available at
@@ -10,7 +10,9 @@ from pytest import raises, skip
 from hscommon.testutil import eq_
 
 try:
-    from ..pe.cache import Cache, colors_to_string, string_to_colors
+    from ..pe.cache import colors_to_string, string_to_colors
+    from ..pe.cache_sqlite import SqliteCache
+    from ..pe.cache_shelve import ShelveCache
 except ImportError:
     skip("Can't import the cache module, probably hasn't been compiled.")
 
@@ -44,21 +46,24 @@ class TestCasestring_to_colors:
         eq_([], string_to_colors('102'))
 
 
-class TestCaseCache:
+class BaseTestCaseCache:
+    def get_cache(self, dbname=None):
+        raise NotImplementedError()
+
     def test_empty(self):
-        c = Cache()
+        c = self.get_cache()
         eq_(0, len(c))
         with raises(KeyError):
             c['foo']
 
     def test_set_then_retrieve_blocks(self):
-        c = Cache()
+        c = self.get_cache()
         b = [(0, 0, 0), (1, 2, 3)]
         c['foo'] = b
         eq_(b, c['foo'])
 
     def test_delitem(self):
-        c = Cache()
+        c = self.get_cache()
         c['foo'] = ''
         del c['foo']
         assert 'foo' not in c
@@ -67,14 +72,14 @@ class TestCaseCache:
 
     def test_persistance(self, tmpdir):
         DBNAME = tmpdir.join('hstest.db')
-        c = Cache(str(DBNAME))
+        c = self.get_cache(str(DBNAME))
         c['foo'] = [(1, 2, 3)]
         del c
-        c = Cache(str(DBNAME))
+        c = self.get_cache(str(DBNAME))
         eq_([(1, 2, 3)], c['foo'])
 
     def test_filter(self):
-        c = Cache()
+        c = self.get_cache()
         c['foo'] = ''
         c['bar'] = ''
         c['baz'] = ''
@@ -85,7 +90,7 @@ class TestCaseCache:
         assert 'bar' not in c
 
     def test_clear(self):
-        c = Cache()
+        c = self.get_cache()
         c['foo'] = ''
         c['bar'] = ''
         c['baz'] = ''
@@ -95,6 +100,22 @@ class TestCaseCache:
         assert 'baz' not in c
         assert 'bar' not in c
 
+    def test_by_id(self):
+        # it's possible to use the cache by referring to the files by their row_id
+        c = self.get_cache()
+        b = [(0, 0, 0), (1, 2, 3)]
+        c['foo'] = b
+        foo_id = c.get_id('foo')
+        eq_(c[foo_id], b)
+
+
+class TestCaseSqliteCache(BaseTestCaseCache):
+    def get_cache(self, dbname=None):
+        if dbname:
+            return SqliteCache(dbname)
+        else:
+            return SqliteCache()
+
     def test_corrupted_db(self, tmpdir, monkeypatch):
         # If we don't do this monkeypatching, we get a weird exception about trying to flush a
         # closed file. I've tried setting logging level and stuff, but nothing worked. So, there we
@@ -104,37 +125,37 @@ class TestCaseCache:
         fp = open(dbname, 'w')
         fp.write('invalid sqlite content')
         fp.close()
-        c = Cache(dbname) # should not raise a DatabaseError
+        c = self.get_cache(dbname) # should not raise a DatabaseError
         c['foo'] = [(1, 2, 3)]
         del c
-        c = Cache(dbname)
+        c = self.get_cache(dbname)
         eq_(c['foo'], [(1, 2, 3)])
 
-    def test_by_id(self):
+
-        # it's possible to use the cache by referring to the files by their row_id
+class TestCaseShelveCache(BaseTestCaseCache):
-        c = Cache()
+    def get_cache(self, dbname=None):
-        b = [(0, 0, 0), (1, 2, 3)]
+        return ShelveCache(dbname)
-        c['foo'] = b
-        foo_id = c.get_id('foo')
-        eq_(c[foo_id], b)
 
 
 class TestCaseCacheSQLEscape:
+    def get_cache(self):
+        return SqliteCache()
+
     def test_contains(self):
-        c = Cache()
+        c = self.get_cache()
         assert "foo'bar" not in c
 
     def test_getitem(self):
-        c = Cache()
+        c = self.get_cache()
         with raises(KeyError):
             c["foo'bar"]
 
     def test_setitem(self):
-        c = Cache()
+        c = self.get_cache()
         c["foo'bar"] = []
 
     def test_delitem(self):
-        c = Cache()
+        c = self.get_cache()
         c["foo'bar"] = []
         try:
             del c["foo'bar"]

core/tests/directories_test.py

@@ -13,6 +13,7 @@ from pytest import raises
 from hscommon.path import Path
 from hscommon.testutil import eq_
 
+from ..fs import File
 from ..directories import Directories, DirectoryState, AlreadyThereError, InvalidPathError
 
 def create_fake_fs(rootpath):
@@ -162,6 +163,20 @@ def test_get_files():
         else:
             assert not f.is_ref
 
+def test_get_files_with_folders():
+    # When fileclasses handle folders, return them and stop recursing!
+    class FakeFile(File):
+        @classmethod
+        def can_handle(cls, path):
+            return True
+
+    d = Directories()
+    p = testpath['fs']
+    d.add_path(p)
+    files = list(d.get_files(fileclasses=[FakeFile]))
+    # We have the 3 root files and the 3 root dirs
+    eq_(6, len(files))
+
 def test_get_folders():
     d = Directories()
     p = testpath['fs']

help/changelog

@@ -1,3 +1,42 @@
+=== 4.0.4 (2019-05-13)
+
+* Update qt/platform.py to support other Unix style OSes (#444)
+* Fix font size scaling issue in properties dialog [qt] (#504)
+* Updates to support Python 3.7
+* Fix issue with result window appearing partially off-screen [qt] (#521)
+* Fix translation error for Simplified Chinese
+* Updates to language files for German (#479)
+* Fix error with multiple close calls to the progress window [qt] (#460, #449)
+* Add Travis CI Builds
+* Un-recurse methods get_files() and get_state() to improve stability (#421)
+* Updates to language files for Italian (#445, #446, #447, #448)
+* Fix issue with cache_shelve (#402, #439)
+* Updated Windows packaging and builds (#438, #456, #461, #491, #474, #490, #565)
+* Handle OS termination signals (#425)
+* Make documentation installation optional
+* Move cocoa UI to dupeguru-cocoa [cocoa]
+
+=== 4.0.3 (2016-11-24)
+
+* Add new picture cache backend: shelve
+* Make shelve picture cache backend the active one on MacOS to fix #394 more
+  elegantly. [cocoa]
+* Remove Sparkle (auto-updates) due to technical limitations. [cocoa]
+
+=== 4.0.2 (2016-10-09)
+
+* Fix systematic crash in Picture Mode under MacOS Sierra. (#394)
+* No change for Linux. Just keeping version in sync.
+
+=== 4.0.1 (2016-08-24)
+
+* Add Greek localization, by Gabriel Koutilellis. (#382)
+* Fix localization base path. [qt] (#378)
+* Fix broken load results dialog. [qt]
+* Fix crash on load results. [cocoa] (#380)
+* Save preferences more predictably. [qt] (#379)
+* Fix picture mode's fuzzy block scanner threshold. (#387)
+
 === 4.0.0 (2016-07-01)
 
 * Merge Standard, Music and Picture editions in the same application!

help/de/credits.rst

@@ -1,43 +0,0 @@
-Credits
-=======
-
-Unten befindet sich die Liste aller Menschen, die direkt oder indirekt zu dupeGuru beigetragen haben.
-
-| **Virgil Dupras, Developer** (`Website <http://www.hardcoded.net>`__)
-
-| **Jérôme Cantin, Icon designer**
-| Icons in dupeGuru are from him
-
-| **Gregor Tätzner, deutsche Übersetzung**
-
-| **Frank Weber, deutsche Übersetzung**
-
-| **Eric Dee, chinesische Übersetzung**
-
-| **Aleš Nehyba, Czech localization**
-
-| **Paolo Rossi, Italian localization**
-
-| **Igor Pavlov, Russian localization**
-
-| **Kyrill Detinov, Russian localization**
-
-| **Yuri Petrashko, Ukrainian localization**
-
-| **Nickolas Pohilets, Ukrainian localization**
-
-| **Victor Figueiredo, Brazilian localization**
-
-| **Phan Anh, Vietnamese localization**
-
-| **Python, Programming language** (`Website <http://www.python.org>`__)
-| The bestest of the bests
-
-| **PyQt, Python-to-Qt bridge** (`Website <http://www.riverbankcomputing.co.uk>`__)
-| Used for the Windows version
-
-| **Sparkle, Auto-update library** (`Website <http://andymatuschak.org/pages/sparkle>`__)
-| Used for the Mac OS X version
-
-| **You, dupeGuru user**
-| You rock.

help/de/index.rst

@@ -37,4 +37,3 @@ Inhalte:
     reprioritize
     faq
     changelog
-    credits

help/en/credits.rst

@@ -1,33 +0,0 @@
-Credits
-=======
-
-Below is the list of people who contributed, directly or indirectly to dupeGuru.
-
-| **Virgil Dupras, Developer** (`Website <https://www.hardcoded.net>`__)
-
-| **Jérôme Cantin, Main icon**
-
-| **Gregor Tätzner, German localization**
-
-| **Frank Weber, German localization**
-
-| **Eric Dee, Chinese localization**
-
-| **Aleš Nehyba, Czech localization**
-
-| **Paolo Rossi, Italian localization**
-
-| **Hrant Ohanyan, Armenian localization**
-
-| **Igor Pavlov, Russian localization**
-
-| **Kyrill Detinov, Russian localization**
-
-| **Yuri Petrashko, Ukrainian localization**
-
-| **Nickolas Pohilets, Ukrainian localization**
-
-| **Victor Figueiredo, Brazilian localization**
-
-| **Phan Anh, Vietnamese localization**
-

help/en/index.rst

@@ -35,7 +35,6 @@ Contents:
     faq
     developer/index
     changelog
-    credits
 
 Indices and tables
 ==================

help/fr/credits.rst

@@ -1,44 +0,0 @@
-Crédits
-=======
-
-Voici la liste des contributeurs de dupeGuru. Merci!
-
-| **Virgil Dupras, Dévelopeur** (`Website <http://www.hardcoded.net>`__)
-
-| **Jérôme Cantin, Designer des icônes**
-
-| **Gregor Tätzner, localisation allemande**
-
-| **Frank Weber, localisation allemande**
-
-| **Eric Dee, localisation choinoise**
-
-| **Aleš Nehyba, localisation tchèque**
-
-| **Paolo Rossi, localisation italienne**
-
-| **Hrant Ohanyan, localisation arménienne**
-
-| **Igor Pavlov, localisation russe**
-
-| **Kyrill Detinov, localisation russe**
-
-| **Yuri Petrashko, localisation ukrainienne**
-
-| **Nickolas Pohilets, localisation ukrainienne**
-
-| **Victor Figueiredo, localisation brésilienne**
-
-| **Phan Anh, localisation vietnamienne**
-
-| **Python, Langage de programmation** (`Website <http://www.python.org>`__)
-| Le meilleur des meilleurs
-
-| **PyQt, Pont Python/Qt** (`Website <http://www.riverbankcomputing.co.uk>`__)
-| Pour les versions Windows et Linux
-
-| **Sparkle, Librairie de mise-à-jour** (`Website <http://andymatuschak.org/pages/sparkle>`__)
-| Pour la version Mac OS X
-
-| **Vous, Utilisateur dupeGuru**
-| Merci!

help/fr/index.rst

@@ -37,4 +37,3 @@ Contents:
     reprioritize
     faq
     changelog
-    credits

help/hy/credits.rst

@@ -1,45 +0,0 @@
-Մասնակիցներ
-===========
-
-Ահա այն մարդկանց ցանկը, ովքեր ուղղակիորեն և անուղղակիորեն մասնակցել են dupeGuru-ի զարգացմանը:
-
-| **Virgil Dupras, Զարգացնող** (`Վեբ կայքը <http://www.hardcoded.net>`__)
-
-| **Jérôme Cantin, Պատկերակների հեղինակ**
-| dupeGuru-ի պատկերակների հեղինակը
-
-| **Gregor Tätzner, Գերմաներեն թարգմանիչը**
-
-| **Frank Weber, Գերմաներեն թարգմանիչը**
-
-| **Eric Dee, Չինարեն թարգմանիչը**
-
-| **Aleš Nehyba, Չեխերեն թարգմանիչը**
-
-| **Paolo Rossi, Իտալերեն թարգմանիչը**
-
-| **Hrant Ohanyan, Հայերեն թարգմանիչը**
-
-| **Igor Pavlov, Russian localization**
-
-| **Kyrill Detinov, Russian localization**
-
-| **Yuri Petrashko, Ukrainian localization**
-
-| **Nickolas Pohilets, Ukrainian localization**
-
-| **Victor Figueiredo, Brazilian localization**
-
-| **Phan Anh, Vietnamese localization**
-
-| **Python, Ծրագրավորման լեզուն** (`Վեբ կայքը <http://www.python.org>`__)
-| Լավագույներից լավագույնը
-
-| **PyQt, Python-ից Qt կամուրջ** (`Վեբ կայքը <http://www.riverbankcomputing.co.uk>`__)
-| Օգտագործվում է Windows-ի տարբերակի
-
-| **Sparkle, Ինքնաթարմացվող շտեմարան** (`Վեբ կայքը <http://andymatuschak.org/pages/sparkle>`__)
-| Օգտագործվում է Mac OS X տարբերակի համար
-
-| **Դուք, dupeGuru-ի օգտվողը**
-| Ողջույն!

help/hy/index.rst

@@ -37,4 +37,3 @@
     reprioritize
     faq
     changelog
-    credits

help/ru/credits.rst

@@ -1,45 +0,0 @@
-Благодарность 
-=============
-
-Ниже приводится список людей, которые способствовали, прямо или косвенно dupeGuru.
-
-| **Virgil Dupras, Разработчик** (`Веб сайт  <http://www.hardcoded.net>`__)
-
-| **Jérôme Cantin, Дизайнера Иконк**
-|  Иконы в dupeGuru от него
-
-| **Gregor Tätzner, Немецкая локализация**
-
-| **Frank Weber, Немецкая локализация**
-
-| **Eric Dee, Китайская локализация**
-
-| **Aleš Nehyba, Чешский локализации**
-
-| **Paolo Rossi, Итальянская локализации**
-
-| **Hrant Ohanyan, Armenian localization**
-
-| **Igor Pavlov, Russian localization**
-
-| **Kyrill Detinov, Russian localization**
-
-| **Yuri Petrashko, Ukrainian localization**
-
-| **Nickolas Pohilets, Ukrainian localization**
-
-| **Victor Figueiredo, Brazilian localization**
-
-| **Phan Anh, Vietnamese localization**
-
-| **Python, Язык программирования** (`Веб сайт  <http://www.python.org>`__)
-| Самая лучшая 
-
-| **PyQt, Python-to-Qt bridge** (`Веб сайт  <http://www.riverbankcomputing.co.uk>`__)
-| Используется для версии для Windows
-
-| **Sparkle, Auto-update library** (`Веб сайт  <http://andymatuschak.org/pages/sparkle>`__)
-| Используется для Mac OS X версии
-
-| **Ты, ползиватель dupeGuru**
-| Ты лучший.