Merge branch 'master' into plugins-v3

Author: zas

.github/workflows/run-tests.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-2019]
+        os: [macos-12, ubuntu-latest, windows-2019]
         python-version: ['3.9', '3.10', '3.11', '3.12']
         include:
         - os: macos-11
@@ -109,7 +109,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-12, ubuntu-latest, windows-latest]
         python-version: ['3.9', '3.12']
 
     steps:

.pylintrc

@@ -283,8 +283,7 @@ min-similarity-lines=4
 
 # List of additional names supposed to be defined in builtins. Remember that
 # you should avoid defining new builtins when possible.
-additional-builtins=_, N_, ngettext, gettext_attributes, pgettext_attributes,
-                    gettext_constants, gettext_countries
+additional-builtins=
 
 # Tells whether unused global variables should be treated as a violation.
 allow-global-unused-variables=yes

INSTALL.md

@@ -62,6 +62,23 @@ To uninstall Picard run:
     pip3 uninstall picard
 
 
+Note about Qt6 installed via pip
+--------------------------------
+
+If you get errors related to `libxcb` on application startup, you may need to install extra libraries on your system.
+
+Typical error looks like:
+
+    qt.qpa.plugin: From 6.5.0, xcb-cursor0 or libxcb-cursor0 is needed to load the Qt xcb platform plugin.
+    qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found.
+    This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.
+
+
+In this case, you have to install extra packages system-wide, for example, in this case, on Ubuntu:
+
+    sudo apt install libxcb-cursor0
+
+
 Installation using setup.py
 ---------------------------
 

org.musicbrainz.Picard.appdata.xml.in

@@ -76,7 +76,7 @@
   <recommends>
     <control>keyboard</control>
     <control>pointing</control>
-    <display_length compare="ge">medium</display_length>
+    <display_length compare="ge">768</display_length>
     <internet>always</internet>
   </recommends>
 

picard/__init__.py

@@ -3,7 +3,7 @@
 # Picard, the next-generation MusicBrainz tagger
 #
 # Copyright (C) 2006-2008, 2011-2014 Lukáš Lalinský
-# Copyright (C) 2009, 2018-2023 Philipp Wolfer
+# Copyright (C) 2009, 2018-2024 Philipp Wolfer
 # Copyright (C) 2012 Chad Wilson
 # Copyright (C) 2012-2013 Michael Wiencek
 # Copyright (C) 2013-2024 Laurent Monin
@@ -31,6 +31,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
+import sys
 
 from picard.version import Version
 
@@ -67,14 +68,12 @@
 api_versions_tuple = [Version.from_string(v) for v in api_versions]
 
 
-def crash_handler():
+def crash_handler(exc: Exception = None):
     """Implements minimal handling of an exception crashing the application.
     This function tries to log the exception to a log file and display
     a minimal crash dialog to the user.
     This function is supposed to be called from inside an except blog.
     """
-    import sys
-
     # Allow disabling the graphical crash handler for debugging and CI purposes.
     if set(sys.argv) & {'--no-crash-dialog', '-v', '--version', '-V', '--long-version', '-h', '--help'}:
         return
@@ -83,7 +82,14 @@ def crash_handler():
     # with minimum chance to fail.
     from tempfile import NamedTemporaryFile
     import traceback
-    trace = traceback.format_exc()
+    if exc:
+        if sys.version_info < (3, 10):
+            trace_list = traceback.format_exception(None, exc, exc.__traceback__)
+        else:
+            trace_list = traceback.format_exception(exc)  # pylint: disable=no-value-for-parameter
+        trace = "".join(trace_list)
+    else:
+        trace = traceback.format_exc()
     logfile = None
     try:
         with NamedTemporaryFile(suffix='.log', prefix='picard-crash-', delete=False) as f:
@@ -124,3 +130,12 @@ def crash_handler():
     msgbox.setDefaultButton(QMessageBox.StandardButton.Close)
     msgbox.exec()
     app.quit()
+
+
+def register_excepthook():
+    def _global_exception_handler(exctype, value, traceback):
+        from picard import crash_handler
+        crash_handler(exc=value)
+        sys.__excepthook__(exctype, value, traceback)
+
+    sys.excepthook = _global_exception_handler

picard/acoustid/__init__.py

@@ -37,12 +37,11 @@
 from picard import log
 from picard.acoustid.recordings import RecordingResolver
 from picard.config import get_config
-from picard.const import (
-    DEFAULT_FPCALC_THREADS,
-    FPCALC_NAMES,
-)
+from picard.const import FPCALC_NAMES
+from picard.const.defaults import DEFAULT_FPCALC_THREADS
 from picard.const.sys import IS_WIN
 from picard.file import File
+from picard.i18n import N_
 from picard.util import (
     find_executable,
     win_prefix_longpath,
@@ -84,6 +83,7 @@ class AcoustIDClient(QtCore.QObject):
 
     def __init__(self, acoustid_api: AcoustIdAPIHelper):
         super().__init__()
+        self.tagger = QtCore.QCoreApplication.instance()
         self._queue = deque()
         self._running = 0
         self._acoustid_api = acoustid_api

picard/acoustid/manager.py

@@ -29,6 +29,7 @@
 from PyQt6 import QtCore
 
 from picard import log
+from picard.i18n import N_
 from picard.util import load_json
 
 
@@ -110,6 +111,7 @@ class AcoustIDManager(QtCore.QObject):
 
     def __init__(self, acoustid_api):
         super().__init__()
+        self.tagger = QtCore.QCoreApplication.instance()
         self._submissions = {}
         self._acoustid_api = acoustid_api
 

picard/album.py

@@ -59,6 +59,10 @@
 from picard.const import VARIOUS_ARTISTS_ID
 from picard.dataobj import DataObject
 from picard.file import File
+from picard.i18n import (
+    N_,
+    gettext as _,
+)
 from picard.mbjson import (
     medium_to_metadata,
     release_group_to_metadata,
@@ -133,6 +137,7 @@ class Album(DataObject, Item):
 
     def __init__(self, album_id, discid=None):
         DataObject.__init__(self, album_id)
+        self.tagger = QtCore.QCoreApplication.instance()
         self.metadata = Metadata()
         self.orig_metadata = Metadata()
         self.tracks = []

picard/browser/addrelease.py

@@ -28,6 +28,7 @@
 from PyQt6.QtCore import QCoreApplication
 
 from picard import log
+from picard.i18n import gettext as _
 from picard.util import format_time
 from picard.util.mbserver import build_submission_url
 from picard.util.webbrowser2 import open

picard/browser/filelookup.py

@@ -62,6 +62,7 @@ def __init__(self, parent, server, port, local_port):
         self.server = server
         self.local_port = int(local_port)
         self.port = port
+        self.tagger = QtCore.QCoreApplication.instance()
 
     def _url(self, path, params=None):
         if params is None:
@@ -137,10 +138,10 @@ def mbid_lookup(self, string, type_=None, mbid_matched_callback=None, browser_fa
         if mbid_matched_callback:
             mbid_matched_callback(entity, id)
         if entity == 'release':
-            QtCore.QObject.tagger.load_album(id)
+            self.tagger.load_album(id)
             return True
         elif entity == 'recording':
-            QtCore.QObject.tagger.load_nat(id)
+            self.tagger.load_nat(id)
             return True
         elif entity == 'release-group':
             AlbumSearchDialog.show_releasegroup_search(id)