MANIFEST.in

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

build.py

@@ -4,16 +4,19 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from pathlib import Path
+import os
+import os.path as op
 import sys
 from optparse import OptionParser
 import shutil
 
-from setuptools import sandbox
+from setuptools import setup, Extension
+
 from hscommon import sphinxgen
 from hscommon.build import (
     add_to_pythonpath,
     print_and_do,
+    move_all,
     fix_qt_resource_file,
 )
 from hscommon import loc
@@ -60,14 +63,14 @@ def parse_args():
 
 def build_help():
     print("Generating Help")
-    current_path = Path(".").absolute()
+    current_path = op.abspath(".")
-    help_basepath = current_path.joinpath("help", "en")
+    help_basepath = op.join(current_path, "help", "en")
-    help_destpath = current_path.joinpath("build", "help")
+    help_destpath = op.join(current_path, "build", "help")
-    changelog_path = current_path.joinpath("help", "changelog")
+    changelog_path = op.join(current_path, "help", "changelog")
     tixurl = "https://github.com/arsenetar/dupeguru/issues/{}"
     confrepl = {"language": "en"}
-    changelogtmpl = current_path.joinpath("help", "changelog.tmpl")
+    changelogtmpl = op.join(current_path, "help", "changelog.tmpl")
-    conftmpl = current_path.joinpath("help", "conf.tmpl")
+    conftmpl = op.join(current_path, "help", "conf.tmpl")
     sphinxgen.gen(
         help_basepath,
         help_destpath,
@@ -80,15 +83,15 @@ def build_help():
 
 
 def build_qt_localizations():
-    loc.compile_all_po(Path("qtlib", "locale"))
+    loc.compile_all_po(op.join("qtlib", "locale"))
-    loc.merge_locale_dir(Path("qtlib", "locale"), "locale")
+    loc.merge_locale_dir(op.join("qtlib", "locale"), "locale")
 
 
 def build_localizations():
     loc.compile_all_po("locale")
     build_qt_localizations()
-    locale_dest = Path("build", "locale")
+    locale_dest = op.join("build", "locale")
-    if locale_dest.exists():
+    if op.exists(locale_dest):
         shutil.rmtree(locale_dest)
     shutil.copytree("locale", locale_dest, ignore=shutil.ignore_patterns("*.po", "*.pot"))
 
@@ -96,35 +99,57 @@ def build_localizations():
 def build_updatepot():
     print("Building .pot files from source files")
     print("Building core.pot")
-    loc.generate_pot(["core"], Path("locale", "core.pot"), ["tr"])
+    loc.generate_pot(["core"], op.join("locale", "core.pot"), ["tr"])
     print("Building columns.pot")
-    loc.generate_pot(["core"], Path("locale", "columns.pot"), ["coltr"])
+    loc.generate_pot(["core"], op.join("locale", "columns.pot"), ["coltr"])
     print("Building ui.pot")
     # 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")]
+    ui_packages = ["qt", op.join("cocoa", "inter")]
-    loc.generate_pot(ui_packages, Path("locale", "ui.pot"), ["tr"], merge=True)
+    loc.generate_pot(ui_packages, op.join("locale", "ui.pot"), ["tr"], merge=True)
     print("Building qtlib.pot")
-    loc.generate_pot(["qtlib"], Path("qtlib", "locale", "qtlib.pot"), ["tr"])
+    loc.generate_pot(["qtlib"], op.join("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(op.join("qtlib", "locale"))
-    # loc.merge_pots_into_pos(Path("cocoalib", "locale"))
+    # loc.merge_pots_into_pos(op.join("cocoalib", "locale"))
 
 
 def build_normpo():
     loc.normalize_all_pos("locale")
-    loc.normalize_all_pos(Path("qtlib", "locale"))
+    loc.normalize_all_pos(op.join("qtlib", "locale"))
-    # loc.normalize_all_pos(Path("cocoalib", "locale"))
+    # loc.normalize_all_pos(op.join("cocoalib", "locale"))
 
 
 def build_pe_modules():
     print("Building PE Modules")
-    # Leverage setup.py to build modules
+    exts = [
-    sandbox.run_setup("setup.py", ["build_ext", "--inplace"])
+        Extension(
+            "_block",
+            [
+                op.join("core", "pe", "modules", "block.c"),
+                op.join("core", "pe", "modules", "common.c"),
+            ],
+        ),
+        Extension(
+            "_cache",
+            [
+                op.join("core", "pe", "modules", "cache.c"),
+                op.join("core", "pe", "modules", "common.c"),
+            ],
+        ),
+    ]
+    exts.append(Extension("_block_qt", [op.join("qt", "pe", "modules", "block.c")]))
+    setup(
+        script_args=["build_ext", "--inplace"],
+        ext_modules=exts,
+    )
+    move_all("_block_qt*", op.join("qt", "pe"))
+    move_all("_block*", op.join("core", "pe"))
+    move_all("_cache*", op.join("core", "pe"))
 
 
 def build_normal():
@@ -135,8 +160,8 @@ def build_normal():
     print("Building localizations")
     build_localizations()
     print("Building Qt stuff")
-    print_and_do("pyrcc5 {0} > {1}".format(Path("qt", "dg.qrc"), Path("qt", "dg_rc.py")))
+    print_and_do("pyrcc5 {0} > {1}".format(op.join("qt", "dg.qrc"), op.join("qt", "dg_rc.py")))
-    fix_qt_resource_file(Path("qt", "dg_rc.py"))
+    fix_qt_resource_file(op.join("qt", "dg_rc.py"))
     build_help()
 
 
@@ -144,10 +169,10 @@ def main():
     if sys.version_info < (3, 6):
         sys.exit("Python < 3.6 is unsupported.")
     options = parse_args()
-    if options.clean and Path("build").exists():
+    if options.clean and op.exists("build"):
         shutil.rmtree("build")
-    if not Path("build").exists():
+    if not op.exists("build"):
-        Path("build").mkdir()
+        os.mkdir("build")
     if options.doc:
         build_help()
     elif options.loc:

core/pe/modules/block.c

@@ -2,9 +2,9 @@
  * 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"
@@ -17,7 +17,8 @@ static PyObject *DifferentBlockCountError;
 /* Returns a 3 sized tuple containing the mean color of 'image'.    
  * image: a PIL image or crop.
  */
-static PyObject *getblock(PyObject *image) {
+static PyObject* getblock(PyObject *image)
+{
     int i, totr, totg, totb;
     Py_ssize_t pixel_count;
     PyObject *ppixels;
@@ -64,7 +65,8 @@ static PyObject *getblock(PyObject *image) {
 /* Returns the difference between the first block and the second.
  * It returns an absolute sum of the 3 differences (RGB).
  */
-static int diff(PyObject *first, PyObject *second) {
+static int diff(PyObject *first, PyObject *second)
+{
     int r1, g1, b1, r2, b2, g2;
     PyObject *pr, *pg, *pb;
     pr = PySequence_ITEM(first, 0);
@@ -99,7 +101,8 @@ If it is 10, for example, 100 blocks will be returns (10 width, 10 height). The
 necessarely cover square areas. The area covered by each block will be proportional to the image\n\
 itself.\n");
 
-static PyObject *block_getblocks2(PyObject *self, PyObject *args) {
+static PyObject* block_getblocks2(PyObject *self, PyObject *args)
+{
     int block_count_per_side, width, height, block_width, block_height, ih;
     PyObject *image;
     PyObject *pimage_size, *pwidth, *pheight;
@@ -125,7 +128,7 @@ static PyObject *block_getblocks2(PyObject *self, PyObject *args) {
     block_width = max(width / block_count_per_side, 1);
     block_height = max(height / block_count_per_side, 1);
     
-  result = PyList_New((Py_ssize_t)block_count_per_side * block_count_per_side);
+    result = PyList_New(block_count_per_side * block_count_per_side);
     if (result == NULL) {
         return NULL;
     }
@@ -171,14 +174,14 @@ PyDoc_STRVAR(block_avgdiff_doc,
 If the result surpasses limit, limit + 1 is returned, except if less than min_iterations\n\
 iterations have been made in the blocks.\n");
 
-static PyObject *block_avgdiff(PyObject *self, PyObject *args) {
+static PyObject* block_avgdiff(PyObject *self, PyObject *args)
+{
     PyObject *first, *second;
     int limit, min_iterations;
     Py_ssize_t count;
     int sum, i, result;
     
-  if (!PyArg_ParseTuple(args, "OOii", &first, &second, &limit,
+    if (!PyArg_ParseTuple(args, "OOii", &first, &second, &limit, &min_iterations)) {
-                        &min_iterations)) {
         return NULL;
     }
     
@@ -203,8 +206,7 @@ static PyObject *block_avgdiff(PyObject *self, PyObject *args) {
         sum += diff(item1, item2);
         Py_DECREF(item1);
         Py_DECREF(item2);
-    if ((sum > limit * iteration_count) &&
+        if ((sum > limit*iteration_count) && (iteration_count >= min_iterations)) {
-        (iteration_count >= min_iterations)) {
             return PyLong_FromLong(limit + 1);
         }
     }
@@ -222,7 +224,8 @@ static PyMethodDef BlockMethods[] = {
     {NULL, NULL, 0, NULL} /* Sentinel */
 };
 
-static struct PyModuleDef BlockDef = {PyModuleDef_HEAD_INIT,
+static struct PyModuleDef BlockDef = {
+    PyModuleDef_HEAD_INIT,
     "_block",
     NULL,
     -1,
@@ -230,9 +233,12 @@ static struct PyModuleDef BlockDef = {PyModuleDef_HEAD_INIT,
     NULL,
     NULL,
     NULL,
-                                      NULL};
+    NULL
+};
 
-PyObject *PyInit__block(void) {
+PyObject *
+PyInit__block(void)
+{
     PyObject *m = PyModule_Create(&BlockDef);
     if (m == NULL) {
         return NULL;
@@ -240,8 +246,7 @@ PyObject *PyInit__block(void) {
     
     NoBlocksError = PyErr_NewException("_block.NoBlocksError", NULL, NULL);
     PyModule_AddObject(m, "NoBlocksError", NoBlocksError);
-  DifferentBlockCountError =
+    DifferentBlockCountError = PyErr_NewException("_block.DifferentBlockCountError", NULL, NULL);
-      PyErr_NewException("_block.DifferentBlockCountError", NULL, NULL);
     PyModule_AddObject(m, "DifferentBlockCountError", DifferentBlockCountError);
 
     return m;

hscommon/sphinxgen.py

@@ -4,7 +4,7 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from pathlib import Path
+import os.path as op
 import re
 
 from .build import read_changelog_file, filereplace
@@ -48,9 +48,9 @@ def gen(
     if confrepl is None:
         confrepl = {}
     if confpath is None:
-        confpath = Path(basepath, "conf.tmpl")
+        confpath = op.join(basepath, "conf.tmpl")
     if changelogtmpl is None:
-        changelogtmpl = Path(basepath, "changelog.tmpl")
+        changelogtmpl = op.join(basepath, "changelog.tmpl")
     changelog = read_changelog_file(changelogpath)
     tix = tixgen(tixurl)
     rendered_logs = []
@@ -62,13 +62,13 @@ def gen(
         rendered = CHANGELOG_FORMAT.format(version=log["version"], date=log["date_str"], description=description)
         rendered_logs.append(rendered)
     confrepl["version"] = changelog[0]["version"]
-    changelog_out = Path(basepath, "changelog.rst")
+    changelog_out = op.join(basepath, "changelog.rst")
     filereplace(changelogtmpl, changelog_out, changelog="\n".join(rendered_logs))
-    if Path(confpath).exists():
+    if op.exists(confpath):
-        conf_out = Path(basepath, "conf.py")
+        conf_out = op.join(basepath, "conf.py")
         filereplace(confpath, conf_out, **confrepl)
     # Call the sphinx_build function, which is the same as doing sphinx-build from cli
     try:
-        sphinx_build([str(basepath), str(destpath)])
+        sphinx_build([basepath, destpath])
     except SystemExit:
         print("Sphinx called sys.exit(), but we're cancelling it because we don't actually want to exit")

package.py

@@ -71,7 +71,7 @@ def package_debian_distribution(distribution):
     version = "{}~{}".format(app_version, distribution)
     destpath = op.join("build", "dupeguru-{}".format(version))
     srcpath = op.join(destpath, "src")
-    packages = ["hscommon", "core", "qtlib", "qt", "send2trash"]
+    packages = ["hscommon", "core", "qtlib", "qt", "send2trash", "hsaudiotag"]
     copy_files_to_package(srcpath, packages, with_so=False)
     os.mkdir(op.join(destpath, "modules"))
     copy_all(op.join("core", "pe", "modules", "*.*"), op.join(destpath, "modules"))
@@ -122,7 +122,14 @@ def package_arch():
     # need to include them).
     print("Packaging for Arch")
     srcpath = op.join("build", "dupeguru-arch")
-    packages = ["hscommon", "core", "qtlib", "qt", "send2trash"]
+    packages = [
+        "hscommon",
+        "core",
+        "qtlib",
+        "qt",
+        "send2trash",
+        "hsaudiotag",
+    ]
     copy_files_to_package(srcpath, packages, with_so=True)
     shutil.copy(op.join("images", "dgse_logo_128.png"), srcpath)
     debopts = json.load(open(op.join("pkg", "arch", "dupeguru.json")))
@@ -226,8 +233,7 @@ def main():
         return
     print("Packaging dupeGuru with UI qt")
     if sys.platform == "win32":
-        package_debian()
+        package_windows()
-        # package_windows()
     elif sys.platform == "darwin":
         package_macos()
     else:

qt/pe/modules/block.c

@@ -2,9 +2,9 @@
  * Created On: 2010-01-31
  * 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 also
+ * which should be included with this package. The terms are also available at 
- *available at http://www.hardcoded.net/licenses/bsd_license
+ * http://www.hardcoded.net/licenses/bsd_license
 **/
 
 #define PY_SSIZE_T_CLEAN
@@ -12,12 +12,22 @@
 
 /* It seems like MS VC defines min/max already */
 #ifndef _MSC_VER
-static int max(int a, int b) { return b > a ? b : a; }
+static int
+max(int a, int b)
+{
+    return b > a ? b : a;
+}
 
-static int min(int a, int b) { return b < a ? b : a; }
+static int
+min(int a, int b)
+{
+    return b < a ? b : a;
+}
 #endif
 
-static PyObject *getblock(PyObject *image, int width, int height) {
+static PyObject*
+getblock(PyObject *image, int width, int height)
+{
     int pixel_count, red, green, blue, bytes_per_line;
     PyObject *pred, *pgreen, *pblue;
     PyObject *result;
@@ -38,9 +48,9 @@ static PyObject *getblock(PyObject *image, int width, int height) {
         Py_DECREF(sipptr);
         s = (char *)PyCapsule_GetPointer(bits_capsule, NULL);
         Py_DECREF(bits_capsule);
-    /* Qt aligns all its lines on 32bit, which means that if the number of bytes
+        /* Qt aligns all its lines on 32bit, which means that if the number of bytes per
-     *per line for image is not divisible by 4, there's going to be crap
+         * line for image is not divisible by 4, there's going to be crap inserted in "s"
-     *inserted in "s" We have to take this into account when calculating offsets
+         * We have to take this into account when calculating offsets
         **/
         for (i=0; i<height; i++) {
             int j;
@@ -74,18 +84,18 @@ static PyObject *getblock(PyObject *image, int width, int height) {
     return result;
 }
 
-/* block_getblocks(QImage image, int block_count_per_side) -> [(int r, int g,
+/* block_getblocks(QImage image, int block_count_per_side) -> [(int r, int g, int b), ...]
- *int b), ...]
  *
- * Compute blocks out of `image`. Note the use of min/max when compes the time
+ * Compute blocks out of `image`. Note the use of min/max when compes the time of computing widths
- *of computing widths and heights and positions. This is to cover the case where
+ * and heights and positions. This is to cover the case where the width or height of the image is
- *the width or height of the image is smaller than `block_count_per_side`. In
+ * smaller than `block_count_per_side`. In these cases, blocks will be, of course, 1 pixel big. But
- *these cases, blocks will be, of course, 1 pixel big. But also, because all
+ * also, because all compared block lists are required to be of the same size, any block that has
- *compared block lists are required to be of the same size, any block that has
+ * no pixel to be assigned to will simply be assigned the last pixel. This is why we have
- * no pixel to be assigned to will simply be assigned the last pixel. This is
+ * min(..., height-block_height-1) and stuff like that.
- *why we have min(..., height-block_height-1) and stuff like that.
 **/
-static PyObject *block_getblocks(PyObject *self, PyObject *args) {
+static PyObject*
+block_getblocks(PyObject *self, PyObject *args)
+{
     int block_count_per_side, width, height, block_width, block_height, ih;
     PyObject *image;
     PyObject *pi;
@@ -109,7 +119,7 @@ static PyObject *block_getblocks(PyObject *self, PyObject *args) {
     block_width = max(width / block_count_per_side, 1);
     block_height = max(height / block_count_per_side, 1);
     
-  result = PyList_New((Py_ssize_t)block_count_per_side * block_count_per_side);
+    result = PyList_New(block_count_per_side * block_count_per_side);
     if (result == NULL) {
         return NULL;
     }
@@ -123,8 +133,7 @@ static PyObject *block_getblocks(PyObject *self, PyObject *args) {
             PyObject *pblock;
             
             left = min(iw*block_width, width-block_width-1);
-      pcrop = PyObject_CallMethod(image, "copy", "iiii", left, top, block_width,
+            pcrop = PyObject_CallMethod(image, "copy", "iiii", left, top, block_width, block_height);
-                                  block_height);
             if (pcrop == NULL) {
                 Py_DECREF(result);
                 return NULL;
@@ -147,7 +156,8 @@ static PyMethodDef BlockMethods[] = {
     {NULL, NULL, 0, NULL} /* Sentinel */
 };
 
-static struct PyModuleDef BlockDef = {PyModuleDef_HEAD_INIT,
+static struct PyModuleDef BlockDef = {
+    PyModuleDef_HEAD_INIT,
     "_block_qt",
     NULL,
     -1,
@@ -155,9 +165,12 @@ static struct PyModuleDef BlockDef = {PyModuleDef_HEAD_INIT,
     NULL,
     NULL,
     NULL,
-                                      NULL};
+    NULL
+};
 
-PyObject *PyInit__block_qt(void) {
+PyObject *
+PyInit__block_qt(void)
+{
     PyObject *m = PyModule_Create(&BlockDef);
     if (m == NULL) {
         return NULL;

qtlib/error_report_dialog.py

@@ -9,7 +9,6 @@
 import traceback
 import sys
 import os
-import platform
 
 from PyQt5.QtCore import Qt, QCoreApplication, QSize
 from PyQt5.QtWidgets import (
@@ -35,9 +34,7 @@ class ErrorReportDialog(QDialog):
         self._setupUi()
         name = QCoreApplication.applicationName()
         version = QCoreApplication.applicationVersion()
-        error_text = "Application Name: {}\nVersion: {}\nPython: {}\nOperating System: {}\n\n{}".format(
+        error_text = "Application Name: {}\nVersion: {}\n\n{}".format(name, version, error)
-            name, version, platform.python_version(), platform.platform(), error
-        )
         # Under windows, we end up with an error report without linesep if we don't mangle it
         error_text = error_text.replace("\n", os.linesep)
         self.errorTextEdit.setPlainText(error_text)

requirements.txt

@@ -1,7 +1,7 @@
 Send2Trash>=1.3.0
 sphinx>=3.0.0
 polib>=1.1.0
-mutagen>=1.44.0
+mutagen>=1.45.1
 distro>=1.5.0
 PyQt5 >=5.14.1,<6.0; sys_platform != 'linux'
 pywin32>=228; sys_platform == 'win32'

setup.cfg

@@ -31,15 +31,12 @@ python_requires = >=3.6
 install_requires = 
     Send2Trash>=1.3.0
     polib>=1.1.0
-    mutagen>=1.45.1
+    hsaudiotag3k>=1.1.3*
     distro>=1.5.0
     PyQt5 >=5.14.1,<6.0; sys_platform != 'linux'
     pywin32>=228; sys_platform == 'win32'
-setup_requires =
-    sphinx>=3.0.0
 tests_require = 
     pytest >=6,<7
-include_package_data = true
 
 [options.entry_points]
 console_scripts =

setup.py

@@ -3,7 +3,7 @@ from pathlib import Path
 
 exts = [
     Extension(
-        "core.pe._block",
+        "_block",
         [
             str(Path("core", "pe", "modules", "block.c")),
             str(Path("core", "pe", "modules", "common.c")),
@@ -11,16 +11,19 @@ exts = [
         include_dirs=[str(Path("core", "pe", "modules"))],
     ),
     Extension(
-        "core.pe._cache",
+        "_cache",
         [
             str(Path("core", "pe", "modules", "cache.c")),
             str(Path("core", "pe", "modules", "common.c")),
         ],
         include_dirs=[str(Path("core", "pe", "modules"))],
     ),
-    Extension("qt.pe._block_qt", [str(Path("qt", "pe", "modules", "block.c"))]),
+    Extension("_block_qt", [str(Path("qt", "pe", "modules", "block.c"))]),
 ]
 
 headers = [str(Path("core", "pe", "modules", "common.h"))]
 
-setup(ext_modules=exts, headers=headers)
+setup(
+    ext_modules=exts,
+    headers=headers,
+)