.github/FUNDING.yml

@@ -1,13 +0,0 @@
-# These are supported funding model platforms
-
-github: arsenetar
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/codeql-analysis.yml

@@ -7,7 +7,7 @@ on:
     # The branches below must be a subset of the branches above
     branches: [ master ]
   schedule:
-    - cron: "24 20 * * 2"
+    - cron: '24 20 * * 2'
 
 jobs:
   analyze:
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: ["cpp", "python"]
+        language: [ 'cpp', 'python' ]
 
     steps:
     - name: Checkout repository

.github/workflows/default.yml

@@ -4,42 +4,71 @@ name: Default CI/CD
 
 on:
   push:
+    branches: [ master ]
   pull_request:
     branches: [ master ]
 
 jobs:
-  pre-commit:
+  lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
-      - name: Set up Python 3.12
+    - name: Set up Python 3.10
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v2
       with:
-          python-version: "3.12"
+        python-version: '3.10'
-      - uses: pre-commit/action@v3.0.1
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt -r requirements-extra.txt
+    - name: Lint with flake8
+      run: |
+        flake8 .
+  format:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.10'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt -r requirements-extra.txt
+    - name: Check format with black
+      run: |
+        black .
   test:
-    needs: [pre-commit]
+    needs: [lint, format]
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
+        python-version: [3.6, 3.7, 3.8, 3.9, '3.10']
-        include:
+        exclude:
-          - os: windows-latest
-            python-version: "3.12"
           - os: macos-latest
-            python-version: "3.12"
+            python-version: 3.6
+          - os: macos-latest
+            python-version: 3.7
+          - os: macos-latest
+            python-version: 3.8
+          - os: windows-latest
+            python-version: 3.6
+          - os: windows-latest
+            python-version: 3.7
+          - os: windows-latest
+            python-version: 3.8
 
     steps:
-      - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-          pip install setuptools
         pip install -r requirements.txt -r requirements-extra.txt
     - name: Build python modules
       run: |
@@ -49,17 +78,7 @@ jobs:
         pytest core hscommon
     - name: Upload Artifacts
       if: matrix.os == 'ubuntu-latest'
-        uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: modules ${{ matrix.python-version }}
-          path: build/**/*.so
+        path: ${{ github.workspace }}/**/*.so
-  merge-artifacts:
-    needs: [test]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Merge Artifacts
-        uses: actions/upload-artifact/merge@v4
-        with:
-          name: modules
-          pattern: modules*
-          delete-merged: true

.github/workflows/tx-push.yml

@@ -1,26 +0,0 @@
-# Push translation source to Transifex
-name: Transifex Sync
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - locale/*.pot
-
-env:
-  TX_VERSION: "v1.6.10"
-
-jobs:
-  push-source:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Get Transifex Client
-        run: |
-          curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash -s -- $TX_VERSION
-      - name: Update & Push Translation Sources
-        env:
-          TX_TOKEN: ${{ secrets.TX_TOKEN }}
-        run: |
-          ./tx push -s --use-git-timestamps

.gitignore

@@ -1,111 +1,30 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-#*.pot
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
-__pypackages__/
-
-# Environments
-.env
-.venv
-env*/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
-# macOS
 .DS_Store
+__pycache__
+*.egg-info
+*.so
+*.mo
+*.waf*
+.lock-waf*
+.tox
+/tags
+*.eggs
 
-# Visual Studio Code
+build
-.vscode/*
+dist
-!.vscode/settings.json
+env*
-!.vscode/tasks.json
+/deps
-!.vscode/launch.json
+cocoa/autogen
-!.vscode/extensions.json
-!.vscode/*.code-snippets
 
-# Local History for Visual Studio Code
+/run.py
-.history/
+/cocoa/*/Info.plist
-
+/cocoa/*/build
-# Built Visual Studio Code Extensions
-*.vsix
-
-# dupeGuru Specific
 /qt/*_rc.py
 /help/*/conf.py
 /help/*/changelog.rst
-cocoa/autogen
+/transifex
-/cocoa/*/Info.plist
-/cocoa/*/build
 
-*.waf*
+*.pyd
-.lock-waf*
+*.exe
-/tags
+*.spec
+
+.vscode

.pre-commit-config.yaml

@@ -1,24 +0,0 @@
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
-    hooks:
-      - id: check-yaml
-      - id: check-toml
-      - id: end-of-file-fixer
-        exclude: ".*.json"
-      - id: trailing-whitespace
-  - repo: https://github.com/psf/black
-    rev: 24.2.0
-    hooks:
-      - id: black
-  - repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
-    hooks:
-      - id: flake8
-        exclude: ^(.tox|env|build|dist|help|qt/dg_rc.py|pkg).*
-  - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
-    rev: v9.11.0
-    hooks:
-      - id: commitlint
-        stages: [commit-msg]
-        additional_dependencies: ["@commitlint/config-conventional"]

.sonarcloud.properties

@@ -1 +1 @@
-sonar.python.version=3.7, 3.8, 3.9, 3.10, 3.11
+sonar.python.version=3.6, 3.7, 3.8, 3.9, 3.10

.tx/config

@@ -1,20 +1,26 @@
 [main]
 host = https://www.transifex.com
 
-[o:voltaicideas:p:dupeguru-1:r:columns]
+[dupeguru-1.core]
-file_filter = locale/<lang>/LC_MESSAGES/columns.po
-source_file = locale/columns.pot
-source_lang = en
-type        = PO
-
-[o:voltaicideas:p:dupeguru-1:r:core]
 file_filter = locale/<lang>/LC_MESSAGES/core.po
 source_file = locale/core.pot
 source_lang = en
 type = PO
 
-[o:voltaicideas:p:dupeguru-1:r:ui]
+[dupeguru-1.columns]
+file_filter = locale/<lang>/LC_MESSAGES/columns.po
+source_file = locale/columns.pot
+source_lang = en
+type = PO
+
+[dupeguru-1.ui]
 file_filter = locale/<lang>/LC_MESSAGES/ui.po
 source_file = locale/ui.pot
 source_lang = en
 type = PO
+
+[dupeguru-1.qtlib]
+file_filter = qtlib/locale/<lang>/LC_MESSAGES/qtlib.po
+source_file = qtlib/locale/qtlib.pot
+source_lang = en
+type = PO

.vscode/extensions.json

@@ -1,12 +0,0 @@
-{
-    // List of extensions which should be recommended for users of this workspace.
-    "recommendations": [
-        "redhat.vscode-yaml",
-        "ms-python.vscode-pylance",
-        "ms-python.python",
-        "ms-python.black-formatter",
-    ],
-    // List of extensions recommended by VS Code that should not be recommended for
-    // users of this workspace.
-    "unwantedRecommendations": []
-}

.vscode/launch.json

@@ -1,17 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "DupuGuru",
-            "type": "debugpy",
-            "request": "launch",
-            "program": "run.py",
-            "console": "integratedTerminal",
-            "subProcess": true,
-            "justMyCode": false
-        },
-    ]
-}

.vscode/settings.json

@@ -1,17 +0,0 @@
-{
-    "cSpell.words": [
-        "Dupras",
-        "hscommon"
-    ],
-    "editor.rulers": [
-        88,
-        120
-    ],
-    "python.languageServer": "Pylance",
-    "yaml.schemaStore.enable": true,
-    "[python]": {
-        "editor.formatOnSave": true,
-        "editor.defaultFormatter": "ms-python.black-formatter"
-    },
-    "python.testing.pytestEnabled": true
-}

CONTRIBUTING.md

@@ -1,88 +0,0 @@
-# Contributing to dupeGuru
-
-The following is a set of guidelines and information for contributing to dupeGuru.
-
-#### Table of Contents
-
-[Things to Know Before Starting](#things-to-know-before-starting)
-
-[Ways to Contribute](#ways-to-contribute)
-  * [Reporting Bugs](#reporting-bugs)
-  * [Suggesting Enhancements](#suggesting-enhancements)
-  * [Localization](#localization)
-  * [Code Contribution](#code-contribution)
-  * [Pull Requests](#pull-requests)
-
-[Style Guides](#style-guides)
-  * [Git Commit Messages](#git-commit-messages)
-  * [Python Style Guide](#python-style-guide)
-  * [Documentation Style Guide](#documentation-style-guide)
-
-[Additional Notes](#additional-notes)
-  * [Issue and Pull Request Labels](#issue-and-pull-request-labels)
-
-## Things to Know Before Starting
-**TODO**
-## Ways to contribute
-### Reporting Bugs
-**TODO**
-### Suggesting Enhancements
-**TODO**
-### Localization
-**TODO**
-### Code Contribution
-**TODO**
-### Pull Requests
-Please follow these steps to have your contribution considered by the maintainers:
-
-1. Keep Pull Request specific to one feature or bug.
-2. Follow the [style guides](#style-guides)
-3. After you submit your pull request, verify that all [status checks](https://help.github.com/articles/about-status-checks/) are passing <details><summary>What if the status checks are failing?</summary>If a status check is failing, and you believe that the failure is unrelated to your change, please leave a comment on the pull request explaining why you believe the failure is unrelated. A maintainer will re-run the status check for you. If we conclude that the failure was a false positive, then we will open an issue to track that problem with our status check suite.</details>
-
-While the prerequisites above must be satisfied prior to having your pull request reviewed, the reviewer(s) may ask you to complete additional design work, tests, or other changes before your pull request can be ultimately accepted.
-
-## Style Guides
-### Git Commit Messages
-- Use the present tense ("Add feature" not "Added feature")
-- Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
-- Limit the first line to 72 characters or less
-- Reference issues and pull requests liberally after the first line
-
-### Python Style Guide
-- All files are formatted with [Black](https://github.com/psf/black)
-- Follow [PEP 8](https://peps.python.org/pep-0008/) as much as practical
-- Pass [flake8](https://flake8.pycqa.org/en/latest/) linting
-- Include [PEP 484](https://peps.python.org/pep-0484/) type hints (new code)
-
-### Documentation Style Guide
-**TODO**
-
-## Additional Notes
-### Issue and Pull Request Labels
-This section lists and describes the various labels used with issues and pull requests.  Each of the labels is listed with a search link as well.
-
-#### Issue Type and Status
-| Label name | Search | Description |
-|------------|--------|-------------|
-| `enhancement` | [search](https://github.com/arsenetar/dupeguru/issues?q=is%3Aopen+is%3Aissue+label%3Aenhancement) | Feature requests and enhancements. |
-| `bug` | [search](https://github.com/arsenetar/dupeguru/issues?q=is%3Aopen+is%3Aissue+label%3Abug) | Bug reports. |
-| `duplicate` | [search](https://github.com/arsenetar/dupeguru/issues?q=is%3Aopen+is%3Aissue+label%3Aduplicate) | Issue is a duplicate of existing issue. |
-| `needs-reproduction` | [search](https://github.com/arsenetar/dupeguru/issues?q=is%3Aopen+is%3Aissue+label%3Aneeds-reproduction) | A bug that has not been able to be reproduced. |
-| `needs-information` | [search](https://github.com/arsenetar/dupeguru/issues?q=is%3Aopen+is%3Aissue+label%3Aneeds-information) | More information needs to be collected about these problems or feature requests (e.g. steps to reproduce). |
-| `blocked` | [search](https://github.com/arsenetar/dupeguru/issues?q=is%3Aopen+is%3Aissue+label%3Ablocked) | Issue blocked by other issues. |
-| `beginner` | [search](https://github.com/arsenetar/dupeguru/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner) | Less complex issues for users who want to start contributing. |
-
-#### Category Labels
-| Label name | Search | Description |
-|------------|--------|-------------|
-| `3rd party` | [search](https://github.com/arsenetar/dupeguru/issues?q=is%3Aopen+is%3Aissue+label%3A%223rd%20party%22)  | Related to a 3rd party dependency. |
-| `crash` | [search](https://github.com/arsenetar/dupeguru/issues?q=is%3Aopen+is%3Aissue+label%3Acrash) | Related to crashes (complete, or unhandled). |
-| `documentation` | [search](https://github.com/arsenetar/dupeguru/issues?q=is%3Aopen+is%3Aissue+label%3Adocumentation) | Related to any documentation. |
-| `linux` | [search](https://github.com/arsenetar/dupeguru/issues?q=is%3Aopen+is%3Aissue+label%3linux) | Related to running on Linux. |
-| `mac` | [search](https://github.com/arsenetar/dupeguru/issues?q=is%3Aopen+is%3Aissue+label%3Amac) | Related to running on macOS. |
-| `performance` | [search](https://github.com/arsenetar/dupeguru/issues?q=is%3Aopen+is%3Aissue+label%3Aperformance) | Related to the performance. |
-| `ui` | [search](https://github.com/arsenetar/dupeguru/issues?q=is%3Aopen+is%3Aissue+label%3Aui)| Related to the visual design. |
-| `windows` | [search](https://github.com/arsenetar/dupeguru/issues?q=is%3Aopen+is%3Aissue+label%3Awindows) | Related to running on Windows. |
-
-#### Pull Request Labels
-None at this time, if the volume of Pull Requests increase labels may be added to manage.

LICENSE

@@ -619,3 +619,4 @@ Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
                      END OF TERMS AND CONDITIONS
+

MANIFEST.in

@@ -3,3 +3,4 @@ recursive-include core *.m
 include run.py
 graft locale
 graft help
+graft qtlib/locale

Makefile

@@ -1,7 +1,7 @@
 PYTHON ?= python3
 PYTHON_VERSION_MINOR := $(shell ${PYTHON} -c "import sys; print(sys.version_info.minor)")
 PYRCC5 ?= pyrcc5
-REQ_MINOR_VERSION = 7
+REQ_MINOR_VERSION = 6
 PREFIX ?= /usr/local
 
 # Window compatability via Msys2 
@@ -35,7 +35,7 @@ endif
 # 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.
 
-packages = hscommon core qt
+packages = hscommon qtlib core qt
 localedirs = $(wildcard locale/*/LC_MESSAGES)
 pofiles = $(wildcard locale/*/LC_MESSAGES/*.po)
 mofiles = $(patsubst %.po,%.mo,$(pofiles))

README.md

@@ -1,12 +1,16 @@
 # dupeGuru
 
 [dupeGuru][dupeguru] is a cross-platform (Linux, OS X, Windows) GUI tool to find duplicate files in
-a system. It is written mostly in Python 3 and uses [qt](https://www.qt.io/) for the UI.
+a system. It is 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 is written in Python and uses Qt5.
+
+The Cocoa UI of dupeGuru is hosted in a separate repo: https://github.com/arsenetar/dupeguru-cocoa
 
 ## Current status
 Still looking for additional help especially with regards to:
-* OSX maintenance: reproducing bugs, packaging verification.
+* OSX maintenance: reproducing bugs & cocoa version, building package with Cocoa UI.
-* Linux maintenance: reproducing bugs, maintaining PPA repository, Debian package, rpm package.
+* Linux maintenance: reproducing bugs, maintaining PPA repository, Debian package.
 * Translations: updating missing strings, transifex project at https://www.transifex.com/voltaicideas/dupeguru-1
 * Documentation: keeping it up-to-date.
 
@@ -22,6 +26,7 @@ This folder contains the source for dupeGuru. Its documentation is in `help`, bu
 * help: Help document, written for Sphinx.
 * locale: .po files for localization.
 * hscommon: A collection of helpers used across HS applications.
+* qtlib: A collection of helpers used across Qt UI codebases of HS applications.
 
 ## How to build dupeGuru from source
 
@@ -31,17 +36,19 @@ For windows instructions see the [Windows Instructions](Windows.md).
 For macos instructions (qt version) see the [macOS Instructions](macos.md).
 
 ### Prerequisites
-* [Python 3.7+][python]
+* [Python 3.6+][python]
 * PyQt5
 
 ### System Setup
 When running in a linux based environment the following system packages or equivalents are needed to build:
 * python3-pyqt5
 * pyqt5-dev-tools (on some systems, see note)
+* python3-wheel (for hsaudiotag3k)
 * python3-venv (only if using a virtual environment)
 * python3-dev
 * build-essential
 
+
 Note: On some linux systems pyrcc5 is not put on the path when installing python3-pyqt5, this will cause some issues with the resource files (and icons). These systems should have a respective pyqt5-dev-tools package, which should also be installed. The presence of pyrcc5 can be checked with `which pyrcc5`.  Debian based systems need the extra package, and Arch does not.
 
 To create packages the following are also needed:

Windows.md

@@ -2,7 +2,7 @@
 
 ### Prerequisites
 
-- [Python 3.7+][python]
+- [Python 3.6+][python]
 - [Visual Studio 2019][vs] or [Visual Studio Build Tools 2019][vsBuildTools] with the Windows 10 SDK
 - [nsis][nsis] (for installer creation)
 - [msys2][msys2] (for using makefile method)
@@ -16,7 +16,7 @@ After installing python it is recommended to update setuptools before compiling
 More details on setting up python for compiling packages on windows can be found on the [python wiki][pythonWindowsCompilers] Take note of the required vc++ versions.
 
 ### With build.py (preferred)
-To build with a different python version 3.7 vs 3.8 or 32 bit vs 64 bit specify that version instead of -3.8 to the `py` command below.  If you want to build additional versions while keeping all virtual environments setup use a different location for each virtual environment.
+To build with a different python version 3.6 vs 3.8 or 32 bit vs 64 bit specify that version instead of -3.8 to the `py` command below.  If you want to build additional versions while keeping all virtual environments setup use a different location for each virtual environment.
 
     $ cd <dupeGuru directory>
     $ py -3.8 -m venv .\env

build.py

@@ -61,7 +61,7 @@ def parse_args():
 
 
 def build_one_help(language):
-    print(f"Generating Help in {language}")
+    print("Generating Help in {}".format(language))
     current_path = Path(".").absolute()
     changelog_path = current_path.joinpath("help", "changelog")
     tixurl = "https://github.com/arsenetar/dupeguru/issues/{}"
@@ -88,8 +88,14 @@ def build_help():
         p.map(build_one_help, languages)
 
 
+def build_qt_localizations():
+    loc.compile_all_po(Path("qtlib", "locale"))
+    loc.merge_locale_dir(Path("qtlib", "locale"), "locale")
+
+
 def build_localizations():
     loc.compile_all_po("locale")
+    build_qt_localizations()
     locale_dest = Path("build", "locale")
     if locale_dest.exists():
         shutil.rmtree(locale_dest)
@@ -103,16 +109,25 @@ def build_updatepot():
     print("Building columns.pot")
     loc.generate_pot(["core"], Path("locale", "columns.pot"), ["coltr"])
     print("Building ui.pot")
-    loc.generate_pot(["qt"], Path("locale", "ui.pot"), ["tr"], merge=True)
+    # 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", Path("cocoa", "inter")]
+    loc.generate_pot(ui_packages, Path("locale", "ui.pot"), ["tr"], merge=True)
+    print("Building qtlib.pot")
+    loc.generate_pot(["qtlib"], Path("qtlib", "locale", "qtlib.pot"), ["tr"])
 
 
 def build_mergepot():
     print("Updating .po files using .pot files")
     loc.merge_pots_into_pos("locale")
+    loc.merge_pots_into_pos(Path("qtlib", "locale"))
+    # loc.merge_pots_into_pos(Path("cocoalib", "locale"))
 
 
 def build_normpo():
     loc.normalize_all_pos("locale")
+    loc.normalize_all_pos(Path("qtlib", "locale"))
+    # loc.normalize_all_pos(Path("cocoalib", "locale"))
 
 
 def build_pe_modules():
@@ -129,15 +144,14 @@ def build_normal():
     print("Building localizations")
     build_localizations()
     print("Building Qt stuff")
-    Path("qt", "dg_rc.py").unlink(missing_ok=True)
+    print_and_do("pyrcc5 {0} > {1}".format(Path("qt", "dg.qrc"), Path("qt", "dg_rc.py")))
-    print_and_do("pyrcc5 {} > {}".format(Path("qt", "dg.qrc"), Path("qt", "dg_rc.py")))
     fix_qt_resource_file(Path("qt", "dg_rc.py"))
     build_help()
 
 
 def main():
-    if sys.version_info < (3, 7):
+    if sys.version_info < (3, 6):
-        sys.exit("Python < 3.7 is unsupported.")
+        sys.exit("Python < 3.6 is unsupported.")
     options = parse_args()
     if options.clean and Path("build").exists():
         shutil.rmtree("build")

commitlint.config.js

@@ -1,17 +0,0 @@
-const Configuration = {
-    /*
-     * Resolve and load @commitlint/config-conventional from node_modules.
-     * Referenced packages must be installed
-     */
-    extends: ['@commitlint/config-conventional'],
-    /*
-     * Any rules defined here will override rules from @commitlint/config-conventional
-     */
-    rules: {
-        'header-max-length': [2, 'always', 72],
-        'subject-case': [2, 'always', 'sentence-case'],
-        'scope-enum': [2, 'always'],
-    },
-};
-
-module.exports = Configuration;

core/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "4.3.1"
+__version__ = "4.2.0"
 __appname__ = "dupeGuru"

core/app.py

@@ -4,39 +4,37 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-import cProfile
-import datetime
 import os
 import os.path as op
 import logging
 import subprocess
 import re
 import shutil
-from pathlib import Path
 
 from send2trash import send2trash
 from hscommon.jobprogress import job
 from hscommon.notify import Broadcaster
+from hscommon.path import Path
 from hscommon.conflict import smart_move, smart_copy
 from hscommon.gui.progress_window import ProgressWindow
 from hscommon.util import delete_if_empty, first, escape, nonone, allsame
 from hscommon.trans import tr
 from hscommon import desktop
 
-from core import se, me, pe
+from . import se, me, pe
-from core.pe.photo import get_delta_dimensions
+from .pe.photo import get_delta_dimensions
-from core.util import cmp_value, fix_surrogate_encoding
+from .util import cmp_value, fix_surrogate_encoding
-from core import directories, results, export, fs, prioritize
+from . import directories, results, export, fs, prioritize
-from core.ignore import IgnoreList
+from .ignore import IgnoreList
-from core.exclude import ExcludeDict as ExcludeList
+from .exclude import ExcludeDict as ExcludeList
-from core.scanner import ScanType
+from .scanner import ScanType
-from core.gui.deletion_options import DeletionOptions
+from .gui.deletion_options import DeletionOptions
-from core.gui.details_panel import DetailsPanel
+from .gui.details_panel import DetailsPanel
-from core.gui.directory_tree import DirectoryTree
+from .gui.directory_tree import DirectoryTree
-from core.gui.ignore_list_dialog import IgnoreListDialog
+from .gui.ignore_list_dialog import IgnoreListDialog
-from core.gui.exclude_list_dialog import ExcludeListDialogCore
+from .gui.exclude_list_dialog import ExcludeListDialogCore
-from core.gui.problem_dialog import ProblemDialog
+from .gui.problem_dialog import ProblemDialog
-from core.gui.stats_label import StatsLabel
+from .gui.stats_label import StatsLabel
 
 HAD_FIRST_LAUNCH_PREFERENCE = "HadFirstLaunch"
 DEBUG_MODE_PREFERENCE = "DebugMode"
@@ -126,13 +124,15 @@ class DupeGuru(Broadcaster):
 
     NAME = PROMPT_NAME = "dupeGuru"
 
+    PICTURE_CACHE_TYPE = "sqlite"  # set to 'shelve' for a ShelveCache
+
     def __init__(self, view, portable=False):
         if view.get_default(DEBUG_MODE_PREFERENCE):
             logging.getLogger().setLevel(logging.DEBUG)
             logging.debug("Debug mode enabled")
         Broadcaster.__init__(self)
         self.view = view
-        self.appdata = desktop.special_folder_path(desktop.SpecialFolder.APPDATA, portable=portable)
+        self.appdata = desktop.special_folder_path(desktop.SpecialFolder.APPDATA, appname=self.NAME, portable=portable)
         if not op.exists(self.appdata):
             os.makedirs(self.appdata)
         self.app_mode = AppMode.STANDARD
@@ -151,8 +151,7 @@ class DupeGuru(Broadcaster):
             "clean_empty_dirs": False,
             "ignore_hardlink_matches": False,
             "copymove_dest_type": DestType.RELATIVE,
-            "include_exists_check": True,
+            "picture_cache_type": self.PICTURE_CACHE_TYPE,
-            "rehash_ignore_mtime": False,
         }
         self.selected_dupes = []
         self.details_panel = DetailsPanel(self)
@@ -182,7 +181,8 @@ class DupeGuru(Broadcaster):
         self.view.create_results_window()
 
     def _get_picture_cache_path(self):
-        cache_name = "cached_pictures.db"
+        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):
@@ -248,7 +248,7 @@ class DupeGuru(Broadcaster):
             ref = group.ref
             linkfunc = os.link if use_hardlinks else os.symlink
             linkfunc(str(ref.path), str_path)
-        self.clean_empty_dirs(dupe.path.parent)
+        self.clean_empty_dirs(dupe.path.parent())
 
     def _create_file(self, path):
         # We add fs.Folder to fileclasses in case the file we're loading contains folder paths.
@@ -262,7 +262,7 @@ class DupeGuru(Broadcaster):
         try:
             f._read_all_info(attrnames=self.METADATA_TO_READ)
             return f
-        except OSError:
+        except EnvironmentError:
             return None
 
     def _get_export_data(self):
@@ -415,7 +415,7 @@ class DupeGuru(Broadcaster):
     def clean_empty_dirs(self, path):
         if self.options["clean_empty_dirs"]:
             while delete_if_empty(path, [".DS_Store"]):
-                path = path.parent
+                path = path.parent()
 
     def clear_picture_cache(self):
         try:
@@ -428,25 +428,25 @@ class DupeGuru(Broadcaster):
 
     def copy_or_move(self, dupe, copy: bool, destination: str, dest_type: DestType):
         source_path = dupe.path
-        location_path = first(p for p in self.directories if p in dupe.path.parents)
+        location_path = first(p for p in self.directories if dupe.path in p)
         dest_path = Path(destination)
         if dest_type in {DestType.RELATIVE, DestType.ABSOLUTE}:
             # no filename, no windows drive letter
-            source_base = source_path.relative_to(source_path.anchor).parent
+            source_base = source_path.remove_drive_letter().parent()
             if dest_type == DestType.RELATIVE:
-                source_base = source_base.relative_to(location_path.relative_to(location_path.anchor))
+                source_base = source_base[location_path:]
-            dest_path = dest_path.joinpath(source_base)
+            dest_path = dest_path[source_base]
         if not dest_path.exists():
-            dest_path.mkdir(parents=True)
+            dest_path.makedirs()
         # Add filename to dest_path. For file move/copy, it's not required, but for folders, yes.
-        dest_path = dest_path.joinpath(source_path.name)
+        dest_path = dest_path[source_path.name]
         logging.debug("Copy/Move operation from '%s' to '%s'", source_path, dest_path)
         # Raises an EnvironmentError if there's a problem
         if copy:
             smart_copy(source_path, dest_path)
         else:
             smart_move(source_path, dest_path)
-            self.clean_empty_dirs(source_path.parent)
+            self.clean_empty_dirs(source_path.parent())
 
     def copy_or_move_marked(self, copy):
         """Start an async move (or copy) job on marked duplicates.
@@ -553,15 +553,9 @@ class DupeGuru(Broadcaster):
                 # a workaround to make the damn thing work.
                 exepath, args = match.groups()
                 path, exename = op.split(exepath)
-                p = subprocess.Popen(
+                subprocess.Popen(exename + args, shell=True, cwd=path)
-                    exename + args, shell=True, cwd=path, stdout=subprocess.PIPE, stderr=subprocess.STDOUT
-                )
-                output = p.stdout.read()
-                logging.info("Custom command %s %s: %s", exename, args, output)
             else:
-                p = subprocess.Popen(dupe_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+                subprocess.Popen(dupe_cmd, shell=True)
-                output = p.stdout.read()
-                logging.info("Custom command %s: %s", dupe_cmd, output)
 
     def load(self):
         """Load directory selection and ignore list from files in appdata.
@@ -786,13 +780,12 @@ class DupeGuru(Broadcaster):
         except OSError as e:
             self.view.show_message(tr("Couldn't write to file: {}").format(str(e)))
 
-    def start_scanning(self, profile_scan=False):
+    def start_scanning(self):
         """Starts an async job to scan for duplicates.
 
         Scans folders selected in :attr:`directories` and put the results in :attr:`results`
         """
         scanner = self.SCANNER_CLASS()
-        fs.filesdb.ignore_mtime = self.options["rehash_ignore_mtime"] is True
         if not self.directories.has_any_file():
             self.view.show_message(tr("The selected directories contain no scannable file."))
             return
@@ -807,9 +800,6 @@ class DupeGuru(Broadcaster):
         self._results_changed()
 
         def do(j):
-            if profile_scan:
-                pr = cProfile.Profile()
-                pr.enable()
             j.set_progress(0, tr("Collecting files to scan"))
             if scanner.scan_type == ScanType.FOLDERS:
                 files = list(self.directories.get_folders(folderclass=se.fs.Folder, j=j))
@@ -820,9 +810,6 @@ class DupeGuru(Broadcaster):
             logging.info("Scanning %d files" % len(files))
             self.results.groups = scanner.get_dupe_groups(files, self.ignore_list, j)
             self.discarded_file_count = scanner.discarded_file_count
-            if profile_scan:
-                pr.disable()
-                pr.dump_stats(op.join(self.appdata, f"{datetime.datetime.now():%Y-%m-%d_%H-%M-%S}.profile"))
 
         self._start_job(JobType.SCAN, do)
 

core/directories.py

@@ -7,13 +7,13 @@
 import os
 from xml.etree import ElementTree as ET
 import logging
-from pathlib import Path
 
 from hscommon.jobprogress import job
+from hscommon.path import Path
 from hscommon.util import FileOrPath
 from hscommon.trans import tr
 
-from core import fs
+from . import fs
 
 __all__ = [
     "Directories",
@@ -63,7 +63,7 @@ class Directories:
 
     def __contains__(self, path):
         for p in self._dirs:
-            if path == p or p in path.parents:
+            if path in p:
                 return True
         return False
 
@@ -84,64 +84,64 @@ class Directories:
             for denied_path_re in self._exclude_list.compiled:
                 if denied_path_re.match(str(path.name)):
                     return DirectoryState.EXCLUDED
-            return DirectoryState.NORMAL
+            # return # We still use the old logic to force state on hidden dirs
         # Override this in subclasses to specify the state of some special folders.
         if path.name.startswith("."):
             return DirectoryState.EXCLUDED
-        return DirectoryState.NORMAL
 
     def _get_files(self, from_path, fileclasses, j):
-        try:
+        for root, dirs, files in os.walk(str(from_path)):
-            with os.scandir(from_path) as iter:
-                root_path = Path(from_path)
-                state = self.get_state(root_path)
-                # if we have no un-excluded dirs under this directory skip going deeper
-                skip_dirs = state == DirectoryState.EXCLUDED and not any(
-                    p.parts[: len(root_path.parts)] == root_path.parts for p in self.states
-                )
-                count = 0
-                for item in iter:
             j.check_if_cancelled()
+            root_path = Path(root)
+            state = self.get_state(root_path)
+            if state == DirectoryState.EXCLUDED and not any(p[: len(root_path)] == root_path for p in self.states):
+                # 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
+                del dirs[:]
             try:
-                        if item.is_dir():
+                if state != DirectoryState.EXCLUDED:
-                            if skip_dirs:
+                    # Old logic
-                                continue
+                    if self._exclude_list is None or not self._exclude_list.mark_count:
-                            yield from self._get_files(item.path, fileclasses, j)
+                        found_files = [fs.get_file(root_path + f, fileclasses=fileclasses) for f in files]
-                            continue
+                    else:
-                        elif state == DirectoryState.EXCLUDED:
+                        found_files = []
-                            continue
+                        # print(f"len of files: {len(files)} {files}")
-                        # File excluding or not
+                        for f in files:
-                        if (
+                            if not self._exclude_list.is_excluded(root, f):
-                            self._exclude_list is None
+                                found_files.append(fs.get_file(root_path + f, fileclasses=fileclasses))
-                            or not self._exclude_list.mark_count
+                    found_files = [f for f in found_files if f is not None]
-                            or not self._exclude_list.is_excluded(str(from_path), item.name)
+                    # 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
-                            file = fs.get_file(item, fileclasses=fileclasses)
+                    # OS X... In other situations, this forloop will do nothing.
-                            if file:
+                    for d in dirs[:]:
-                                file.is_ref = state == DirectoryState.REFERENCE
+                        f = fs.get_file(root_path + d, fileclasses=fileclasses)
-                                count += 1
+                        if f is not None:
-                                yield file
+                            found_files.append(f)
-                    except (OSError, fs.InvalidPath):
+                            dirs.remove(d)
-                        pass
                     logging.debug(
                         "Collected %d files in folder %s",
-                    count,
+                        len(found_files),
                         str(root_path),
                     )
-        except OSError:
+                    for file in found_files:
+                        file.is_ref = state == DirectoryState.REFERENCE
+                        yield file
+            except (EnvironmentError, fs.InvalidPath):
                 pass
 
     def _get_folders(self, from_folder, j):
         j.check_if_cancelled()
         try:
             for subfolder in from_folder.subfolders:
-                yield from self._get_folders(subfolder, j)
+                for folder in self._get_folders(subfolder, j):
+                    yield folder
             state = self.get_state(from_folder.path)
             if state != DirectoryState.EXCLUDED:
                 from_folder.is_ref = state == DirectoryState.REFERENCE
                 logging.debug("Yielding Folder %r state: %d", from_folder, state)
                 yield from_folder
-        except (OSError, fs.InvalidPath):
+        except (EnvironmentError, fs.InvalidPath):
             pass
 
     # ---Public
@@ -159,7 +159,7 @@ class Directories:
             raise AlreadyThereError()
         if not path.exists():
             raise InvalidPathError()
-        self._dirs = [p for p in self._dirs if path not in p.parents]
+        self._dirs = [p for p in self._dirs if p not in path]
         self._dirs.append(path)
 
     @staticmethod
@@ -170,10 +170,10 @@ class Directories:
         :rtype: list of Path
         """
         try:
-            subpaths = [p for p in path.glob("*") if p.is_dir()]
+            subpaths = [p for p in path.listdir() if p.isdir()]
             subpaths.sort(key=lambda x: x.name.lower())
             return subpaths
-        except OSError:
+        except EnvironmentError:
             return []
 
     def get_files(self, fileclasses=None, j=job.nulljob):
@@ -187,7 +187,7 @@ class Directories:
         for path in self._dirs:
             for file in self._get_files(path, fileclasses=fileclasses, j=j):
                 file_count += 1
-                if not isinstance(j, job.NullJob):
+                if type(j) != job.NullJob:
                     j.set_progress(-1, tr("Collected {} files to scan").format(file_count))
                 yield file
 
@@ -203,7 +203,7 @@ class Directories:
             from_folder = folderclass(path)
             for folder in self._get_folders(from_folder, j):
                 folder_count += 1
-                if not isinstance(j, job.NullJob):
+                if type(j) != job.NullJob:
                     j.set_progress(-1, tr("Collected {} folders to scan").format(folder_count))
                 yield folder
 
@@ -215,16 +215,19 @@ class Directories:
         # direct match? easy result.
         if path in self.states:
             return self.states[path]
-        state = self._default_state_for_path(path)
+        state = self._default_state_for_path(path) or DirectoryState.NORMAL
         # Save non-default states in cache, necessary for _get_files()
         if state != DirectoryState.NORMAL:
             self.states[path] = state
             return state
-        # find the longest parent path that is in states and return that state if found
+
-        # NOTE: path.parents is ordered longest to shortest
+        prevlen = 0
-        for parent_path in path.parents:
+        # we loop through the states to find the longest matching prefix
-            if parent_path in self.states:
+        # if the parent has a state in cache, return that state
-                return self.states[parent_path]
+        for p, s in self.states.items():
+            if p.is_parent_of(path) and len(p) > prevlen:
+                prevlen = len(p)
+                state = s
         return state
 
     def has_any_file(self):
@@ -293,6 +296,6 @@ class Directories:
         if self.get_state(path) == state:
             return
         for iter_path in list(self.states.keys()):
-            if path in iter_path.parents:
+            if path.is_parent_of(iter_path):
                 del self.states[iter_path]
         self.states[path] = state

core/engine.py

@@ -166,7 +166,7 @@ def reduce_common_words(word_dict, threshold):
     The exception to this removal are the objects where all the words of the object are common.
     Because if we remove them, we will miss some duplicates!
     """
-    uncommon_words = {word for word, objects in word_dict.items() if len(objects) < threshold}
+    uncommon_words = set(word for word, objects in word_dict.items() if len(objects) < threshold)
     for word, objects in list(word_dict.items()):
         if len(objects) < threshold:
             continue
@@ -283,7 +283,7 @@ def getmatches_by_contents(files, bigsize=0, j=job.nulljob):
     """Returns a list of :class:`Match` within ``files`` if their contents is the same.
 
     :param bigsize: The size in bytes over which we consider files big enough to
-                    justify taking samples of the file for hashing. If 0, compute digest as usual.
+                    justify taking samples of md5. If 0, compute md5 as usual.
     :param j: A :ref:`job progress instance <jobs>`.
     """
     size2files = defaultdict(set)
@@ -300,16 +300,15 @@ def getmatches_by_contents(files, bigsize=0, j=job.nulljob):
             if first.is_ref and second.is_ref:
                 continue  # Don't spend time comparing two ref pics together.
             if first.size == 0 and second.size == 0:
-                # skip hashing for zero length files
+                # skip md5 for zero length files
                 result.append(Match(first, second, 100))
                 continue
-            # if digests are the same (and not None) then files match
+            if first.md5partial == second.md5partial:
-            if first.digest_partial is not None and first.digest_partial == second.digest_partial:
                 if bigsize > 0 and first.size > bigsize:
-                    if first.digest_samples is not None and first.digest_samples == second.digest_samples:
+                    if first.md5samples == second.md5samples:
                         result.append(Match(first, second, 100))
                 else:
-                    if first.digest is not None and first.digest == second.digest:
+                    if first.md5 == second.md5:
                         result.append(Match(first, second, 100))
         group_count += 1
         j.add_progress(desc=PROGRESS_MESSAGE % (len(result), group_count))
@@ -410,7 +409,7 @@ class Group:
 
         You can call this after the duplicate scanning process to free a bit of memory.
         """
-        discarded = {m for m in self.matches if not all(obj in self.unordered for obj in [m.first, m.second])}
+        discarded = set(m for m in self.matches if not all(obj in self.unordered for obj in [m.first, m.second]))
         self.matches -= discarded
         self.candidates = defaultdict(set)
         return discarded
@@ -457,7 +456,7 @@ class Group:
             self._matches_for_ref = None
             if (len(self) > 1) and any(not getattr(item, "is_ref", False) for item in self):
                 if discard_matches:
-                    self.matches = {m for m in self.matches if item not in m}
+                    self.matches = set(m for m in self.matches if item not in m)
             else:
                 self._clear()
         except ValueError:
@@ -530,7 +529,7 @@ def get_groups(matches):
         del dupe2group
         del matches
         # should free enough memory to continue
-        logging.warning(f"Memory Overflow. Groups: {len(groups)}")
+        logging.warning("Memory Overflow. Groups: {0}".format(len(groups)))
     # Now that we have a group, we have to discard groups' matches and see if there're any "orphan"
     # matches, that is, matches that were candidate in a group but that none of their 2 files were
     # accepted in the group. With these orphan groups, it's safe to build additional groups

core/exclude.py

@@ -2,7 +2,7 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from core.markable import Markable
+from .markable import Markable
 from xml.etree import ElementTree as ET
 
 # TODO: perhaps use regex module for better Unicode support? https://pypi.org/project/regex/

core/fs.py

@@ -11,28 +11,16 @@
 # resulting needless complexity and memory usage. It's been a while since I wanted to do that fork,
 # and I'm doing it now.
 
-import os
+import hashlib
-
 from math import floor
 import logging
 import sqlite3
-from sys import platform
 from threading import Lock
-from typing import Any, AnyStr, Union, Callable
+from typing import Any
 
-from pathlib import Path
+from hscommon.path import Path
 from hscommon.util import nonone, get_file_ext
 
-hasher: Callable
-try:
-    import xxhash
-
-    hasher = xxhash.xxh128
-except ImportError:
-    import hashlib
-
-    hasher = hashlib.md5
-
 __all__ = [
     "File",
     "Folder",
@@ -52,12 +40,9 @@ NOT_SET = object()
 # CPU.
 CHUNK_SIZE = 1024 * 1024  # 1 MiB
 
-# Minimum size below which partial hashing is not used
+# Minimum size below which partial hashes don't need to be computed
 MIN_FILE_SIZE = 3 * CHUNK_SIZE  # 3MiB, because we take 3 samples
 
-# Partial hashing offset and size
-PARTIAL_OFFSET_SIZE = (0x4000, 0x4000)
-
 
 class FSError(Exception):
     cls_message = "An error has occured on '{name}' in '{parent}'"
@@ -98,101 +83,75 @@ class OperationError(FSError):
 
 
 class FilesDB:
-    schema_version = 1
-    schema_version_description = "Changed from md5 to xxhash if available."
 
-    create_table_query = """CREATE TABLE IF NOT EXISTS files (path TEXT PRIMARY KEY, size INTEGER, mtime_ns INTEGER,
+    create_table_query = "CREATE TABLE IF NOT EXISTS files (path TEXT PRIMARY KEY, size INTEGER, mtime_ns INTEGER, entry_dt DATETIME, md5 BLOB, md5partial BLOB)"
-        entry_dt DATETIME, digest BLOB, digest_partial BLOB, digest_samples BLOB)"""
+    drop_table_query = "DROP TABLE files;"
-    drop_table_query = "DROP TABLE IF EXISTS files;"
     select_query = "SELECT {key} FROM files WHERE path=:path AND size=:size and mtime_ns=:mtime_ns"
-    select_query_ignore_mtime = "SELECT {key} FROM files WHERE path=:path AND size=:size"
     insert_query = """
-        INSERT INTO files (path, size, mtime_ns, entry_dt, {key})
+        INSERT INTO files (path, size, mtime_ns, entry_dt, {key}) VALUES (:path, :size, :mtime_ns, datetime('now'), :value)
-        VALUES (:path, :size, :mtime_ns, datetime('now'), :value)
         ON CONFLICT(path) DO UPDATE SET size=:size, mtime_ns=:mtime_ns, entry_dt=datetime('now'), {key}=:value;
     """
 
-    ignore_mtime = False
-
     def __init__(self):
         self.conn = None
+        self.cur = None
         self.lock = None
 
-    def connect(self, path: Union[AnyStr, os.PathLike]) -> None:
+    def connect(self, path):
-        if platform.startswith("gnu0"):
+        # type: (str, ) -> None
-            self.conn = sqlite3.connect(path, check_same_thread=False, isolation_level=None)
+
-        else:
         self.conn = sqlite3.connect(path, check_same_thread=False)
+        self.cur = self.conn.cursor()
+        self.cur.execute(self.create_table_query)
         self.lock = Lock()
-        self._check_upgrade()
 
-    def _check_upgrade(self) -> None:
+    def clear(self):
-        with self.lock, self.conn as conn:
+        # type: () -> None
-            has_schema = conn.execute(
-                "SELECT NAME FROM sqlite_master WHERE type='table' AND name='schema_version'"
-            ).fetchall()
-            version = None
-            if has_schema:
-                version = conn.execute("SELECT version FROM schema_version ORDER BY version DESC").fetchone()[0]
-            else:
-                conn.execute("CREATE TABLE schema_version (version int PRIMARY KEY, description TEXT)")
-            if version != self.schema_version:
-                conn.execute(self.drop_table_query)
-                conn.execute(
-                    "INSERT OR REPLACE INTO schema_version VALUES (:version, :description)",
-                    {"version": self.schema_version, "description": self.schema_version_description},
-                )
-            conn.execute(self.create_table_query)
 
-    def clear(self) -> None:
+        with self.lock:
-        with self.lock, self.conn as conn:
+            self.cur.execute(self.drop_table_query)
-            conn.execute(self.drop_table_query)
+            self.cur.execute(self.create_table_query)
-            conn.execute(self.create_table_query)
+
+    def get(self, path, key):
+        # type: (Path, str) -> bytes
 
-    def get(self, path: Path, key: str) -> Union[bytes, None]:
         stat = path.stat()
         size = stat.st_size
         mtime_ns = stat.st_mtime_ns
-        try:
+
-            with self.conn as conn:
+        with self.lock:
-                if self.ignore_mtime:
+            self.cur.execute(self.select_query.format(key=key), {"path": str(path), "size": size, "mtime_ns": mtime_ns})
-                    cursor = conn.execute(
+            result = self.cur.fetchone()
-                        self.select_query_ignore_mtime.format(key=key), {"path": str(path), "size": size}
-                    )
-                else:
-                    cursor = conn.execute(
-                        self.select_query.format(key=key),
-                        {"path": str(path), "size": size, "mtime_ns": mtime_ns},
-                    )
-                result = cursor.fetchone()
-                cursor.close()
 
         if result:
             return result[0]
-        except Exception as ex:
-            logging.warning(f"Couldn't get {key} for {path} w/{size}, {mtime_ns}: {ex}")
 
         return None
 
-    def put(self, path: Path, key: str, value: Any) -> None:
+    def put(self, path, key, value):
+        # type: (Path, str, Any) -> None
+
         stat = path.stat()
         size = stat.st_size
         mtime_ns = stat.st_mtime_ns
-        try:
+
-            with self.lock, self.conn as conn:
+        with self.lock:
-                conn.execute(
+            self.cur.execute(
                 self.insert_query.format(key=key),
                 {"path": str(path), "size": size, "mtime_ns": mtime_ns, "value": value},
             )
-        except Exception as ex:
-            logging.warning(f"Couldn't put {key} for {path} w/{size}, {mtime_ns}: {ex}")
 
-    def commit(self) -> None:
+    def commit(self):
+        # type: () -> None
+
         with self.lock:
             self.conn.commit()
 
-    def close(self) -> None:
+    def close(self):
+        # type: () -> None
+
         with self.lock:
+            self.cur.close()
             self.conn.close()
 
 
@@ -202,26 +161,19 @@ filesdb = FilesDB()  # Singleton
 class File:
     """Represents a file and holds metadata to be used for scanning."""
 
-    INITIAL_INFO = {"size": 0, "mtime": 0, "digest": b"", "digest_partial": b"", "digest_samples": b""}
+    INITIAL_INFO = {"size": 0, "mtime": 0, "md5": b"", "md5partial": b"", "md5samples": b""}
     # Slots for File make us save quite a bit of memory. In a memory test I've made with a lot of
     # files, I saved 35% memory usage with "unread" files (no _read_info() call) and gains become
     # even greater when we take into account read attributes (70%!). Yeah, it's worth it.
-    __slots__ = ("path", "unicode_path", "is_ref", "words") + tuple(INITIAL_INFO.keys())
+    __slots__ = ("path", "is_ref", "words") + tuple(INITIAL_INFO.keys())
 
     def __init__(self, path):
+        self.path = path
         for attrname in self.INITIAL_INFO:
             setattr(self, attrname, NOT_SET)
-        if type(path) is os.DirEntry:
-            self.path = Path(path.path)
-            self.size = nonone(path.stat().st_size, 0)
-            self.mtime = nonone(path.stat().st_mtime, 0)
-        else:
-            self.path = path
-        if self.path:
-            self.unicode_path = str(self.path)
 
     def __repr__(self):
-        return f"<{self.__class__.__name__} {str(self.path)}>"
+        return "<{} {}>".format(self.__class__.__name__, str(self.path))
 
     def __getattribute__(self, attrname):
         result = object.__getattribute__(self, attrname)
@@ -235,46 +187,32 @@ class File:
                 result = self.INITIAL_INFO[attrname]
         return result
 
-    def _calc_digest(self):
+    def _calc_md5(self):
         # type: () -> bytes
 
         with self.path.open("rb") as fp:
-            file_hash = hasher()
+            md5 = hashlib.md5()
             # The goal here is to not run out of memory on really big files. However, the chunk
             # size has to be large enough so that the python loop isn't too costly in terms of
             # CPU.
             CHUNK_SIZE = 1024 * 1024  # 1 mb
             filedata = fp.read(CHUNK_SIZE)
             while filedata:
-                file_hash.update(filedata)
+                md5.update(filedata)
                 filedata = fp.read(CHUNK_SIZE)
-            return file_hash.digest()
+            return md5.digest()
 
-    def _calc_digest_partial(self):
+    def _calc_md5partial(self):
         # type: () -> bytes
+
+        # This offset is where we should start reading the file to get a partial md5
+        # For audio file, it should be where audio data starts
+        offset, size = (0x4000, 0x4000)
+
         with self.path.open("rb") as fp:
-            fp.seek(PARTIAL_OFFSET_SIZE[0])
+            fp.seek(offset)
-            partial_data = fp.read(PARTIAL_OFFSET_SIZE[1])
+            partialdata = fp.read(size)
-            return hasher(partial_data).digest()
+            return hashlib.md5(partialdata).digest()
-
-    def _calc_digest_samples(self) -> bytes:
-        size = self.size
-        with self.path.open("rb") as fp:
-            # Chunk at 25% of the file
-            fp.seek(floor(size * 25 / 100), 0)
-            file_data = fp.read(CHUNK_SIZE)
-            file_hash = hasher(file_data)
-
-            # Chunk at 60% of the file
-            fp.seek(floor(size * 60 / 100), 0)
-            file_data = fp.read(CHUNK_SIZE)
-            file_hash.update(file_data)
-
-            # Last chunk of the file
-            fp.seek(-CHUNK_SIZE, 2)
-            file_data = fp.read(CHUNK_SIZE)
-            file_hash.update(file_data)
-            return file_hash.digest()
 
     def _read_info(self, field):
         # print(f"_read_info({field}) for {self}")
@@ -282,30 +220,48 @@ class File:
             stats = self.path.stat()
             self.size = nonone(stats.st_size, 0)
             self.mtime = nonone(stats.st_mtime, 0)
-        elif field == "digest_partial":
+        elif field == "md5partial":
-            self.digest_partial = filesdb.get(self.path, "digest_partial")
+            try:
-            if self.digest_partial is None:
+                self.md5partial = filesdb.get(self.path, "md5partial")
-                # If file is smaller than partial requirements just use the full digest
+                if self.md5partial is None:
-                if self.size < PARTIAL_OFFSET_SIZE[0] + PARTIAL_OFFSET_SIZE[1]:
+                    self.md5partial = self._calc_md5partial()
-                    self.digest_partial = self.digest
+                    filesdb.put(self.path, "md5partial", self.md5partial)
-                else:
+            except Exception as e:
-                    self.digest_partial = self._calc_digest_partial()
+                logging.warning("Couldn't get md5partial for %s: %s", self.path, e)
-                filesdb.put(self.path, "digest_partial", self.digest_partial)
+        elif field == "md5":
-        elif field == "digest":
+            try:
-            self.digest = filesdb.get(self.path, "digest")
+                self.md5 = filesdb.get(self.path, "md5")
-            if self.digest is None:
+                if self.md5 is None:
-                self.digest = self._calc_digest()
+                    self.md5 = self._calc_md5()
-                filesdb.put(self.path, "digest", self.digest)
+                    filesdb.put(self.path, "md5", self.md5)
-        elif field == "digest_samples":
+            except Exception as e:
+                logging.warning("Couldn't get md5 for %s: %s", self.path, e)
+        elif field == "md5samples":
+            try:
+                with self.path.open("rb") as fp:
                     size = self.size
                     # Might as well hash such small files entirely.
                     if size <= MIN_FILE_SIZE:
-                self.digest_samples = self.digest
+                        setattr(self, field, self.md5)
                         return
-            self.digest_samples = filesdb.get(self.path, "digest_samples")
+
-            if self.digest_samples is None:
+                    # Chunk at 25% of the file
-                self.digest_samples = self._calc_digest_samples()
+                    fp.seek(floor(size * 25 / 100), 0)
-                filesdb.put(self.path, "digest_samples", self.digest_samples)
+                    filedata = fp.read(CHUNK_SIZE)
+                    md5 = hashlib.md5(filedata)
+
+                    # Chunk at 60% of the file
+                    fp.seek(floor(size * 60 / 100), 0)
+                    filedata = fp.read(CHUNK_SIZE)
+                    md5.update(filedata)
+
+                    # Last chunk of the file
+                    fp.seek(-CHUNK_SIZE, 2)
+                    filedata = fp.read(CHUNK_SIZE)
+                    md5.update(filedata)
+                    setattr(self, field, md5.digest())
+            except Exception as e:
+                logging.error(f"Error computing md5samples: {e}")
 
     def _read_all_info(self, attrnames=None):
         """Cache all possible info.
@@ -321,25 +277,17 @@ class File:
     @classmethod
     def can_handle(cls, path):
         """Returns whether this file wrapper class can handle ``path``."""
-        return not path.is_symlink() and path.is_file()
+        return not path.islink() and path.isfile()
-
-    def exists(self) -> bool:
-        """Safely check if the underlying file exists, treat error as non-existent"""
-        try:
-            return self.path.exists()
-        except OSError as ex:
-            logging.warning(f"Checking {self.path} raised: {ex}")
-            return False
 
     def rename(self, newname):
         if newname == self.name:
             return
-        destpath = self.path.parent.joinpath(newname)
+        destpath = self.path.parent()[newname]
         if destpath.exists():
-            raise AlreadyExistsError(newname, self.path.parent)
+            raise AlreadyExistsError(newname, self.path.parent())
         try:
             self.path.rename(destpath)
-        except OSError:
+        except EnvironmentError:
             raise OperationError(self)
         if not destpath.exists():
             raise OperationError(self)
@@ -360,20 +308,19 @@ class File:
 
     @property
     def folder_path(self):
-        return self.path.parent
+        return self.path.parent()
 
 
 class Folder(File):
     """A wrapper around a folder path.
 
-    It has the size/digest info of a File, but its value is the sum of its subitems.
+    It has the size/md5 info of a File, but its value is the sum of its subitems.
     """
 
     __slots__ = File.__slots__ + ("_subfolders",)
 
     def __init__(self, path):
         File.__init__(self, path)
-        self.size = NOT_SET
         self._subfolders = None
 
     def _all_items(self):
@@ -388,31 +335,31 @@ class Folder(File):
             self.size = size
             stats = self.path.stat()
             self.mtime = nonone(stats.st_mtime, 0)
-        elif field in {"digest", "digest_partial", "digest_samples"}:
+        elif field in {"md5", "md5partial", "md5samples"}:
             # What's sensitive here is that we must make sure that subfiles'
-            # digest are always added up in the same order, but we also want a
+            # md5 are always added up in the same order, but we also want a
-            # different digest if a file gets moved in a different subdirectory.
+            # different md5 if a file gets moved in a different subdirectory.
 
-            def get_dir_digest_concat():
+            def get_dir_md5_concat():
                 items = self._all_items()
                 items.sort(key=lambda f: f.path)
-                digests = [getattr(f, field) for f in items]
+                md5s = [getattr(f, field) for f in items]
-                return b"".join(digests)
+                return b"".join(md5s)
 
-            digest = hasher(get_dir_digest_concat()).digest()
+            md5 = hashlib.md5(get_dir_md5_concat())
+            digest = md5.digest()
             setattr(self, field, digest)
 
     @property
     def subfolders(self):
         if self._subfolders is None:
-            with os.scandir(self.path) as iter:
+            subfolders = [p for p in self.path.listdir() if not p.islink() and p.isdir()]
-                subfolders = [p for p in iter if not p.is_symlink() and p.is_dir()]
             self._subfolders = [self.__class__(p) for p in subfolders]
         return self._subfolders
 
     @classmethod
     def can_handle(cls, path):
-        return not path.is_symlink() and path.is_dir()
+        return not path.islink() and path.isdir()
 
 
 def get_file(path, fileclasses=[File]):
@@ -437,11 +384,10 @@ def get_files(path, fileclasses=[File]):
     assert all(issubclass(fileclass, File) for fileclass in fileclasses)
     try:
         result = []
-        with os.scandir(path) as iter:
+        for path in path.listdir():
-            for item in iter:
+            file = get_file(path, fileclasses=fileclasses)
-                file = get_file(item, fileclasses=fileclasses)
             if file is not None:
                 result.append(file)
         return result
-    except OSError:
+    except EnvironmentError:
         raise InvalidPath(path)

core/gui/details_panel.py

@@ -7,7 +7,7 @@
 # http://www.gnu.org/licenses/gpl-3.0.html
 
 from hscommon.gui.base import GUIObject
-from core.gui.base import DupeGuruGUIObject
+from .base import DupeGuruGUIObject
 
 
 class DetailsPanel(GUIObject, DupeGuruGUIObject):

core/gui/directory_tree.py

@@ -8,8 +8,8 @@
 
 from hscommon.gui.tree import Tree, Node
 
-from core.directories import DirectoryState
+from ..directories import DirectoryState
-from core.gui.base import DupeGuruGUIObject
+from .base import DupeGuruGUIObject
 
 STATE_ORDER = [DirectoryState.NORMAL, DirectoryState.REFERENCE, DirectoryState.EXCLUDED]
 

core/gui/exclude_list_dialog.py

@@ -5,7 +5,7 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from core.gui.exclude_list_table import ExcludeListTable
+from .exclude_list_table import ExcludeListTable
 from core.exclude import has_sep
 from os import sep
 import logging

core/gui/exclude_list_table.py

@@ -2,7 +2,7 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from core.gui.base import DupeGuruGUIObject
+from .base import DupeGuruGUIObject
 from hscommon.gui.table import GUITable, Row
 from hscommon.gui.column import Column, Columns
 from hscommon.trans import trget

core/gui/ignore_list_dialog.py

@@ -6,7 +6,7 @@
 # http://www.gnu.org/licenses/gpl-3.0.html
 
 from hscommon.trans import tr
-from core.gui.ignore_list_table import IgnoreListTable
+from .ignore_list_table import IgnoreListTable
 
 
 class IgnoreListDialog:

core/gui/problem_dialog.py

@@ -8,7 +8,7 @@
 
 from hscommon import desktop
 
-from core.gui.problem_table import ProblemTable
+from .problem_table import ProblemTable
 
 
 class ProblemDialog:

core/gui/result_table.py

@@ -11,7 +11,7 @@ from operator import attrgetter
 from hscommon.gui.table import GUITable, Row
 from hscommon.gui.column import Columns
 
-from core.gui.base import DupeGuruGUIObject
+from .base import DupeGuruGUIObject
 
 
 class DupeRow(Row):

core/gui/stats_label.py

@@ -6,7 +6,7 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from core.gui.base import DupeGuruGUIObject
+from .base import DupeGuruGUIObject
 
 
 class StatsLabel(DupeGuruGUIObject):

core/me/__init__.py

@@ -1 +1 @@
-from core.me import fs, prioritize, result_table, scanner  # noqa
+from . import fs, prioritize, result_table, scanner  # noqa

core/me/fs.py

@@ -97,6 +97,11 @@ class MusicFile(fs.File):
             "dupe_count": format_dupe_count(dupe_count),
         }
 
+    def _get_md5partial_offset_and_size(self):
+        # No longer calculating the offset and audio size, just whole file
+        size = self.path.stat().st_size
+        return (0, size)
+
     def _read_info(self, field):
         fs.File._read_info(self, field)
         if field in TAG_FIELDS:

core/pe/__init__.py

@@ -1,7 +1,8 @@
-from core.pe import (  # noqa
+from . import (  # noqa
     block,
     cache,
     exif,
+    iphoto_plist,
     matchblock,
     matchexif,
     photo,

core/pe/block.py

@@ -6,7 +6,7 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from core.pe._block import NoBlocksError, DifferentBlockCountError, avgdiff, getblocks2  # NOQA
+from ._block import NoBlocksError, DifferentBlockCountError, avgdiff, getblocks2  # NOQA
 
 # Converted to C
 # def getblock(image):

core/pe/block.pyi

@@ -1,13 +0,0 @@
-from typing import Tuple, List, Union, Sequence
-
-_block = Tuple[int, int, int]
-
-class NoBlocksError(Exception): ...  # noqa: E302, E701
-class DifferentBlockCountError(Exception): ...  # noqa E701
-
-def getblock(image: object) -> Union[_block, None]: ...  # noqa: E302
-def getblocks2(image: object, block_count_per_side: int) -> Union[List[_block], None]: ...
-def diff(first: _block, second: _block) -> int: ...
-def avgdiff(  # noqa: E302
-    first: Sequence[_block], second: Sequence[_block], limit: int = 768, min_iterations: int = 1
-) -> Union[int, None]: ...

core/pe/cache.py

@@ -4,13 +4,24 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from core.pe._cache import bytes_to_colors  # noqa
+from ._cache import string_to_colors  # noqa
 
 
-def colors_to_bytes(colors):
+def colors_to_string(colors):
-    """Transform the 3 sized tuples 'colors' into a bytes string.
+    """Transform the 3 sized tuples 'colors' into a hex string.
 
-    [(0,100,255)] --> b'\x00d\xff'
+    [(0,100,255)] --> 0064ff
-    [(1,2,3),(4,5,6)] --> b'\x01\x02\x03\x04\x05\x06'
+    [(1,2,3),(4,5,6)] --> 010203040506
     """
-    return b"".join(map(bytes, 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):
+#     """Transform the string 's' in a list of 3 sized tuples.
+#     """
+#     result = []
+#     for i in xrange(0, len(s), 6):
+#         number = int(s[i:i+6], 16)
+#         result.append((number >> 16, (number >> 8) & 0xff, number & 0xff))
+#     return result

core/pe/cache.pyi

@@ -1,6 +0,0 @@
-from typing import Union, Tuple, List
-
-_block = Tuple[int, int, int]
-
-def colors_to_bytes(colors: List[_block]) -> bytes: ...  # noqa: E302
-def bytes_to_colors(s: bytes) -> Union[List[_block], None]: ...

core/pe/cache_shelve.py

@@ -0,0 +1,141 @@
+# 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

@@ -9,24 +9,12 @@ import os.path as op
 import logging
 import sqlite3 as sqlite
 
-from core.pe.cache import bytes_to_colors, colors_to_bytes
+from .cache import string_to_colors, colors_to_string
 
 
 class SqliteCache:
     """A class to cache picture blocks in a sqlite backend."""
 
-    schema_version = 2
-    schema_version_description = "Added blocks for all 8 orientations."
-
-    create_table_query = (
-        "CREATE TABLE IF NOT EXISTS "
-        "pictures(path TEXT, mtime_ns INTEGER, blocks BLOB, blocks2 BLOB, blocks3 BLOB, "
-        "blocks4 BLOB, blocks5 BLOB, blocks6 BLOB, blocks7 BLOB, blocks8 BLOB)"
-    )
-    create_index_query = "CREATE INDEX IF NOT EXISTS idx_path on pictures (path)"
-    drop_table_query = "DROP TABLE IF EXISTS pictures"
-    drop_index_query = "DROP INDEX IF EXISTS idx_path"
-
     def __init__(self, db=":memory:", readonly=False):
         # readonly is not used in the sqlite version of the cache
         self.dbname = db
@@ -47,20 +35,12 @@ class SqliteCache:
     # Optimized
     def __getitem__(self, key):
         if isinstance(key, int):
-            sql = (
+            sql = "select blocks from pictures where rowid = ?"
-                "select blocks, blocks2, blocks3, blocks4, blocks5, blocks6, blocks7, blocks8 "
-                "from pictures "
-                "where rowid = ?"
-            )
         else:
-            sql = (
+            sql = "select blocks from pictures where path = ?"
-                "select blocks, blocks2, blocks3, blocks4, blocks5, blocks6, blocks7, blocks8 "
+        result = self.con.execute(sql, [key]).fetchone()
-                "from pictures "
+        if result:
-                "where path = ?"
+            result = string_to_colors(result[0])
-            )
-        blocks = self.con.execute(sql, [key]).fetchone()
-        if blocks:
-            result = [bytes_to_colors(block) for block in blocks]
             return result
         else:
             raise KeyError(key)
@@ -76,33 +56,35 @@ class SqliteCache:
         return result[0][0]
 
     def __setitem__(self, path_str, blocks):
-        blocks = [colors_to_bytes(block) for block in 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 = (
+            sql = "update pictures set blocks = ?, mtime = ? where path = ?"
-                "update pictures set blocks = ?, blocks2 = ?, blocks3 = ?, blocks4 = ?, blocks5 = ?, blocks6 = ?, "
-                "blocks7 = ?, blocks8 = ?, mtime_ns = ?"
-                "where path = ?"
-            )
         else:
-            sql = (
+            sql = "insert into pictures(blocks,mtime,path) values(?,?,?)"
-                "insert into pictures(blocks,blocks2,blocks3,blocks4,blocks5,blocks6,blocks7,blocks8,mtime_ns,path) "
-                "values(?,?,?,?,?,?,?,?,?,?)"
-            )
         try:
-            self.con.execute(sql, blocks + [mtime, path_str])
+            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):
-        try:
+        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)
-            self._check_upgrade()
+        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
@@ -111,25 +93,6 @@ class SqliteCache:
             os.remove(self.dbname)
             self._create_con(second_try=True)
 
-    def _check_upgrade(self) -> None:
-        with self.con as conn:
-            has_schema = conn.execute(
-                "SELECT NAME FROM sqlite_master WHERE type='table' AND name='schema_version'"
-            ).fetchall()
-            version = None
-            if has_schema:
-                version = conn.execute("SELECT version FROM schema_version ORDER BY version DESC").fetchone()[0]
-            else:
-                conn.execute("CREATE TABLE schema_version (version int PRIMARY KEY, description TEXT)")
-            if version != self.schema_version:
-                conn.execute(self.drop_table_query)
-                conn.execute(
-                    "INSERT OR REPLACE INTO schema_version VALUES (:version, :description)",
-                    {"version": self.schema_version, "description": self.schema_version_description},
-                )
-            conn.execute(self.create_table_query)
-            conn.execute(self.create_index_query)
-
     def clear(self):
         self.close()
         if self.dbname != ":memory:":
@@ -155,28 +118,9 @@ class SqliteCache:
             raise ValueError(path)
 
     def get_multiple(self, rowids):
-        ids = ",".join(map(str, rowids))
+        sql = "select rowid, blocks from pictures where rowid in (%s)" % ",".join(map(str, rowids))
-        sql = (
-            "select rowid, blocks, blocks2, blocks3, blocks4, blocks5, blocks6, blocks7, blocks8 "
-            f"from pictures where rowid in ({ids})"
-        )
         cur = self.con.execute(sql)
-        return (
+        return ((rowid, string_to_colors(blocks)) for rowid, blocks in cur)
-            (
-                rowid,
-                [
-                    bytes_to_colors(blocks),
-                    bytes_to_colors(blocks2),
-                    bytes_to_colors(blocks3),
-                    bytes_to_colors(blocks4),
-                    bytes_to_colors(blocks5),
-                    bytes_to_colors(blocks6),
-                    bytes_to_colors(blocks7),
-                    bytes_to_colors(blocks8),
-                ],
-            )
-            for rowid, blocks, blocks2, blocks3, blocks4, blocks5, blocks6, blocks7, blocks8 in cur
-        )
 
     def purge_outdated(self):
         """Go through the cache and purge outdated records.
@@ -185,12 +129,12 @@ class SqliteCache:
         the db.
         """
         todelete = []
-        sql = "select rowid, path, mtime_ns from pictures"
+        sql = "select rowid, path, mtime from pictures"
         cur = self.con.execute(sql)
-        for rowid, path_str, mtime_ns in cur:
+        for rowid, path_str, mtime in cur:
-            if mtime_ns and op.exists(path_str):
+            if mtime and op.exists(path_str):
                 picture_mtime = os.stat(path_str).st_mtime
-                if int(picture_mtime) <= mtime_ns:
+                if int(picture_mtime) <= mtime:
                     # not outdated
                     continue
             todelete.append(rowid)

core/pe/iphoto_plist.py

@@ -0,0 +1,33 @@
+# Created By: Virgil Dupras
+# Created On: 2014-03-15
+# 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 plistlib
+
+
+class IPhotoPlistParser(plistlib._PlistParser):
+    """A parser for iPhoto plists.
+
+    iPhoto plists tend to be malformed, so we have to subclass the built-in parser to be a bit more
+    lenient.
+    """
+
+    def __init__(self):
+        plistlib._PlistParser.__init__(self, use_builtin_types=True, dict_type=dict)
+        # For debugging purposes, we remember the last bit of data to be analyzed so that we can
+        # log it in case of an exception
+        self.lastdata = ""
+
+    def get_data(self):
+        self.lastdata = plistlib._PlistParser.get_data(self)
+        return self.lastdata
+
+    def end_integer(self):
+        try:
+            self.add_object(int(self.get_data()))
+        except ValueError:
+            self.add_object(0)

core/pe/matchblock.py

@@ -15,8 +15,7 @@ from hscommon.trans import tr
 from hscommon.jobprogress import job
 
 from core.engine import Match
-from core.pe.block import avgdiff, DifferentBlockCountError, NoBlocksError
+from .block import avgdiff, DifferentBlockCountError, NoBlocksError
-from core.pe.cache_sqlite import SqliteCache
 
 # OPTIMIZATION NOTES:
 # The bottleneck of the matching phase is CPU, which is why we use multiprocessing. However, another
@@ -28,7 +27,7 @@ from core.pe.cache_sqlite import SqliteCache
 # to files in other chunks. So chunkifying doesn't save us any actual comparison, but the advantage
 # is that instead of reading blocks from disk number_of_files**2 times, we read it
 # number_of_files*number_of_chunks times.
-# Determining the right chunk size is tricky, because if it's too big, too many blocks will be in
+# Determining the right chunk size is tricky, bceause if it's too big, too many blocks will be in
 # memory at the same time and we might end up with memory trashing, which is awfully slow. So,
 # because our *real* bottleneck is CPU, the chunk size must simply be enough so that the CPU isn't
 # starved by Disk IOs.
@@ -51,10 +50,17 @@ except Exception:
 
 
 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, match_rotated, j=job.nulljob):
+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
@@ -72,21 +78,16 @@ def prepare_pictures(pictures, cache_path, with_dimensions, match_rotated, j=job
                 # entry in iPhoto library.
                 logging.warning("We have a picture with a null path here")
                 continue
+            picture.unicode_path = str(picture.path)
             logging.debug("Analyzing picture at %s", picture.unicode_path)
             if with_dimensions:
                 picture.dimensions  # pre-read dimensions
             try:
-                if picture.unicode_path not in cache or (
+                if picture.unicode_path not in cache:
-                    match_rotated and any(block == [] for block in cache[picture.unicode_path])
+                    blocks = picture.get_blocks(BLOCK_COUNT_PER_SIDE)
-                ):
-                    if match_rotated:
-                        blocks = [picture.get_blocks(BLOCK_COUNT_PER_SIDE, orientation) for orientation in range(1, 9)]
-                    else:
-                        blocks = [[]] * 8
-                        blocks[max(picture.get_orientation() - 1, 0)] = picture.get_blocks(BLOCK_COUNT_PER_SIDE)
                     cache[picture.unicode_path] = blocks
                 prepared.append(picture)
-            except (OSError, ValueError) as e:
+            except (IOError, ValueError) as e:
                 logging.warning(str(e))
             except MemoryError:
                 logging.warning(
@@ -124,13 +125,13 @@ def get_match(first, second, percentage):
     return Match(first, second, percentage)
 
 
-def async_compare(ref_ids, other_ids, dbname, threshold, picinfo, match_rotated=False):
+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 = get_cache(dbname, readonly=True)
     limit = 100 - threshold
-    ref_pairs = list(cache.get_multiple(ref_ids))  # (rowid, [b, b2, ..., b8])
+    ref_pairs = list(cache.get_multiple(ref_ids))
     if other_ids is not None:
         other_pairs = list(cache.get_multiple(other_ids))
         comparisons_to_do = [(r, o) for r in ref_pairs for o in other_pairs]
@@ -143,35 +144,22 @@ def async_compare(ref_ids, other_ids, dbname, threshold, picinfo, match_rotated=
         if ref_is_ref and other_is_ref:
             continue
         if ref_dimensions != other_dimensions:
-            if match_rotated:
-                rotated_ref_dimensions = (ref_dimensions[1], ref_dimensions[0])
-                if rotated_ref_dimensions != other_dimensions:
             continue
-            else:
-                continue
-
-        orientation_range = 1
-        if match_rotated:
-            orientation_range = 8
-
-        for orientation_ref in range(orientation_range):
         try:
-                diff = avgdiff(ref_blocks[orientation_ref], other_blocks[0], limit, MIN_ITERATIONS)
+            diff = avgdiff(ref_blocks, other_blocks, limit, MIN_ITERATIONS)
             percentage = 100 - diff
         except (DifferentBlockCountError, NoBlocksError):
             percentage = 0
         if percentage >= threshold:
             results.append((ref_id, other_id, percentage))
-                break
-
     cache.close()
     return results
 
 
-def getmatches(pictures, cache_path, threshold, match_scaled=False, match_rotated=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, None), p.is_ref)
+            return (None, p.is_ref)
         else:
             return (p.dimensions, p.is_ref)
 
@@ -193,7 +181,7 @@ def getmatches(pictures, cache_path, threshold, match_scaled=False, match_rotate
         j.set_progress(comparison_count, progress_msg)
 
     j = j.start_subjob([3, 7])
-    pictures = prepare_pictures(pictures, cache_path, not match_scaled, match_rotated, j=j)
+    pictures = prepare_pictures(pictures, cache_path, with_dimensions=not match_scaled, j=j)
     j = j.start_subjob([9, 1], tr("Preparing for matching"))
     cache = get_cache(cache_path)
     id2picture = {}
@@ -223,7 +211,7 @@ def getmatches(pictures, cache_path, threshold, match_scaled=False, match_rotate
                 picinfo.update({p.cache_id: get_picinfo(p) for p in other_chunk})
             else:
                 other_ids = None
-            args = (ref_ids, other_ids, cache_path, threshold, picinfo, match_rotated)
+            args = (ref_ids, other_ids, cache_path, threshold, picinfo)
             async_results.append(pool.apply_async(async_compare, args))
             collect_results()
         collect_results(collect_all=True)
@@ -250,7 +238,7 @@ def getmatches(pictures, cache_path, threshold, match_scaled=False, match_rotate
     for ref_id, other_id, percentage in myiter:
         ref = id2picture[ref_id]
         other = id2picture[other_id]
-        if percentage == 100 and ref.digest != other.digest:
+        if percentage == 100 and ref.md5 != other.md5:
             percentage = 99
         if percentage >= threshold:
             ref.dimensions  # pre-read dimensions for display in results

core/pe/modules/cache.c

@@ -2,36 +2,58 @@
  * Created On: 2010-01-30
  * Copyright 2014 Hardcoded Software (http://www.hardcoded.net)
  *
- * This software is licensed under the "BSD" License as described in the
+ * This software is licensed under the "BSD" License as described in the "LICENSE" file, 
- * "LICENSE" file, which should be included with this package. The terms are
+ * which should be included with this package. The terms are also available at 
- * also available at http://www.hardcoded.net/licenses/bsd_license
+ * http://www.hardcoded.net/licenses/bsd_license
  */
 
 #include "common.h"
 
-static PyObject *cache_bytes_to_colors(PyObject *self, PyObject *args) {
+/* I know that there strtol out there, but it requires a pointer to
-  char *y;
+ * a char, which would in turn require me to buffer my chars around,
-  Py_ssize_t char_count, i, color_count;
+ * making the whole process slower.
-  PyObject *result;
+ */
-  unsigned long r, g, b;
+static long
-  Py_ssize_t ci;
+xchar_to_long(char c)
-  PyObject *color_tuple;
+{
+    if ((c >= 48) && (c <= 57)) { /* 0-9 */
+        return c - 48;
+    }
+    else if ((c >= 65) && (c <= 70)) { /* A-F */
+        return c - 55;
+    }
+    else if ((c >= 97) && (c <= 102)) { /* a-f */
+        return c - 87;
+    }
+    return 0;
+}
 
-  if (!PyArg_ParseTuple(args, "y#", &y, &char_count)) {
+static PyObject*
+cache_string_to_colors(PyObject *self, PyObject *args)
+{
+    char *s;
+    Py_ssize_t char_count, color_count, i;
+    PyObject *result;
+    
+    if (!PyArg_ParseTuple(args, "s#", &s, &char_count)) {
         return NULL;
     }
     
-  color_count = char_count / 3;
+    color_count = (char_count / 6);
     result = PyList_New(color_count);
     if (result == NULL) {
         return NULL;
     }
     
     for (i=0; i<color_count; i++) {
-    ci = i * 3;
+        long r, g, b;
-    r = (unsigned char)y[ci];
+        Py_ssize_t ci;
-    g = (unsigned char)y[ci + 1];
+        PyObject *color_tuple;
-    b = (unsigned char)y[ci + 2];
+        
+        ci = i * 6;
+        r = (xchar_to_long(s[ci]) << 4) + xchar_to_long(s[ci+1]);
+        g = (xchar_to_long(s[ci+2]) << 4) + xchar_to_long(s[ci+3]);
+        b = (xchar_to_long(s[ci+4]) << 4) + xchar_to_long(s[ci+5]);
         
         color_tuple = inttuple(3, r, g, b);
         if (color_tuple == NULL) {
@@ -45,12 +67,13 @@ static PyObject *cache_bytes_to_colors(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef CacheMethods[] = {
-    {"bytes_to_colors", cache_bytes_to_colors, METH_VARARGS,
+    {"string_to_colors",  cache_string_to_colors, METH_VARARGS,
-     "Transform the bytes 's' into a list of 3 sized tuples."},
+     "Transform the string 's' in a list of 3 sized tuples."},
     {NULL, NULL, 0, NULL}        /* Sentinel */
 };
 
-static struct PyModuleDef CacheDef = {PyModuleDef_HEAD_INIT,
+static struct PyModuleDef CacheDef = {
+    PyModuleDef_HEAD_INIT,
     "_cache",
     NULL,
     -1,
@@ -58,9 +81,12 @@ static struct PyModuleDef CacheDef = {PyModuleDef_HEAD_INIT,
     NULL,
     NULL,
     NULL,
-                                      NULL};
+    NULL
+};
 
-PyObject *PyInit__cache(void) {
+PyObject *
+PyInit__cache(void)
+{
     PyObject *m = PyModule_Create(&CacheDef);
     if (m == NULL) {
         return NULL;

core/pe/modules/common.c

@@ -32,7 +32,7 @@ PyObject* inttuple(int n, ...)
     result = PyTuple_New(n);
     
     for (i=0; i<n; i++) {
-        pnumber = PyLong_FromUnsignedLong(va_arg(numbers, long));
+        pnumber = PyLong_FromLong(va_arg(numbers, long));
         if (pnumber == NULL) {
             Py_DECREF(result);
             return NULL;

core/pe/photo.py

@@ -9,7 +9,7 @@ from hscommon.util import get_file_ext, format_size
 
 from core.util import format_timestamp, format_perc, format_dupe_count
 from core import fs
-from core.pe import exif
+from . import exif
 
 # This global value is set by the platform-specific subclasser of the Photo base class
 PLAT_SPECIFIC_PHOTO_CLASS = None
@@ -29,7 +29,7 @@ class Photo(fs.File):
     __slots__ = fs.File.__slots__ + tuple(INITIAL_INFO.keys())
 
     # These extensions are supported on all platforms
-    HANDLED_EXTS = {"png", "jpg", "jpeg", "gif", "bmp", "tiff", "tif", "webp"}
+    HANDLED_EXTS = {"png", "jpg", "jpeg", "gif", "bmp", "tiff", "tif"}
 
     def _plat_get_dimensions(self):
         raise NotImplementedError()
@@ -37,7 +37,7 @@ class Photo(fs.File):
     def _plat_get_blocks(self, block_count_per_side, orientation):
         raise NotImplementedError()
 
-    def get_orientation(self):
+    def _get_orientation(self):
         if not hasattr(self, "_cached_orientation"):
             try:
                 with self.path.open("rb") as fp:
@@ -95,13 +95,10 @@ class Photo(fs.File):
         fs.File._read_info(self, field)
         if field == "dimensions":
             self.dimensions = self._plat_get_dimensions()
-            if self.get_orientation() in {5, 6, 7, 8}:
+            if self._get_orientation() in {5, 6, 7, 8}:
                 self.dimensions = (self.dimensions[1], self.dimensions[0])
         elif field == "exif_timestamp":
             self.exif_timestamp = self._get_exif_timestamp()
 
-    def get_blocks(self, block_count_per_side, orientation: int = None):
+    def get_blocks(self, block_count_per_side):
-        if orientation is None:
+        return self._plat_get_blocks(block_count_per_side, self._get_orientation())
-            return self._plat_get_blocks(block_count_per_side, self.get_orientation())
-        else:
-            return self._plat_get_blocks(block_count_per_side, orientation)

core/pe/scanner.py

@@ -8,13 +8,12 @@ from hscommon.trans import tr
 
 from core.scanner import Scanner, ScanType, ScanOption
 
-from core.pe import matchblock, matchexif
+from . import matchblock, matchexif
 
 
 class ScannerPE(Scanner):
     cache_path = None
     match_scaled = False
-    match_rotated = False
 
     @staticmethod
     def get_scan_options():
@@ -30,7 +29,6 @@ class ScannerPE(Scanner):
                 cache_path=self.cache_path,
                 threshold=self.min_match_percentage,
                 match_scaled=self.match_scaled,
-                match_rotated=self.match_rotated,
                 j=j,
             )
         elif self.scan_type == ScanType.EXIFTIMESTAMP:

core/prioritize.py

@@ -43,7 +43,7 @@ class Criterion:
 
     @property
     def display(self):
-        return f"{self.category.NAME} ({self.display_value})"
+        return "{} ({})".format(self.category.NAME, self.display_value)
 
 
 class ValueListCategory(CriterionCategory):
@@ -82,12 +82,10 @@ class FolderCategory(ValueListCategory):
 
     def sort_key(self, dupe, crit_value):
         value = self.extract_value(dupe)
-        # This is instead of using is_relative_to() which was added in py 3.9
+        if value[: len(crit_value)] == crit_value:
-        try:
-            value.relative_to(crit_value)
-        except ValueError:
-            return 1
             return 0
+        else:
+            return 1
 
 
 class FilenameCategory(CriterionCategory):
@@ -96,8 +94,6 @@ class FilenameCategory(CriterionCategory):
     DOESNT_END_WITH_NUMBER = 1
     LONGEST = 2
     SHORTEST = 3
-    LONGEST_PATH = 4
-    SHORTEST_PATH = 5
 
     def format_criterion_value(self, value):
         return {
@@ -105,8 +101,6 @@ class FilenameCategory(CriterionCategory):
             self.DOESNT_END_WITH_NUMBER: tr("Doesn't end with number"),
             self.LONGEST: tr("Longest"),
             self.SHORTEST: tr("Shortest"),
-            self.LONGEST_PATH: tr("Longest Path"),
-            self.SHORTEST_PATH: tr("Shortest Path"),
         }[value]
 
     def extract_value(self, dupe):
@@ -120,10 +114,6 @@ class FilenameCategory(CriterionCategory):
                 return 0 if ends_with_digit else 1
             else:
                 return 1 if ends_with_digit else 0
-        elif crit_value == self.LONGEST_PATH:
-            return len(str(dupe.folder_path)) * -1
-        elif crit_value == self.SHORTEST_PATH:
-            return len(str(dupe.folder_path))
         else:
             value = len(value)
             if crit_value == self.LONGEST:
@@ -138,8 +128,6 @@ class FilenameCategory(CriterionCategory):
                 self.DOESNT_END_WITH_NUMBER,
                 self.LONGEST,
                 self.SHORTEST,
-                self.LONGEST_PATH,
-                self.SHORTEST_PATH,
             ]
         ]
 

core/results.py

@@ -10,7 +10,6 @@ import logging
 import re
 import os
 import os.path as op
-from errno import EISDIR, EACCES
 from xml.etree import ElementTree as ET
 
 from hscommon.jobprogress.job import nulljob
@@ -18,8 +17,8 @@ from hscommon.conflict import get_conflicted_name
 from hscommon.util import flatten, nonone, FileOrPath, format_size
 from hscommon.trans import tr
 
-from core import engine
+from . import engine
-from core.markable import Markable
+from .markable import Markable
 
 
 class Results(Markable):
@@ -192,7 +191,7 @@ class Results(Markable):
             self.__filters.append(filter_str)
             if self.__filtered_dupes is None:
                 self.__filtered_dupes = flatten(g[:] for g in self.groups)
-            self.__filtered_dupes = {dupe for dupe in self.__filtered_dupes if filter_re.search(str(dupe.path))}
+            self.__filtered_dupes = set(dupe for dupe in self.__filtered_dupes if filter_re.search(str(dupe.path)))
             filtered_groups = set()
             for dupe in self.__filtered_dupes:
                 filtered_groups.add(self.get_group_of_duplicate(dupe))
@@ -302,7 +301,7 @@ class Results(Markable):
             try:
                 func(dupe)
                 to_remove.append(dupe)
-            except (OSError, UnicodeEncodeError) as e:
+            except (EnvironmentError, UnicodeEncodeError) as e:
                 self.problems.append((dupe, str(e)))
         if remove_from_results:
             self.remove_duplicates(to_remove)
@@ -375,10 +374,10 @@ class Results(Markable):
 
         try:
             do_write(outfile)
-        except OSError as e:
+        except IOError as e:
-            # If our OSError is because dest is already a directory, we want to handle that. 21 is
+            # If our IOError is because dest is already a directory, we want to handle that. 21 is
-            # the code we get on OS X and Linux (EISDIR), 13 is what we get on Windows (EACCES).
+            # the code we get on OS X and Linux, 13 is what we get on Windows.
-            if e.errno in (EISDIR, EACCES):
+            if e.errno in {21, 13}:
                 p = str(outfile)
                 dirname, basename = op.split(p)
                 otherfiles = os.listdir(dirname)

core/scanner.py

@@ -13,7 +13,7 @@ from hscommon.jobprogress import job
 from hscommon.util import dedupe, rem_file_ext, get_file_ext
 from hscommon.trans import tr
 
-from core import engine
+from . import engine
 
 # It's quite ugly to have scan types from all editions all put in the same class, but because there's
 # there will be some nasty bugs popping up (ScanType is used in core when in should exclusively be
@@ -87,6 +87,8 @@ class Scanner:
             }
         ):
             j = j.start_subjob([2, 8])
+            for f in j.iter_with_progress(files, tr("Read size of %d/%d files")):
+                f.size  # pre-read, makes a smoother progress if read here (especially for bundles)
             if self.size_threshold:
                 files = [f for f in files if f.size >= self.size_threshold]
             if self.large_size_threshold:
@@ -132,7 +134,7 @@ class Scanner:
             return False
         if is_same_with_digit(refname, dupename):
             return True
-        return len(dupe.path.parts) > len(ref.path.parts)
+        return len(dupe.path) > len(ref.path)
 
     @staticmethod
     def get_scan_options():
@@ -162,17 +164,14 @@ class Scanner:
             toremove = set()
             last_parent_path = sortedpaths[0]
             for p in sortedpaths[1:]:
-                if last_parent_path in p.parents:
+                if p in last_parent_path:
                     toremove.add(p)
                 else:
                     last_parent_path = p
             matches = [m for m in matches if m.first.path not in toremove or m.second.path not in toremove]
         if not self.mix_file_kind:
             matches = [m for m in matches if get_file_ext(m.first.name) == get_file_ext(m.second.name)]
-        if self.include_exists_check:
+        matches = [m for m in matches if m.first.path.exists() and m.second.path.exists()]
-            matches = [m for m in matches if m.first.exists() and m.second.exists()]
-        # Contents already handles ref checks, other scan types might not catch during scan
-        if self.scan_type != ScanType.CONTENTS:
         matches = [m for m in matches if not (m.first.is_ref and m.second.is_ref)]
         if ignore_list:
             matches = [m for m in matches if not ignore_list.are_ignored(str(m.first.path), str(m.second.path))]
@@ -213,4 +212,3 @@ class Scanner:
     large_size_threshold = 0
     big_file_size_threshold = 0
     word_weighting = False
-    include_exists_check = True

core/se/__init__.py

@@ -1 +1 @@
-from core.se import fs, result_table, scanner  # noqa
+from . import fs, result_table, scanner  # noqa

core/tests/app_test.py

@@ -7,19 +7,18 @@
 import os
 import os.path as op
 import logging
-import tempfile
 
 import pytest
-from pathlib import Path
+from hscommon.path import Path
 import hscommon.conflict
 import hscommon.util
 from hscommon.testutil import eq_, log_calls
 from hscommon.jobprogress.job import Job
 
-from core.tests.base import TestApp
+from .base import TestApp
-from core.tests.results_test import GetTestGroups
+from .results_test import GetTestGroups
-from core import app, fs, engine
+from .. import app, fs, engine
-from core.scanner import ScanType
+from ..scanner import ScanType
 
 
 def add_fake_files_to_directories(directories, files):
@@ -57,7 +56,7 @@ class TestCaseDupeGuru:
         # for this unit is pathetic. What's done is done. My approach now is to add tests for
         # every change I want to make. The blowup was caused by a missing import.
         p = Path(str(tmpdir))
-        p.joinpath("foo").touch()
+        p["foo"].open("w").close()
         monkeypatch.setattr(
             hscommon.conflict,
             "smart_copy",
@@ -69,23 +68,22 @@ class TestCaseDupeGuru:
         dgapp = TestApp().app
         dgapp.directories.add_path(p)
         [f] = dgapp.directories.get_files()
-        with tempfile.TemporaryDirectory() as tmp_dir:
+        dgapp.copy_or_move(f, True, "some_destination", 0)
-            dgapp.copy_or_move(f, True, tmp_dir, 0)
         eq_(1, len(hscommon.conflict.smart_copy.calls))
         call = hscommon.conflict.smart_copy.calls[0]
-            eq_(call["dest_path"], Path(tmp_dir, "foo"))
+        eq_(call["dest_path"], op.join("some_destination", "foo"))
         eq_(call["source_path"], f.path)
 
     def test_copy_or_move_clean_empty_dirs(self, tmpdir, monkeypatch):
         tmppath = Path(str(tmpdir))
-        sourcepath = tmppath.joinpath("source")
+        sourcepath = tmppath["source"]
         sourcepath.mkdir()
-        sourcepath.joinpath("myfile").touch()
+        sourcepath["myfile"].open("w")
         app = TestApp().app
         app.directories.add_path(tmppath)
         [myfile] = app.directories.get_files()
         monkeypatch.setattr(app, "clean_empty_dirs", log_calls(lambda path: None))
-        app.copy_or_move(myfile, False, tmppath.joinpath("dest"), 0)
+        app.copy_or_move(myfile, False, tmppath["dest"], 0)
         calls = app.clean_empty_dirs.calls
         eq_(1, len(calls))
         eq_(sourcepath, calls[0]["path"])
@@ -97,7 +95,7 @@ class TestCaseDupeGuru:
 
         # At some point, any() was used in a wrong way that made Scan() wrongly return 1
         app = TestApp().app
-        f1, f2 = (FakeFile("foo") for _ in range(2))
+        f1, f2 = [FakeFile("foo") for _ in range(2)]
         f1.is_ref, f2.is_ref = (False, False)
         assert not (bool(f1) and bool(f2))
         add_fake_files_to_directories(app.directories, [f1, f2])
@@ -108,8 +106,8 @@ class TestCaseDupeGuru:
         # If the ignore_hardlink_matches option is set, don't match files hardlinking to the same
         # inode.
         tmppath = Path(str(tmpdir))
-        tmppath.joinpath("myfile").open("wt").write("foo")
+        tmppath["myfile"].open("w").write("foo")
-        os.link(str(tmppath.joinpath("myfile")), str(tmppath.joinpath("hardlink")))
+        os.link(str(tmppath["myfile"]), str(tmppath["hardlink"]))
         app = TestApp().app
         app.directories.add_path(tmppath)
         app.options["scan_type"] = ScanType.CONTENTS
@@ -155,7 +153,7 @@ class TestCaseDupeGuruCleanEmptyDirs:
         # delete_if_empty must be recursively called up in the path until it returns False
         @log_calls
         def mock_delete_if_empty(path, files_to_delete=[]):
-            return len(path.parts) > 1
+            return len(path) > 1
 
         monkeypatch.setattr(hscommon.util, "delete_if_empty", mock_delete_if_empty)
         # XXX This monkeypatch is temporary. will be fixed in a better monkeypatcher.
@@ -182,8 +180,8 @@ class TestCaseDupeGuruWithResults:
         self.rtable.refresh()
         tmpdir = request.getfixturevalue("tmpdir")
         tmppath = Path(str(tmpdir))
-        tmppath.joinpath("foo").mkdir()
+        tmppath["foo"].mkdir()
-        tmppath.joinpath("bar").mkdir()
+        tmppath["bar"].mkdir()
         self.app.directories.add_path(tmppath)
 
     def test_get_objects(self, do_setup):
@@ -426,9 +424,12 @@ class TestCaseDupeGuruRenameSelected:
     def do_setup(self, request):
         tmpdir = request.getfixturevalue("tmpdir")
         p = Path(str(tmpdir))
-        p.joinpath("foo bar 1").touch()
+        fp = open(str(p["foo bar 1"]), mode="w")
-        p.joinpath("foo bar 2").touch()
+        fp.close()
-        p.joinpath("foo bar 3").touch()
+        fp = open(str(p["foo bar 2"]), mode="w")
+        fp.close()
+        fp = open(str(p["foo bar 3"]), mode="w")
+        fp.close()
         files = fs.get_files(p)
         for f in files:
             f.is_ref = False
@@ -450,7 +451,7 @@ class TestCaseDupeGuruRenameSelected:
         g = self.groups[0]
         self.rtable.select([1])
         assert app.rename_selected("renamed")
-        names = [p.name for p in self.p.glob("*")]
+        names = [p.name for p in self.p.listdir()]
         assert "renamed" in names
         assert "foo bar 2" not in names
         eq_(g.dupes[0].name, "renamed")
@@ -463,7 +464,7 @@ class TestCaseDupeGuruRenameSelected:
         assert not app.rename_selected("renamed")
         msg = logging.warning.calls[0]["msg"]
         eq_("dupeGuru Warning: list index out of range", msg)
-        names = [p.name for p in self.p.glob("*")]
+        names = [p.name for p in self.p.listdir()]
         assert "renamed" not in names
         assert "foo bar 2" in names
         eq_(g.dupes[0].name, "foo bar 2")
@@ -476,7 +477,7 @@ class TestCaseDupeGuruRenameSelected:
         assert not app.rename_selected("foo bar 1")
         msg = logging.warning.calls[0]["msg"]
         assert msg.startswith("dupeGuru Warning: 'foo bar 1' already exists in")
-        names = [p.name for p in self.p.glob("*")]
+        names = [p.name for p in self.p.listdir()]
         assert "foo bar 1" in names
         assert "foo bar 2" in names
         eq_(g.dupes[0].name, "foo bar 2")
@@ -487,9 +488,9 @@ class TestAppWithDirectoriesInTree:
     def do_setup(self, request):
         tmpdir = request.getfixturevalue("tmpdir")
         p = Path(str(tmpdir))
-        p.joinpath("sub1").mkdir()
+        p["sub1"].mkdir()
-        p.joinpath("sub2").mkdir()
+        p["sub2"].mkdir()
-        p.joinpath("sub3").mkdir()
+        p["sub3"].mkdir()
         app = TestApp()
         self.app = app.app
         self.dtree = app.dtree

core/tests/base.py

@@ -5,16 +5,17 @@
 # http://www.gnu.org/licenses/gpl-3.0.html
 
 from hscommon.testutil import TestApp as TestAppBase, CallLogger, eq_, with_app  # noqa
-from pathlib import Path
+from hscommon.path import Path
 from hscommon.util import get_file_ext, format_size
 from hscommon.gui.column import Column
 from hscommon.jobprogress.job import nulljob, JobCancelled
 
-from core import engine, prioritize
+from .. import engine
-from core.engine import getwords
+from .. import prioritize
-from core.app import DupeGuru as DupeGuruBase
+from ..engine import getwords
-from core.gui.result_table import ResultTable as ResultTableBase
+from ..app import DupeGuru as DupeGuruBase
-from core.gui.prioritize_dialog import PrioritizeDialog
+from ..gui.result_table import ResultTable as ResultTableBase
+from ..gui.prioritize_dialog import PrioritizeDialog
 
 
 class DupeGuruView:
@@ -85,9 +86,9 @@ class NamedObject:
             folder = "basepath"
         self._folder = Path(folder)
         self.size = size
-        self.digest_partial = name
+        self.md5partial = name
-        self.digest = name
+        self.md5 = name
-        self.digest_samples = name
+        self.md5samples = name
         if with_words:
             self.words = getwords(name)
         self.is_ref = False
@@ -110,11 +111,11 @@ class NamedObject:
 
     @property
     def path(self):
-        return self._folder.joinpath(self.name)
+        return self._folder[self.name]
 
     @property
     def folder_path(self):
-        return self.path.parent
+        return self.path.parent()
 
     @property
     def extension(self):

core/tests/block_test.py

@@ -9,7 +9,7 @@ from pytest import raises, skip
 from hscommon.testutil import eq_
 
 try:
-    from core.pe.block import avgdiff, getblocks2, NoBlocksError, DifferentBlockCountError
+    from ..pe.block import avgdiff, getblocks2, NoBlocksError, DifferentBlockCountError
 except ImportError:
     skip("Can't import the block module, probably hasn't been compiled.")
 

core/tests/cache_test.py

@@ -10,41 +10,41 @@ from pytest import raises, skip
 from hscommon.testutil import eq_
 
 try:
-    from core.pe.cache import colors_to_bytes, bytes_to_colors
+    from ..pe.cache import colors_to_string, string_to_colors
-    from core.pe.cache_sqlite import SqliteCache
+    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.")
 
 
 class TestCaseColorsToString:
     def test_no_color(self):
-        eq_(b"", colors_to_bytes([]))
+        eq_("", colors_to_string([]))
 
     def test_single_color(self):
-        eq_(b"\x00\x00\x00", colors_to_bytes([(0, 0, 0)]))
+        eq_("000000", colors_to_string([(0, 0, 0)]))
-        eq_(b"\x01\x01\x01", colors_to_bytes([(1, 1, 1)]))
+        eq_("010101", colors_to_string([(1, 1, 1)]))
-        eq_(b"\x0a\x14\x1e", colors_to_bytes([(10, 20, 30)]))
+        eq_("0a141e", colors_to_string([(10, 20, 30)]))
 
     def test_two_colors(self):
-        eq_(b"\x00\x01\x02\x03\x04\x05", colors_to_bytes([(0, 1, 2), (3, 4, 5)]))
+        eq_("000102030405", colors_to_string([(0, 1, 2), (3, 4, 5)]))
 
 
 class TestCaseStringToColors:
     def test_empty(self):
-        eq_([], bytes_to_colors(b""))
+        eq_([], string_to_colors(""))
 
     def test_single_color(self):
-        eq_([(0, 0, 0)], bytes_to_colors(b"\x00\x00\x00"))
+        eq_([(0, 0, 0)], string_to_colors("000000"))
-        eq_([(2, 3, 4)], bytes_to_colors(b"\x02\x03\x04"))
+        eq_([(2, 3, 4)], string_to_colors("020304"))
-        eq_([(10, 20, 30)], bytes_to_colors(b"\x0a\x14\x1e"))
+        eq_([(10, 20, 30)], string_to_colors("0a141e"))
 
     def test_two_colors(self):
-        eq_([(10, 20, 30), (40, 50, 60)], bytes_to_colors(b"\x0a\x14\x1e\x28\x32\x3c"))
+        eq_([(10, 20, 30), (40, 50, 60)], string_to_colors("0a141e28323c"))
 
     def test_incomplete_color(self):
         # don't return anything if it's not a complete color
-        eq_([], bytes_to_colors(b"\x01"))
+        eq_([], string_to_colors("102"))
-        eq_([(1, 2, 3)], bytes_to_colors(b"\x01\x02\x03\x04"))
 
 
 class BaseTestCaseCache:
@@ -59,13 +59,13 @@ class BaseTestCaseCache:
 
     def test_set_then_retrieve_blocks(self):
         c = self.get_cache()
-        b = [[(0, 0, 0), (1, 2, 3)]] * 8
+        b = [(0, 0, 0), (1, 2, 3)]
         c["foo"] = b
         eq_(b, c["foo"])
 
     def test_delitem(self):
         c = self.get_cache()
-        c["foo"] = [[]] * 8
+        c["foo"] = ""
         del c["foo"]
         assert "foo" not in c
         with raises(KeyError):
@@ -74,16 +74,16 @@ class BaseTestCaseCache:
     def test_persistance(self, tmpdir):
         DBNAME = tmpdir.join("hstest.db")
         c = self.get_cache(str(DBNAME))
-        c["foo"] = [[(1, 2, 3)]] * 8
+        c["foo"] = [(1, 2, 3)]
         del c
         c = self.get_cache(str(DBNAME))
-        eq_([[(1, 2, 3)]] * 8, c["foo"])
+        eq_([(1, 2, 3)], c["foo"])
 
     def test_filter(self):
         c = self.get_cache()
-        c["foo"] = [[]] * 8
+        c["foo"] = ""
-        c["bar"] = [[]] * 8
+        c["bar"] = ""
-        c["baz"] = [[]] * 8
+        c["baz"] = ""
         c.filter(lambda p: p != "bar")  # only 'bar' is removed
         eq_(2, len(c))
         assert "foo" in c
@@ -92,9 +92,9 @@ class BaseTestCaseCache:
 
     def test_clear(self):
         c = self.get_cache()
-        c["foo"] = [[]] * 8
+        c["foo"] = ""
-        c["bar"] = [[]] * 8
+        c["bar"] = ""
-        c["baz"] = [[]] * 8
+        c["baz"] = ""
         c.clear()
         eq_(0, len(c))
         assert "foo" not in c
@@ -104,7 +104,7 @@ class BaseTestCaseCache:
     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)]] * 8
+        b = [(0, 0, 0), (1, 2, 3)]
         c["foo"] = b
         foo_id = c.get_id("foo")
         eq_(c[foo_id], b)
@@ -127,10 +127,15 @@ class TestCaseSqliteCache(BaseTestCaseCache):
         fp.write("invalid sqlite content")
         fp.close()
         c = self.get_cache(dbname)  # should not raise a DatabaseError
-        c["foo"] = [[(1, 2, 3)]] * 8
+        c["foo"] = [(1, 2, 3)]
         del c
         c = self.get_cache(dbname)
-        eq_(c["foo"], [[(1, 2, 3)]] * 8)
+        eq_(c["foo"], [(1, 2, 3)])
+
+
+class TestCaseShelveCache(BaseTestCaseCache):
+    def get_cache(self, dbname=None):
+        return ShelveCache(dbname)
 
 
 class TestCaseCacheSQLEscape:
@@ -152,7 +157,7 @@ class TestCaseCacheSQLEscape:
 
     def test_delitem(self):
         c = self.get_cache()
-        c["foo'bar"] = [[]] * 8
+        c["foo'bar"] = []
         try:
             del c["foo'bar"]
         except KeyError:

core/tests/directories_test.py

@@ -10,39 +10,45 @@ import tempfile
 import shutil
 
 from pytest import raises
-from pathlib import Path
+from hscommon.path import Path
 from hscommon.testutil import eq_
 from hscommon.plat import ISWINDOWS
 
-from core.fs import File
+from ..fs import File
-from core.directories import (
+from ..directories import (
     Directories,
     DirectoryState,
     AlreadyThereError,
     InvalidPathError,
 )
-from core.exclude import ExcludeList, ExcludeDict
+from ..exclude import ExcludeList, ExcludeDict
 
 
 def create_fake_fs(rootpath):
     # We have it as a separate function because other units are using it.
-    rootpath = rootpath.joinpath("fs")
+    rootpath = rootpath["fs"]
     rootpath.mkdir()
-    rootpath.joinpath("dir1").mkdir()
+    rootpath["dir1"].mkdir()
-    rootpath.joinpath("dir2").mkdir()
+    rootpath["dir2"].mkdir()
-    rootpath.joinpath("dir3").mkdir()
+    rootpath["dir3"].mkdir()
-    with rootpath.joinpath("file1.test").open("wt") as fp:
+    fp = rootpath["file1.test"].open("w")
     fp.write("1")
-    with rootpath.joinpath("file2.test").open("wt") as fp:
+    fp.close()
+    fp = rootpath["file2.test"].open("w")
     fp.write("12")
-    with rootpath.joinpath("file3.test").open("wt") as fp:
+    fp.close()
+    fp = rootpath["file3.test"].open("w")
     fp.write("123")
-    with rootpath.joinpath("dir1", "file1.test").open("wt") as fp:
+    fp.close()
+    fp = rootpath["dir1"]["file1.test"].open("w")
     fp.write("1")
-    with rootpath.joinpath("dir2", "file2.test").open("wt") as fp:
+    fp.close()
+    fp = rootpath["dir2"]["file2.test"].open("w")
     fp.write("12")
-    with rootpath.joinpath("dir3", "file3.test").open("wt") as fp:
+    fp.close()
+    fp = rootpath["dir3"]["file3.test"].open("w")
     fp.write("123")
+    fp.close()
     return rootpath
 
 
@@ -54,10 +60,11 @@ def setup_module(module):
     # and another with a more complex structure.
     testpath = Path(tempfile.mkdtemp())
     module.testpath = testpath
-    rootpath = testpath.joinpath("onefile")
+    rootpath = testpath["onefile"]
     rootpath.mkdir()
-    with rootpath.joinpath("test.txt").open("wt") as fp:
+    fp = rootpath["test.txt"].open("w")
     fp.write("test_data")
+    fp.close()
     create_fake_fs(testpath)
 
 
@@ -73,13 +80,13 @@ def test_empty():
 
 def test_add_path():
     d = Directories()
-    p = testpath.joinpath("onefile")
+    p = testpath["onefile"]
     d.add_path(p)
     eq_(1, len(d))
     assert p in d
-    assert (p.joinpath("foobar")) in d
+    assert (p["foobar"]) in d
-    assert p.parent not in d
+    assert p.parent() not in d
-    p = testpath.joinpath("fs")
+    p = testpath["fs"]
     d.add_path(p)
     eq_(2, len(d))
     assert p in d
@@ -87,18 +94,18 @@ def test_add_path():
 
 def test_add_path_when_path_is_already_there():
     d = Directories()
-    p = testpath.joinpath("onefile")
+    p = testpath["onefile"]
     d.add_path(p)
     with raises(AlreadyThereError):
         d.add_path(p)
     with raises(AlreadyThereError):
-        d.add_path(p.joinpath("foobar"))
+        d.add_path(p["foobar"])
     eq_(1, len(d))
 
 
 def test_add_path_containing_paths_already_there():
     d = Directories()
-    d.add_path(testpath.joinpath("onefile"))
+    d.add_path(testpath["onefile"])
     eq_(1, len(d))
     d.add_path(testpath)
     eq_(len(d), 1)
@@ -107,7 +114,7 @@ def test_add_path_containing_paths_already_there():
 
 def test_add_path_non_latin(tmpdir):
     p = Path(str(tmpdir))
-    to_add = p.joinpath("unicode\u201a")
+    to_add = p["unicode\u201a"]
     os.mkdir(str(to_add))
     d = Directories()
     try:
@@ -118,25 +125,25 @@ def test_add_path_non_latin(tmpdir):
 
 def test_del():
     d = Directories()
-    d.add_path(testpath.joinpath("onefile"))
+    d.add_path(testpath["onefile"])
     try:
         del d[1]
         assert False
     except IndexError:
         pass
-    d.add_path(testpath.joinpath("fs"))
+    d.add_path(testpath["fs"])
     del d[1]
     eq_(1, len(d))
 
 
 def test_states():
     d = Directories()
-    p = testpath.joinpath("onefile")
+    p = testpath["onefile"]
     d.add_path(p)
     eq_(DirectoryState.NORMAL, d.get_state(p))
     d.set_state(p, DirectoryState.REFERENCE)
     eq_(DirectoryState.REFERENCE, d.get_state(p))
-    eq_(DirectoryState.REFERENCE, d.get_state(p.joinpath("dir1")))
+    eq_(DirectoryState.REFERENCE, d.get_state(p["dir1"]))
     eq_(1, len(d.states))
     eq_(p, list(d.states.keys())[0])
     eq_(DirectoryState.REFERENCE, d.states[p])
@@ -145,7 +152,7 @@ def test_states():
 def test_get_state_with_path_not_there():
     # When the path's not there, just return DirectoryState.Normal
     d = Directories()
-    d.add_path(testpath.joinpath("onefile"))
+    d.add_path(testpath["onefile"])
     eq_(d.get_state(testpath), DirectoryState.NORMAL)
 
 
@@ -153,26 +160,26 @@ def test_states_overwritten_when_larger_directory_eat_smaller_ones():
     # ref #248
     # When setting the state of a folder, we overwrite previously set states for subfolders.
     d = Directories()
-    p = testpath.joinpath("onefile")
+    p = testpath["onefile"]
     d.add_path(p)
     d.set_state(p, DirectoryState.EXCLUDED)
     d.add_path(testpath)
     d.set_state(testpath, DirectoryState.REFERENCE)
     eq_(d.get_state(p), DirectoryState.REFERENCE)
-    eq_(d.get_state(p.joinpath("dir1")), DirectoryState.REFERENCE)
+    eq_(d.get_state(p["dir1"]), DirectoryState.REFERENCE)
     eq_(d.get_state(testpath), DirectoryState.REFERENCE)
 
 
 def test_get_files():
     d = Directories()
-    p = testpath.joinpath("fs")
+    p = testpath["fs"]
     d.add_path(p)
-    d.set_state(p.joinpath("dir1"), DirectoryState.REFERENCE)
+    d.set_state(p["dir1"], DirectoryState.REFERENCE)
-    d.set_state(p.joinpath("dir2"), DirectoryState.EXCLUDED)
+    d.set_state(p["dir2"], DirectoryState.EXCLUDED)
     files = list(d.get_files())
     eq_(5, len(files))
     for f in files:
-        if f.path.parent == p.joinpath("dir1"):
+        if f.path.parent() == p["dir1"]:
             assert f.is_ref
         else:
             assert not f.is_ref
@@ -186,7 +193,7 @@ def test_get_files_with_folders():
             return True
 
     d = Directories()
-    p = testpath.joinpath("fs")
+    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
@@ -195,23 +202,23 @@ def test_get_files_with_folders():
 
 def test_get_folders():
     d = Directories()
-    p = testpath.joinpath("fs")
+    p = testpath["fs"]
     d.add_path(p)
-    d.set_state(p.joinpath("dir1"), DirectoryState.REFERENCE)
+    d.set_state(p["dir1"], DirectoryState.REFERENCE)
-    d.set_state(p.joinpath("dir2"), DirectoryState.EXCLUDED)
+    d.set_state(p["dir2"], DirectoryState.EXCLUDED)
     folders = list(d.get_folders())
     eq_(len(folders), 3)
     ref = [f for f in folders if f.is_ref]
     not_ref = [f for f in folders if not f.is_ref]
     eq_(len(ref), 1)
-    eq_(ref[0].path, p.joinpath("dir1"))
+    eq_(ref[0].path, p["dir1"])
     eq_(len(not_ref), 2)
     eq_(ref[0].size, 1)
 
 
 def test_get_files_with_inherited_exclusion():
     d = Directories()
-    p = testpath.joinpath("onefile")
+    p = testpath["onefile"]
     d.add_path(p)
     d.set_state(p, DirectoryState.EXCLUDED)
     eq_([], list(d.get_files()))
@@ -227,13 +234,13 @@ def test_save_and_load(tmpdir):
     d1.add_path(p1)
     d1.add_path(p2)
     d1.set_state(p1, DirectoryState.REFERENCE)
-    d1.set_state(p1.joinpath("dir1"), DirectoryState.EXCLUDED)
+    d1.set_state(p1["dir1"], DirectoryState.EXCLUDED)
     tmpxml = str(tmpdir.join("directories_testunit.xml"))
     d1.save_to_file(tmpxml)
     d2.load_from_file(tmpxml)
     eq_(2, len(d2))
     eq_(DirectoryState.REFERENCE, d2.get_state(p1))
-    eq_(DirectoryState.EXCLUDED, d2.get_state(p1.joinpath("dir1")))
+    eq_(DirectoryState.EXCLUDED, d2.get_state(p1["dir1"]))
 
 
 def test_invalid_path():
@@ -261,7 +268,7 @@ def test_load_from_file_with_invalid_path(tmpdir):
     # This test simulates a load from file resulting in a
     # InvalidPath raise. Other directories must be loaded.
     d1 = Directories()
-    d1.add_path(testpath.joinpath("onefile"))
+    d1.add_path(testpath["onefile"])
     # Will raise InvalidPath upon loading
     p = Path(str(tmpdir.join("toremove")))
     p.mkdir()
@@ -276,11 +283,11 @@ def test_load_from_file_with_invalid_path(tmpdir):
 
 def test_unicode_save(tmpdir):
     d = Directories()
-    p1 = Path(str(tmpdir), "hello\xe9")
+    p1 = Path(str(tmpdir))["hello\xe9"]
     p1.mkdir()
-    p1.joinpath("foo\xe9").mkdir()
+    p1["foo\xe9"].mkdir()
     d.add_path(p1)
-    d.set_state(p1.joinpath("foo\xe9"), DirectoryState.EXCLUDED)
+    d.set_state(p1["foo\xe9"], DirectoryState.EXCLUDED)
     tmpxml = str(tmpdir.join("directories_testunit.xml"))
     try:
         d.save_to_file(tmpxml)
@@ -290,12 +297,12 @@ def test_unicode_save(tmpdir):
 
 def test_get_files_refreshes_its_directories():
     d = Directories()
-    p = testpath.joinpath("fs")
+    p = testpath["fs"]
     d.add_path(p)
     files = d.get_files()
     eq_(6, len(list(files)))
     time.sleep(1)
-    os.remove(str(p.joinpath("dir1", "file1.test")))
+    os.remove(str(p["dir1"]["file1.test"]))
     files = d.get_files()
     eq_(5, len(list(files)))
 
@@ -304,15 +311,15 @@ def test_get_files_does_not_choke_on_non_existing_directories(tmpdir):
     d = Directories()
     p = Path(str(tmpdir))
     d.add_path(p)
-    shutil.rmtree(str(p))
+    p.rmtree()
     eq_([], list(d.get_files()))
 
 
 def test_get_state_returns_excluded_by_default_for_hidden_directories(tmpdir):
     d = Directories()
     p = Path(str(tmpdir))
-    hidden_dir_path = p.joinpath(".foo")
+    hidden_dir_path = p[".foo"]
-    p.joinpath(".foo").mkdir()
+    p[".foo"].mkdir()
     d.add_path(p)
     eq_(d.get_state(hidden_dir_path), DirectoryState.EXCLUDED)
     # But it can be overriden
@@ -324,23 +331,22 @@ def test_default_path_state_override(tmpdir):
     # It's possible for a subclass to override the default state of a path
     class MyDirectories(Directories):
         def _default_state_for_path(self, path):
-            if "foobar" in path.parts:
+            if "foobar" in path:
                 return DirectoryState.EXCLUDED
-            return DirectoryState.NORMAL
 
     d = MyDirectories()
     p1 = Path(str(tmpdir))
-    p1.joinpath("foobar").mkdir()
+    p1["foobar"].mkdir()
-    p1.joinpath("foobar/somefile").touch()
+    p1["foobar/somefile"].open("w").close()
-    p1.joinpath("foobaz").mkdir()
+    p1["foobaz"].mkdir()
-    p1.joinpath("foobaz/somefile").touch()
+    p1["foobaz/somefile"].open("w").close()
     d.add_path(p1)
-    eq_(d.get_state(p1.joinpath("foobaz")), DirectoryState.NORMAL)
+    eq_(d.get_state(p1["foobaz"]), DirectoryState.NORMAL)
-    eq_(d.get_state(p1.joinpath("foobar")), DirectoryState.EXCLUDED)
+    eq_(d.get_state(p1["foobar"]), DirectoryState.EXCLUDED)
     eq_(len(list(d.get_files())), 1)  # only the 'foobaz' file is there
     # However, the default state can be changed
-    d.set_state(p1.joinpath("foobar"), DirectoryState.NORMAL)
+    d.set_state(p1["foobar"], DirectoryState.NORMAL)
-    eq_(d.get_state(p1.joinpath("foobar")), DirectoryState.NORMAL)
+    eq_(d.get_state(p1["foobar"]), DirectoryState.NORMAL)
     eq_(len(list(d.get_files())), 2)
 
 
@@ -366,42 +372,42 @@ files: {self.d._exclude_list.compiled_files} all: {self.d._exclude_list.compiled
         self.d._exclude_list.add(regex)
         self.d._exclude_list.mark(regex)
         p1 = Path(str(tmpdir))
-        p1.joinpath("$Recycle.Bin").mkdir()
+        p1["$Recycle.Bin"].mkdir()
-        p1.joinpath("$Recycle.Bin", "subdir").mkdir()
+        p1["$Recycle.Bin"]["subdir"].mkdir()
         self.d.add_path(p1)
-        eq_(self.d.get_state(p1.joinpath("$Recycle.Bin")), DirectoryState.EXCLUDED)
+        eq_(self.d.get_state(p1["$Recycle.Bin"]), DirectoryState.EXCLUDED)
         # By default, subdirs should be excluded too, but this can be overridden separately
-        eq_(self.d.get_state(p1.joinpath("$Recycle.Bin", "subdir")), DirectoryState.EXCLUDED)
+        eq_(self.d.get_state(p1["$Recycle.Bin"]["subdir"]), DirectoryState.EXCLUDED)
-        self.d.set_state(p1.joinpath("$Recycle.Bin", "subdir"), DirectoryState.NORMAL)
+        self.d.set_state(p1["$Recycle.Bin"]["subdir"], DirectoryState.NORMAL)
-        eq_(self.d.get_state(p1.joinpath("$Recycle.Bin", "subdir")), DirectoryState.NORMAL)
+        eq_(self.d.get_state(p1["$Recycle.Bin"]["subdir"]), DirectoryState.NORMAL)
 
     def test_exclude_refined(self, tmpdir):
         regex1 = r"^\$Recycle\.Bin$"
         self.d._exclude_list.add(regex1)
         self.d._exclude_list.mark(regex1)
         p1 = Path(str(tmpdir))
-        p1.joinpath("$Recycle.Bin").mkdir()
+        p1["$Recycle.Bin"].mkdir()
-        p1.joinpath("$Recycle.Bin", "somefile.png").touch()
+        p1["$Recycle.Bin"]["somefile.png"].open("w").close()
-        p1.joinpath("$Recycle.Bin", "some_unwanted_file.jpg").touch()
+        p1["$Recycle.Bin"]["some_unwanted_file.jpg"].open("w").close()
-        p1.joinpath("$Recycle.Bin", "subdir").mkdir()
+        p1["$Recycle.Bin"]["subdir"].mkdir()
-        p1.joinpath("$Recycle.Bin", "subdir", "somesubdirfile.png").touch()
+        p1["$Recycle.Bin"]["subdir"]["somesubdirfile.png"].open("w").close()
-        p1.joinpath("$Recycle.Bin", "subdir", "unwanted_subdirfile.gif").touch()
+        p1["$Recycle.Bin"]["subdir"]["unwanted_subdirfile.gif"].open("w").close()
-        p1.joinpath("$Recycle.Bin", "subdar").mkdir()
+        p1["$Recycle.Bin"]["subdar"].mkdir()
-        p1.joinpath("$Recycle.Bin", "subdar", "somesubdarfile.jpeg").touch()
+        p1["$Recycle.Bin"]["subdar"]["somesubdarfile.jpeg"].open("w").close()
-        p1.joinpath("$Recycle.Bin", "subdar", "unwanted_subdarfile.png").touch()
+        p1["$Recycle.Bin"]["subdar"]["unwanted_subdarfile.png"].open("w").close()
-        self.d.add_path(p1.joinpath("$Recycle.Bin"))
+        self.d.add_path(p1["$Recycle.Bin"])
 
         # Filter should set the default state to Excluded
-        eq_(self.d.get_state(p1.joinpath("$Recycle.Bin")), DirectoryState.EXCLUDED)
+        eq_(self.d.get_state(p1["$Recycle.Bin"]), DirectoryState.EXCLUDED)
         # The subdir should inherit its parent state
-        eq_(self.d.get_state(p1.joinpath("$Recycle.Bin", "subdir")), DirectoryState.EXCLUDED)
+        eq_(self.d.get_state(p1["$Recycle.Bin"]["subdir"]), DirectoryState.EXCLUDED)
-        eq_(self.d.get_state(p1.joinpath("$Recycle.Bin", "subdar")), DirectoryState.EXCLUDED)
+        eq_(self.d.get_state(p1["$Recycle.Bin"]["subdar"]), DirectoryState.EXCLUDED)
         # Override a child path's state
-        self.d.set_state(p1.joinpath("$Recycle.Bin", "subdir"), DirectoryState.NORMAL)
+        self.d.set_state(p1["$Recycle.Bin"]["subdir"], DirectoryState.NORMAL)
-        eq_(self.d.get_state(p1.joinpath("$Recycle.Bin", "subdir")), DirectoryState.NORMAL)
+        eq_(self.d.get_state(p1["$Recycle.Bin"]["subdir"]), DirectoryState.NORMAL)
         # Parent should keep its default state, and the other child too
-        eq_(self.d.get_state(p1.joinpath("$Recycle.Bin")), DirectoryState.EXCLUDED)
+        eq_(self.d.get_state(p1["$Recycle.Bin"]), DirectoryState.EXCLUDED)
-        eq_(self.d.get_state(p1.joinpath("$Recycle.Bin", "subdar")), DirectoryState.EXCLUDED)
+        eq_(self.d.get_state(p1["$Recycle.Bin"]["subdar"]), DirectoryState.EXCLUDED)
         # print(f"get_folders(): {[x for x in self.d.get_folders()]}")
 
         # only the 2 files directly under the Normal directory
@@ -413,8 +419,8 @@ files: {self.d._exclude_list.compiled_files} all: {self.d._exclude_list.compiled
         assert "somesubdirfile.png" in files
         assert "unwanted_subdirfile.gif" in files
         # Overriding the parent should enable all children
-        self.d.set_state(p1.joinpath("$Recycle.Bin"), DirectoryState.NORMAL)
+        self.d.set_state(p1["$Recycle.Bin"], DirectoryState.NORMAL)
-        eq_(self.d.get_state(p1.joinpath("$Recycle.Bin", "subdar")), DirectoryState.NORMAL)
+        eq_(self.d.get_state(p1["$Recycle.Bin"]["subdar"]), DirectoryState.NORMAL)
         # all files there
         files = self.get_files_and_expect_num_result(6)
         assert "somefile.png" in files
@@ -438,7 +444,7 @@ files: {self.d._exclude_list.compiled_files} all: {self.d._exclude_list.compiled
         assert self.d._exclude_list.error(regex3) is None
         # print(f"get_folders(): {[x for x in self.d.get_folders()]}")
         # Directory shouldn't change its state here, unless explicitely done by user
-        eq_(self.d.get_state(p1.joinpath("$Recycle.Bin", "subdir")), DirectoryState.NORMAL)
+        eq_(self.d.get_state(p1["$Recycle.Bin"]["subdir"]), DirectoryState.NORMAL)
         files = self.get_files_and_expect_num_result(5)
         assert "unwanted_subdirfile.gif" not in files
         assert "unwanted_subdarfile.png" in files
@@ -447,15 +453,15 @@ files: {self.d._exclude_list.compiled_files} all: {self.d._exclude_list.compiled
         regex4 = r".*subdir$"
         self.d._exclude_list.rename(regex3, regex4)
         assert self.d._exclude_list.error(regex4) is None
-        p1.joinpath("$Recycle.Bin", "subdar", "file_ending_with_subdir").touch()
+        p1["$Recycle.Bin"]["subdar"]["file_ending_with_subdir"].open("w").close()
-        eq_(self.d.get_state(p1.joinpath("$Recycle.Bin", "subdir")), DirectoryState.EXCLUDED)
+        eq_(self.d.get_state(p1["$Recycle.Bin"]["subdir"]), DirectoryState.EXCLUDED)
         files = self.get_files_and_expect_num_result(4)
         assert "file_ending_with_subdir" not in files
         assert "somesubdarfile.jpeg" in files
         assert "somesubdirfile.png" not in files
         assert "unwanted_subdirfile.gif" not in files
-        self.d.set_state(p1.joinpath("$Recycle.Bin", "subdir"), DirectoryState.NORMAL)
+        self.d.set_state(p1["$Recycle.Bin"]["subdir"], DirectoryState.NORMAL)
-        eq_(self.d.get_state(p1.joinpath("$Recycle.Bin", "subdir")), DirectoryState.NORMAL)
+        eq_(self.d.get_state(p1["$Recycle.Bin"]["subdir"]), DirectoryState.NORMAL)
         # print(f"get_folders(): {[x for x in self.d.get_folders()]}")
         files = self.get_files_and_expect_num_result(6)
         assert "file_ending_with_subdir" not in files
@@ -465,9 +471,9 @@ files: {self.d._exclude_list.compiled_files} all: {self.d._exclude_list.compiled
         regex5 = r".*subdir.*"
         self.d._exclude_list.rename(regex4, regex5)
         # Files containing substring should be filtered
-        eq_(self.d.get_state(p1.joinpath("$Recycle.Bin", "subdir")), DirectoryState.NORMAL)
+        eq_(self.d.get_state(p1["$Recycle.Bin"]["subdir"]), DirectoryState.NORMAL)
         # The path should not match, only the filename, the "subdir" in the directory name shouldn't matter
-        p1.joinpath("$Recycle.Bin", "subdir", "file_which_shouldnt_match").touch()
+        p1["$Recycle.Bin"]["subdir"]["file_which_shouldnt_match"].open("w").close()
         files = self.get_files_and_expect_num_result(5)
         assert "somesubdirfile.png" not in files
         assert "unwanted_subdirfile.gif" not in files
@@ -487,7 +493,7 @@ files: {self.d._exclude_list.compiled_files} all: {self.d._exclude_list.compiled
         assert self.d._exclude_list.error(regex6) is None
         assert regex6 in self.d._exclude_list
         # This still should not be affected
-        eq_(self.d.get_state(p1.joinpath("$Recycle.Bin", "subdir")), DirectoryState.NORMAL)
+        eq_(self.d.get_state(p1["$Recycle.Bin"]["subdir"]), DirectoryState.NORMAL)
         files = self.get_files_and_expect_num_result(5)
         # These files are under the "/subdir" directory
         assert "somesubdirfile.png" not in files
@@ -499,20 +505,20 @@ files: {self.d._exclude_list.compiled_files} all: {self.d._exclude_list.compiled
 
     def test_japanese_unicode(self, tmpdir):
         p1 = Path(str(tmpdir))
-        p1.joinpath("$Recycle.Bin").mkdir()
+        p1["$Recycle.Bin"].mkdir()
-        p1.joinpath("$Recycle.Bin", "somerecycledfile.png").touch()
+        p1["$Recycle.Bin"]["somerecycledfile.png"].open("w").close()
-        p1.joinpath("$Recycle.Bin", "some_unwanted_file.jpg").touch()
+        p1["$Recycle.Bin"]["some_unwanted_file.jpg"].open("w").close()
-        p1.joinpath("$Recycle.Bin", "subdir").mkdir()
+        p1["$Recycle.Bin"]["subdir"].mkdir()
-        p1.joinpath("$Recycle.Bin", "subdir", "過去白濁物語～]_カラー.jpg").touch()
+        p1["$Recycle.Bin"]["subdir"]["過去白濁物語～]_カラー.jpg"].open("w").close()
-        p1.joinpath("$Recycle.Bin", "思叫物語").mkdir()
+        p1["$Recycle.Bin"]["思叫物語"].mkdir()
-        p1.joinpath("$Recycle.Bin", "思叫物語", "なししろ会う前").touch()
+        p1["$Recycle.Bin"]["思叫物語"]["なししろ会う前"].open("w").close()
-        p1.joinpath("$Recycle.Bin", "思叫物語", "堂～ロ").touch()
+        p1["$Recycle.Bin"]["思叫物語"]["堂～ロ"].open("w").close()
-        self.d.add_path(p1.joinpath("$Recycle.Bin"))
+        self.d.add_path(p1["$Recycle.Bin"])
         regex3 = r".*物語.*"
         self.d._exclude_list.add(regex3)
         self.d._exclude_list.mark(regex3)
         # print(f"get_folders(): {[x for x in self.d.get_folders()]}")
-        eq_(self.d.get_state(p1.joinpath("$Recycle.Bin", "思叫物語")), DirectoryState.EXCLUDED)
+        eq_(self.d.get_state(p1["$Recycle.Bin"]["思叫物語"]), DirectoryState.EXCLUDED)
         files = self.get_files_and_expect_num_result(2)
         assert "過去白濁物語～]_カラー.jpg" not in files
         assert "なししろ会う前" not in files
@@ -521,7 +527,7 @@ files: {self.d._exclude_list.compiled_files} all: {self.d._exclude_list.compiled
         regex4 = r".*物語$"
         self.d._exclude_list.rename(regex3, regex4)
         assert self.d._exclude_list.error(regex4) is None
-        self.d.set_state(p1.joinpath("$Recycle.Bin", "思叫物語"), DirectoryState.NORMAL)
+        self.d.set_state(p1["$Recycle.Bin"]["思叫物語"], DirectoryState.NORMAL)
         files = self.get_files_and_expect_num_result(5)
         assert "過去白濁物語～]_カラー.jpg" in files
         assert "なししろ会う前" in files
@@ -533,15 +539,15 @@ files: {self.d._exclude_list.compiled_files} all: {self.d._exclude_list.compiled
         self.d._exclude_list.add(regex)
         self.d._exclude_list.mark(regex)
         p1 = Path(str(tmpdir))
-        p1.joinpath("foobar").mkdir()
+        p1["foobar"].mkdir()
-        p1.joinpath("foobar", ".hidden_file.txt").touch()
+        p1["foobar"][".hidden_file.txt"].open("w").close()
-        p1.joinpath("foobar", ".hidden_dir").mkdir()
+        p1["foobar"][".hidden_dir"].mkdir()
-        p1.joinpath("foobar", ".hidden_dir", "foobar.jpg").touch()
+        p1["foobar"][".hidden_dir"]["foobar.jpg"].open("w").close()
-        p1.joinpath("foobar", ".hidden_dir", ".hidden_subfile.png").touch()
+        p1["foobar"][".hidden_dir"][".hidden_subfile.png"].open("w").close()
-        self.d.add_path(p1.joinpath("foobar"))
+        self.d.add_path(p1["foobar"])
         # It should not inherit its parent's state originally
-        eq_(self.d.get_state(p1.joinpath("foobar", ".hidden_dir")), DirectoryState.EXCLUDED)
+        eq_(self.d.get_state(p1["foobar"][".hidden_dir"]), DirectoryState.EXCLUDED)
-        self.d.set_state(p1.joinpath("foobar", ".hidden_dir"), DirectoryState.NORMAL)
+        self.d.set_state(p1["foobar"][".hidden_dir"], DirectoryState.NORMAL)
         # The files should still be filtered
         files = self.get_files_and_expect_num_result(1)
         eq_(len(self.d._exclude_list.compiled_paths), 0)

core/tests/engine_test.py

@@ -10,9 +10,9 @@ from hscommon.jobprogress import job
 from hscommon.util import first
 from hscommon.testutil import eq_, log_calls
 
-from core.tests.base import NamedObject
+from .base import NamedObject
-from core import engine
+from .. import engine
-from core.engine import (
+from ..engine import (
     get_match,
     getwords,
     Group,
@@ -71,10 +71,7 @@ class TestCasegetwords:
 
     def test_unicode(self):
         eq_(["e", "c", "0", "a", "o", "u", "e", "u"], getwords("é ç 0 à ö û è ¤ ù"))
-        eq_(
+        eq_(["02", "君のこころは輝いてるかい？", "国木田花丸", "solo", "ver"], getwords("02 君のこころは輝いてるかい？ 国木田花丸 Solo Ver"))
-            ["02", "君のこころは輝いてるかい？", "国木田花丸", "solo", "ver"],
-            getwords("02 君のこころは輝いてるかい？ 国木田花丸 Solo Ver"),
-        )
 
     def test_splitter_chars(self):
         eq_(
@@ -274,9 +271,9 @@ class TestCaseBuildWordDict:
 class TestCaseMergeSimilarWords:
     def test_some_similar_words(self):
         d = {
-            "foobar": {1},
+            "foobar": set([1]),
-            "foobar1": {2},
+            "foobar1": set([2]),
-            "foobar2": {3},
+            "foobar2": set([3]),
         }
         merge_similar_words(d)
         eq_(1, len(d))
@@ -286,8 +283,8 @@ class TestCaseMergeSimilarWords:
 class TestCaseReduceCommonWords:
     def test_typical(self):
         d = {
-            "foo": {NamedObject("foo bar", True) for _ in range(50)},
+            "foo": set([NamedObject("foo bar", True) for _ in range(50)]),
-            "bar": {NamedObject("foo bar", True) for _ in range(49)},
+            "bar": set([NamedObject("foo bar", True) for _ in range(49)]),
         }
         reduce_common_words(d, 50)
         assert "foo" not in d
@@ -296,7 +293,7 @@ class TestCaseReduceCommonWords:
     def test_dont_remove_objects_with_only_common_words(self):
         d = {
             "common": set([NamedObject("common uncommon", True) for _ in range(50)] + [NamedObject("common", True)]),
-            "uncommon": {NamedObject("common uncommon", True)},
+            "uncommon": set([NamedObject("common uncommon", True)]),
         }
         reduce_common_words(d, 50)
         eq_(1, len(d["common"]))
@@ -305,7 +302,7 @@ class TestCaseReduceCommonWords:
     def test_values_still_are_set_instances(self):
         d = {
             "common": set([NamedObject("common uncommon", True) for _ in range(50)] + [NamedObject("common", True)]),
-            "uncommon": {NamedObject("common uncommon", True)},
+            "uncommon": set([NamedObject("common uncommon", True)]),
         }
         reduce_common_words(d, 50)
         assert isinstance(d["common"], set)
@@ -315,9 +312,9 @@ class TestCaseReduceCommonWords:
         # If a word has been removed by the reduce, an object in a subsequent common word that
         # contains the word that has been removed would cause a KeyError.
         d = {
-            "foo": {NamedObject("foo bar baz", True) for _ in range(50)},
+            "foo": set([NamedObject("foo bar baz", True) for _ in range(50)]),
-            "bar": {NamedObject("foo bar baz", True) for _ in range(50)},
+            "bar": set([NamedObject("foo bar baz", True) for _ in range(50)]),
-            "baz": {NamedObject("foo bar baz", True) for _ in range(49)},
+            "baz": set([NamedObject("foo bar baz", True) for _ in range(49)]),
         }
         try:
             reduce_common_words(d, 50)
@@ -331,7 +328,7 @@ class TestCaseReduceCommonWords:
             o.words = [["foo", "bar"], ["baz"]]
             return o
 
-        d = {"foo": {create_it() for _ in range(50)}}
+        d = {"foo": set([create_it() for _ in range(50)])}
         try:
             reduce_common_words(d, 50)
         except TypeError:
@@ -346,7 +343,7 @@ class TestCaseReduceCommonWords:
         d = {
             "foo": set([NamedObject("foo bar baz", True) for _ in range(49)] + [only_common]),
             "bar": set([NamedObject("foo bar baz", True) for _ in range(49)] + [only_common]),
-            "baz": {NamedObject("foo bar baz", True) for _ in range(49)},
+            "baz": set([NamedObject("foo bar baz", True) for _ in range(49)]),
         }
         reduce_common_words(d, 50)
         eq_(1, len(d["foo"]))
@@ -533,7 +530,7 @@ class TestCaseGetMatches:
 
 
 class TestCaseGetMatchesByContents:
-    def test_big_file_partial_hashing(self):
+    def test_big_file_partial_hashes(self):
         smallsize = 1
         bigsize = 100 * 1024 * 1024  # 100MB
         f = [
@@ -542,17 +539,17 @@ class TestCaseGetMatchesByContents:
             no("smallfoo", size=smallsize),
             no("smallbar", size=smallsize),
         ]
-        f[0].digest = f[0].digest_partial = f[0].digest_samples = "foobar"
+        f[0].md5 = f[0].md5partial = f[0].md5samples = "foobar"
-        f[1].digest = f[1].digest_partial = f[1].digest_samples = "foobar"
+        f[1].md5 = f[1].md5partial = f[1].md5samples = "foobar"
-        f[2].digest = f[2].digest_partial = "bleh"
+        f[2].md5 = f[2].md5partial = "bleh"
-        f[3].digest = f[3].digest_partial = "bleh"
+        f[3].md5 = f[3].md5partial = "bleh"
         r = getmatches_by_contents(f, bigsize=bigsize)
         eq_(len(r), 2)
-        # User disabled optimization for big files, compute digests as usual
+        # User disabled optimization for big files, compute hashes as usual
         r = getmatches_by_contents(f, bigsize=0)
         eq_(len(r), 2)
-        # Other file is now slightly different, digest_partial is still the same
+        # Other file is now slightly different, md5partial is still the same
-        f[1].digest = f[1].digest_samples = "foobardiff"
+        f[1].md5 = f[1].md5samples = "foobardiff"
         r = getmatches_by_contents(f, bigsize=bigsize)
         # Successfully filter it out
         eq_(len(r), 1)
@@ -887,7 +884,7 @@ class TestCaseGetGroups:
         # If, with a (A, B, C, D) set, all match with A, but C and D don't match with B and that the
         # (A, B) match is the highest (thus resulting in an (A, B) group), still match C and D
         # in a separate group instead of discarding them.
-        A, B, C, D = (NamedObject() for _ in range(4))
+        A, B, C, D = [NamedObject() for _ in range(4)]
         m1 = Match(A, B, 90)  # This is the strongest "A" match
         m2 = Match(A, C, 80)  # Because C doesn't match with B, it won't be in the group
         m3 = Match(A, D, 80)  # Same thing for D

core/tests/exclude_test.py

@@ -10,8 +10,8 @@ from xml.etree import ElementTree as ET
 from hscommon.testutil import eq_
 from hscommon.plat import ISWINDOWS
 
-from core.tests.base import DupeGuru
+from .base import DupeGuru
-from core.exclude import ExcludeList, ExcludeDict, default_regexes, AlreadyThereException
+from ..exclude import ExcludeList, ExcludeDict, default_regexes, AlreadyThereException
 
 from re import error
 
@@ -289,8 +289,8 @@ class TestCaseListEmptyUnion(TestCaseListEmpty):
         compiled = [x for x in self.exclude_list.compiled]
         assert regex not in compiled
         # Need to escape both to get the same strings after compilation
-        compiled_escaped = {x.encode("unicode-escape").decode() for x in compiled[0].pattern.split("|")}
+        compiled_escaped = set([x.encode("unicode-escape").decode() for x in compiled[0].pattern.split("|")])
-        default_escaped = {x.encode("unicode-escape").decode() for x in default_regexes}
+        default_escaped = set([x.encode("unicode-escape").decode() for x in default_regexes])
         assert compiled_escaped == default_escaped
         eq_(len(default_regexes), len(compiled[0].pattern.split("|")))
 
@@ -366,8 +366,8 @@ class TestCaseDictEmptyUnion(TestCaseDictEmpty):
         compiled = [x for x in self.exclude_list.compiled]
         assert regex not in compiled
         # Need to escape both to get the same strings after compilation
-        compiled_escaped = {x.encode("unicode-escape").decode() for x in compiled[0].pattern.split("|")}
+        compiled_escaped = set([x.encode("unicode-escape").decode() for x in compiled[0].pattern.split("|")])
-        default_escaped = {x.encode("unicode-escape").decode() for x in default_regexes}
+        default_escaped = set([x.encode("unicode-escape").decode() for x in default_regexes])
         assert compiled_escaped == default_escaped
         eq_(len(default_regexes), len(compiled[0].pattern.split("|")))
 

core/tests/fs_test.py

@@ -6,47 +6,43 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-import typing
+import hashlib
 from os import urandom
 
-from pathlib import Path
+from hscommon.path import Path
 from hscommon.testutil import eq_
 from core.tests.directories_test import create_fake_fs
 
-from core import fs
+from .. import fs
-
-hasher: typing.Callable
-try:
-    import xxhash
-
-    hasher = xxhash.xxh128
-except ImportError:
-    import hashlib
-
-    hasher = hashlib.md5
 
 
 def create_fake_fs_with_random_data(rootpath):
-    rootpath = rootpath.joinpath("fs")
+    rootpath = rootpath["fs"]
     rootpath.mkdir()
-    rootpath.joinpath("dir1").mkdir()
+    rootpath["dir1"].mkdir()
-    rootpath.joinpath("dir2").mkdir()
+    rootpath["dir2"].mkdir()
-    rootpath.joinpath("dir3").mkdir()
+    rootpath["dir3"].mkdir()
+    fp = rootpath["file1.test"].open("wb")
     data1 = urandom(200 * 1024)  # 200KiB
     data2 = urandom(1024 * 1024)  # 1MiB
     data3 = urandom(10 * 1024 * 1024)  # 10MiB
-    with rootpath.joinpath("file1.test").open("wb") as fp:
     fp.write(data1)
-    with rootpath.joinpath("file2.test").open("wb") as fp:
+    fp.close()
+    fp = rootpath["file2.test"].open("wb")
     fp.write(data2)
-    with rootpath.joinpath("file3.test").open("wb") as fp:
+    fp.close()
+    fp = rootpath["file3.test"].open("wb")
     fp.write(data3)
-    with rootpath.joinpath("dir1", "file1.test").open("wb") as fp:
+    fp.close()
+    fp = rootpath["dir1"]["file1.test"].open("wb")
     fp.write(data1)
-    with rootpath.joinpath("dir2", "file2.test").open("wb") as fp:
+    fp.close()
+    fp = rootpath["dir2"]["file2.test"].open("wb")
     fp.write(data2)
-    with rootpath.joinpath("dir3", "file3.test").open("wb") as fp:
+    fp.close()
+    fp = rootpath["dir3"]["file3.test"].open("wb")
     fp.write(data3)
+    fp.close()
     return rootpath
 
 
@@ -56,54 +52,54 @@ def test_size_aggregates_subfiles(tmpdir):
     eq_(b.size, 12)
 
 
-def test_digest_aggregate_subfiles_sorted(tmpdir):
+def test_md5_aggregate_subfiles_sorted(tmpdir):
-    # dir.allfiles can return child in any order. Thus, bundle.digest must aggregate
+    # dir.allfiles can return child in any order. Thus, bundle.md5 must aggregate
-    # all files' digests it contains, but it must make sure that it does so in the
+    # all files' md5 it contains, but it must make sure that it does so in the
     # same order everytime.
     p = create_fake_fs_with_random_data(Path(str(tmpdir)))
     b = fs.Folder(p)
-    digest1 = fs.File(p.joinpath("dir1", "file1.test")).digest
+    md51 = fs.File(p["dir1"]["file1.test"]).md5
-    digest2 = fs.File(p.joinpath("dir2", "file2.test")).digest
+    md52 = fs.File(p["dir2"]["file2.test"]).md5
-    digest3 = fs.File(p.joinpath("dir3", "file3.test")).digest
+    md53 = fs.File(p["dir3"]["file3.test"]).md5
-    digest4 = fs.File(p.joinpath("file1.test")).digest
+    md54 = fs.File(p["file1.test"]).md5
-    digest5 = fs.File(p.joinpath("file2.test")).digest
+    md55 = fs.File(p["file2.test"]).md5
-    digest6 = fs.File(p.joinpath("file3.test")).digest
+    md56 = fs.File(p["file3.test"]).md5
-    # The expected digest is the hash of digests for folders and the direct digest for files
+    # The expected md5 is the md5 of md5s for folders and the direct md5 for files
-    folder_digest1 = hasher(digest1).digest()
+    folder_md51 = hashlib.md5(md51).digest()
-    folder_digest2 = hasher(digest2).digest()
+    folder_md52 = hashlib.md5(md52).digest()
-    folder_digest3 = hasher(digest3).digest()
+    folder_md53 = hashlib.md5(md53).digest()
-    digest = hasher(folder_digest1 + folder_digest2 + folder_digest3 + digest4 + digest5 + digest6).digest()
+    md5 = hashlib.md5(folder_md51 + folder_md52 + folder_md53 + md54 + md55 + md56)
-    eq_(b.digest, digest)
+    eq_(b.md5, md5.digest())
 
 
-def test_partial_digest_aggregate_subfile_sorted(tmpdir):
+def test_partial_md5_aggregate_subfile_sorted(tmpdir):
     p = create_fake_fs_with_random_data(Path(str(tmpdir)))
     b = fs.Folder(p)
-    digest1 = fs.File(p.joinpath("dir1", "file1.test")).digest_partial
+    md51 = fs.File(p["dir1"]["file1.test"]).md5partial
-    digest2 = fs.File(p.joinpath("dir2", "file2.test")).digest_partial
+    md52 = fs.File(p["dir2"]["file2.test"]).md5partial
-    digest3 = fs.File(p.joinpath("dir3", "file3.test")).digest_partial
+    md53 = fs.File(p["dir3"]["file3.test"]).md5partial
-    digest4 = fs.File(p.joinpath("file1.test")).digest_partial
+    md54 = fs.File(p["file1.test"]).md5partial
-    digest5 = fs.File(p.joinpath("file2.test")).digest_partial
+    md55 = fs.File(p["file2.test"]).md5partial
-    digest6 = fs.File(p.joinpath("file3.test")).digest_partial
+    md56 = fs.File(p["file3.test"]).md5partial
-    # The expected digest is the hash of digests for folders and the direct digest for files
+    # The expected md5 is the md5 of md5s for folders and the direct md5 for files
-    folder_digest1 = hasher(digest1).digest()
+    folder_md51 = hashlib.md5(md51).digest()
-    folder_digest2 = hasher(digest2).digest()
+    folder_md52 = hashlib.md5(md52).digest()
-    folder_digest3 = hasher(digest3).digest()
+    folder_md53 = hashlib.md5(md53).digest()
-    digest = hasher(folder_digest1 + folder_digest2 + folder_digest3 + digest4 + digest5 + digest6).digest()
+    md5 = hashlib.md5(folder_md51 + folder_md52 + folder_md53 + md54 + md55 + md56)
-    eq_(b.digest_partial, digest)
+    eq_(b.md5partial, md5.digest())
 
-    digest1 = fs.File(p.joinpath("dir1", "file1.test")).digest_samples
+    md51 = fs.File(p["dir1"]["file1.test"]).md5samples
-    digest2 = fs.File(p.joinpath("dir2", "file2.test")).digest_samples
+    md52 = fs.File(p["dir2"]["file2.test"]).md5samples
-    digest3 = fs.File(p.joinpath("dir3", "file3.test")).digest_samples
+    md53 = fs.File(p["dir3"]["file3.test"]).md5samples
-    digest4 = fs.File(p.joinpath("file1.test")).digest_samples
+    md54 = fs.File(p["file1.test"]).md5samples
-    digest5 = fs.File(p.joinpath("file2.test")).digest_samples
+    md55 = fs.File(p["file2.test"]).md5samples
-    digest6 = fs.File(p.joinpath("file3.test")).digest_samples
+    md56 = fs.File(p["file3.test"]).md5samples
-    # The expected digest is the digest of digests for folders and the direct digest for files
+    # The expected md5 is the md5 of md5s for folders and the direct md5 for files
-    folder_digest1 = hasher(digest1).digest()
+    folder_md51 = hashlib.md5(md51).digest()
-    folder_digest2 = hasher(digest2).digest()
+    folder_md52 = hashlib.md5(md52).digest()
-    folder_digest3 = hasher(digest3).digest()
+    folder_md53 = hashlib.md5(md53).digest()
-    digest = hasher(folder_digest1 + folder_digest2 + folder_digest3 + digest4 + digest5 + digest6).digest()
+    md5 = hashlib.md5(folder_md51 + folder_md52 + folder_md53 + md54 + md55 + md56)
-    eq_(b.digest_samples, digest)
+    eq_(b.md5samples, md5.digest())
 
 
 def test_has_file_attrs(tmpdir):

core/tests/ignore_test.py

@@ -10,7 +10,7 @@ from xml.etree import ElementTree as ET
 from pytest import raises
 from hscommon.testutil import eq_
 
-from core.ignore import IgnoreList
+from ..ignore import IgnoreList
 
 
 def test_empty():

core/tests/markable_test.py

@@ -6,7 +6,7 @@
 
 from hscommon.testutil import eq_
 
-from core.markable import MarkableList, Markable
+from ..markable import MarkableList, Markable
 
 
 def gen():

core/tests/prioritize_test.py

@@ -9,8 +9,8 @@
 import os.path as op
 from itertools import combinations
 
-from core.tests.base import TestApp, NamedObject, with_app, eq_
+from .base import TestApp, NamedObject, with_app, eq_
-from core.engine import Group, Match
+from ..engine import Group, Match
 
 no = NamedObject
 

core/tests/result_table_test.py

@@ -6,7 +6,7 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from core.tests.base import TestApp, GetTestGroups
+from .base import TestApp, GetTestGroups
 
 
 def app_with_results():

core/tests/results_test.py

@@ -12,9 +12,10 @@ from xml.etree import ElementTree as ET
 from pytest import raises
 from hscommon.testutil import eq_
 from hscommon.util import first
-from core import engine
+
-from core.tests.base import NamedObject, GetTestGroups, DupeGuru
+from .. import engine
-from core.results import Results
+from .base import NamedObject, GetTestGroups, DupeGuru
+from ..results import Results
 
 
 class TestCaseResultsEmpty:
@@ -336,7 +337,7 @@ class TestCaseResultsMarkings:
         def log_object(o):
             log.append(o)
             if o is self.objects[1]:
-                raise OSError("foobar")
+                raise EnvironmentError("foobar")
 
         log = []
         self.results.mark_all()
@@ -446,7 +447,7 @@ class TestCaseResultsXML:
         self.results.groups = self.groups
 
     def get_file(self, path):  # use this as a callback for load_from_xml
-        return [o for o in self.objects if str(o.path) == path][0]
+        return [o for o in self.objects if o.path == path][0]
 
     def test_save_to_xml(self):
         self.objects[0].is_ref = True
@@ -463,7 +464,7 @@ class TestCaseResultsXML:
         eq_(6, len(g1))
         eq_(3, len([c for c in g1 if c.tag == "file"]))
         eq_(3, len([c for c in g1 if c.tag == "match"]))
-        d1, d2, d3 = (c for c in g1 if c.tag == "file")
+        d1, d2, d3 = [c for c in g1 if c.tag == "file"]
         eq_(op.join("basepath", "foo bar"), d1.get("path"))
         eq_(op.join("basepath", "bar bleh"), d2.get("path"))
         eq_(op.join("basepath", "foo bleh"), d3.get("path"))
@@ -476,7 +477,7 @@ class TestCaseResultsXML:
         eq_(3, len(g2))
         eq_(2, len([c for c in g2 if c.tag == "file"]))
         eq_(1, len([c for c in g2 if c.tag == "match"]))
-        d1, d2 = (c for c in g2 if c.tag == "file")
+        d1, d2 = [c for c in g2 if c.tag == "file"]
         eq_(op.join("basepath", "ibabtu"), d1.get("path"))
         eq_(op.join("basepath", "ibabtu"), d2.get("path"))
         eq_("n", d1.get("is_ref"))

core/tests/scanner_test.py

@@ -7,33 +7,29 @@
 import pytest
 
 from hscommon.jobprogress import job
-from pathlib import Path
+from hscommon.path import Path
 from hscommon.testutil import eq_
 
-from core import fs
+from .. import fs
-from core.engine import getwords, Match
+from ..engine import getwords, Match
-from core.ignore import IgnoreList
+from ..ignore import IgnoreList
-from core.scanner import Scanner, ScanType
+from ..scanner import Scanner, ScanType
-from core.me.scanner import ScannerME
+from ..me.scanner import ScannerME
 
 
-# TODO update this to be able to inherit from fs.File
 class NamedObject:
     def __init__(self, name="foobar", size=1, path=None):
         if path is None:
             path = Path(name)
         else:
-            path = Path(path, name)
+            path = Path(path)[name]
         self.name = name
         self.size = size
         self.path = path
         self.words = getwords(name)
 
     def __repr__(self):
-        return "<NamedObject {!r} {!r}>".format(self.name, self.path)
+        return "<NamedObject %r %r>" % (self.name, self.path)
-
-    def exists(self):
-        return self.path.exists()
 
 
 no = NamedObject
@@ -127,19 +123,19 @@ def test_content_scan(fake_fileexists):
     s = Scanner()
     s.scan_type = ScanType.CONTENTS
     f = [no("foo"), no("bar"), no("bleh")]
-    f[0].digest = f[0].digest_partial = f[0].digest_samples = "foobar"
+    f[0].md5 = f[0].md5partial = f[0].md5samples = "foobar"
-    f[1].digest = f[1].digest_partial = f[1].digest_samples = "foobar"
+    f[1].md5 = f[1].md5partial = f[1].md5samples = "foobar"
-    f[2].digest = f[2].digest_partial = f[1].digest_samples = "bleh"
+    f[2].md5 = f[2].md5partial = f[1].md5samples = "bleh"
     r = s.get_dupe_groups(f)
     eq_(len(r), 1)
     eq_(len(r[0]), 2)
-    eq_(s.discarded_file_count, 0)  # don't count the different digest as discarded!
+    eq_(s.discarded_file_count, 0)  # don't count the different md5 as discarded!
 
 
 def test_content_scan_compare_sizes_first(fake_fileexists):
     class MyFile(no):
         @property
-        def digest(self):
+        def md5(self):
             raise AssertionError()
 
     s = Scanner()
@@ -165,14 +161,14 @@ def test_ignore_file_size(fake_fileexists):
         no("largeignore1", large_size + 1),
         no("largeignore2", large_size + 1),
     ]
-    f[0].digest = f[0].digest_partial = f[0].digest_samples = "smallignore"
+    f[0].md5 = f[0].md5partial = f[0].md5samples = "smallignore"
-    f[1].digest = f[1].digest_partial = f[1].digest_samples = "smallignore"
+    f[1].md5 = f[1].md5partial = f[1].md5samples = "smallignore"
-    f[2].digest = f[2].digest_partial = f[2].digest_samples = "small"
+    f[2].md5 = f[2].md5partial = f[2].md5samples = "small"
-    f[3].digest = f[3].digest_partial = f[3].digest_samples = "small"
+    f[3].md5 = f[3].md5partial = f[3].md5samples = "small"
-    f[4].digest = f[4].digest_partial = f[4].digest_samples = "large"
+    f[4].md5 = f[4].md5partial = f[4].md5samples = "large"
-    f[5].digest = f[5].digest_partial = f[5].digest_samples = "large"
+    f[5].md5 = f[5].md5partial = f[5].md5samples = "large"
-    f[6].digest = f[6].digest_partial = f[6].digest_samples = "largeignore"
+    f[6].md5 = f[6].md5partial = f[6].md5samples = "largeignore"
-    f[7].digest = f[7].digest_partial = f[7].digest_samples = "largeignore"
+    f[7].md5 = f[7].md5partial = f[7].md5samples = "largeignore"
 
     r = s.get_dupe_groups(f)
     # No ignores
@@ -201,21 +197,21 @@ def test_big_file_partial_hashes(fake_fileexists):
     s.big_file_size_threshold = bigsize
 
     f = [no("bigfoo", bigsize), no("bigbar", bigsize), no("smallfoo", smallsize), no("smallbar", smallsize)]
-    f[0].digest = f[0].digest_partial = f[0].digest_samples = "foobar"
+    f[0].md5 = f[0].md5partial = f[0].md5samples = "foobar"
-    f[1].digest = f[1].digest_partial = f[1].digest_samples = "foobar"
+    f[1].md5 = f[1].md5partial = f[1].md5samples = "foobar"
-    f[2].digest = f[2].digest_partial = "bleh"
+    f[2].md5 = f[2].md5partial = "bleh"
-    f[3].digest = f[3].digest_partial = "bleh"
+    f[3].md5 = f[3].md5partial = "bleh"
     r = s.get_dupe_groups(f)
     eq_(len(r), 2)
 
-    # digest_partial is still the same, but the file is actually different
+    # md5partial is still the same, but the file is actually different
-    f[1].digest = f[1].digest_samples = "difffoobar"
+    f[1].md5 = f[1].md5samples = "difffoobar"
-    # here we compare the full digests, as the user disabled the optimization
+    # here we compare the full md5s, as the user disabled the optimization
     s.big_file_size_threshold = 0
     r = s.get_dupe_groups(f)
     eq_(len(r), 1)
 
-    # here we should compare the digest_samples, and see they are different
+    # here we should compare the md5samples, and see they are different
     s.big_file_size_threshold = bigsize
     r = s.get_dupe_groups(f)
     eq_(len(r), 1)
@@ -225,9 +221,9 @@ def test_min_match_perc_doesnt_matter_for_content_scan(fake_fileexists):
     s = Scanner()
     s.scan_type = ScanType.CONTENTS
     f = [no("foo"), no("bar"), no("bleh")]
-    f[0].digest = f[0].digest_partial = f[0].digest_samples = "foobar"
+    f[0].md5 = f[0].md5partial = f[0].md5samples = "foobar"
-    f[1].digest = f[1].digest_partial = f[1].digest_samples = "foobar"
+    f[1].md5 = f[1].md5partial = f[1].md5samples = "foobar"
-    f[2].digest = f[2].digest_partial = f[2].digest_samples = "bleh"
+    f[2].md5 = f[2].md5partial = f[2].md5samples = "bleh"
     s.min_match_percentage = 101
     r = s.get_dupe_groups(f)
     eq_(len(r), 1)
@@ -238,16 +234,12 @@ def test_min_match_perc_doesnt_matter_for_content_scan(fake_fileexists):
     eq_(len(r[0]), 2)
 
 
-def test_content_scan_doesnt_put_digest_in_words_at_the_end(fake_fileexists):
+def test_content_scan_doesnt_put_md5_in_words_at_the_end(fake_fileexists):
     s = Scanner()
     s.scan_type = ScanType.CONTENTS
     f = [no("foo"), no("bar")]
-    f[0].digest = f[0].digest_partial = f[0].digest_samples = (
+    f[0].md5 = f[0].md5partial = f[0].md5samples = "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
-        "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+    f[1].md5 = f[1].md5partial = f[1].md5samples = "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
-    )
-    f[1].digest = f[1].digest_partial = f[1].digest_samples = (
-        "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
-    )
     r = s.get_dupe_groups(f)
     # FIXME looks like we are missing something here?
     r[0]
@@ -340,7 +332,7 @@ def test_tag_scan(fake_fileexists):
 def test_tag_with_album_scan(fake_fileexists):
     s = Scanner()
     s.scan_type = ScanType.TAG
-    s.scanned_tags = {"artist", "album", "title"}
+    s.scanned_tags = set(["artist", "album", "title"])
     o1 = no("foo")
     o2 = no("bar")
     o3 = no("bleh")
@@ -360,7 +352,7 @@ def test_tag_with_album_scan(fake_fileexists):
 def test_that_dash_in_tags_dont_create_new_fields(fake_fileexists):
     s = Scanner()
     s.scan_type = ScanType.TAG
-    s.scanned_tags = {"artist", "album", "title"}
+    s.scanned_tags = set(["artist", "album", "title"])
     s.min_match_percentage = 50
     o1 = no("foo")
     o2 = no("bar")
@@ -377,7 +369,7 @@ def test_that_dash_in_tags_dont_create_new_fields(fake_fileexists):
 def test_tag_scan_with_different_scanned(fake_fileexists):
     s = Scanner()
     s.scan_type = ScanType.TAG
-    s.scanned_tags = {"track", "year"}
+    s.scanned_tags = set(["track", "year"])
     o1 = no("foo")
     o2 = no("bar")
     o1.artist = "The White Stripes"
@@ -395,7 +387,7 @@ def test_tag_scan_with_different_scanned(fake_fileexists):
 def test_tag_scan_only_scans_existing_tags(fake_fileexists):
     s = Scanner()
     s.scan_type = ScanType.TAG
-    s.scanned_tags = {"artist", "foo"}
+    s.scanned_tags = set(["artist", "foo"])
     o1 = no("foo")
     o2 = no("bar")
     o1.artist = "The White Stripes"
@@ -409,7 +401,7 @@ def test_tag_scan_only_scans_existing_tags(fake_fileexists):
 def test_tag_scan_converts_to_str(fake_fileexists):
     s = Scanner()
     s.scan_type = ScanType.TAG
-    s.scanned_tags = {"track"}
+    s.scanned_tags = set(["track"])
     o1 = no("foo")
     o2 = no("bar")
     o1.track = 42
@@ -424,7 +416,7 @@ def test_tag_scan_converts_to_str(fake_fileexists):
 def test_tag_scan_non_ascii(fake_fileexists):
     s = Scanner()
     s.scan_type = ScanType.TAG
-    s.scanned_tags = {"title"}
+    s.scanned_tags = set(["title"])
     o1 = no("foo")
     o2 = no("bar")
     o1.title = "foobar\u00e9"
@@ -576,14 +568,12 @@ def test_dont_group_files_that_dont_exist(tmpdir):
     s = Scanner()
     s.scan_type = ScanType.CONTENTS
     p = Path(str(tmpdir))
-    with p.joinpath("file1").open("w") as fp:
+    p["file1"].open("w").write("foo")
-        fp.write("foo")
+    p["file2"].open("w").write("foo")
-    with p.joinpath("file2").open("w") as fp:
-        fp.write("foo")
     file1, file2 = fs.get_files(p)
 
     def getmatches(*args, **kw):
-        file2.path.unlink()
+        file2.path.remove()
         return [Match(file1, file2, 100)]
 
     s._getmatches = getmatches
@@ -597,21 +587,21 @@ def test_folder_scan_exclude_subfolder_matches(fake_fileexists):
     s = Scanner()
     s.scan_type = ScanType.FOLDERS
     topf1 = no("top folder 1", size=42)
-    topf1.digest = topf1.digest_partial = topf1.digest_samples = b"some_digest__1"
+    topf1.md5 = topf1.md5partial = topf1.md5samples = b"some_md5_1"
     topf1.path = Path("/topf1")
     topf2 = no("top folder 2", size=42)
-    topf2.digest = topf2.digest_partial = topf2.digest_samples = b"some_digest__1"
+    topf2.md5 = topf2.md5partial = topf2.md5samples = b"some_md5_1"
     topf2.path = Path("/topf2")
     subf1 = no("sub folder 1", size=41)
-    subf1.digest = subf1.digest_partial = subf1.digest_samples = b"some_digest__2"
+    subf1.md5 = subf1.md5partial = subf1.md5samples = b"some_md5_2"
     subf1.path = Path("/topf1/sub")
     subf2 = no("sub folder 2", size=41)
-    subf2.digest = subf2.digest_partial = subf2.digest_samples = b"some_digest__2"
+    subf2.md5 = subf2.md5partial = subf2.md5samples = b"some_md5_2"
     subf2.path = Path("/topf2/sub")
     eq_(len(s.get_dupe_groups([topf1, topf2, subf1, subf2])), 1)  # only top folders
     # however, if another folder matches a subfolder, keep in in the matches
     otherf = no("other folder", size=41)
-    otherf.digest = otherf.digest_partial = otherf.digest_samples = b"some_digest__2"
+    otherf.md5 = otherf.md5partial = otherf.md5samples = b"some_md5_2"
     otherf.path = Path("/otherfolder")
     eq_(len(s.get_dupe_groups([topf1, topf2, subf1, subf2, otherf])), 2)
 
@@ -634,9 +624,9 @@ def test_dont_count_ref_files_as_discarded(fake_fileexists):
     o1 = no("foo", path="p1")
     o2 = no("foo", path="p2")
     o3 = no("foo", path="p3")
-    o1.digest = o1.digest_partial = o1.digest_samples = "foobar"
+    o1.md5 = o1.md5partial = o1.md5samples = "foobar"
-    o2.digest = o2.digest_partial = o2.digest_samples = "foobar"
+    o2.md5 = o2.md5partial = o2.md5samples = "foobar"
-    o3.digest = o3.digest_partial = o3.digest_samples = "foobar"
+    o3.md5 = o3.md5partial = o3.md5samples = "foobar"
     o1.is_ref = True
     o2.is_ref = True
     eq_(len(s.get_dupe_groups([o1, o2, o3])), 1)

core/util.py

@@ -7,12 +7,6 @@
 import time
 import sys
 import os
-import urllib.request
-import urllib.error
-import json
-import semantic_version
-import logging
-from typing import Union
 
 from hscommon.util import format_time_decimal
 
@@ -70,34 +64,3 @@ def fix_surrogate_encoding(s, encoding="utf-8"):
 
 def executable_folder():
     return os.path.dirname(os.path.abspath(sys.argv[0]))
-
-
-def check_for_update(current_version: str, include_prerelease: bool = False) -> Union[None, dict]:
-    request = urllib.request.Request(
-        "https://api.github.com/repos/arsenetar/dupeguru/releases",
-        headers={"Accept": "application/vnd.github.v3+json"},
-    )
-    try:
-        with urllib.request.urlopen(request) as response:
-            if response.status != 200:
-                logging.warn(f"Error retriving updates. Status: {response.status}")
-                return None
-            try:
-                response_json = json.loads(response.read())
-            except json.JSONDecodeError as ex:
-                logging.warn(f"Error parsing updates. {ex.msg}")
-                return None
-    except urllib.error.URLError as ex:
-        logging.warn(f"Error retriving updates. {ex.reason}")
-        return None
-    new_version = semantic_version.Version(current_version)
-    new_url = None
-    for release in response_json:
-        release_version = semantic_version.Version(release["name"])
-        if new_version < release_version and (include_prerelease or not release_version.prerelease):
-            new_version = release_version
-            new_url = release["html_url"]
-    if new_url is not None:
-        return {"version": new_version, "url": new_url}
-    else:
-        return None

help/changelog

@@ -1,31 +1,3 @@
-=== 4.3.1 (2022-07-08)
-* Fix issue where cache db exceptions could prevent files being hashed (#1015)
-* Add extra guard for non-zero length files without digests to prevent false duplicates
-* Update Italian translations
-
-=== 4.3.0 (2022-07-01)
-* Redirect stdout from custom command to the log files (#1008)
-* Update translations
-* Fix typo in debian control file (#989)
-* Add option to profile scans
-* Update fs.py to optimize stat() calls
-* Fix Error when delete after scan (#988)
-* Update directory scanning to use os.scandir() and DirEntry objects
-* Improve performance of Directories.get_state()
-* Migrate from hscommon.path to pathlib
-* Switch file hashing to xxhash with fallback to md5
-* Add update check feature to about box
-
-=== 4.2.1 (2022-03-25)
-* Default to English on unsupported system language (#976)
-* Fix image viewer zoom datatype issue (#978)
-* Fix errors from window change event (#937, #980)
-* Fix deprecation warning from SQLite
-* Enforce minimum Windows version in installer (#983)
-* Fix help path for local files
-* Drop python 3.6 support
-* VS Code project settings added, yaml validation for GitHub actions
-
 === 4.2.0 (2021-01-24)
 
 * Add Malay and Turkish

help/en/contribute.rst

@@ -12,7 +12,7 @@ a community around this project.
 
 So, whatever your skills, if you're interested in contributing to dupeGuru, please do so. Normally,
 this documentation should be enough to get you started, but if it isn't, then **please**,
-open a discussion at https://github.com/arsenetar/dupeguru/discussions.  If there's any situation where you'd
+`let me know`_ because it's a problem that I'm committed to fix. If there's any situation where you'd
 wish to contribute but some doubt you're having prevent you from going forward, please contact me.
 I'd much prefer to spend the time figuring out with you whether (and how) you can contribute than
 taking the chance of missing that opportunity.
@@ -24,7 +24,7 @@ Development process
 * `Issue Tracker`_
 * `Issue labels meaning`_
 
-dupeGuru's source code is on GitHub and thus managed in a Git repository. At all times, you should
+dupeGuru's source code is on Github and thus managed in a Git repository. At all times, you should
 be able to build from source a fresh checkout of the ``master`` branch using instructions from the
 ``README.md`` file at the root of this project. If you can't, it's a bug. Please report it.
 
@@ -61,7 +61,7 @@ It's the same thing with feature requests. Description of a feature request, whe
 already been given to how such a feature would fit in the current design, are precious to developers
 and help them figure out a clear roadmap for the project.
 
-So, even if you're not a developer, you can always open a GitHub account and create/comment issues.
+So, even if you're not a developer, you can always open a Github account and create/comment issues.
 Your contribution will be much appreciated.
 
 **Documentation**. This is a bit trickier because dupeGuru's documentation is written with a rather
@@ -82,9 +82,10 @@ agree on what should be added to the documentation.
 dupeGuru. For more information about how to do that, you can refer to the `translator guide`_.
 
 .. _been open source: https://www.hardcoded.net/articles/free-as-in-speech-fair-as-in-trade
+.. _let me know: mailto:hsoft@hardcoded.net
 .. _Source code repository: https://github.com/arsenetar/dupeguru
-.. _Issue Tracker: https://github.com/arsenetar/issues
+.. _Issue Tracker: https://github.com/hsoft/arsenetar/issues
-.. _Issue labels meaning: https://github.com/arsenetar/wiki/issue-labels
+.. _Issue labels meaning: https://github.com/hsoft/arsenetar/wiki/issue-labels
 .. _Sphinx: http://sphinx-doc.org/
 .. _reST: http://en.wikipedia.org/wiki/ReStructuredText
-.. _translator guide: https://github.com/arsenetar/wiki/Translator-Guide
+.. _translator guide: https://github.com/hsoft/arsenetar/wiki/Translator-Guide

help/en/developer/hscommon/gui/progress_window.rst

@@ -15,3 +15,4 @@ hscommon.gui.progress_window
     .. autoclass:: ProgressWindowView
         :members:
         :private-members:
+    

help/en/developer/hscommon/gui/tree.rst

@@ -15,3 +15,4 @@ hscommon.gui.tree
     .. autoclass:: Node
         :members:
         :private-members:
+

help/en/developer/hscommon/index.rst

@@ -13,3 +13,4 @@ hscommon
     util
     jobprogress/*
     gui/*
+

help/en/developer/hscommon/jobprogress/job.rst

@@ -14,3 +14,4 @@ hscommon.jobprogress.job
 
     .. autoclass:: NullJob
         :members:
+

help/en/developer/hscommon/jobprogress/performer.rst

@@ -9,3 +9,4 @@ hscommon.jobprogress.performer
     
     .. autoclass:: ThreadedJobPerformer
         :members:
+

help/en/faq.rst

@@ -30,8 +30,8 @@ that makes sure that you will **always** keep at least one member of the duplica
 How can I report a bug a suggest a feature?
 -------------------------------------------
 
-dupeGuru is hosted on `GitHub`_ and it's also where issues are tracked. The best way to report a
+dupeGuru is hosted on `Github`_ and it's also where issues are tracked. The best way to report a
-bug or suggest a feature is to sign up on GitHub and `open an issue`_.
+bug or suggest a feature is to sign up on Github and `open an issue`_. 
 
 The mark box of a file I want to delete is disabled. What must I do?
 --------------------------------------------------------------------
@@ -176,5 +176,6 @@ Preferences are stored elsewhere:
 * Linux: ``~/.config/Hardcoded Software/dupeGuru.conf``
 * Mac OS X: In the built-in ``defaults`` system, as ``com.hardcoded-software.dupeguru``
 
-.. _GitHub: https://github.com/arsenetar/dupeguru
+.. _Github: https://github.com/arsenetar/dupeguru
 .. _open an issue: https://github.com/arsenetar/dupeguru/wiki/issue-labels
+

help/en/preferences.rst

@@ -14,10 +14,6 @@ Preferences
     If you check this box, pictures of different dimensions will be allowed in the same
     duplicate group.
 
-**Match pictures of different rotations:**
-    If you check this box, pictures of different rotations will be allowed in the same
-    duplicate group.
-
 .. _filter-hardness:
 
 **Filter Hardness:**

help/hy/quick_start.rst

@@ -12,3 +12,4 @@
 * Եթե համոզված եք, որ կրկնօրինակը արդյունքներում կա, ապա սեղմեք **Խմբագրել-->Նշել բոլորը**, և ապա **Գործողություններ-->Ուղարկել Նշվածը Աղբարկղ**:
 
 Սա միայն բազային ստուգում է: Կան բազմաթիվ կարգավորումներ, որոնք հնարավորություն են տալիս նշելու տարբեր արդյունքներ և մի քանի եղանակներ արդյունքների փոփոխման: Մանրամասների համար կարդացեք Օգնության ֆայլը:
+

help/hy/reprioritize.rst

@@ -23,3 +23,4 @@ dupeGuru-ը փորձում է որոշել, թե որ կրկնօրինակներ
 մեծագույն ֆայլը և եթե երկու կամ ավելի ֆայլեր ունեն նույն չափը, ապա մեկը ունի  ֆայլի անուն, որը
 չի ավարտվում թվով, կօգտագործվի: Երբ փաստարկի արդյունքը կապված է, կարգը, որի սխալները
 նախկինում էին, խումբը պետք է օգտագործվի:
+

help/uk/faq.rst

@@ -114,3 +114,4 @@
     Якщо все це не так, `контакт УГ підтримки <http://www.hardcoded.net/support>`_, ми зрозуміти це.
 
 .. todo:: This FAQ qestion is outdated, see english version.
+

hscommon/.gitignore

@@ -0,0 +1,5 @@
+*.pyc
+*.mo
+*.so
+.DS_Store
+/docs_html

hscommon/build.py

@@ -9,7 +9,6 @@
 """This module is a collection of function to help in HS apps build process.
 """
 
-from argparse import ArgumentParser
 import os
 import sys
 import os.path as op
@@ -21,19 +20,23 @@ import re
 import importlib
 from datetime import datetime
 import glob
-from typing import Any, AnyStr, Callable, Dict, List, Union
+import sysconfig
+import modulefinder
 
-from hscommon.plat import ISWINDOWS
+from setuptools import setup, Extension
+
+from .plat import ISWINDOWS
+from .util import ensure_folder, delete_files_with_pattern
 
 
-def print_and_do(cmd: str) -> int:
+def print_and_do(cmd):
     """Prints ``cmd`` and executes it in the shell."""
     print(cmd)
     p = Popen(cmd, shell=True)
     return p.wait()
 
 
-def _perform(src: os.PathLike, dst: os.PathLike, action: Callable, actionname: str) -> None:
+def _perform(src, dst, action, actionname):
     if not op.lexists(src):
         print("Copying %s failed: it doesn't exist." % src)
         return
@@ -42,26 +45,34 @@ def _perform(src: os.PathLike, dst: os.PathLike, action: Callable, actionname: s
             shutil.rmtree(dst)
         else:
             os.remove(dst)
-    print("{} {} --> {}".format(actionname, src, dst))
+    print("%s %s --> %s" % (actionname, src, dst))
     action(src, dst)
 
 
-def copy_file_or_folder(src: os.PathLike, dst: os.PathLike) -> None:
+def copy_file_or_folder(src, dst):
     if op.isdir(src):
         shutil.copytree(src, dst, symlinks=True)
     else:
         shutil.copy(src, dst)
 
 
-def move(src: os.PathLike, dst: os.PathLike) -> None:
+def move(src, dst):
     _perform(src, dst, os.rename, "Moving")
 
 
-def copy(src: os.PathLike, dst: os.PathLike) -> None:
+def copy(src, dst):
     _perform(src, dst, copy_file_or_folder, "Copying")
 
 
-def _perform_on_all(pattern: AnyStr, dst: os.PathLike, action: Callable) -> None:
+def symlink(src, dst):
+    _perform(src, dst, os.symlink, "Symlinking")
+
+
+def hardlink(src, dst):
+    _perform(src, dst, os.link, "Hardlinking")
+
+
+def _perform_on_all(pattern, dst, action):
     # pattern is a glob pattern, example "folder/foo*". The file is moved directly in dst, no folder
     # structure from src is kept.
     filenames = glob.glob(pattern)
@@ -70,35 +81,42 @@ def _perform_on_all(pattern: AnyStr, dst: os.PathLike, action: Callable) -> None
         action(fn, destpath)
 
 
-def move_all(pattern: AnyStr, dst: os.PathLike) -> None:
+def move_all(pattern, dst):
     _perform_on_all(pattern, dst, move)
 
 
-def copy_all(pattern: AnyStr, dst: os.PathLike) -> None:
+def copy_all(pattern, dst):
     _perform_on_all(pattern, dst, copy)
 
 
-def filereplace(filename: os.PathLike, outfilename: Union[os.PathLike, None] = None, **kwargs) -> None:
+def ensure_empty_folder(path):
+    """Make sure that the path exists and that it's an empty folder."""
+    if op.exists(path):
+        shutil.rmtree(path)
+    os.mkdir(path)
+
+
+def filereplace(filename, outfilename=None, **kwargs):
     """Reads `filename`, replaces all {variables} in kwargs, and writes the result to `outfilename`."""
     if outfilename is None:
         outfilename = filename
-    fp = open(filename, encoding="utf-8")
+    fp = open(filename, "rt", encoding="utf-8")
     contents = fp.read()
     fp.close()
     # We can't use str.format() because in some files, there might be {} characters that mess with it.
     for key, item in kwargs.items():
-        contents = contents.replace(f"{{{key}}}", item)
+        contents = contents.replace("{{{}}}".format(key), item)
     fp = open(outfilename, "wt", encoding="utf-8")
     fp.write(contents)
     fp.close()
 
 
-def get_module_version(modulename: str) -> str:
+def get_module_version(modulename):
     mod = importlib.import_module(modulename)
     return mod.__version__
 
 
-def setup_package_argparser(parser: ArgumentParser):
+def setup_package_argparser(parser):
     parser.add_argument(
         "--sign",
         dest="sign_identity",
@@ -125,13 +143,13 @@ def setup_package_argparser(parser: ArgumentParser):
 
 
 # `args` come from an ArgumentParser updated with setup_package_argparser()
-def package_cocoa_app_in_dmg(app_path: os.PathLike, destfolder: os.PathLike, args) -> None:
+def package_cocoa_app_in_dmg(app_path, destfolder, args):
     # Rather than signing our app in XCode during the build phase, we sign it during the package
     # phase because running the app before packaging can modify it and we want to be sure to have
     # a valid signature.
     if args.sign_identity:
-        sign_identity = f"Developer ID Application: {args.sign_identity}"
+        sign_identity = "Developer ID Application: {}".format(args.sign_identity)
-        result = print_and_do(f'codesign --force --deep --sign "{sign_identity}" "{app_path}"')
+        result = print_and_do('codesign --force --deep --sign "{}" "{}"'.format(sign_identity, app_path))
         if result != 0:
             print("ERROR: Signing failed. Aborting packaging.")
             return
@@ -141,32 +159,46 @@ def package_cocoa_app_in_dmg(app_path: os.PathLike, destfolder: os.PathLike, arg
     build_dmg(app_path, destfolder)
 
 
-def build_dmg(app_path: os.PathLike, destfolder: os.PathLike) -> None:
+def build_dmg(app_path, destfolder):
     """Builds a DMG volume with application at ``app_path`` and puts it in ``dest_path``.
 
     The name of the resulting DMG volume is determined by the app's name and version.
     """
     print(repr(op.join(app_path, "Contents", "Info.plist")))
-    with open(op.join(app_path, "Contents", "Info.plist"), "rb") as fp:
+    plist = plistlib.readPlist(op.join(app_path, "Contents", "Info.plist"))
-        plist = plistlib.load(fp)
     workpath = tempfile.mkdtemp()
     dmgpath = op.join(workpath, plist["CFBundleName"])
     os.mkdir(dmgpath)
-    print_and_do('cp -R "{}" "{}"'.format(app_path, dmgpath))
+    print_and_do('cp -R "%s" "%s"' % (app_path, dmgpath))
     print_and_do('ln -s /Applications "%s"' % op.join(dmgpath, "Applications"))
-    dmgname = "{}_osx_{}.dmg".format(
+    dmgname = "%s_osx_%s.dmg" % (
         plist["CFBundleName"].lower().replace(" ", "_"),
         plist["CFBundleVersion"].replace(".", "_"),
     )
     print("Building %s" % dmgname)
     # UDBZ = bzip compression. UDZO (zip compression) was used before, but it compresses much less.
-    print_and_do(
+    print_and_do('hdiutil create "%s" -format UDBZ -nocrossdev -srcdir "%s"' % (op.join(destfolder, dmgname), dmgpath))
-        'hdiutil create "{}" -format UDBZ -nocrossdev -srcdir "{}"'.format(op.join(destfolder, dmgname), dmgpath)
-    )
     print("Build Complete")
 
 
-def add_to_pythonpath(path: os.PathLike) -> None:
+def copy_sysconfig_files_for_embed(destpath):
+    # This normally shouldn't be needed for Python 3.3+.
+    makefile = sysconfig.get_makefile_filename()
+    configh = sysconfig.get_config_h_filename()
+    shutil.copy(makefile, destpath)
+    shutil.copy(configh, destpath)
+    with open(op.join(destpath, "site.py"), "w") as fp:
+        fp.write(
+            """
+import os.path as op
+from distutils import sysconfig
+sysconfig.get_makefile_filename = lambda: op.join(op.dirname(__file__), 'Makefile')
+sysconfig.get_config_h_filename = lambda: op.join(op.dirname(__file__), 'pyconfig.h')
+"""
+        )
+
+
+def add_to_pythonpath(path):
     """Adds ``path`` to both ``PYTHONPATH`` env and ``sys.path``."""
     abspath = op.abspath(path)
     pythonpath = os.environ.get("PYTHONPATH", "")
@@ -179,12 +211,7 @@ def add_to_pythonpath(path: os.PathLike) -> None:
 # This is a method to hack around those freakingly tricky data inclusion/exlusion rules
 # in setuptools. We copy the packages *without data* in a build folder and then build the plugin
 # from there.
-def copy_packages(
+def copy_packages(packages_names, dest, create_links=False, extra_ignores=None):
-    packages_names: List[str],
-    dest: os.PathLike,
-    create_links: bool = False,
-    extra_ignores: Union[List[str], None] = None,
-) -> None:
     """Copy python packages ``packages_names`` to ``dest``, spurious data.
 
     Copy will happen without tests, testdata, mercurial data or C extension module source with it.
@@ -211,7 +238,7 @@ def copy_packages(
                 os.unlink(dest_path)
             else:
                 shutil.rmtree(dest_path)
-        print(f"Copying package at {source_path} to {dest_path}")
+        print("Copying package at {0} to {1}".format(source_path, dest_path))
         if create_links:
             os.symlink(op.abspath(source_path), dest_path)
         else:
@@ -221,14 +248,28 @@ def copy_packages(
                 shutil.copy(source_path, dest_path)
 
 
+def copy_qt_plugins(folder_names, dest):  # This is only for Windows
+    from PyQt5.QtCore import QLibraryInfo
+
+    qt_plugin_dir = QLibraryInfo.location(QLibraryInfo.PluginsPath)
+
+    def ignore(path, names):
+        if path == qt_plugin_dir:
+            return [n for n in names if n not in folder_names]
+        else:
+            return [n for n in names if not n.endswith(".dll")]
+
+    shutil.copytree(qt_plugin_dir, dest, ignore=ignore)
+
+
 def build_debian_changelog(
-    changelogpath: os.PathLike,
+    changelogpath,
-    destfile: os.PathLike,
+    destfile,
-    pkgname: str,
+    pkgname,
-    from_version: Union[str, None] = None,
+    from_version=None,
-    distribution: str = "precise",
+    distribution="precise",
-    fix_version: Union[str, None] = None,
+    fix_version=None,
-) -> None:
+):
     """Builds a debian changelog out of a YAML changelog.
 
     Use fix_version to patch the top changelog to that version (if, for example, there was a
@@ -281,7 +322,7 @@ def build_debian_changelog(
 re_changelog_header = re.compile(r"=== ([\d.b]*) \(([\d\-]*)\)")
 
 
-def read_changelog_file(filename: os.PathLike) -> List[Dict[str, Any]]:
+def read_changelog_file(filename):
     def iter_by_three(it):
         while True:
             try:
@@ -292,7 +333,7 @@ def read_changelog_file(filename: os.PathLike) -> List[Dict[str, Any]]:
                 return
             yield version, date, description
 
-    with open(filename, encoding="utf-8") as fp:
+    with open(filename, "rt", encoding="utf-8") as fp:
         contents = fp.read()
     splitted = re_changelog_header.split(contents)[1:]  # the first item is empty
     result = []
@@ -308,7 +349,184 @@ def read_changelog_file(filename: os.PathLike) -> List[Dict[str, Any]]:
     return result
 
 
-def fix_qt_resource_file(path: os.PathLike) -> None:
+class OSXAppStructure:
+    def __init__(self, dest):
+        self.dest = dest
+        self.contents = op.join(dest, "Contents")
+        self.macos = op.join(self.contents, "MacOS")
+        self.resources = op.join(self.contents, "Resources")
+        self.frameworks = op.join(self.contents, "Frameworks")
+        self.infoplist = op.join(self.contents, "Info.plist")
+
+    def create(self, infoplist):
+        ensure_empty_folder(self.dest)
+        os.makedirs(self.macos)
+        os.mkdir(self.resources)
+        os.mkdir(self.frameworks)
+        copy(infoplist, self.infoplist)
+        open(op.join(self.contents, "PkgInfo"), "wt").write("APPLxxxx")
+
+    def copy_executable(self, executable):
+        info = plistlib.readPlist(self.infoplist)
+        self.executablename = info["CFBundleExecutable"]
+        self.executablepath = op.join(self.macos, self.executablename)
+        copy(executable, self.executablepath)
+
+    def copy_resources(self, *resources, use_symlinks=False):
+        for path in resources:
+            resource_dest = op.join(self.resources, op.basename(path))
+            action = symlink if use_symlinks else copy
+            action(op.abspath(path), resource_dest)
+
+    def copy_frameworks(self, *frameworks):
+        for path in frameworks:
+            framework_dest = op.join(self.frameworks, op.basename(path))
+            copy(path, framework_dest)
+
+
+def create_osx_app_structure(
+    dest,
+    executable,
+    infoplist,
+    resources=None,
+    frameworks=None,
+    symlink_resources=False,
+):
+    # `dest`: A path to the destination .app folder
+    # `executable`: the path of the executable file that goes in "MacOS"
+    # `infoplist`: The path to your Info.plist file.
+    # `resources`: A list of paths of files or folders going in the "Resources" folder.
+    # `frameworks`: Same as above for "Frameworks".
+    # `symlink_resources`: If True, will symlink resources into the structure instead of copying them.
+    app = OSXAppStructure(dest)
+    app.create(infoplist)
+    app.copy_executable(executable)
+    app.copy_resources(*resources, use_symlinks=symlink_resources)
+    app.copy_frameworks(*frameworks)
+
+
+class OSXFrameworkStructure:
+    def __init__(self, dest):
+        self.dest = dest
+        self.contents = op.join(dest, "Versions", "A")
+        self.resources = op.join(self.contents, "Resources")
+        self.headers = op.join(self.contents, "Headers")
+        self.infoplist = op.join(self.resources, "Info.plist")
+        self._update_executable_path()
+
+    def _update_executable_path(self):
+        if not op.exists(self.infoplist):
+            self.executablename = self.executablepath = None
+            return
+        info = plistlib.readPlist(self.infoplist)
+        self.executablename = info["CFBundleExecutable"]
+        self.executablepath = op.join(self.contents, self.executablename)
+
+    def create(self, infoplist):
+        ensure_empty_folder(self.dest)
+        os.makedirs(self.contents)
+        os.mkdir(self.resources)
+        os.mkdir(self.headers)
+        copy(infoplist, self.infoplist)
+        self._update_executable_path()
+
+    def create_symlinks(self):
+        # Only call this after create() and copy_executable()
+        os.symlink("A", op.join(self.dest, "Versions", "Current"))
+        os.symlink(op.relpath(self.executablepath, self.dest), op.join(self.dest, self.executablename))
+        os.symlink(op.relpath(self.headers, self.dest), op.join(self.dest, "Headers"))
+        os.symlink(op.relpath(self.resources, self.dest), op.join(self.dest, "Resources"))
+
+    def copy_executable(self, executable):
+        copy(executable, self.executablepath)
+
+    def copy_resources(self, *resources, use_symlinks=False):
+        for path in resources:
+            resource_dest = op.join(self.resources, op.basename(path))
+            action = symlink if use_symlinks else copy
+            action(op.abspath(path), resource_dest)
+
+    def copy_headers(self, *headers, use_symlinks=False):
+        for path in headers:
+            header_dest = op.join(self.headers, op.basename(path))
+            action = symlink if use_symlinks else copy
+            action(op.abspath(path), header_dest)
+
+
+def copy_embeddable_python_dylib(dst):
+    runtime = op.join(
+        sysconfig.get_config_var("PYTHONFRAMEWORKPREFIX"),
+        sysconfig.get_config_var("LDLIBRARY"),
+    )
+    filedest = op.join(dst, "Python")
+    shutil.copy(runtime, filedest)
+    os.chmod(filedest, 0o774)  # We need write permission to use install_name_tool
+    cmd = "install_name_tool -id @rpath/Python %s" % filedest
+    print_and_do(cmd)
+
+
+def collect_stdlib_dependencies(script, dest_folder, extra_deps=None):
+    sysprefix = sys.prefix  # could be a virtualenv
+    basesysprefix = sys.base_prefix  # seems to be path to non-virtual sys
+    real_lib_prefix = sysconfig.get_config_var("LIBDEST")  # leaving this in case it is neede
+
+    def is_stdlib_path(path):
+        # A module path is only a stdlib path if it's in either sys.prefix or
+        # sysconfig.get_config_var('prefix') (the 2 are different if we are in a virtualenv) and if
+        # there's no "site-package in the path.
+        if not path:
+            return False
+        if "site-package" in path:
+            return False
+        if not (path.startswith(sysprefix) or path.startswith(basesysprefix) or path.startswith(real_lib_prefix)):
+            return False
+        return True
+
+    ensure_folder(dest_folder)
+    mf = modulefinder.ModuleFinder()
+    mf.run_script(script)
+    modpaths = [mod.__file__ for mod in mf.modules.values()]
+    modpaths = filter(is_stdlib_path, modpaths)
+    for p in modpaths:
+        if p.startswith(real_lib_prefix):
+            relpath = op.relpath(p, real_lib_prefix)
+        elif p.startswith(sysprefix):
+            relpath = op.relpath(p, sysprefix)
+            assert relpath.startswith("lib/python3.")  # we want to get rid of that lib/python3.x part
+            relpath = relpath[len("lib/python3.X/") :]
+        elif p.startswith(basesysprefix):
+            relpath = op.relpath(p, basesysprefix)
+            assert relpath.startswith("lib/python3.")
+            relpath = relpath[len("lib/python3.X/") :]
+        else:
+            raise AssertionError()
+        if relpath.startswith("lib-dynload"):  # We copy .so files in lib-dynload directly in our dest
+            relpath = relpath[len("lib-dynload/") :]
+        if relpath.startswith("encodings") or relpath.startswith("distutils"):
+            # We force their inclusion later.
+            continue
+        dest_path = op.join(dest_folder, relpath)
+        ensure_folder(op.dirname(dest_path))
+        copy(p, dest_path)
+    # stringprep is used by encodings.
+    # We use real_lib_prefix with distutils because virtualenv messes with it and we need to refer
+    # to the original distutils folder.
+    FORCED_INCLUSION = [
+        "encodings",
+        "stringprep",
+        op.join(real_lib_prefix, "distutils"),
+    ]
+    if extra_deps:
+        FORCED_INCLUSION += extra_deps
+    copy_packages(FORCED_INCLUSION, dest_folder)
+    # There's a couple of rather big exe files in the distutils folder that we absolutely don't
+    # need. Remove them.
+    delete_files_with_pattern(op.join(dest_folder, "distutils"), "*.exe")
+    # And, finally, create an empty "site.py" that Python needs around on startup.
+    open(op.join(dest_folder, "site.py"), "w").close()
+
+
+def fix_qt_resource_file(path):
     # pyrcc5 under Windows, if the locale is non-english, can produce a source file with a date
     # containing accented characters. If it does, the encoding is wrong and it prevents the file
     # from being correctly frozen by cx_freeze. To work around that, we open the file, strip all
@@ -319,3 +537,21 @@ def fix_qt_resource_file(path: os.PathLike) -> None:
     lines = [line for line in lines if not line.startswith(b"#")]
     with open(path, "wb") as fp:
         fp.write(b"\n".join(lines))
+
+
+def build_cocoa_ext(extname, dest, source_files, extra_frameworks=(), extra_includes=()):
+    extra_link_args = ["-framework", "CoreFoundation", "-framework", "Foundation"]
+    for extra in extra_frameworks:
+        extra_link_args += ["-framework", extra]
+    ext = Extension(
+        extname,
+        source_files,
+        extra_link_args=extra_link_args,
+        include_dirs=extra_includes,
+    )
+    setup(script_args=["build_ext", "--inplace"], ext_modules=[ext])
+    # Our problem here is to get the fully qualified filename of the resulting .so but I couldn't
+    # find a documented way to do so. The only thing I could find is this below :(
+    fn = ext._file_name
+    assert op.exists(fn)
+    move(fn, op.join(dest, fn))

hscommon/build_ext.py

@@ -0,0 +1,30 @@
+# 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 argparse
+
+from setuptools import setup, Extension
+
+
+def get_parser():
+    parser = argparse.ArgumentParser(description="Build an arbitrary Python extension.")
+    parser.add_argument("source_files", nargs="+", help="List of source files to compile")
+    parser.add_argument("name", nargs=1, help="Name of the resulting extension")
+    return parser
+
+
+def main():
+    args = get_parser().parse_args()
+    print("Building {}...".format(args.name[0]))
+    ext = Extension(args.name[0], args.source_files)
+    setup(
+        script_args=["build_ext", "--inplace"],
+        ext_modules=[ext],
+    )
+
+
+if __name__ == "__main__":
+    main()

hscommon/conflict.py

@@ -14,9 +14,7 @@ import re
 import os
 import shutil
 
-from errno import EISDIR, EACCES
+from .path import Path, pathify
-from pathlib import Path
-from typing import Callable, List
 
 # This matches [123], but not [12] (3 digits being the minimum).
 # It also matches [1234] [12345] etc..
@@ -24,7 +22,7 @@ from typing import Callable, List
 re_conflict = re.compile(r"^\[\d{3}\d*\] ")
 
 
-def get_conflicted_name(other_names: List[str], name: str) -> str:
+def get_conflicted_name(other_names, name):
     """Returns name with a ``[000]`` number in front of it.
 
     The number between brackets depends on how many conlicted filenames
@@ -41,7 +39,7 @@ def get_conflicted_name(other_names: List[str], name: str) -> str:
         i += 1
 
 
-def get_unconflicted_name(name: str) -> str:
+def get_unconflicted_name(name):
     """Returns ``name`` without ``[]`` brackets.
 
     Brackets which, of course, might have been added by func:`get_conflicted_name`.
@@ -49,35 +47,38 @@ def get_unconflicted_name(name: str) -> str:
     return re_conflict.sub("", name, 1)
 
 
-def is_conflicted(name: str) -> bool:
+def is_conflicted(name):
     """Returns whether ``name`` is prepended with a bracketed number."""
     return re_conflict.match(name) is not None
 
 
-def _smart_move_or_copy(operation: Callable, source_path: Path, dest_path: Path) -> None:
+@pathify
+def _smart_move_or_copy(operation, source_path: Path, dest_path: Path):
     """Use move() or copy() to move and copy file with the conflict management."""
-    if dest_path.is_dir() and not source_path.is_dir():
+    if dest_path.isdir() and not source_path.isdir():
-        dest_path = dest_path.joinpath(source_path.name)
+        dest_path = dest_path[source_path.name]
     if dest_path.exists():
         filename = dest_path.name
-        dest_dir_path = dest_path.parent
+        dest_dir_path = dest_path.parent()
         newname = get_conflicted_name(os.listdir(str(dest_dir_path)), filename)
-        dest_path = dest_dir_path.joinpath(newname)
+        dest_path = dest_dir_path[newname]
     operation(str(source_path), str(dest_path))
 
 
-def smart_move(source_path: Path, dest_path: Path) -> None:
+def smart_move(source_path, dest_path):
     """Same as :func:`smart_copy`, but it moves files instead."""
     _smart_move_or_copy(shutil.move, source_path, dest_path)
 
 
-def smart_copy(source_path: Path, dest_path: Path) -> None:
+def smart_copy(source_path, dest_path):
     """Copies ``source_path`` to ``dest_path``, recursively and with conflict resolution."""
     try:
         _smart_move_or_copy(shutil.copy, source_path, dest_path)
-    except OSError as e:
+    except IOError as e:
-        # It's a directory, code is 21 on OS X / Linux (EISDIR) and 13 on Windows (EACCES)
+        if e.errno in {
-        if e.errno in (EISDIR, EACCES):
+            21,
+            13,
+        }:  # it's a directory, code is 21 on OS X / Linux and 13 on Windows
             _smart_move_or_copy(shutil.copytree, source_path, dest_path)
         else:
             raise

hscommon/debug.py

@@ -0,0 +1,23 @@
+# Created By: Virgil Dupras
+# Created On: 2011-04-19
+# 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 sys
+import traceback
+
+
+# Taken from http://bzimmer.ziclix.com/2008/12/17/python-thread-dumps/
+def stacktraces():
+    code = []
+    for thread_id, stack in sys._current_frames().items():
+        code.append("\n# ThreadID: %s" % thread_id)
+        for filename, lineno, name, line in traceback.extract_stack(stack):
+            code.append('File: "%s", line %d, in %s' % (filename, lineno, name))
+            if line:
+                code.append("  %s" % (line.strip()))
+
+    return "\n".join(code)

hscommon/desktop.py

@@ -6,33 +6,31 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from enum import Enum
-from os import PathLike
 import os.path as op
 import logging
 
 
-class SpecialFolder(Enum):
+class SpecialFolder:
     APPDATA = 1
     CACHE = 2
 
 
-def open_url(url: str) -> None:
+def open_url(url):
     """Open ``url`` with the default browser."""
     _open_url(url)
 
 
-def open_path(path: PathLike) -> None:
+def open_path(path):
     """Open ``path`` with its associated application."""
     _open_path(str(path))
 
 
-def reveal_path(path: PathLike) -> None:
+def reveal_path(path):
     """Open the folder containing ``path`` with the default file browser."""
     _reveal_path(str(path))
 
 
-def special_folder_path(special_folder: SpecialFolder, portable: bool = False) -> str:
+def special_folder_path(special_folder, appname=None, portable=False):
     """Returns the path of ``special_folder``.
 
     ``special_folder`` is a SpecialFolder.* const. The result is the special folder for the current
@@ -40,25 +38,48 @@ def special_folder_path(special_folder: SpecialFolder, portable: bool = False) -
 
     You can override the application name with ``appname``. This argument is ingored under Qt.
     """
-    return _special_folder_path(special_folder, portable=portable)
+    return _special_folder_path(special_folder, appname, portable=portable)
 
 
+try:
+    # Normally, we would simply do "from cocoa import proxy", but due to a bug in pytest (currently
+    # at v2.4.2), our test suite is broken when we do that. This below is a workaround until that
+    # bug is fixed.
+    import cocoa
+
+    if not hasattr(cocoa, "proxy"):
+        raise ImportError()
+    proxy = cocoa.proxy
+    _open_url = proxy.openURL_
+    _open_path = proxy.openPath_
+    _reveal_path = proxy.revealPath_
+
+    def _special_folder_path(special_folder, appname=None, portable=False):
+        if special_folder == SpecialFolder.CACHE:
+            base = proxy.getCachePath()
+        else:
+            base = proxy.getAppdataPath()
+        if not appname:
+            appname = proxy.bundleInfo_("CFBundleName")
+        return op.join(base, appname)
+
+except ImportError:
     try:
         from PyQt5.QtCore import QUrl, QStandardPaths
         from PyQt5.QtGui import QDesktopServices
-    from qt.util import get_appdata
+        from qtlib.util import get_appdata
         from core.util import executable_folder
         from hscommon.plat import ISWINDOWS, ISOSX
         import subprocess
 
-    def _open_url(url: str) -> None:
+        def _open_url(url):
             QDesktopServices.openUrl(QUrl(url))
 
-    def _open_path(path: str) -> None:
+        def _open_path(path):
             url = QUrl.fromLocalFile(str(path))
             QDesktopServices.openUrl(url)
 
-    def _reveal_path(path: str) -> None:
+        def _reveal_path(path):
             if ISWINDOWS:
                 subprocess.run(["explorer", "/select,", op.abspath(path)])
             elif ISOSX:
@@ -66,7 +87,7 @@ try:
             else:
                 _open_path(op.dirname(str(path)))
 
-    def _special_folder_path(special_folder: SpecialFolder, portable: bool = False) -> str:
+        def _special_folder_path(special_folder, appname=None, portable=False):
             if special_folder == SpecialFolder.CACHE:
                 if ISWINDOWS and portable:
                     folder = op.join(executable_folder(), "cache")
@@ -81,17 +102,13 @@ except ImportError:
         # weird situation. Let's just have dummy fallbacks.
         logging.warning("Can't setup desktop functions!")
 
-    def _open_url(url: str) -> None:
+        def _open_path(path):
             # Dummy for tests
             pass
 
-    def _open_path(path: str) -> None:
+        def _reveal_path(path):
             # Dummy for tests
             pass
 
-    def _reveal_path(path: str) -> None:
+        def _special_folder_path(special_folder, appname=None, portable=False):
-        # Dummy for tests
-        pass
-
-    def _special_folder_path(special_folder: SpecialFolder, portable: bool = False) -> str:
             return "/tmp"

hscommon/geometry.py

@@ -0,0 +1,216 @@
+# Created By: Virgil Dupras
+# Created On: 2011-08-05
+# 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 sys import maxsize as INF
+from math import sqrt
+
+VERY_SMALL = 0.0000001
+
+
+class Point:
+    def __init__(self, x, y):
+        self.x = x
+        self.y = y
+
+    def __repr__(self):
+        return "<Point {:2.2f}, {:2.2f}>".format(*self)
+
+    def __iter__(self):
+        yield self.x
+        yield self.y
+
+    def distance_to(self, other):
+        return Line(self, other).length()
+
+
+class Line:
+    def __init__(self, p1, p2):
+        self.p1 = p1
+        self.p2 = p2
+
+    def __repr__(self):
+        return "<Line {}, {}>".format(*self)
+
+    def __iter__(self):
+        yield self.p1
+        yield self.p2
+
+    def dx(self):
+        return self.p2.x - self.p1.x
+
+    def dy(self):
+        return self.p2.y - self.p1.y
+
+    def length(self):
+        return sqrt(self.dx() ** 2 + self.dy() ** 2)
+
+    def slope(self):
+        if self.dx() == 0:
+            return INF if self.dy() > 0 else -INF
+        else:
+            return self.dy() / self.dx()
+
+    def intersection_point(self, other):
+        # with help from http://paulbourke.net/geometry/lineline2d/
+        if abs(self.slope() - other.slope()) < VERY_SMALL:
+            # parallel. Even if coincident, we return nothing
+            return None
+
+        A, B = self
+        C, D = other
+
+        denom = (D.y - C.y) * (B.x - A.x) - (D.x - C.x) * (B.y - A.y)
+        if denom == 0:
+            return None
+        numera = (D.x - C.x) * (A.y - C.y) - (D.y - C.y) * (A.x - C.x)
+        numerb = (B.x - A.x) * (A.y - C.y) - (B.y - A.y) * (A.x - C.x)
+
+        mua = numera / denom
+        mub = numerb / denom
+        if (0 <= mua <= 1) and (0 <= mub <= 1):
+            x = A.x + mua * (B.x - A.x)
+            y = A.y + mua * (B.y - A.y)
+            return Point(x, y)
+        else:
+            return None
+
+
+class Rect:
+    def __init__(self, x, y, w, h):
+        self.x = x
+        self.y = y
+        self.w = w
+        self.h = h
+
+    def __iter__(self):
+        yield self.x
+        yield self.y
+        yield self.w
+        yield self.h
+
+    def __repr__(self):
+        return "<Rect {:2.2f}, {:2.2f}, {:2.2f}, {:2.2f}>".format(*self)
+
+    @classmethod
+    def from_center(cls, center, width, height):
+        x = center.x - width / 2
+        y = center.y - height / 2
+        return cls(x, y, width, height)
+
+    @classmethod
+    def from_corners(cls, pt1, pt2):
+        x1, y1 = pt1
+        x2, y2 = pt2
+        return cls(min(x1, x2), min(y1, y2), abs(x1 - x2), abs(y1 - y2))
+
+    def center(self):
+        return Point(self.x + self.w / 2, self.y + self.h / 2)
+
+    def contains_point(self, point):
+        x, y = point
+        (x1, y1), (x2, y2) = self.corners()
+        return (x1 <= x <= x2) and (y1 <= y <= y2)
+
+    def contains_rect(self, rect):
+        pt1, pt2 = rect.corners()
+        return self.contains_point(pt1) and self.contains_point(pt2)
+
+    def corners(self):
+        return Point(self.x, self.y), Point(self.x + self.w, self.y + self.h)
+
+    def intersects(self, other):
+        r1pt1, r1pt2 = self.corners()
+        r2pt1, r2pt2 = other.corners()
+        if r1pt1.x < r2pt1.x:
+            xinter = r1pt2.x >= r2pt1.x
+        else:
+            xinter = r2pt2.x >= r1pt1.x
+        if not xinter:
+            return False
+        if r1pt1.y < r2pt1.y:
+            yinter = r1pt2.y >= r2pt1.y
+        else:
+            yinter = r2pt2.y >= r1pt1.y
+        return yinter
+
+    def lines(self):
+        pt1, pt4 = self.corners()
+        pt2 = Point(pt4.x, pt1.y)
+        pt3 = Point(pt1.x, pt4.y)
+        l1 = Line(pt1, pt2)
+        l2 = Line(pt2, pt4)
+        l3 = Line(pt3, pt4)
+        l4 = Line(pt1, pt3)
+        return l1, l2, l3, l4
+
+    def scaled_rect(self, dx, dy):
+        """Returns a rect that has the same borders at self, but grown/shrunk by dx/dy on each side."""
+        x, y, w, h = self
+        x -= dx
+        y -= dy
+        w += dx * 2
+        h += dy * 2
+        return Rect(x, y, w, h)
+
+    def united(self, other):
+        """Returns the bounding rectangle of this rectangle and `other`."""
+        # ul=upper left lr=lower right
+        ulcorner1, lrcorner1 = self.corners()
+        ulcorner2, lrcorner2 = other.corners()
+        corner1 = Point(min(ulcorner1.x, ulcorner2.x), min(ulcorner1.y, ulcorner2.y))
+        corner2 = Point(max(lrcorner1.x, lrcorner2.x), max(lrcorner1.y, lrcorner2.y))
+        return Rect.from_corners(corner1, corner2)
+
+    # --- Properties
+    @property
+    def top(self):
+        return self.y
+
+    @top.setter
+    def top(self, value):
+        self.y = value
+
+    @property
+    def bottom(self):
+        return self.y + self.h
+
+    @bottom.setter
+    def bottom(self, value):
+        self.y = value - self.h
+
+    @property
+    def left(self):
+        return self.x
+
+    @left.setter
+    def left(self, value):
+        self.x = value
+
+    @property
+    def right(self):
+        return self.x + self.w
+
+    @right.setter
+    def right(self, value):
+        self.x = value - self.w
+
+    @property
+    def width(self):
+        return self.w
+
+    @width.setter
+    def width(self, value):
+        self.w = value
+
+    @property
+    def height(self):
+        return self.h
+
+    @height.setter
+    def height(self, value):
+        self.h = value

hscommon/gui/base.py

@@ -36,11 +36,11 @@ class GUIObject:
     ``multibind`` flag to ``True`` and the safeguard will be disabled.
     """
 
-    def __init__(self, multibind: bool = False) -> None:
+    def __init__(self, multibind=False):
         self._view = None
         self._multibind = multibind
 
-    def _view_updated(self) -> None:
+    def _view_updated(self):
         """(Virtual) Called after :attr:`view` has been set.
 
         Doing nothing by default, this method is called after :attr:`view` has been set (it isn't
@@ -48,7 +48,7 @@ class GUIObject:
         (which is often the whole of the initialization code).
         """
 
-    def has_view(self) -> bool:
+    def has_view(self):
         return (self._view is not None) and (not isinstance(self._view, NoopGUI))
 
     @property
@@ -67,7 +67,7 @@ class GUIObject:
         return self._view
 
     @view.setter
-    def view(self, value) -> None:
+    def view(self, value):
         if self._view is None and value is None:
             # Initial view assignment
             return

hscommon/gui/column.py

@@ -7,10 +7,8 @@
 # http://www.gnu.org/licenses/gpl-3.0.html
 
 import copy
-from typing import Any, List, Tuple, Union
 
-from hscommon.gui.base import GUIObject
+from .base import GUIObject
-from hscommon.gui.table import GUITable
 
 
 class Column:
@@ -19,7 +17,7 @@ class Column:
     These attributes are then used to correctly configure the column on the "view" side.
     """
 
-    def __init__(self, name: str, display: str = "", visible: bool = True, optional: bool = False) -> None:
+    def __init__(self, name, display="", visible=True, optional=False):
         #: "programmatical" (not for display) name. Used as a reference in a couple of place, such
         #: as :meth:`Columns.column_by_name`.
         self.name = name
@@ -54,14 +52,14 @@ class ColumnsView:
     callbacks.
     """
 
-    def restore_columns(self) -> None:
+    def restore_columns(self):
         """Update all columns according to the model.
 
         When this is called, our view has to update the columns title, order and visibility of all
         columns.
         """
 
-    def set_column_visible(self, colname: str, visible: bool) -> None:
+    def set_column_visible(self, colname, visible):
         """Update visibility of column ``colname``.
 
         Called when the user toggles the visibility of a column, we must update the column
@@ -75,13 +73,13 @@ class PrefAccessInterface:
     *Not actually used in the code. For documentation purposes only.*
     """
 
-    def get_default(self, key: str, fallback_value: Union[Any, None]) -> Any:
+    def get_default(self, key, fallback_value):
         """Retrieve the value for ``key`` in the currently running app's preference store.
 
         If the key doesn't exist, return ``fallback_value``.
         """
 
-    def set_default(self, key: str, value: Any) -> None:
+    def set_default(self, key, value):
         """Set the value ``value`` for ``key`` in the currently running app's preference store."""
 
 
@@ -106,65 +104,65 @@ class Columns(GUIObject):
                          have that same prefix.
     """
 
-    def __init__(self, table: GUITable, prefaccess=None, savename: Union[str, None] = None):
+    def __init__(self, table, prefaccess=None, savename=None):
         GUIObject.__init__(self)
         self.table = table
         self.prefaccess = prefaccess
         self.savename = savename
         # We use copy here for test isolation. If we don't, changing a column affects all tests.
-        self.column_list: List[Column] = list(map(copy.copy, table.COLUMNS))
+        self.column_list = list(map(copy.copy, table.COLUMNS))
         for i, column in enumerate(self.column_list):
             column.logical_index = i
             column.ordered_index = i
         self.coldata = {col.name: col for col in self.column_list}
 
     # --- Private
-    def _get_colname_attr(self, colname: str, attrname: str, default: Any) -> Any:
+    def _get_colname_attr(self, colname, attrname, default):
         try:
             return getattr(self.coldata[colname], attrname)
         except KeyError:
             return default
 
-    def _set_colname_attr(self, colname: str, attrname: str, value: Any) -> None:
+    def _set_colname_attr(self, colname, attrname, value):
         try:
             col = self.coldata[colname]
             setattr(col, attrname, value)
         except KeyError:
             pass
 
-    def _optional_columns(self) -> List[Column]:
+    def _optional_columns(self):
         return [c for c in self.column_list if c.optional]
 
     # --- Override
-    def _view_updated(self) -> None:
+    def _view_updated(self):
         self.restore_columns()
 
     # --- Public
-    def column_by_index(self, index: int):
+    def column_by_index(self, index):
         """Return the :class:`Column` having the :attr:`~Column.logical_index` ``index``."""
         return self.column_list[index]
 
-    def column_by_name(self, name: str):
+    def column_by_name(self, name):
         """Return the :class:`Column` having the :attr:`~Column.name` ``name``."""
         return self.coldata[name]
 
-    def columns_count(self) -> int:
+    def columns_count(self):
         """Returns the number of columns in our set."""
         return len(self.column_list)
 
-    def column_display(self, colname: str) -> str:
+    def column_display(self, colname):
         """Returns display name for column named ``colname``, or ``''`` if there's none."""
         return self._get_colname_attr(colname, "display", "")
 
-    def column_is_visible(self, colname: str) -> bool:
+    def column_is_visible(self, colname):
         """Returns visibility for column named ``colname``, or ``True`` if there's none."""
         return self._get_colname_attr(colname, "visible", True)
 
-    def column_width(self, colname: str) -> int:
+    def column_width(self, colname):
         """Returns width for column named ``colname``, or ``0`` if there's none."""
         return self._get_colname_attr(colname, "width", 0)
 
-    def columns_to_right(self, colname: str) -> List[str]:
+    def columns_to_right(self, colname):
         """Returns the list of all columns to the right of ``colname``.
 
         "right" meaning "having a higher :attr:`Column.ordered_index`" in our left-to-right
@@ -174,7 +172,7 @@ class Columns(GUIObject):
         index = column.ordered_index
         return [col.name for col in self.column_list if (col.visible and col.ordered_index > index)]
 
-    def menu_items(self) -> List[Tuple[str, bool]]:
+    def menu_items(self):
         """Returns a list of items convenient for quick visibility menu generation.
 
         Returns a list of ``(display_name, is_marked)`` items for each optional column in the
@@ -186,7 +184,7 @@ class Columns(GUIObject):
         """
         return [(c.display, c.visible) for c in self._optional_columns()]
 
-    def move_column(self, colname: str, index: int) -> None:
+    def move_column(self, colname, index):
         """Moves column ``colname`` to ``index``.
 
         The column will be placed just in front of the column currently having that index, or to the
@@ -197,7 +195,7 @@ class Columns(GUIObject):
         colnames.insert(index, colname)
         self.set_column_order(colnames)
 
-    def reset_to_defaults(self) -> None:
+    def reset_to_defaults(self):
         """Reset all columns' width and visibility to their default values."""
         self.set_column_order([col.name for col in self.column_list])
         for col in self._optional_columns():
@@ -205,11 +203,11 @@ class Columns(GUIObject):
             col.width = col.default_width
         self.view.restore_columns()
 
-    def resize_column(self, colname: str, newwidth: int) -> None:
+    def resize_column(self, colname, newwidth):
         """Set column ``colname``'s width to ``newwidth``."""
         self._set_colname_attr(colname, "width", newwidth)
 
-    def restore_columns(self) -> None:
+    def restore_columns(self):
         """Restore's column persistent attributes from the last :meth:`save_columns`."""
         if not (self.prefaccess and self.savename and self.coldata):
             if (not self.savename) and (self.coldata):
@@ -218,7 +216,7 @@ class Columns(GUIObject):
                 self.view.restore_columns()
             return
         for col in self.column_list:
-            pref_name = f"{self.savename}.Columns.{col.name}"
+            pref_name = "{}.Columns.{}".format(self.savename, col.name)
             coldata = self.prefaccess.get_default(pref_name, fallback_value={})
             if "index" in coldata:
                 col.ordered_index = coldata["index"]
@@ -228,19 +226,18 @@ class Columns(GUIObject):
                 col.visible = coldata["visible"]
         self.view.restore_columns()
 
-    def save_columns(self) -> None:
+    def save_columns(self):
         """Save column attributes in persistent storage for restoration in :meth:`restore_columns`."""
         if not (self.prefaccess and self.savename and self.coldata):
             return
         for col in self.column_list:
-            pref_name = f"{self.savename}.Columns.{col.name}"
+            pref_name = "{}.Columns.{}".format(self.savename, col.name)
             coldata = {"index": col.ordered_index, "width": col.width}
             if col.optional:
                 coldata["visible"] = col.visible
             self.prefaccess.set_default(pref_name, coldata)
 
-    # TODO annotate colnames
+    def set_column_order(self, colnames):
-    def set_column_order(self, colnames) -> None:
         """Change the columns order so it matches the order in ``colnames``.
 
         :param colnames: A list of column names in the desired order.
@@ -250,17 +247,17 @@ class Columns(GUIObject):
             col = self.coldata[colname]
             col.ordered_index = i
 
-    def set_column_visible(self, colname: str, visible: bool) -> None:
+    def set_column_visible(self, colname, visible):
         """Set the visibility of column ``colname``."""
         self.table.save_edits()  # the table on the GUI side will stop editing when the columns change
         self._set_colname_attr(colname, "visible", visible)
         self.view.set_column_visible(colname, visible)
 
-    def set_default_width(self, colname: str, width: int) -> None:
+    def set_default_width(self, colname, width):
         """Set the default width or column ``colname``."""
         self._set_colname_attr(colname, "default_width", width)
 
-    def toggle_menu_item(self, index: int) -> bool:
+    def toggle_menu_item(self, index):
         """Toggles the visibility of an optional column.
 
         You know, that optional column menu you've generated in :meth:`menu_items`? Well, ``index``
@@ -274,11 +271,11 @@ class Columns(GUIObject):
 
     # --- Properties
     @property
-    def ordered_columns(self) -> List[Column]:
+    def ordered_columns(self):
         """List of :class:`Column` in visible order."""
         return [col for col in sorted(self.column_list, key=lambda col: col.ordered_index)]
 
     @property
-    def colnames(self) -> List[str]:
+    def colnames(self):
         """List of column names in visible order."""
         return [col.name for col in self.ordered_columns]

hscommon/gui/progress_window.py

@@ -4,10 +4,9 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from typing import Callable, Tuple, Union
+from ..jobprogress.performer import ThreadedJobPerformer
-from hscommon.jobprogress.performer import ThreadedJobPerformer
+from .base import GUIObject
-from hscommon.gui.base import GUIObject
+from .text_field import TextField
-from hscommon.gui.text_field import TextField
 
 
 class ProgressWindowView:
@@ -21,13 +20,13 @@ class ProgressWindowView:
     It's also expected to call :meth:`ProgressWindow.cancel` when the cancel button is clicked.
     """
 
-    def show(self) -> None:
+    def show(self):
         """Show the dialog."""
 
-    def close(self) -> None:
+    def close(self):
         """Close the dialog."""
 
-    def set_progress(self, progress: int) -> None:
+    def set_progress(self, progress):
         """Set the progress of the progress bar to ``progress``.
 
         Not all jobs are equally responsive on their job progress report and it is recommended that
@@ -61,11 +60,7 @@ class ProgressWindow(GUIObject, ThreadedJobPerformer):
                        called as if the job terminated normally.
     """
 
-    def __init__(
+    def __init__(self, finish_func, error_func=None):
-        self,
-        finish_func: Callable[[Union[str, None]], None],
-        error_func: Callable[[Union[str, None], Exception], bool] = None,
-    ) -> None:
         # finish_func(jobid) is the function that is called when a job is completed.
         GUIObject.__init__(self)
         ThreadedJobPerformer.__init__(self)
@@ -76,9 +71,9 @@ class ProgressWindow(GUIObject, ThreadedJobPerformer):
         #: :class:`.TextField`. It contains the job textual update that the function might yield
         #: during its course.
         self.progressdesc_textfield = TextField()
-        self.jobid: Union[str, None] = None
+        self.jobid = None
 
-    def cancel(self) -> None:
+    def cancel(self):
         """Call for a user-initiated job cancellation."""
         # The UI is sometimes a bit buggy and calls cancel() on self.view.close(). We just want to
         # make sure that this doesn't lead us to think that the user acually cancelled the task, so
@@ -86,7 +81,7 @@ class ProgressWindow(GUIObject, ThreadedJobPerformer):
         if self._job_running:
             self.job_cancelled = True
 
-    def pulse(self) -> None:
+    def pulse(self):
         """Update progress reports in the GUI.
 
         Call this regularly from the GUI main run loop. The values might change before
@@ -116,7 +111,7 @@ class ProgressWindow(GUIObject, ThreadedJobPerformer):
             self.progressdesc_textfield.text = last_desc
         self.view.set_progress(last_progress)
 
-    def run(self, jobid: str, title: str, target: Callable, args: Tuple = ()):
+    def run(self, jobid, title, target, args=()):
         """Starts a threaded job.
 
         The ``target`` function will be sent, as its first argument, a :class:`.Job` instance which

hscommon/gui/selectable_list.py

@@ -8,7 +8,7 @@
 
 from collections.abc import Sequence, MutableSequence
 
-from hscommon.gui.base import GUIObject
+from .base import GUIObject
 
 
 class Selectable(Sequence):

hscommon/gui/table.py

@@ -8,10 +8,9 @@
 
 from collections.abc import MutableSequence
 from collections import namedtuple
-from typing import Any, List, Tuple, Union
 
-from hscommon.gui.base import GUIObject
+from .base import GUIObject
-from hscommon.gui.selectable_list import Selectable
+from .selectable_list import Selectable
 
 
 # We used to directly subclass list, but it caused problems at some point with deepcopy
@@ -28,16 +27,12 @@ class Table(MutableSequence, Selectable):
     Subclasses :class:`.Selectable`.
     """
 
-    # Should be List[Column], but have circular import...
+    def __init__(self):
-    COLUMNS: List = []
-
-    def __init__(self) -> None:
         Selectable.__init__(self)
-        self._rows: List["Row"] = []
+        self._rows = []
-        self._header: Union["Row", None] = None
+        self._header = None
-        self._footer: Union["Row", None] = None
+        self._footer = None
 
-    # TODO type hint for key
     def __delitem__(self, key):
         self._rows.__delitem__(key)
         if self._header is not None and ((not self) or (self[0] is not self._header)):
@@ -46,18 +41,16 @@ class Table(MutableSequence, Selectable):
             self._footer = None
         self._check_selection_range()
 
-    # TODO type hint for key
+    def __getitem__(self, key):
-    def __getitem__(self, key) -> Any:
         return self._rows.__getitem__(key)
 
-    def __len__(self) -> int:
+    def __len__(self):
         return len(self._rows)
 
-    # TODO type hint for key
+    def __setitem__(self, key, value):
-    def __setitem__(self, key, value: Any) -> None:
         self._rows.__setitem__(key, value)
 
-    def append(self, item: "Row") -> None:
+    def append(self, item):
         """Appends ``item`` at the end of the table.
 
         If there's a footer, the item is inserted before it.
@@ -67,7 +60,7 @@ class Table(MutableSequence, Selectable):
         else:
             self._rows.append(item)
 
-    def insert(self, index: int, item: "Row") -> None:
+    def insert(self, index, item):
         """Inserts ``item`` at ``index`` in the table.
 
         If there's a header, will make sure we don't insert before it, and if there's a footer, will
@@ -79,7 +72,7 @@ class Table(MutableSequence, Selectable):
             index = len(self) - 1
         self._rows.insert(index, item)
 
-    def remove(self, row: "Row") -> None:
+    def remove(self, row):
         """Removes ``row`` from table.
 
         If ``row`` is a header or footer, that header or footer will be set to ``None``.
@@ -91,7 +84,7 @@ class Table(MutableSequence, Selectable):
         self._rows.remove(row)
         self._check_selection_range()
 
-    def sort_by(self, column_name: str, desc: bool = False) -> None:
+    def sort_by(self, column_name, desc=False):
         """Sort table by ``column_name``.
 
         Sort key for each row is computed from :meth:`Row.sort_key_for_column`.
@@ -112,7 +105,7 @@ class Table(MutableSequence, Selectable):
 
     # --- Properties
     @property
-    def footer(self) -> Union["Row", None]:
+    def footer(self):
         """If set, a row that always stay at the bottom of the table.
 
         :class:`Row`. *get/set*.
@@ -135,7 +128,7 @@ class Table(MutableSequence, Selectable):
         return self._footer
 
     @footer.setter
-    def footer(self, value: Union["Row", None]) -> None:
+    def footer(self, value):
         if self._footer is not None:
             self._rows.pop()
         if value is not None:
@@ -143,7 +136,7 @@ class Table(MutableSequence, Selectable):
         self._footer = value
 
     @property
-    def header(self) -> Union["Row", None]:
+    def header(self):
         """If set, a row that always stay at the bottom of the table.
 
         See :attr:`footer` for details.
@@ -151,7 +144,7 @@ class Table(MutableSequence, Selectable):
         return self._header
 
     @header.setter
-    def header(self, value: Union["Row", None]) -> None:
+    def header(self, value):
         if self._header is not None:
             self._rows.pop(0)
         if value is not None:
@@ -159,7 +152,7 @@ class Table(MutableSequence, Selectable):
         self._header = value
 
     @property
-    def row_count(self) -> int:
+    def row_count(self):
         """Number or rows in the table (without counting header and footer).
 
         *int*. *read-only*.
@@ -172,7 +165,7 @@ class Table(MutableSequence, Selectable):
         return result
 
     @property
-    def rows(self) -> List["Row"]:
+    def rows(self):
         """List of rows in the table, excluding header and footer.
 
         List of :class:`Row`. *read-only*.
@@ -186,7 +179,7 @@ class Table(MutableSequence, Selectable):
         return self[start:end]
 
     @property
-    def selected_row(self) -> "Row":
+    def selected_row(self):
         """Selected row according to :attr:`Selectable.selected_index`.
 
         :class:`Row`. *get/set*.
@@ -197,14 +190,14 @@ class Table(MutableSequence, Selectable):
         return self[self.selected_index] if self.selected_index is not None else None
 
     @selected_row.setter
-    def selected_row(self, value: int) -> None:
+    def selected_row(self, value):
         try:
             self.selected_index = self.index(value)
         except ValueError:
             pass
 
     @property
-    def selected_rows(self) -> List["Row"]:
+    def selected_rows(self):
         """List of selected rows based on :attr:`.selected_indexes`.
 
         List of :class:`Row`. *read-only*.
@@ -226,20 +219,20 @@ class GUITableView:
     Whenever the user changes the selection, we expect the view to call :meth:`Table.select`.
     """
 
-    def refresh(self) -> None:
+    def refresh(self):
         """Refreshes the contents of the table widget.
 
         Ensures that the contents of the table widget is synced with the model. This includes
         selection.
         """
 
-    def start_editing(self) -> None:
+    def start_editing(self):
         """Start editing the currently selected row.
 
         Begin whatever inline editing support that the view supports.
         """
 
-    def stop_editing(self) -> None:
+    def stop_editing(self):
         """Stop editing if there's an inline editing in effect.
 
         There's no "aborting" implied in this call, so it's appropriate to send whatever the user
@@ -267,33 +260,33 @@ class GUITable(Table, GUIObject):
     :class:`GUITableView`.
     """
 
-    def __init__(self) -> None:
+    def __init__(self):
         GUIObject.__init__(self)
         Table.__init__(self)
         #: The row being currently edited by the user. ``None`` if no edit is taking place.
-        self.edited: Union["Row", None] = None
+        self.edited = None
-        self._sort_descriptor: Union[SortDescriptor, None] = None
+        self._sort_descriptor = None
 
     # --- Virtual
-    def _do_add(self) -> Tuple["Row", int]:
+    def _do_add(self):
         """(Virtual) Creates a new row, adds it in the table.
 
         Returns ``(row, insert_index)``.
         """
         raise NotImplementedError()
 
-    def _do_delete(self) -> None:
+    def _do_delete(self):
         """(Virtual) Delete the selected rows."""
         pass
 
-    def _fill(self) -> None:
+    def _fill(self):
         """(Virtual/Required) Fills the table with all the rows that this table is supposed to have.
 
         Called by :meth:`refresh`. Does nothing by default.
         """
         pass
 
-    def _is_edited_new(self) -> bool:
+    def _is_edited_new(self):
         """(Virtual) Returns whether the currently edited row should be considered "new".
 
         This is used in :meth:`cancel_edits` to know whether the cancellation of the edit means a
@@ -322,7 +315,7 @@ class GUITable(Table, GUIObject):
                 self.select([len(self) - 1])
 
     # --- Public
-    def add(self) -> None:
+    def add(self):
         """Add a new row in edit mode.
 
         Requires :meth:`do_add` to be implemented. The newly added row will be selected and in edit
@@ -341,7 +334,7 @@ class GUITable(Table, GUIObject):
         self.edited = row
         self.view.start_editing()
 
-    def can_edit_cell(self, column_name: str, row_index: int) -> bool:
+    def can_edit_cell(self, column_name, row_index):
         """Returns whether the cell at ``row_index`` and ``column_name`` can be edited.
 
         A row is, by default, editable as soon as it has an attr with the same name as `column`.
@@ -353,7 +346,7 @@ class GUITable(Table, GUIObject):
         row = self[row_index]
         return row.can_edit_cell(column_name)
 
-    def cancel_edits(self) -> None:
+    def cancel_edits(self):
         """Cancels the current edit operation.
 
         If there's an :attr:`edited` row, it will be re-initialized (with :meth:`Row.load`).
@@ -371,7 +364,7 @@ class GUITable(Table, GUIObject):
         self.edited = None
         self.view.refresh()
 
-    def delete(self) -> None:
+    def delete(self):
         """Delete the currently selected rows.
 
         Requires :meth:`_do_delete` for this to have any effect on the model. Cancels editing if
@@ -384,7 +377,7 @@ class GUITable(Table, GUIObject):
         if self:
             self._do_delete()
 
-    def refresh(self, refresh_view: bool = True) -> None:
+    def refresh(self, refresh_view=True):
         """Empty the table and re-create its rows.
 
         :meth:`_fill` is called after we emptied the table to create our rows. Previous sort order
@@ -406,7 +399,7 @@ class GUITable(Table, GUIObject):
         if refresh_view:
             self.view.refresh()
 
-    def save_edits(self) -> None:
+    def save_edits(self):
         """Commit user edits to the model.
 
         This is done by calling :meth:`Row.save`.
@@ -417,7 +410,7 @@ class GUITable(Table, GUIObject):
         self.edited = None
         row.save()
 
-    def sort_by(self, column_name: str, desc: bool = False) -> None:
+    def sort_by(self, column_name, desc=False):
         """Sort table by ``column_name``.
 
         Overrides :meth:`Table.sort_by`. After having performed sorting, calls
@@ -457,18 +450,18 @@ class Row:
     Of course, this is only default behavior. This can be overriden.
     """
 
-    def __init__(self, table: GUITable) -> None:
+    def __init__(self, table):
-        super().__init__()
+        super(Row, self).__init__()
         self.table = table
 
-    def _edit(self) -> None:
+    def _edit(self):
         if self.table.edited is self:
             return
         assert self.table.edited is None
         self.table.edited = self
 
     # --- Virtual
-    def can_edit(self) -> bool:
+    def can_edit(self):
         """(Virtual) Whether the whole row can be edited.
 
         By default, always returns ``True``. This is for the *whole* row. For individual cells, it's
@@ -476,7 +469,7 @@ class Row:
         """
         return True
 
-    def load(self) -> None:
+    def load(self):
         """(Virtual/Required) Loads up values from the model to be presented in the table.
 
         Usually, our model instances contain values that are not quite ready for display. If you
@@ -485,7 +478,7 @@ class Row:
         """
         raise NotImplementedError()
 
-    def save(self) -> None:
+    def save(self):
         """(Virtual/Required) Saves user edits into your model.
 
         If your table is editable, this is called when the user commits his changes. Usually, these
@@ -494,7 +487,7 @@ class Row:
         """
         raise NotImplementedError()
 
-    def sort_key_for_column(self, column_name: str) -> Any:
+    def sort_key_for_column(self, column_name):
         """(Virtual) Return the value that is to be used to sort by column ``column_name``.
 
         By default, looks for an attribute with the same name as ``column_name``, but with an
@@ -507,7 +500,7 @@ class Row:
             return getattr(self, column_name)
 
     # --- Public
-    def can_edit_cell(self, column_name: str) -> bool:
+    def can_edit_cell(self, column_name):
         """Returns whether cell for column ``column_name`` can be edited.
 
         By the default, the check is done in many steps:
@@ -537,7 +530,7 @@ class Row:
             return False
         return bool(getattr(prop, "fset", None))
 
-    def get_cell_value(self, attrname: str) -> Any:
+    def get_cell_value(self, attrname):
         """Get cell value for ``attrname``.
 
         By default, does a simple ``getattr()``, but it is used to allow subclasses to have
@@ -547,7 +540,7 @@ class Row:
             attrname = "from_"
         return getattr(self, attrname)
 
-    def set_cell_value(self, attrname: str, value: Any) -> None:
+    def set_cell_value(self, attrname, value):
         """Set cell value to ``value`` for ``attrname``.
 
         By default, does a simple ``setattr()``, but it is used to allow subclasses to have

hscommon/gui/text_field.py

@@ -5,8 +5,8 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from hscommon.gui.base import GUIObject
+from .base import GUIObject
-from hscommon.util import nonone
+from ..util import nonone
 
 
 class TextFieldView:

hscommon/gui/tree.py

@@ -6,7 +6,7 @@
 
 from collections.abc import MutableSequence
 
-from hscommon.gui.base import GUIObject
+from .base import GUIObject
 
 
 class Node(MutableSequence):
@@ -77,7 +77,8 @@ class Node(MutableSequence):
         if include_self and predicate(self):
             yield self
         for child in self:
-            yield from child.findall(predicate, include_self=True)
+            for found in child.findall(predicate, include_self=True):
+                yield found
 
     def get_node(self, index_path):
         """Returns the node at ``index_path``.

hscommon/jobprogress/job.py

@@ -7,9 +7,6 @@
 # http://www.gnu.org/licenses/gpl-3.0.html
 
 
-from typing import Any, Callable, Generator, List, Union
-
-
 class JobCancelled(Exception):
     "The user has cancelled the job"
 
@@ -39,7 +36,7 @@ class Job:
     """
 
     # ---Magic functions
-    def __init__(self, job_proportions: Union[List[int], int], callback: Callable) -> None:
+    def __init__(self, job_proportions, callback):
         """Initialize the Job with 'jobcount' jobs. Start every job with
         start_job(). Every time the job progress is updated, 'callback' is called
         'callback' takes a 'progress' int param, and a optional 'desc'
@@ -58,12 +55,12 @@ class Job:
         self._currmax = 1
 
     # ---Private
-    def _subjob_callback(self, progress: int, desc: str = "") -> bool:
+    def _subjob_callback(self, progress, desc=""):
         """This is the callback passed to children jobs."""
         self.set_progress(progress, desc)
         return True  # if JobCancelled has to be raised, it will be at the highest level
 
-    def _do_update(self, desc: str) -> None:
+    def _do_update(self, desc):
         """Calls the callback function with a % progress as a parameter.
 
         The parameter is a int in the 0-100 range.
@@ -81,16 +78,13 @@ class Job:
             raise JobCancelled()
 
     # ---Public
-    def add_progress(self, progress: int = 1, desc: str = "") -> None:
+    def add_progress(self, progress=1, desc=""):
         self.set_progress(self._progress + progress, desc)
 
-    def check_if_cancelled(self) -> None:
+    def check_if_cancelled(self):
         self._do_update("")
 
-    # TODO type hint iterable
+    def iter_with_progress(self, iterable, desc_format=None, every=1, count=None):
-    def iter_with_progress(
-        self, iterable, desc_format: Union[str, None] = None, every: int = 1, count: Union[int, None] = None
-    ) -> Generator[Any, None, None]:
         """Iterate through ``iterable`` while automatically adding progress.
 
         WARNING: We need our iterable's length. If ``iterable`` is not a sequence (that is,
@@ -113,7 +107,7 @@ class Job:
             desc = desc_format % (count, count)
         self.set_progress(100, desc)
 
-    def start_job(self, max_progress: int = 100, desc: str = "") -> None:
+    def start_job(self, max_progress=100, desc=""):
         """Begin work on the next job. You must not call start_job more than
         'jobcount' (in __init__) times.
         'max' is the job units you are to perform.
@@ -128,7 +122,7 @@ class Job:
         self._currmax = max(1, max_progress)
         self._do_update(desc)
 
-    def start_subjob(self, job_proportions: Union[List[int], int], desc: str = "") -> "Job":
+    def start_subjob(self, job_proportions, desc=""):
         """Starts a sub job. Use this when you want to split a job into
         multiple smaller jobs. Pretty handy when starting a process where you
         know how many subjobs you will have, but don't know the work unit count
@@ -138,7 +132,7 @@ class Job:
         self.start_job(100, desc)
         return Job(job_proportions, self._subjob_callback)
 
-    def set_progress(self, progress: int, desc: str = "") -> None:
+    def set_progress(self, progress, desc=""):
         """Sets the progress of the current job to 'progress', and call the
         callback
         """
@@ -148,27 +142,30 @@ class Job:
         self._do_update(desc)
 
 
-class NullJob(Job):
+class NullJob:
-    def __init__(self, *args, **kwargs) -> None:
+    def __init__(self, *args, **kwargs):
         # Null job does nothing
         pass
 
-    def add_progress(self, *args, **kwargs) -> None:
+    def add_progress(self, *args, **kwargs):
         # Null job does nothing
         pass
 
-    def check_if_cancelled(self) -> None:
+    def check_if_cancelled(self):
         # Null job does nothing
         pass
 
-    def start_job(self, *args, **kwargs) -> None:
+    def iter_with_progress(self, sequence, *args, **kwargs):
+        return iter(sequence)
+
+    def start_job(self, *args, **kwargs):
         # Null job does nothing
         pass
 
-    def start_subjob(self, *args, **kwargs) -> "NullJob":
+    def start_subjob(self, *args, **kwargs):
         return NullJob()
 
-    def set_progress(self, *args, **kwargs) -> None:
+    def set_progress(self, *args, **kwargs):
         # Null job does nothing
         pass
 

hscommon/jobprogress/performer.py

@@ -8,9 +8,8 @@
 
 from threading import Thread
 import sys
-from typing import Callable, Tuple, Union
 
-from hscommon.jobprogress.job import Job, JobInProgressError, JobCancelled
+from .job import Job, JobInProgressError, JobCancelled
 
 
 class ThreadedJobPerformer:
@@ -29,15 +28,15 @@ class ThreadedJobPerformer:
     last_error = None
 
     # --- Protected
-    def create_job(self) -> Job:
+    def create_job(self):
         if self._job_running:
             raise JobInProgressError()
-        self.last_progress: Union[int, None] = -1
+        self.last_progress = -1
         self.last_desc = ""
         self.job_cancelled = False
         return Job(1, self._update_progress)
 
-    def _async_run(self, *args) -> None:
+    def _async_run(self, *args):
         target = args[0]
         args = tuple(args[1:])
         self._job_running = True
@@ -53,7 +52,7 @@ class ThreadedJobPerformer:
             self._job_running = False
             self.last_progress = None
 
-    def reraise_if_error(self) -> None:
+    def reraise_if_error(self):
         """Reraises the error that happened in the thread if any.
 
         Call this after the caller of run_threaded detected that self._job_running returned to False
@@ -61,13 +60,13 @@ class ThreadedJobPerformer:
         if self.last_error is not None:
             raise self.last_error.with_traceback(self.last_traceback)
 
-    def _update_progress(self, newprogress: int, newdesc: str = "") -> bool:
+    def _update_progress(self, newprogress, newdesc=""):
         self.last_progress = newprogress
         if newdesc:
             self.last_desc = newdesc
         return not self.job_cancelled
 
-    def run_threaded(self, target: Callable, args: Tuple = ()) -> None:
+    def run_threaded(self, target, args=()):
         if self._job_running:
             raise JobInProgressError()
         args = (target,) + args

hscommon/loc.py

@@ -1,25 +1,38 @@
 import os
 import os.path as op
 import shutil
+import re
 import tempfile
-from typing import Any, List
 
 import polib
 
-from hscommon import pygettext
+from . import pygettext
+from .util import modified_after, dedupe, ensure_folder
+from .build import print_and_do, ensure_empty_folder
 
 LC_MESSAGES = "LC_MESSAGES"
 
+# There isn't a 1-on-1 exact fit between .po language codes and cocoa ones
+PO2COCOA = {
+    "pl_PL": "pl",
+    "pt_BR": "pt-BR",
+    "zh_CN": "zh-Hans",
+}
 
-def get_langs(folder: str) -> List[str]:
+COCOA2PO = {v: k for k, v in PO2COCOA.items()}
+
+STRING_EXT = ".strings"
+
+
+def get_langs(folder):
     return [name for name in os.listdir(folder) if op.isdir(op.join(folder, name))]
 
 
-def files_with_ext(folder: str, ext: str) -> List[str]:
+def files_with_ext(folder, ext):
     return [op.join(folder, fn) for fn in os.listdir(folder) if fn.endswith(ext)]
 
 
-def generate_pot(folders: List[str], outpath: str, keywords: Any, merge: bool = False) -> None:
+def generate_pot(folders, outpath, keywords, merge=False):
     if merge and not op.exists(outpath):
         merge = False
     if merge:
@@ -40,7 +53,7 @@ def generate_pot(folders: List[str], outpath: str, keywords: Any, merge: bool =
             print("Exception while removing temporary folder %s\n", genpath)
 
 
-def compile_all_po(base_folder: str) -> None:
+def compile_all_po(base_folder):
     langs = get_langs(base_folder)
     for lang in langs:
         pofolder = op.join(base_folder, lang, LC_MESSAGES)
@@ -50,7 +63,7 @@ def compile_all_po(base_folder: str) -> None:
             p.save_as_mofile(pofile[:-3] + ".mo")
 
 
-def merge_locale_dir(target: str, mergeinto: str) -> None:
+def merge_locale_dir(target, mergeinto):
     langs = get_langs(target)
     for lang in langs:
         if not op.exists(op.join(mergeinto, lang)):
@@ -61,7 +74,7 @@ def merge_locale_dir(target: str, mergeinto: str) -> None:
             shutil.copy(mofile, op.join(mergeinto, lang, LC_MESSAGES))
 
 
-def merge_pots_into_pos(folder: str) -> None:
+def merge_pots_into_pos(folder):
     # We're going to take all pot files in `folder` and for each lang, merge it with the po file
     # with the same name.
     potfiles = files_with_ext(folder, ".pot")
@@ -74,7 +87,7 @@ def merge_pots_into_pos(folder: str) -> None:
             po.save()
 
 
-def merge_po_and_preserve(source: str, dest: str) -> None:
+def merge_po_and_preserve(source, dest):
     # Merges source entries into dest, but keep old entries intact
     sourcepo = polib.pofile(source)
     destpo = polib.pofile(dest)
@@ -86,7 +99,7 @@ def merge_po_and_preserve(source: str, dest: str) -> None:
     destpo.save()
 
 
-def normalize_all_pos(base_folder: str) -> None:
+def normalize_all_pos(base_folder):
     """Normalize the format of .po files in base_folder.
 
     When getting POs from external sources, such as Transifex, we end up with spurious diffs because
@@ -103,3 +116,118 @@ def normalize_all_pos(base_folder: str) -> None:
         for pofile in pofiles:
             p = polib.pofile(pofile)
             p.save()
+
+
+# --- Cocoa
+def all_lproj_paths(folder):
+    return files_with_ext(folder, ".lproj")
+
+
+def escape_cocoa_strings(s):
+    return s.replace("\\", "\\\\").replace('"', '\\"').replace("\n", "\\n")
+
+
+def unescape_cocoa_strings(s):
+    return s.replace("\\\\", "\\").replace('\\"', '"').replace("\\n", "\n")
+
+
+def strings2pot(target, dest):
+    with open(target, "rt", encoding="utf-8") as fp:
+        contents = fp.read()
+    # We're reading an en.lproj file. We only care about the righthand part of the translation.
+    re_trans = re.compile(r'".*" = "(.*)";')
+    strings = re_trans.findall(contents)
+    if op.exists(dest):
+        po = polib.pofile(dest)
+    else:
+        po = polib.POFile()
+    for s in dedupe(strings):
+        s = unescape_cocoa_strings(s)
+        entry = po.find(s)
+        if entry is None:
+            entry = polib.POEntry(msgid=s)
+            po.append(entry)
+        # we don't know or care about a line number so we put 0
+        entry.occurrences.append((target, "0"))
+        entry.occurrences = dedupe(entry.occurrences)
+    po.save(dest)
+
+
+def allstrings2pot(lprojpath, dest, excludes=None):
+    allstrings = files_with_ext(lprojpath, STRING_EXT)
+    if excludes:
+        allstrings = [p for p in allstrings if op.splitext(op.basename(p))[0] not in excludes]
+    for strings_path in allstrings:
+        strings2pot(strings_path, dest)
+
+
+def po2strings(pofile, en_strings, dest):
+    # Takes en_strings and replace all righthand parts of "foo" = "bar"; entries with translations
+    # in pofile, then puts the result in dest.
+    po = polib.pofile(pofile)
+    if not modified_after(pofile, dest):
+        return
+    ensure_folder(op.dirname(dest))
+    print("Creating {} from {}".format(dest, pofile))
+    with open(en_strings, "rt", encoding="utf-8") as fp:
+        contents = fp.read()
+    re_trans = re.compile(r'(?<= = ").*(?=";\n)')
+
+    def repl(match):
+        s = match.group(0)
+        unescaped = unescape_cocoa_strings(s)
+        entry = po.find(unescaped)
+        if entry is None:
+            print("WARNING: Could not find entry '{}' in .po file".format(s))
+            return s
+        trans = entry.msgstr
+        return escape_cocoa_strings(trans) if trans else s
+
+    contents = re_trans.sub(repl, contents)
+    with open(dest, "wt", encoding="utf-8") as fp:
+        fp.write(contents)
+
+
+def generate_cocoa_strings_from_code(code_folder, dest_folder):
+    # Uses the "genstrings" command to generate strings file from all .m files in "code_folder".
+    # The strings file (their name depends on the localization table used in the source) will be
+    # placed in "dest_folder".
+    # genstrings produces utf-16 files with comments. After having generated the files, we convert
+    # them to utf-8 and remove the comments.
+    ensure_empty_folder(dest_folder)
+    print_and_do('genstrings -o "{}" `find "{}" -name *.m | xargs`'.format(dest_folder, code_folder))
+    for stringsfile in os.listdir(dest_folder):
+        stringspath = op.join(dest_folder, stringsfile)
+        with open(stringspath, "rt", encoding="utf-16") as fp:
+            content = fp.read()
+        content = re.sub(r"/\*.*?\*/", "", content)
+        content = re.sub(r"\n{2,}", "\n", content)
+        # I have no idea why, but genstrings seems to have problems with "%" character in strings
+        # and inserts (number)$ after it. Find these bogus inserts and remove them.
+        content = re.sub(r"%\d\$", "%", content)
+        with open(stringspath, "wt", encoding="utf-8") as fp:
+            fp.write(content)
+
+
+def generate_cocoa_strings_from_xib(xib_folder):
+    xibs = [op.join(xib_folder, fn) for fn in os.listdir(xib_folder) if fn.endswith(".xib")]
+    for xib in xibs:
+        dest = xib.replace(".xib", STRING_EXT)
+        print_and_do("ibtool {} --generate-strings-file {}".format(xib, dest))
+        print_and_do("iconv -f utf-16 -t utf-8 {0} | tee {0}".format(dest))
+
+
+def localize_stringsfile(stringsfile, dest_root_folder):
+    stringsfile_name = op.basename(stringsfile)
+    for lang in get_langs("locale"):
+        pofile = op.join("locale", lang, "LC_MESSAGES", "ui.po")
+        cocoa_lang = PO2COCOA.get(lang, lang)
+        dest_lproj = op.join(dest_root_folder, cocoa_lang + ".lproj")
+        ensure_folder(dest_lproj)
+        po2strings(pofile, stringsfile, op.join(dest_lproj, stringsfile_name))
+
+
+def localize_all_stringsfiles(src_folder, dest_root_folder):
+    stringsfiles = [op.join(src_folder, fn) for fn in os.listdir(src_folder) if fn.endswith(STRING_EXT)]
+    for path in stringsfiles:
+        localize_stringsfile(path, dest_root_folder)

hscommon/notify.py

@@ -13,7 +13,6 @@ the method with the same name as the broadcasted message is called on the listen
 """
 
 from collections import defaultdict
-from typing import Callable, DefaultDict, List
 
 
 class Broadcaster:
@@ -22,10 +21,10 @@ class Broadcaster:
     def __init__(self):
         self.listeners = set()
 
-    def add_listener(self, listener: "Listener") -> None:
+    def add_listener(self, listener):
         self.listeners.add(listener)
 
-    def notify(self, msg: str) -> None:
+    def notify(self, msg):
         """Notify all connected listeners of ``msg``.
 
         That means that each listeners will have their method with the same name as ``msg`` called.
@@ -34,18 +33,18 @@ class Broadcaster:
             if listener in self.listeners:  # disconnected during notification
                 listener.dispatch(msg)
 
-    def remove_listener(self, listener: "Listener") -> None:
+    def remove_listener(self, listener):
         self.listeners.discard(listener)
 
 
 class Listener:
     """A listener is initialized with the broadcaster it's going to listen to. Initially, it is not connected."""
 
-    def __init__(self, broadcaster: Broadcaster) -> None:
+    def __init__(self, broadcaster):
         self.broadcaster = broadcaster
-        self._bound_notifications: DefaultDict[str, List[Callable]] = defaultdict(list)
+        self._bound_notifications = defaultdict(list)
 
-    def bind_messages(self, messages: str, func: Callable) -> None:
+    def bind_messages(self, messages, func):
         """Binds multiple message to the same function.
 
         Often, we perform the same thing on multiple messages. Instead of having the same function
@@ -55,15 +54,15 @@ class Listener:
         for message in messages:
             self._bound_notifications[message].append(func)
 
-    def connect(self) -> None:
+    def connect(self):
         """Connects the listener to its broadcaster."""
         self.broadcaster.add_listener(self)
 
-    def disconnect(self) -> None:
+    def disconnect(self):
         """Disconnects the listener from its broadcaster."""
         self.broadcaster.remove_listener(self)
 
-    def dispatch(self, msg: str) -> None:
+    def dispatch(self, msg):
         if msg in self._bound_notifications:
             for func in self._bound_notifications[msg]:
                 func()
@@ -75,14 +74,14 @@ class Listener:
 class Repeater(Broadcaster, Listener):
     REPEATED_NOTIFICATIONS = None
 
-    def __init__(self, broadcaster: Broadcaster) -> None:
+    def __init__(self, broadcaster):
         Broadcaster.__init__(self)
         Listener.__init__(self, broadcaster)
 
-    def _repeat_message(self, msg: str) -> None:
+    def _repeat_message(self, msg):
         if not self.REPEATED_NOTIFICATIONS or msg in self.REPEATED_NOTIFICATIONS:
             self.notify(msg)
 
-    def dispatch(self, msg: str) -> None:
+    def dispatch(self, msg):
         Listener.dispatch(self, msg)
         self._repeat_message(msg)

hscommon/path.py

@@ -7,9 +7,208 @@
 # http://www.gnu.org/licenses/gpl-3.0.html
 
 import logging
+import os
+import os.path as op
+import shutil
+import sys
+from itertools import takewhile
 from functools import wraps
 from inspect import signature
-from pathlib import Path
+
+
+class Path(tuple):
+    """A handy class to work with paths.
+
+    We subclass ``tuple``, each element of the tuple represents an element of the path.
+
+    * ``Path('/foo/bar/baz')[1]`` --> ``'bar'``
+    * ``Path('/foo/bar/baz')[1:2]`` --> ``Path('bar/baz')``
+    * ``Path('/foo/bar')['baz']`` --> ``Path('/foo/bar/baz')``
+    * ``str(Path('/foo/bar/baz'))`` --> ``'/foo/bar/baz'``
+    """
+
+    # Saves a little bit of memory usage
+    __slots__ = ()
+
+    def __new__(cls, value, separator=None):
+        def unicode_if_needed(s):
+            if isinstance(s, str):
+                return s
+            else:
+                try:
+                    return str(s, sys.getfilesystemencoding())
+                except UnicodeDecodeError:
+                    logging.warning("Could not decode %r", s)
+                    raise
+
+        if isinstance(value, Path):
+            return value
+        if not separator:
+            separator = os.sep
+        if isinstance(value, bytes):
+            value = unicode_if_needed(value)
+        if isinstance(value, str):
+            if value:
+                if (separator not in value) and ("/" in value):
+                    separator = "/"
+                value = value.split(separator)
+            else:
+                value = ()
+        else:
+            if any(isinstance(x, bytes) for x in value):
+                value = [unicode_if_needed(x) for x in value]
+            # value is a tuple/list
+            if any(separator in x for x in value):
+                # We have a component with a separator in it. Let's rejoin it, and generate another path.
+                return Path(separator.join(value), separator)
+        if (len(value) > 1) and (not value[-1]):
+            value = value[
+                :-1
+            ]  # We never want a path to end with a '' (because Path() can be called with a trailing slash ending path)
+        return tuple.__new__(cls, value)
+
+    def __add__(self, other):
+        other = Path(other)
+        if other and (not other[0]):
+            other = other[1:]
+        return Path(tuple.__add__(self, other))
+
+    def __contains__(self, item):
+        if isinstance(item, Path):
+            return item[: len(self)] == self
+        else:
+            return tuple.__contains__(self, item)
+
+    def __eq__(self, other):
+        return tuple.__eq__(self, Path(other))
+
+    def __getitem__(self, key):
+        if isinstance(key, slice):
+            if isinstance(key.start, Path):
+                equal_elems = list(takewhile(lambda pair: pair[0] == pair[1], zip(self, key.start)))
+                key = slice(len(equal_elems), key.stop, key.step)
+            if isinstance(key.stop, Path):
+                equal_elems = list(
+                    takewhile(
+                        lambda pair: pair[0] == pair[1],
+                        zip(reversed(self), reversed(key.stop)),
+                    )
+                )
+                stop = -len(equal_elems) if equal_elems else None
+                key = slice(key.start, stop, key.step)
+            return Path(tuple.__getitem__(self, key))
+        elif isinstance(key, (str, Path)):
+            return self + key
+        else:
+            return tuple.__getitem__(self, key)
+
+    def __hash__(self):
+        return tuple.__hash__(self)
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+    def __radd__(self, other):
+        return Path(other) + self
+
+    def __str__(self):
+        if len(self) == 1:
+            first = self[0]
+            if (len(first) == 2) and (first[1] == ":"):  # Windows drive letter
+                return first + "\\"
+            elif not len(first):  # root directory
+                return "/"
+        return os.sep.join(self)
+
+    def has_drive_letter(self):
+        if not self:
+            return False
+        first = self[0]
+        return (len(first) == 2) and (first[1] == ":")
+
+    def is_parent_of(self, other):
+        """Whether ``other`` is a subpath of ``self``.
+
+        Almost the same as ``other in self``, but it's a bit more self-explicative and when
+        ``other == self``, returns False.
+        """
+        if other == self:
+            return False
+        else:
+            return other in self
+
+    def remove_drive_letter(self):
+        if self.has_drive_letter():
+            return self[1:]
+        else:
+            return self
+
+    def tobytes(self):
+        return str(self).encode(sys.getfilesystemencoding())
+
+    def parent(self):
+        """Returns the parent path.
+
+        ``Path('/foo/bar/baz').parent()`` --> ``Path('/foo/bar')``
+        """
+        return self[:-1]
+
+    @property
+    def name(self):
+        """Last element of the path (filename), with extension.
+
+        ``Path('/foo/bar/baz').name`` --> ``'baz'``
+        """
+        return self[-1]
+
+    # OS method wrappers
+    def exists(self):
+        return op.exists(str(self))
+
+    def copy(self, dest_path):
+        return shutil.copy(str(self), str(dest_path))
+
+    def copytree(self, dest_path, *args, **kwargs):
+        return shutil.copytree(str(self), str(dest_path), *args, **kwargs)
+
+    def isdir(self):
+        return op.isdir(str(self))
+
+    def isfile(self):
+        return op.isfile(str(self))
+
+    def islink(self):
+        return op.islink(str(self))
+
+    def listdir(self):
+        return [self[name] for name in os.listdir(str(self))]
+
+    def mkdir(self, *args, **kwargs):
+        return os.mkdir(str(self), *args, **kwargs)
+
+    def makedirs(self, *args, **kwargs):
+        return os.makedirs(str(self), *args, **kwargs)
+
+    def move(self, dest_path):
+        return shutil.move(str(self), str(dest_path))
+
+    def open(self, *args, **kwargs):
+        return open(str(self), *args, **kwargs)
+
+    def remove(self):
+        return os.remove(str(self))
+
+    def rename(self, dest_path):
+        return os.rename(str(self), str(dest_path))
+
+    def rmdir(self):
+        return os.rmdir(str(self))
+
+    def rmtree(self):
+        return shutil.rmtree(str(self))
+
+    def stat(self):
+        return os.stat(str(self))
 
 
 def pathify(f):
@@ -47,7 +246,7 @@ def log_io_error(func):
     def wrapper(path, *args, **kwargs):
         try:
             return func(path, *args, **kwargs)
-        except OSError as e:
+        except (IOError, OSError) as e:
             msg = 'Error "{0}" during operation "{1}" on "{2}": "{3}"'
             classname = e.__class__.__name__
             funcname = func.__name__

hscommon/pygettext.py

@@ -15,8 +15,7 @@
 #
 
 import os
-import importlib.machinery
+import imp
-import importlib.util
 import sys
 import glob
 import token
@@ -111,7 +110,7 @@ def _visit_pyfiles(list, dirname, names):
     # get extension for python source files
     if "_py_ext" not in globals():
         global _py_ext
-        _py_ext = importlib.machinery.SOURCE_SUFFIXES[0]
+        _py_ext = [triple[0] for triple in imp.get_suffixes() if triple[2] == imp.PY_SOURCE][0]
 
     # don't recurse into CVS directories
     if "CVS" in names:
@@ -121,6 +120,45 @@ def _visit_pyfiles(list, dirname, names):
     list.extend([os.path.join(dirname, file) for file in names if os.path.splitext(file)[1] == _py_ext])
 
 
+def _get_modpkg_path(dotted_name, pathlist=None):
+    """Get the filesystem path for a module or a package.
+
+    Return the file system path to a file for a module, and to a directory for
+    a package. Return None if the name is not found, or is a builtin or
+    extension module.
+    """
+    # split off top-most name
+    parts = dotted_name.split(".", 1)
+
+    if len(parts) > 1:
+        # we have a dotted path, import top-level package
+        try:
+            file, pathname, description = imp.find_module(parts[0], pathlist)
+            if file:
+                file.close()
+        except ImportError:
+            return None
+
+        # check if it's indeed a package
+        if description[2] == imp.PKG_DIRECTORY:
+            # recursively handle the remaining name parts
+            pathname = _get_modpkg_path(parts[1], [pathname])
+        else:
+            pathname = None
+    else:
+        # plain name
+        try:
+            file, pathname, description = imp.find_module(dotted_name, pathlist)
+            if file:
+                file.close()
+            if description[2] not in [imp.PY_SOURCE, imp.PKG_DIRECTORY]:
+                pathname = None
+        except ImportError:
+            pathname = None
+
+    return pathname
+
+
 def getFilesForName(name):
     """Get a list of module files for a filename, a module or package name,
     or a directory.
@@ -135,11 +173,7 @@ def getFilesForName(name):
             return file_list
 
         # try to find module or package
-        try:
+        name = _get_modpkg_path(name)
-            spec = importlib.util.find_spec(name)
-            name = spec.origin
-        except ImportError:
-            name = None
         if not name:
             return []
 
@@ -340,7 +374,7 @@ def main(source_files, outpath, keywords=None):
             fp = open(options.excludefilename, encoding="utf-8")
             options.toexclude = fp.readlines()
             fp.close()
-        except OSError:
+        except IOError:
             print(
                 "Can't read --exclude-file: %s" % options.excludefilename,
                 file=sys.stderr,

hscommon/sphinxgen.py

@@ -6,9 +6,8 @@
 
 from pathlib import Path
 import re
-from typing import Callable, Dict, Union
 
-from hscommon.build import read_changelog_file, filereplace
+from .build import read_changelog_file, filereplace
 from sphinx.cmd.build import build_main as sphinx_build
 
 CHANGELOG_FORMAT = """
@@ -19,25 +18,25 @@ CHANGELOG_FORMAT = """
 """
 
 
-def tixgen(tixurl: str) -> Callable[[str], str]:
+def tixgen(tixurl):
     """This is a filter *generator*. tixurl is a url pattern for the tix with a {0} placeholder
     for the tix #
     """
     urlpattern = tixurl.format("\\1")  # will be replaced buy the content of the first group in re
     R = re.compile(r"#(\d+)")
-    repl = f"`#\\1 <{urlpattern}>`__"
+    repl = "`#\\1 <{}>`__".format(urlpattern)
     return lambda text: R.sub(repl, text)
 
 
 def gen(
-    basepath: Path,
+    basepath,
-    destpath: Path,
+    destpath,
-    changelogpath: Path,
+    changelogpath,
-    tixurl: str,
+    tixurl,
-    confrepl: Union[Dict[str, str], None] = None,
+    confrepl=None,
-    confpath: Union[Path, None] = None,
+    confpath=None,
-    changelogtmpl: Union[Path, None] = None,
+    changelogtmpl=None,
-) -> None:
+):
     """Generate sphinx docs with all bells and whistles.
 
     basepath: The base sphinx source path.