Fix BASE_PATH for frozen macOS app

.github/workflows/default.yml

@@ -76,3 +76,9 @@ jobs:
     - name: Run tests
       run: |
         pytest core hscommon
+    - name: Upload Artifacts
+      if: matrix.os == 'ubuntu-latest'
+      uses: actions/upload-artifact@v3
+      with:
+        name: modules ${{ matrix.python-version }}
+        path: ${{ github.workspace }}/**/*.so

Makefile

@@ -53,7 +53,7 @@ pyc: | env
 	${VENV_PYTHON} -m compileall ${packages}
 
 reqs:
-ifneq ($(shell test $(PYTHON_VERSION_MINOR) -gt $(REQ_MINOR_VERSION); echo $$?),0)
+ifneq ($(shell test $(PYTHON_VERSION_MINOR) -ge $(REQ_MINOR_VERSION); echo $$?),0)
 	$(error "Python 3.${REQ_MINOR_VERSION}+ required. Aborting.")
 endif
 ifndef NO_VENV

core/exclude.py

@@ -507,7 +507,6 @@ if ISWINDOWS:
     def has_sep(regexp):
         return "\\" + sep in regexp
 
-
 else:
 
     def has_sep(regexp):

core/pe/modules/block_osx.m

@@ -10,6 +10,8 @@
 #include "common.h"
 
 #import <Foundation/Foundation.h>
+#import <CoreGraphics/CoreGraphics.h>
+#import <ImageIO/ImageIO.h>
 
 #define RADIANS( degrees ) ( degrees * M_PI / 180 )
 

hscommon/desktop.py

@@ -63,7 +63,6 @@ try:
             appname = proxy.bundleInfo_("CFBundleName")
         return op.join(base, appname)
 
-
 except ImportError:
     try:
         from PyQt5.QtCore import QUrl, QStandardPaths

hscommon/util.py

@@ -226,7 +226,7 @@ def format_time_decimal(seconds):
 
 
 SIZE_DESC = ("B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB")
-SIZE_VALS = tuple(1024 ** i for i in range(1, 9))
+SIZE_VALS = tuple(1024**i for i in range(1, 9))
 
 
 def format_size(size, decimal=0, forcepower=-1, showdesc=True):
@@ -258,7 +258,7 @@ def format_size(size, decimal=0, forcepower=-1, showdesc=True):
     if decimal == 0:
         divided_size = ceil(divided_size)
     else:
-        divided_size = ceil(divided_size * (10 ** decimal)) / (10 ** decimal)
+        divided_size = ceil(divided_size * (10**decimal)) / (10**decimal)
     if negative:
         divided_size *= -1
     result = size_format % divided_size

package.py

@@ -213,7 +213,7 @@ def package_macos():
             "--osx-bundle-identifier=com.hardcoded-software.dupeguru",
             "--add-data={0}:locale".format(LOCALE_DIR),
             "--add-data={0}:help".format(HELP_DIR),
-            ENTRY_SCRIPT,
+            "{0}".format(ENTRY_SCRIPT),
         ]
     )
 

pkg/debian/control

@@ -10,7 +10,7 @@ Vcs-Git: https://github.com/arsenetar/dupeguru.git
 
 Package: {pkgname}
 Architecture: {arch}
-Depends: ${shlibs:Depends}, python3 (>=3.4), python3-pyqt5
+Depends: ${shlibs:Depends}, python3 (>=3.6), python3-pyqt5, python3-mutagen
 Provides: dupeguru-se, dupeguru-me, dupeguru-pe
 Replaces: dupeguru-se, dupeguru-me, dupeguru-pe
 Conflicts: dupeguru-se, dupeguru-me, dupeguru-pe

qt/platform.py

@@ -12,7 +12,11 @@ if op.exists(__file__):
     # inside qt/, so we just go back one level.
     BASE_PATH = op.abspath(op.join(op.dirname(__file__), ".."))
 else:
-    # We're under a freezed environment. Our base path is ''.
+    # Should be a frozen environment
+    if ISOSX:
+        BASE_PATH = op.abspath(op.join(op.dirname(__file__), '..', '..', 'Resources'))
+    else:
+        # For others our base path is ''.
         BASE_PATH = ""
 HELP_PATH = op.join(BASE_PATH, "help")
 

qt/preferences_dialog.py

@@ -302,6 +302,7 @@ use the modifier key to drag the floating window around"
             setchecked(self.reference_bold_font, prefs.reference_bold_font)
             setchecked(self.tabs_default_pos, prefs.tabs_default_pos)
             setchecked(self.use_native_dialogs, prefs.use_native_dialogs)
+            if plat.ISWINDOWS:
                 setchecked(self.use_dark_style, prefs.use_dark_style)
             setchecked(
                 self.details_dialog_titlebar_enabled,
@@ -347,6 +348,7 @@ use the modifier key to drag the floating window around"
         prefs.tableFontSize = self.fontSizeSpinBox.value()
         prefs.tabs_default_pos = ischecked(self.tabs_default_pos)
         prefs.use_native_dialogs = ischecked(self.use_native_dialogs)
+        if plat.ISWINDOWS:
             prefs.use_dark_style = ischecked(self.use_dark_style)
         lang = self.supportedLanguages[self.languageComboBox.currentIndex()]
         oldlang = self.app.prefs.language

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,py38,py39
+envlist = py36,py37,py38,py39,py310
 skipsdist = True
 skip_missing_interpreters = True