From 3dcaf0ccdf43218760fe7d316ec496def0963cce Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Tue, 7 Jun 2022 08:00:29 +0200
Subject: [PATCH 01/19] Updated translations from transifex

---
 po/appstream/nl.po  |  4 ++--
 po/attributes/nl.po |  8 ++++----
 po/countries/nl.po  |  6 +++---
 po/es.po            | 16 ++++++++--------
 po/nl.po            |  6 +++---
 po/zh_TW.po         |  6 +++---
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/po/appstream/nl.po b/po/appstream/nl.po
index 7f5cfd4e2..6b97f5b2f 100644
--- a/po/appstream/nl.po
+++ b/po/appstream/nl.po
@@ -5,7 +5,7 @@
 # 
 # Translators:
 # Lukáš Lalinský <lalinsky@gmail.com>, 2020
-# Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2021
+# Maurits Meulenbelt, 2021
 # 
 #, fuzzy
 msgid ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-01-14 23:03+0100\n"
 "PO-Revision-Date: 2018-11-25 07:37+0000\n"
-"Last-Translator: Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2021\n"
+"Last-Translator: Maurits Meulenbelt, 2021\n"
 "Language-Team: Dutch (https://www.transifex.com/musicbrainz/teams/13846/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/attributes/nl.po b/po/attributes/nl.po
index 15f9b67c1..8cf18bb14 100644
--- a/po/attributes/nl.po
+++ b/po/attributes/nl.po
@@ -2,8 +2,8 @@
 # Translators:
 # reneweesp <bmom43@hotmail.com>, 2017
 # Maurits Meulenbelt <email address hidden>, 2012
-# Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2012
-# Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2013-2022
+# Maurits Meulenbelt, 2012
+# Maurits Meulenbelt, 2013-2022
 # Nikolai Prokoschenko <email address hidden>, 2011
 # Nikolai Prokoschenko <nikolai@prokoschenko.de>, 2011
 # Niko Strijbol <strijbol.niko@gmail.com>, 2018
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "PO-Revision-Date: 2012-05-24 18:52+0000\n"
-"Last-Translator: Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2013-2022\n"
+"Last-Translator: Maurits Meulenbelt, 2013-2022\n"
 "Language-Team: Dutch (http://www.transifex.com/musicbrainz/musicbrainz/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -186,7 +186,7 @@ msgstr "Een ballet is muziek die is gecomponeerd om samen met choreografie te wo
 #: DB:release_packaging/description:19
 msgctxt "release_packaging"
 msgid "A box usually containing multiple discs as part of a boxed set."
-msgstr ""
+msgstr "Een doos met meestal meerdere cd’s als onderdeel van een boxset."
 
 #: DB:work_type/description:3
 msgctxt "work_type"
diff --git a/po/countries/nl.po b/po/countries/nl.po
index 8fb9651f6..ce709c6a9 100644
--- a/po/countries/nl.po
+++ b/po/countries/nl.po
@@ -1,13 +1,13 @@
 # 
 # Translators:
-# Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2012
-# Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2014-2015
+# Maurits Meulenbelt, 2012
+# Maurits Meulenbelt, 2014-2015
 # Nikolai Prokoschenko <nikolai@prokoschenko.de>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "PO-Revision-Date: 2012-05-24 19:20+0000\n"
-"Last-Translator: Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2014-2015\n"
+"Last-Translator: Maurits Meulenbelt, 2014-2015\n"
 "Language-Team: Dutch (http://www.transifex.com/musicbrainz/musicbrainz/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/es.po b/po/es.po
index 1a68dff47..3b5979c68 100644
--- a/po/es.po
+++ b/po/es.po
@@ -84,7 +84,7 @@ msgstr "Archivos desagrupados"
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] "Añadida %(count)i publicación a la colección \"%(name)s\""
-msgstr[1] ""
+msgstr[1] "Añadidas %(count)i publicaciones a la colección \"%(name)s\""
 msgstr[2] "Añadidas %(count)i publicaciones a la colección \"%(name)s\""
 
 #: picard/collection.py:86
@@ -92,7 +92,7 @@ msgstr[2] "Añadidas %(count)i publicaciones a la colección \"%(name)s\""
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] "Eliminada %(count)i publicación de la colección \"%(name)s\""
-msgstr[1] ""
+msgstr[1] "Eliminadas %(count)i publicaciones de la colección \"%(name)s\""
 msgstr[2] "Eliminadas %(count)i publicaciones de la colección \"%(name)s\""
 
 #: picard/collection.py:97
@@ -3675,7 +3675,7 @@ msgstr "Actualizar la lista"
 msgid "%s (%i release)"
 msgid_plural "%s (%i releases)"
 msgstr[0] "%s (%i publicación)"
-msgstr[1] ""
+msgstr[1] "%s (%i publicaciones)"
 msgstr[2] "%s (%i publicaciones)"
 
 #: picard/ui/colors.py:37
@@ -3904,7 +3904,7 @@ msgstr "&Información"
 msgid "%i file in this track"
 msgid_plural "%i files in this track"
 msgstr[0] "%i fichero en esta pista"
-msgstr[1] ""
+msgstr[1] "%i ficheros en esta pista"
 msgstr[2] "%i ficheros en esta pista"
 
 #: picard/ui/infodialog.py:409
@@ -4215,7 +4215,7 @@ msgid ""
 msgid_plural ""
 "There are %d unsaved files. Closing Picard will lose all unsaved changes."
 msgstr[0] "Hay %d archivo no guardado. Si cierra Picard perderá todos los cambios sin guardar."
-msgstr[1] ""
+msgstr[1] "Hay %d archivos no guardados. Si cierras Picard perderás todos los cambios sin guardar."
 msgstr[2] "Hay %d archivos no guardados. Si cierras Picard perderás todos los cambios sin guardar."
 
 #: picard/ui/mainwindow.py:347
@@ -4740,7 +4740,7 @@ msgstr ""
 msgid "(different across %d item)"
 msgid_plural "(different across %d items)"
 msgstr[0] "(varía en %d elemento)"
-msgstr[1] ""
+msgstr[1] "(varía en %d elementos)"
 msgstr[2] "(varía en %d elementos)"
 
 #: picard/ui/metadatabox.py:120
@@ -4748,7 +4748,7 @@ msgstr[2] "(varía en %d elementos)"
 msgid "(missing from %d item)"
 msgid_plural "(missing from %d items)"
 msgstr[0] "(falta en %d elemento)"
-msgstr[1] ""
+msgstr[1] "(falta en %d elementos)"
 msgstr[2] "(falta en %d elementos)"
 
 #: picard/ui/metadatabox.py:218
@@ -4807,7 +4807,7 @@ msgstr "Remover de la lista 'Etiquetas Preservadas'"
 msgid "Use Original Value"
 msgid_plural "Use Original Values"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "Usar valor original"
 msgstr[2] "Usar valor original"
 
 #: picard/ui/metadatabox.py:439
diff --git a/po/nl.po b/po/nl.po
index 8452e02ad..eb5983d2b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,8 +6,8 @@
 # reneweesp <bmom43@hotmail.com>, 2017-2019
 # Dogmatica <jeroendoggen@hotmail.com>, 2006
 # Jan van Thiel <zout@gewis.nl>, 2006
-# Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2012
-# Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2012-2022
+# Maurits Meulenbelt, 2012
+# Maurits Meulenbelt, 2012-2022
 # Philipp Wolfer <ph.wolfer@gmail.com>, 2019-2021
 msgid ""
 msgstr ""
@@ -15,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2022-05-01 15:38+0200\n"
 "PO-Revision-Date: 2012-05-29 16:17+0000\n"
-"Last-Translator: Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2012-2022\n"
+"Last-Translator: Maurits Meulenbelt, 2012-2022\n"
 "Language-Team: Dutch (http://www.transifex.com/musicbrainz/musicbrainz/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3979fde7d..f8b92b455 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@
 # Philipp Wolfer <ph.wolfer@gmail.com>, 2019-2022
 # S B <koalaleaves@protonmail.com>, 2022
 # Shen-Ta Hsieh(BestSteve) <ibmibmibm.tw@gmail.com>, 2016
-# Shen-Ta Hsieh(BestSteve) <ibmibmibm.tw@gmail.com>, 2016-2020
+# Shen-Ta Hsieh(BestSteve) <ibmibmibm.tw@gmail.com>, 2016-2020,2022
 # riotism, 2017-2018,2020
 msgid ""
 msgstr ""
@@ -15,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2022-05-01 15:38+0200\n"
 "PO-Revision-Date: 2012-05-29 16:17+0000\n"
-"Last-Translator: Philipp Wolfer <ph.wolfer@gmail.com>, 2019-2022\n"
+"Last-Translator: Shen-Ta Hsieh(BestSteve) <ibmibmibm.tw@gmail.com>, 2016-2020,2022\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/musicbrainz/musicbrainz/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -6933,7 +6933,7 @@ msgstr "指揮"
 
 #: picard/util/tags.py:53
 msgid "Copyright"
-msgstr "著作權"
+msgstr "版權"
 
 #: picard/util/tags.py:55
 msgid "Video Director"

From 04ddb9f3f076b7940fd6325e271a21a851c3ae44 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Tue, 7 Jun 2022 08:10:30 +0200
Subject: [PATCH 02/19] Release 2.8.1

---
 NEWS.md            | 10 ++++++++++
 picard/__init__.py |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index 9a67d256a..aea7d94c2 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,13 @@
+# Version 2.8.1 - 2022-06-07
+
+## Bugfixes
+
+- [PICARD-2489](https://tickets.metabrainz.org/browse/PICARD-2489) - Preferred Releases UI not loading in Options menu on FreeBSD
+- [PICARD-2491](https://tickets.metabrainz.org/browse/PICARD-2491) - Crash upon loading album information for releases with MBID redirects
+- [PICARD-2493](https://tickets.metabrainz.org/browse/PICARD-2493) - If locales for picard-countries or picard-attributes are missing UI translation is completely skipped
+- [PICARD-2494](https://tickets.metabrainz.org/browse/PICARD-2494) - Remove empty info dialog for "[standalone-recordings]" special album entry
+
+
 # Version 2.8 - 2022-05-24
 
 ## Tasks
diff --git a/picard/__init__.py b/picard/__init__.py
index d6aed0bdf..bb16f00ec 100644
--- a/picard/__init__.py
+++ b/picard/__init__.py
@@ -42,7 +42,7 @@ PICARD_APP_NAME = "Picard"
 PICARD_DISPLAY_NAME = "MusicBrainz Picard"
 PICARD_APP_ID = "org.musicbrainz.Picard"
 PICARD_DESKTOP_NAME = PICARD_APP_ID + ".desktop"
-PICARD_VERSION = Version(2, 8, 0, 'final', 0)
+PICARD_VERSION = Version(2, 8, 1, 'final', 0)
 
 
 # optional build version

From fdb9752147a6f67809788a22b88a019ed87f6022 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Tue, 7 Jun 2022 17:56:51 +0200
Subject: [PATCH 03/19] PICARD-2498: HTML escape plugin metadata before display

---
 picard/ui/options/plugins.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/picard/ui/options/plugins.py b/picard/ui/options/plugins.py
index 4f618839f..3a4077615 100644
--- a/picard/ui/options/plugins.py
+++ b/picard/ui/options/plugins.py
@@ -31,6 +31,7 @@
 
 
 from functools import partial
+from html import escape
 from operator import attrgetter
 import os.path
 
@@ -599,10 +600,10 @@ class PluginsOptionsPage(OptionsPage):
         if plugin.description:
             text.append(plugin.description + "<hr width='90%'/>")
         infos = [
-            (_("Name"), plugin.name),
-            (_("Authors"), plugin.author),
+            (_("Name"), escape(plugin.name)),
+            (_("Authors"), escape(plugin.author)),
             (_("License"), plugin.license),
-            (_("Files"), plugin.files_list),
+            (_("Files"), escape(plugin.files_list)),
         ]
         for label, value in infos:
             if value:

From 51bbbf362a41c406f454f27e2e694ea7dce84073 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Tue, 7 Jun 2022 18:12:18 +0200
Subject: [PATCH 04/19] PICARD-2498: Link plugin authors with e-mail using
 mailto:

---
 picard/ui/options/plugins.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/picard/ui/options/plugins.py b/picard/ui/options/plugins.py
index 3a4077615..0be20fe9c 100644
--- a/picard/ui/options/plugins.py
+++ b/picard/ui/options/plugins.py
@@ -34,6 +34,7 @@ from functools import partial
 from html import escape
 from operator import attrgetter
 import os.path
+import re
 
 from PyQt5 import (
     QtCore,
@@ -601,7 +602,7 @@ class PluginsOptionsPage(OptionsPage):
             text.append(plugin.description + "<hr width='90%'/>")
         infos = [
             (_("Name"), escape(plugin.name)),
-            (_("Authors"), escape(plugin.author)),
+            (_("Authors"), self.link_authors(plugin.author)),
             (_("License"), plugin.license),
             (_("Files"), escape(plugin.files_list)),
         ]
@@ -610,6 +611,22 @@ class PluginsOptionsPage(OptionsPage):
                 text.append("<b>{0}:</b> {1}".format(label, value))
         self.ui.details.setText("<p>{0}</p>".format("<br/>\n".join(text)))
 
+    @staticmethod
+    def link_authors(authors):
+        formatted_authors = []
+        re_author = re.compile(r"(?P<author>.*?)\s*<(?P<email>.*?)>")
+        for author in authors.split(','):
+            match = re_author.match(author.strip())
+            if match:
+                author_str = '<a href="mailto:{email}">{author}</a>'.format(
+                    email=escape(match['email']),
+                    author=escape(match['author']),
+                )
+                formatted_authors.append(author_str)
+            else:
+                formatted_authors.append(escape(author))
+        return ', '.join(formatted_authors)
+
     def change_details(self):
         item = self.selected_item()
         if item:

From bb07ff7f41b32033d5829a91b97e4d4f5d60d256 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Wed, 8 Jun 2022 21:16:57 +0200
Subject: [PATCH 05/19] PICARD-2498: Added test for
 PluginsOptionsPage.link_authors

---
 picard/ui/options/plugins.py    |  5 +++--
 test/test_ui_options_plugins.py | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 test/test_ui_options_plugins.py

diff --git a/picard/ui/options/plugins.py b/picard/ui/options/plugins.py
index 0be20fe9c..7efc9a117 100644
--- a/picard/ui/options/plugins.py
+++ b/picard/ui/options/plugins.py
@@ -614,9 +614,10 @@ class PluginsOptionsPage(OptionsPage):
     @staticmethod
     def link_authors(authors):
         formatted_authors = []
-        re_author = re.compile(r"(?P<author>.*?)\s*<(?P<email>.*?)>")
+        re_author = re.compile(r"(?P<author>.*?)\s*<(?P<email>.*?@.*?)>")
         for author in authors.split(','):
-            match = re_author.match(author.strip())
+            author = author.strip()
+            match = re_author.fullmatch(author)
             if match:
                 author_str = '<a href="mailto:{email}">{author}</a>'.format(
                     email=escape(match['email']),
diff --git a/test/test_ui_options_plugins.py b/test/test_ui_options_plugins.py
new file mode 100644
index 000000000..42d5e3a2a
--- /dev/null
+++ b/test/test_ui_options_plugins.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+#
+# Picard, the next-generation MusicBrainz tagger
+#
+# Copyright (C) 2022 Philipp Wolfer
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+from test.picardtestcase import PicardTestCase
+
+from picard.ui.options.plugins import PluginsOptionsPage
+
+
+class PluginsOptionsPageTest(PicardTestCase):
+
+    def test_link_authors(self):
+        self.assertEqual(
+            '<a href="mailto:coyote@acme.com">Wile E. Coyote</a>, Road &lt;Runner&gt;',
+            PluginsOptionsPage.link_authors('Wile E. Coyote <coyote@acme.com>, Road <Runner>'),
+        )

From 5ef1a4825e392892b1794b6ab52d4f452ff25f9c Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Wed, 8 Jun 2022 23:56:31 +0200
Subject: [PATCH 06/19] Re-enable macOS tests with Python 3.10

---
 .github/workflows/run-tests.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 9052a7447..789d24da8 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -12,9 +12,6 @@ jobs:
         exclude:
         - os: macos-latest
           python-version: '3.6'
-        # pyobjc is not yet compatible with Python 3.10
-        - os: macos-latest
-          python-version: '3.10'
         include:
         - os: macos-10.15
           python-version: '3.6'

From 32fef293e1d8c9702732908381756865cb419622 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Thu, 9 Jun 2022 17:48:31 +0200
Subject: [PATCH 07/19] PICARD-2480: Detect and ignore data tracks in EAC log
 files

---
 picard/disc/utils.py        |  24 +++++++++++++++++-------
 test/data/eac-datatrack.log | Bin 0 -> 10840 bytes
 test/test_disc_eaclog.py    |   5 +++++
 3 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 test/data/eac-datatrack.log

diff --git a/picard/disc/utils.py b/picard/disc/utils.py
index 634f07942..ff1dd339a 100644
--- a/picard/disc/utils.py
+++ b/picard/disc/utils.py
@@ -24,13 +24,14 @@
 # SOFTWARE.
 
 PREGAP_LENGTH = 150
+DATA_TRACK_GAP = 11400
 
 
 class NotSupportedTOCError(Exception):
     pass
 
 
-def calculate_mb_toc_numbers(toc_entries):
+def calculate_mb_toc_numbers(toc):
     """
     Take iterator of toc entries, return a tuple of numbers for musicbrainz disc id
 
@@ -39,16 +40,25 @@ def calculate_mb_toc_numbers(toc_entries):
     - start_sector: start sector of the track
     - end_sector: end sector of the track
     """
-    eac = tuple(toc_entries)
-    num_tracks = len(eac)
+    toc = tuple(toc)
+    toc = _remove_data_track(toc)
+    num_tracks = len(toc)
     if not num_tracks:
-        raise NotSupportedTOCError("Empty track list: %s", eac)
+        raise NotSupportedTOCError("Empty track list: %s", toc)
 
     expected_tracknums = tuple(range(1, num_tracks+1))
-    tracknums = tuple(int(e['num']) for e in eac)
+    tracknums = tuple(int(e['num']) for e in toc)
     if expected_tracknums != tracknums:
         raise NotSupportedTOCError("Non-standard track number sequence: %s", tracknums)
 
-    leadout_offset = int(eac[-1]['end_sector']) + PREGAP_LENGTH + 1
-    offsets = tuple((int(x['start_sector']) + PREGAP_LENGTH) for x in eac)
+    leadout_offset = int(toc[-1]['end_sector']) + PREGAP_LENGTH + 1
+    offsets = tuple((int(x['start_sector']) + PREGAP_LENGTH) for x in toc)
     return (1, num_tracks, leadout_offset) + offsets
+
+
+def _remove_data_track(toc):
+    if len(toc) > 1:
+        last_track_gap = int(toc[-1]['start_sector']) - int(toc[-2]['end_sector'])
+        if last_track_gap == DATA_TRACK_GAP + 1:
+            toc = toc[:-1]
+    return toc
diff --git a/test/data/eac-datatrack.log b/test/data/eac-datatrack.log
new file mode 100644
index 0000000000000000000000000000000000000000..8e19e657fc59a622eacdfb7a45709653bb19e0af
GIT binary patch
literal 10840
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
Ce!$fL

literal 0
HcmV?d00001

diff --git a/test/test_disc_eaclog.py b/test/test_disc_eaclog.py
index 3320ccd35..16633996f 100644
--- a/test/test_disc_eaclog.py
+++ b/test/test_disc_eaclog.py
@@ -93,6 +93,11 @@ class TestTocFromFile(PicardTestCase):
     def test_toc_from_file_xld(self):
         self._test_toc_from_file('xld.log')
 
+    def test_toc_from_file_with_datatrack(self):
+        test_log = get_test_data_path('eac-datatrack.log')
+        toc = toc_from_file(test_log)
+        self.assertEqual((1, 8, 178288, 150, 20575, 42320, 62106, 78432, 94973, 109750, 130111), toc)
+
     def test_toc_from_empty_file(self):
         test_log = get_test_data_path('eac-empty.log')
         with self.assertRaises(NotSupportedTOCError):

From f65dcd79b18bfe7b428716f5a93a0c602327a843 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Thu, 9 Jun 2022 17:49:59 +0200
Subject: [PATCH 08/19] Use a namedtuple for TOC entries from parsed ripper
 logs

---
 picard/disc/eaclog.py     | 12 ++++++------
 picard/disc/utils.py      | 20 +++++++++++++-------
 picard/disc/whipperlog.py | 12 +++++-------
 test/test_disc_eaclog.py  | 27 +++++++--------------------
 test/test_disc_utils.py   | 29 +++++++++--------------------
 5 files changed, 40 insertions(+), 60 deletions(-)

diff --git a/picard/disc/eaclog.py b/picard/disc/eaclog.py
index 8395edf80..7facaf785 100644
--- a/picard/disc/eaclog.py
+++ b/picard/disc/eaclog.py
@@ -25,7 +25,10 @@
 
 import re
 
-from picard.disc.utils import calculate_mb_toc_numbers
+from picard.disc.utils import (
+    TocEntry,
+    calculate_mb_toc_numbers,
+)
 
 
 RE_TOC_TABLE_HEADER = re.compile(r""" \s*
@@ -50,9 +53,6 @@ RE_TOC_TABLE_LINE = re.compile(r"""
     \s*$""", re.VERBOSE)
 
 
-PREGAP_LENGTH = 150
-
-
 def filter_toc_entries(lines):
     """
     Take iterator of lines, return iterator of toc entries
@@ -71,7 +71,7 @@ def filter_toc_entries(lines):
         m = RE_TOC_TABLE_LINE.match(line)
         if not m:
             break
-        yield m.groupdict()
+        yield TocEntry(int(m['num']), int(m['start_sector']), int(m['end_sector']))
 
 
 ENCODING_BOMS = {
@@ -92,7 +92,7 @@ def _detect_encoding(path):
 
 
 def toc_from_file(path):
-    """Reads EAC / XLD log files, generates musicbrainz disc TOC listing for use as discid.
+    """Reads EAC / XLD log files, generates MusicBrainz disc TOC listing for use as discid.
 
     Warning: may work wrong for discs having data tracks. May generate wrong
     results on other non-standard cases."""
diff --git a/picard/disc/utils.py b/picard/disc/utils.py
index ff1dd339a..b4cbbc28b 100644
--- a/picard/disc/utils.py
+++ b/picard/disc/utils.py
@@ -23,20 +23,26 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+from collections import namedtuple
+
+
 PREGAP_LENGTH = 150
 DATA_TRACK_GAP = 11400
 
 
+TocEntry = namedtuple('TocEntry', 'number start_sector end_sector')
+
+
 class NotSupportedTOCError(Exception):
     pass
 
 
 def calculate_mb_toc_numbers(toc):
     """
-    Take iterator of toc entries, return a tuple of numbers for musicbrainz disc id
+    Take iterator of TOC entries, return a tuple of numbers for MusicBrainz disc id
 
-    Each toc entry is a dict with the following keys:
-    - num: track number
+    Each entry is a TocEntry namedtuple with the following fields:
+    - number: track number
     - start_sector: start sector of the track
     - end_sector: end sector of the track
     """
@@ -47,18 +53,18 @@ def calculate_mb_toc_numbers(toc):
         raise NotSupportedTOCError("Empty track list: %s", toc)
 
     expected_tracknums = tuple(range(1, num_tracks+1))
-    tracknums = tuple(int(e['num']) for e in toc)
+    tracknums = tuple(e.number for e in toc)
     if expected_tracknums != tracknums:
         raise NotSupportedTOCError("Non-standard track number sequence: %s", tracknums)
 
-    leadout_offset = int(toc[-1]['end_sector']) + PREGAP_LENGTH + 1
-    offsets = tuple((int(x['start_sector']) + PREGAP_LENGTH) for x in toc)
+    leadout_offset = toc[-1].end_sector + PREGAP_LENGTH + 1
+    offsets = tuple(e.start_sector + PREGAP_LENGTH for e in toc)
     return (1, num_tracks, leadout_offset) + offsets
 
 
 def _remove_data_track(toc):
     if len(toc) > 1:
-        last_track_gap = int(toc[-1]['start_sector']) - int(toc[-2]['end_sector'])
+        last_track_gap = toc[-1].start_sector - toc[-2].end_sector
         if last_track_gap == DATA_TRACK_GAP + 1:
             toc = toc[:-1]
     return toc
diff --git a/picard/disc/whipperlog.py b/picard/disc/whipperlog.py
index e040b0d6b..2552a9146 100644
--- a/picard/disc/whipperlog.py
+++ b/picard/disc/whipperlog.py
@@ -18,10 +18,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-
 import yaml
 
-from picard.disc.utils import calculate_mb_toc_numbers
+from picard.disc.utils import (
+    TocEntry,
+    calculate_mb_toc_numbers,
+)
 
 
 def toc_from_file(path):
@@ -32,11 +34,7 @@ def toc_from_file(path):
     with open(path, encoding='utf-8') as f:
         data = yaml.safe_load(f)
         toc_entries = (
-            {
-                'num': num,
-                'start_sector': t['Start sector'],
-                'end_sector': t['End sector'],
-            }
+            TocEntry(num, t['Start sector'], t['End sector'])
             for num, t in data['TOC'].items()
         )
         return calculate_mb_toc_numbers(toc_entries)
diff --git a/test/test_disc_eaclog.py b/test/test_disc_eaclog.py
index 16633996f..88eba0e5e 100644
--- a/test/test_disc_eaclog.py
+++ b/test/test_disc_eaclog.py
@@ -31,7 +31,10 @@ from picard.disc.eaclog import (
     filter_toc_entries,
     toc_from_file,
 )
-from picard.disc.utils import NotSupportedTOCError
+from picard.disc.utils import (
+    NotSupportedTOCError,
+    TocEntry,
+)
 
 
 test_log = (
@@ -46,25 +49,9 @@ test_log = (
 )
 
 test_entries = [
-    {
-        'num': '1',
-        'start_time': '0:00.00',
-        'length_time': '5:32.14',
-        'start_sector': '0',
-        'end_sector': '24913'
-    }, {
-        'num': '2',
-        'start_time': '5:32.14',
-        'length_time': '4:07.22',
-        'start_sector': '24914',
-        'end_sector': '43460'
-    }, {
-        'num': '3',
-        'start_time': '9:39.36',
-        'length_time': '3:50.29',
-        'start_sector': '43461',
-        'end_sector': '60739'
-    }
+    TocEntry(1, 0, 24913),
+    TocEntry(2, 24914, 43460),
+    TocEntry(3, 43461, 60739),
 ]
 
 
diff --git a/test/test_disc_utils.py b/test/test_disc_utils.py
index 23a71f88e..260127974 100644
--- a/test/test_disc_utils.py
+++ b/test/test_disc_utils.py
@@ -23,30 +23,15 @@ from test.picardtestcase import PicardTestCase
 
 from picard.disc.utils import (
     NotSupportedTOCError,
+    TocEntry,
     calculate_mb_toc_numbers,
 )
 
 
 test_entries = [
-    {
-        'num': '1',
-        'start_time': '0:00.00',
-        'length_time': '5:32.14',
-        'start_sector': '0',
-        'end_sector': '24913'
-    }, {
-        'num': '2',
-        'start_time': '5:32.14',
-        'length_time': '4:07.22',
-        'start_sector': '24914',
-        'end_sector': '43460'
-    }, {
-        'num': '3',
-        'start_time': '9:39.36',
-        'length_time': '3:50.29',
-        'start_sector': '43461',
-        'end_sector': '60739'
-    }
+    TocEntry(1, 0, 24913),
+    TocEntry(2, 24914, 43460),
+    TocEntry(3, 43461, 60739),
 ]
 
 
@@ -56,10 +41,14 @@ class TestCalculateMbTocNumbers(PicardTestCase):
         self.assertEqual((1, 3, 60890, 150, 25064, 43611), calculate_mb_toc_numbers(test_entries))
 
     def test_calculate_mb_toc_numbers_invalid_track_numbers(self):
-        entries = [{'num': '1'}, {'num': '3'}, {'num': '4'}]
+        entries = [TocEntry(1, 0, 100), TocEntry(3, 101, 200), TocEntry(4, 201, 300)]
         with self.assertRaises(NotSupportedTOCError):
             calculate_mb_toc_numbers(entries)
 
     def test_calculate_mb_toc_numbers_empty_entries(self):
         with self.assertRaises(NotSupportedTOCError):
             calculate_mb_toc_numbers([])
+
+    def test_calculate_mb_toc_numbers_ignore_datatrack(self):
+        entries = [*test_entries, TocEntry(4, 72140, 80000)]
+        self.assertEqual((1, 3, 60890, 150, 25064, 43611), calculate_mb_toc_numbers(entries))

From 73b57bf3a995431b74fb5319aa0609d561d7d9b3 Mon Sep 17 00:00:00 2001
From: Laurent Monin <github@norz.org>
Date: Thu, 9 Jun 2022 21:32:59 +0200
Subject: [PATCH 09/19] calculate_mb_toc_numbers(): toc is empty, not needed in
 exception message

---
 picard/disc/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/picard/disc/utils.py b/picard/disc/utils.py
index b4cbbc28b..51895a828 100644
--- a/picard/disc/utils.py
+++ b/picard/disc/utils.py
@@ -50,7 +50,7 @@ def calculate_mb_toc_numbers(toc):
     toc = _remove_data_track(toc)
     num_tracks = len(toc)
     if not num_tracks:
-        raise NotSupportedTOCError("Empty track list: %s", toc)
+        raise NotSupportedTOCError("Empty track list")
 
     expected_tracknums = tuple(range(1, num_tracks+1))
     tracknums = tuple(e.number for e in toc)

From e3edfb757e8184ad46dfabbd90a3548ddd336111 Mon Sep 17 00:00:00 2001
From: Laurent Monin <github@norz.org>
Date: Thu, 9 Jun 2022 21:33:24 +0200
Subject: [PATCH 10/19] calculate_mb_toc_numbers(): use f-string

---
 picard/disc/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/picard/disc/utils.py b/picard/disc/utils.py
index 51895a828..88643deab 100644
--- a/picard/disc/utils.py
+++ b/picard/disc/utils.py
@@ -55,7 +55,7 @@ def calculate_mb_toc_numbers(toc):
     expected_tracknums = tuple(range(1, num_tracks+1))
     tracknums = tuple(e.number for e in toc)
     if expected_tracknums != tracknums:
-        raise NotSupportedTOCError("Non-standard track number sequence: %s", tracknums)
+        raise NotSupportedTOCError(f"Non-standard track number sequence: {tracknums}")
 
     leadout_offset = toc[-1].end_sector + PREGAP_LENGTH + 1
     offsets = tuple(e.start_sector + PREGAP_LENGTH for e in toc)

From 54fcdb98f3bdba4d74025ddd605b0e2e16a290d3 Mon Sep 17 00:00:00 2001
From: Laurent Monin <github@norz.org>
Date: Thu, 9 Jun 2022 21:33:43 +0200
Subject: [PATCH 11/19] TestCalculateMbTocNumbers: test NotSupportedTOCError
 messages

---
 test/test_disc_utils.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/test_disc_utils.py b/test/test_disc_utils.py
index 260127974..5641ea88a 100644
--- a/test/test_disc_utils.py
+++ b/test/test_disc_utils.py
@@ -18,7 +18,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-
 from test.picardtestcase import PicardTestCase
 
 from picard.disc.utils import (
@@ -42,11 +41,11 @@ class TestCalculateMbTocNumbers(PicardTestCase):
 
     def test_calculate_mb_toc_numbers_invalid_track_numbers(self):
         entries = [TocEntry(1, 0, 100), TocEntry(3, 101, 200), TocEntry(4, 201, 300)]
-        with self.assertRaises(NotSupportedTOCError):
+        with self.assertRaisesRegex(NotSupportedTOCError, r"^Non-standard track number sequence: \(1, 3, 4\)$"):
             calculate_mb_toc_numbers(entries)
 
     def test_calculate_mb_toc_numbers_empty_entries(self):
-        with self.assertRaises(NotSupportedTOCError):
+        with self.assertRaisesRegex(NotSupportedTOCError, r"^Empty track list$"):
             calculate_mb_toc_numbers([])
 
     def test_calculate_mb_toc_numbers_ignore_datatrack(self):

From 3b26fe8c425743083a96f9a045c388bafb9ccd96 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Thu, 18 Jul 2019 20:48:21 +0000
Subject: [PATCH 12/19] Haiku: Added Icon-O-Matic source icon

---
 resources/img-src/picard-logo-haiku.iom | Bin 0 -> 15326 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 resources/img-src/picard-logo-haiku.iom

diff --git a/resources/img-src/picard-logo-haiku.iom b/resources/img-src/picard-logo-haiku.iom
new file mode 100644
index 0000000000000000000000000000000000000000..df27930e591f18db441f434d173c3e470c3579f2
GIT binary patch
literal 15326
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

literal 0
HcmV?d00001


From 401102d2ef1e52bc92f23fa08bedace633a5ea82 Mon Sep 17 00:00:00 2001
From: Frazer Smith <frazer.dev@outlook.com>
Date: Sat, 18 Jun 2022 20:29:38 +0100
Subject: [PATCH 13/19] Update GitHub Actions

---
 .github/workflows/codacy-analysis.yml |  6 +++---
 .github/workflows/codeql-analysis.yml |  8 ++++----
 .github/workflows/package.yml         | 28 +++++++++++++--------------
 .github/workflows/pypi-release.yml    | 12 ++++++------
 .github/workflows/run-tests.yml       | 12 ++++++------
 5 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/codacy-analysis.yml b/.github/workflows/codacy-analysis.yml
index b2b678ac1..b388e8c91 100644
--- a/.github/workflows/codacy-analysis.yml
+++ b/.github/workflows/codacy-analysis.yml
@@ -24,11 +24,11 @@ jobs:
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@1.1.0
+        uses: codacy/codacy-analysis-cli-action@v4
         with:
           # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
           # You can also omit the token and run the tools that support default configurations
@@ -44,6 +44,6 @@ jobs:
 
       # Upload the SARIF file generated in the previous step
       - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 26600a411..acde4702b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -21,11 +21,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: python
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -36,7 +36,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -50,4 +50,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 9a205f0c0..fd4fb0b69 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -36,12 +36,12 @@ jobs:
       PYTHON_SHA256SUM: 7888174c6fe441b00448c7ab3e9cbf0e6c3c7dea0750577baf09e1383fc44656
       MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos-deployment-version }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0  # Fetch entire history, needed for setting the build number
     - run: git fetch --depth=1 origin +refs/tags/release-*:refs/tags/release-*
     - name: Cache libdiscid
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ~/libdiscid
         key: ${{ runner.os }}-libdiscid-${{ env.DISCID_VERSION }}-${{ env.MACOSX_DEPLOYMENT_TARGET }}
@@ -104,7 +104,7 @@ jobs:
         APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
         CODESIGN_MACOS_P12_PASSWORD: ${{ secrets.CODESIGN_MACOS_P12_PASSWORD }}
     - name: Archive production artifacts
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v3
       with:
         name: macos-app-${{ matrix.macos-deployment-version }}
         path: artifacts/
@@ -120,12 +120,12 @@ jobs:
         - portable
       fail-fast: false
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0  # Fetch entire history, needed for setting the build number
     - run: git fetch --depth=1 origin +refs/tags/release-*:refs/tags/release-*
     - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v3
       with:
         python-version: 3.8
     - name: Setup Windows build environment
@@ -216,7 +216,7 @@ jobs:
       if: env.CODESIGN == '1'
       run: Remove-Item .\codesign.pfx
     - name: Archive production artifacts
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v3
       if: matrix.type != 'signed-app' || env.CODESIGN == '1'
       with:
         name: windows-${{ matrix.type }}
@@ -229,31 +229,31 @@ jobs:
       - package-macos
       - package-windows
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v1
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v3
       with:
         python-version: 3.9
-    - uses: actions/download-artifact@v1
+    - uses: actions/download-artifact@v3
       with:
         name: macos-app-10.12
         path: artifacts/
-    - uses: actions/download-artifact@v1
+    - uses: actions/download-artifact@v3
       with:
         name: macos-app-10.14
         path: artifacts/
-    - uses: actions/download-artifact@v1
+    - uses: actions/download-artifact@v3
       with:
         name: windows-signed-app
         path: artifacts/
-    - uses: actions/download-artifact@v1
+    - uses: actions/download-artifact@v3
       with:
         name: windows-store-app
         path: artifacts/
-    - uses: actions/download-artifact@v1
+    - uses: actions/download-artifact@v3
       with:
         name: windows-installer
         path: artifacts/
-    - uses: actions/download-artifact@v1
+    - uses: actions/download-artifact@v3
       with:
         name: windows-portable
         path: artifacts/
diff --git a/.github/workflows/pypi-release.yml b/.github/workflows/pypi-release.yml
index 5a77a81e4..601680eb5 100644
--- a/.github/workflows/pypi-release.yml
+++ b/.github/workflows/pypi-release.yml
@@ -11,8 +11,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v1
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v3
       with:
         python-version: 3.8
     - name: Install dependencies
@@ -26,7 +26,7 @@ jobs:
       run: |
         python setup.py clean sdist
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: picard-sdist
         path: dist/*
@@ -79,9 +79,9 @@ jobs:
         - os: macos-10.15
           python-version: '3.10'
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install gettext and openssl (macOS)
@@ -103,7 +103,7 @@ jobs:
       run: |
         python setup.py clean bdist_wheel
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: picard-bdist-${{ runner.os }}
         path: dist/*.whl
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 789d24da8..3b4e18a46 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -19,9 +19,9 @@ jobs:
       CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -68,9 +68,9 @@ jobs:
         ]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -93,9 +93,9 @@ jobs:
         python-version: ['3.8']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install gettext (Linux)

From 8d987ade6a6c952cf61c7bdf39168ca5e68b532f Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Mon, 20 Jun 2022 21:11:37 +0200
Subject: [PATCH 14/19] PICARD-2504: Make MB web service query limit
 configurable

---
 picard/browser/filelookup.py     |  9 ++--
 picard/cluster.py                |  4 +-
 picard/file.py                   |  6 +--
 picard/ui/options/advanced.py    |  6 ++-
 picard/ui/searchdialog/album.py  |  9 ++--
 picard/ui/searchdialog/artist.py | 11 ++--
 picard/ui/searchdialog/track.py  |  9 ++--
 picard/ui/ui_options_advanced.py | 66 +++++++++++++++---------
 test/test_browser.py             |  3 ++
 ui/options_advanced.ui           | 86 ++++++++++++++++++++++----------
 10 files changed, 139 insertions(+), 70 deletions(-)

diff --git a/picard/browser/filelookup.py b/picard/browser/filelookup.py
index 327f5c2dd..7f09f6da7 100644
--- a/picard/browser/filelookup.py
+++ b/picard/browser/filelookup.py
@@ -35,10 +35,8 @@ import re
 from PyQt5 import QtCore
 
 from picard import log
-from picard.const import (
-    PICARD_URLS,
-    QUERY_LIMIT,
-)
+from picard.config import get_config
+from picard.const import PICARD_URLS
 from picard.disc import Disc
 from picard.util import (
     build_qurl,
@@ -172,8 +170,9 @@ class FileLookup(object):
     def search_entity(self, type_, query, adv=False, mbid_matched_callback=None, force_browser=False):
         if not force_browser and self.mbid_lookup(query, type_, mbid_matched_callback=mbid_matched_callback):
             return True
+        config = get_config()
         params = {
-            'limit': QUERY_LIMIT,
+            'limit': config.setting['query_limit'],
             'type': type_,
             'query': query,
         }
diff --git a/picard/cluster.py b/picard/cluster.py
index c9fb17f51..37ff649df 100644
--- a/picard/cluster.py
+++ b/picard/cluster.py
@@ -45,7 +45,6 @@ import re
 from PyQt5 import QtCore
 
 from picard.config import get_config
-from picard.const import QUERY_LIMIT
 from picard.file import File
 from picard.metadata import (
     Metadata,
@@ -282,11 +281,12 @@ class Cluster(FileList):
             N_("Looking up the metadata for cluster %(album)s..."),
             {'album': self.metadata['album']}
         )
+        config = get_config()
         self.lookup_task = self.tagger.mb_api.find_releases(self._lookup_finished,
             artist=self.metadata['albumartist'],
             release=self.metadata['album'],
             tracks=str(len(self.files)),
-            limit=QUERY_LIMIT)
+            limit=config.setting['query_limit'])
 
     def clear_lookup_task(self):
         if self.lookup_task:
diff --git a/picard/file.py b/picard/file.py
index 7de338054..7d143f3a7 100644
--- a/picard/file.py
+++ b/picard/file.py
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2004 Robert Kaye
 # Copyright (C) 2006-2009, 2011-2013, 2017 Lukáš Lalinský
-# Copyright (C) 2007-2011, 2015, 2018-2021 Philipp Wolfer
+# Copyright (C) 2007-2011, 2015, 2018-2022 Philipp Wolfer
 # Copyright (C) 2008 Gary van der Merwe
 # Copyright (C) 2008-2009 Nikolai Prokoschenko
 # Copyright (C) 2009 Carlin Mangar
@@ -62,7 +62,6 @@ from picard import (
     log,
 )
 from picard.config import get_config
-from picard.const import QUERY_LIMIT
 from picard.const.sys import (
     IS_MACOS,
     IS_WIN,
@@ -876,6 +875,7 @@ class File(QtCore.QObject, Item):
         self.clear_lookup_task()
         metadata = self.metadata
         self.set_pending()
+        config = get_config()
         self.lookup_task = self.tagger.mb_api.find_tracks(
             partial(self._lookup_finished, File.LOOKUP_METADATA),
             track=metadata['title'],
@@ -885,7 +885,7 @@ class File(QtCore.QObject, Item):
             tracks=metadata['totaltracks'],
             qdur=str(metadata.length // 2000),
             isrc=metadata['isrc'],
-            limit=QUERY_LIMIT)
+            limit=config.setting['query_limit'])
 
     def clear_lookup_task(self):
         if self.lookup_task:
diff --git a/picard/ui/options/advanced.py b/picard/ui/options/advanced.py
index 8e0c49e66..6da9ecb2b 100644
--- a/picard/ui/options/advanced.py
+++ b/picard/ui/options/advanced.py
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2006-2007 Lukáš Lalinský
 # Copyright (C) 2013-2015, 2018, 2020-2021 Laurent Monin
-# Copyright (C) 2014, 2019-2021 Philipp Wolfer
+# Copyright (C) 2014, 2019-2022 Philipp Wolfer
 # Copyright (C) 2016-2017 Sambhav Kothari
 #
 # This program is free software; you can redistribute it and/or
@@ -29,6 +29,7 @@ from picard.config import (
     TextOption,
     get_config,
 )
+from picard.const import QUERY_LIMIT
 
 from picard.ui.options import (
     OptionsPage,
@@ -51,6 +52,7 @@ class AdvancedOptionsPage(OptionsPage):
         BoolOption("setting", "ignore_hidden_files", False),
         BoolOption("setting", "recursively_add_files", True),
         IntOption("setting", "ignore_track_duration_difference_under", 2),
+        IntOption("setting", "query_limit", QUERY_LIMIT),
         BoolOption("setting", "completeness_ignore_videos", False),
         BoolOption("setting", "completeness_ignore_pregap", False),
         BoolOption("setting", "completeness_ignore_data", False),
@@ -70,6 +72,7 @@ class AdvancedOptionsPage(OptionsPage):
         self.ui.ignore_hidden_files.setChecked(config.setting["ignore_hidden_files"])
         self.ui.recursively_add_files.setChecked(config.setting["recursively_add_files"])
         self.ui.ignore_track_duration_difference_under.setValue(config.setting["ignore_track_duration_difference_under"])
+        self.ui.query_limit.setValue(config.setting["query_limit"])
         self.ui.completeness_ignore_videos.setChecked(config.setting["completeness_ignore_videos"])
         self.ui.completeness_ignore_pregap.setChecked(config.setting["completeness_ignore_pregap"])
         self.ui.completeness_ignore_data.setChecked(config.setting["completeness_ignore_data"])
@@ -83,6 +86,7 @@ class AdvancedOptionsPage(OptionsPage):
         config.setting["ignore_hidden_files"] = self.ui.ignore_hidden_files.isChecked()
         config.setting["recursively_add_files"] = self.ui.recursively_add_files.isChecked()
         config.setting["ignore_track_duration_difference_under"] = self.ui.ignore_track_duration_difference_under.value()
+        config.setting["query_limit"] = self.ui.query_limit.value()
         config.setting["completeness_ignore_videos"] = self.ui.completeness_ignore_videos.isChecked()
         config.setting["completeness_ignore_pregap"] = self.ui.completeness_ignore_pregap.isChecked()
         config.setting["completeness_ignore_data"] = self.ui.completeness_ignore_data.isChecked()
diff --git a/picard/ui/searchdialog/album.py b/picard/ui/searchdialog/album.py
index a95d356d4..555b59893 100644
--- a/picard/ui/searchdialog/album.py
+++ b/picard/ui/searchdialog/album.py
@@ -31,11 +31,13 @@ from PyQt5 import (
 from PyQt5.QtCore import pyqtSignal
 
 from picard import log
-from picard.config import Option
+from picard.config import (
+    Option,
+    get_config,
+)
 from picard.const import (
     CAA_HOST,
     CAA_PORT,
-    QUERY_LIMIT,
 )
 from picard.coverart.image import CaaThumbnailCoverArtImage
 from picard.mbjson import (
@@ -168,11 +170,12 @@ class AlbumSearchDialog(SearchDialog):
         self.retry_params = Retry(self.search, text)
         self.search_box_text(text)
         self.show_progress()
+        config = get_config()
         self.tagger.mb_api.find_releases(self.handle_reply,
                                          query=text,
                                          search=True,
                                          advanced_search=self.use_advanced_search,
-                                         limit=QUERY_LIMIT)
+                                         limit=config.setting['query_limit'])
 
     def show_similar_albums(self, cluster):
         """Perform search by using existing metadata information
diff --git a/picard/ui/searchdialog/artist.py b/picard/ui/searchdialog/artist.py
index 0570b0854..e8b6ab1d1 100644
--- a/picard/ui/searchdialog/artist.py
+++ b/picard/ui/searchdialog/artist.py
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2016 Rahul Raturi
 # Copyright (C) 2018, 2020-2021 Laurent Monin
-# Copyright (C) 2018-2021 Philipp Wolfer
+# Copyright (C) 2018-2022 Philipp Wolfer
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -23,8 +23,10 @@
 
 from PyQt5 import QtCore
 
-from picard.config import Option
-from picard.const import QUERY_LIMIT
+from picard.config import (
+    Option,
+    get_config,
+)
 from picard.mbjson import artist_to_metadata
 from picard.metadata import Metadata
 
@@ -64,11 +66,12 @@ class ArtistSearchDialog(SearchDialog):
         self.retry_params = Retry(self.search, text)
         self.search_box_text(text)
         self.show_progress()
+        config = get_config()
         self.tagger.mb_api.find_artists(self.handle_reply,
                                         query=text,
                                         search=True,
                                         advanced_search=self.use_advanced_search,
-                                        limit=QUERY_LIMIT)
+                                        limit=config.setting['query_limit'])
 
     def retry(self):
         self.retry_params.function(self.retry_params.query)
diff --git a/picard/ui/searchdialog/track.py b/picard/ui/searchdialog/track.py
index 3b87e3ce7..19e3b10fc 100644
--- a/picard/ui/searchdialog/track.py
+++ b/picard/ui/searchdialog/track.py
@@ -24,8 +24,10 @@
 
 from PyQt5 import QtCore
 
-from picard.config import Option
-from picard.const import QUERY_LIMIT
+from picard.config import (
+    Option,
+    get_config,
+)
 from picard.file import File
 from picard.mbjson import (
     countries_from_node,
@@ -76,11 +78,12 @@ class TrackSearchDialog(SearchDialog):
         self.retry_params = Retry(self.search, text)
         self.search_box_text(text)
         self.show_progress()
+        config = get_config()
         self.tagger.mb_api.find_tracks(self.handle_reply,
                                        query=text,
                                        search=True,
                                        advanced_search=self.use_advanced_search,
-                                       limit=QUERY_LIMIT)
+                                       limit=config.setting['query_limit'])
 
     def show_similar_tracks(self, file_):
         """Perform search using existing metadata information
diff --git a/picard/ui/ui_options_advanced.py b/picard/ui/ui_options_advanced.py
index 68237e4ea..d79bcd68a 100644
--- a/picard/ui/ui_options_advanced.py
+++ b/picard/ui/ui_options_advanced.py
@@ -10,7 +10,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_AdvancedOptionsPage(object):
     def setupUi(self, AdvancedOptionsPage):
         AdvancedOptionsPage.setObjectName("AdvancedOptionsPage")
-        AdvancedOptionsPage.resize(570, 435)
+        AdvancedOptionsPage.resize(570, 455)
         self.vboxlayout = QtWidgets.QVBoxLayout(AdvancedOptionsPage)
         self.vboxlayout.setObjectName("vboxlayout")
         self.groupBox = QtWidgets.QGroupBox(AdvancedOptionsPage)
@@ -18,9 +18,40 @@ class Ui_AdvancedOptionsPage(object):
         self.gridlayout = QtWidgets.QGridLayout(self.groupBox)
         self.gridlayout.setSpacing(2)
         self.gridlayout.setObjectName("gridlayout")
-        self.recursively_add_files = QtWidgets.QCheckBox(self.groupBox)
-        self.recursively_add_files.setObjectName("recursively_add_files")
-        self.gridlayout.addWidget(self.recursively_add_files, 5, 0, 1, 1)
+        self.label_ignore_regex = QtWidgets.QLabel(self.groupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label_ignore_regex.sizePolicy().hasHeightForWidth())
+        self.label_ignore_regex.setSizePolicy(sizePolicy)
+        self.label_ignore_regex.setWordWrap(True)
+        self.label_ignore_regex.setObjectName("label_ignore_regex")
+        self.gridlayout.addWidget(self.label_ignore_regex, 1, 0, 1, 1)
+        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+        self.label_request_limit = QtWidgets.QLabel(self.groupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label_request_limit.sizePolicy().hasHeightForWidth())
+        self.label_request_limit.setSizePolicy(sizePolicy)
+        self.label_request_limit.setObjectName("label_request_limit")
+        self.horizontalLayout_2.addWidget(self.label_request_limit)
+        self.query_limit = QtWidgets.QSpinBox(self.groupBox)
+        self.query_limit.setAccelerated(True)
+        self.query_limit.setMinimum(1)
+        self.query_limit.setMaximum(100)
+        self.query_limit.setProperty("value", 50)
+        self.query_limit.setObjectName("query_limit")
+        self.horizontalLayout_2.addWidget(self.query_limit)
+        self.gridlayout.addLayout(self.horizontalLayout_2, 8, 0, 1, 1)
+        self.regex_error = QtWidgets.QLabel(self.groupBox)
+        self.regex_error.setText("")
+        self.regex_error.setObjectName("regex_error")
+        self.gridlayout.addWidget(self.regex_error, 3, 0, 1, 1)
+        self.ignore_regex = QtWidgets.QLineEdit(self.groupBox)
+        self.ignore_regex.setObjectName("ignore_regex")
+        self.gridlayout.addWidget(self.ignore_regex, 2, 0, 1, 1)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setSizeConstraint(QtWidgets.QLayout.SetDefaultConstraint)
         self.horizontalLayout.setObjectName("horizontalLayout")
@@ -48,25 +79,12 @@ class Ui_AdvancedOptionsPage(object):
         self.ignore_track_duration_difference_under.setObjectName("ignore_track_duration_difference_under")
         self.horizontalLayout.addWidget(self.ignore_track_duration_difference_under)
         self.gridlayout.addLayout(self.horizontalLayout, 6, 0, 2, 1)
-        self.label_ignore_regex = QtWidgets.QLabel(self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label_ignore_regex.sizePolicy().hasHeightForWidth())
-        self.label_ignore_regex.setSizePolicy(sizePolicy)
-        self.label_ignore_regex.setWordWrap(True)
-        self.label_ignore_regex.setObjectName("label_ignore_regex")
-        self.gridlayout.addWidget(self.label_ignore_regex, 1, 0, 1, 1)
-        self.regex_error = QtWidgets.QLabel(self.groupBox)
-        self.regex_error.setText("")
-        self.regex_error.setObjectName("regex_error")
-        self.gridlayout.addWidget(self.regex_error, 3, 0, 1, 1)
+        self.recursively_add_files = QtWidgets.QCheckBox(self.groupBox)
+        self.recursively_add_files.setObjectName("recursively_add_files")
+        self.gridlayout.addWidget(self.recursively_add_files, 5, 0, 1, 1)
         self.ignore_hidden_files = QtWidgets.QCheckBox(self.groupBox)
         self.ignore_hidden_files.setObjectName("ignore_hidden_files")
         self.gridlayout.addWidget(self.ignore_hidden_files, 4, 0, 1, 1)
-        self.ignore_regex = QtWidgets.QLineEdit(self.groupBox)
-        self.ignore_regex.setObjectName("ignore_regex")
-        self.gridlayout.addWidget(self.ignore_regex, 2, 0, 1, 1)
         self.vboxlayout.addWidget(self.groupBox)
         self.groupBox_completeness = QtWidgets.QGroupBox(AdvancedOptionsPage)
         self.groupBox_completeness.setObjectName("groupBox_completeness")
@@ -105,7 +123,8 @@ class Ui_AdvancedOptionsPage(object):
         AdvancedOptionsPage.setTabOrder(self.ignore_regex, self.ignore_hidden_files)
         AdvancedOptionsPage.setTabOrder(self.ignore_hidden_files, self.recursively_add_files)
         AdvancedOptionsPage.setTabOrder(self.recursively_add_files, self.ignore_track_duration_difference_under)
-        AdvancedOptionsPage.setTabOrder(self.ignore_track_duration_difference_under, self.completeness_ignore_videos)
+        AdvancedOptionsPage.setTabOrder(self.ignore_track_duration_difference_under, self.query_limit)
+        AdvancedOptionsPage.setTabOrder(self.query_limit, self.completeness_ignore_videos)
         AdvancedOptionsPage.setTabOrder(self.completeness_ignore_videos, self.completeness_ignore_pregap)
         AdvancedOptionsPage.setTabOrder(self.completeness_ignore_pregap, self.completeness_ignore_data)
         AdvancedOptionsPage.setTabOrder(self.completeness_ignore_data, self.completeness_ignore_silence)
@@ -113,9 +132,10 @@ class Ui_AdvancedOptionsPage(object):
     def retranslateUi(self, AdvancedOptionsPage):
         _translate = QtCore.QCoreApplication.translate
         self.groupBox.setTitle(_("Advanced options"))
-        self.recursively_add_files.setText(_("Include sub-folders when adding files from folder"))
-        self.label_track_duration_diff.setText(_("Ignore track duration difference under this number of seconds"))
         self.label_ignore_regex.setText(_("Ignore file paths matching the following regular expression:"))
+        self.label_request_limit.setText(_("Max. number of entities to return per MusicBrainz query"))
+        self.label_track_duration_diff.setText(_("Ignore track duration difference under this number of seconds"))
+        self.recursively_add_files.setText(_("Include sub-folders when adding files from folder"))
         self.ignore_hidden_files.setText(_("Ignore hidden files"))
         self.groupBox_completeness.setTitle(_("Ignore the following tracks when determining whether a release is complete"))
         self.completeness_ignore_videos.setText(_("Video tracks"))
diff --git a/test/test_browser.py b/test/test_browser.py
index ad6808a94..990c7cbda 100644
--- a/test/test_browser.py
+++ b/test/test_browser.py
@@ -196,6 +196,7 @@ class BrowserLookupTest(PicardTestCase):
 
     @patch.object(webbrowser2, 'open')
     def test_search_entity(self, mock_open):
+        self.set_config_values({'query_limit': 25})
         result = self.lookup.search_entity('foo', 'search:123')
         self.assertTrue(result)
         url = mock_open.call_args[0][0]
@@ -209,6 +210,7 @@ class BrowserLookupTest(PicardTestCase):
 
     @patch.object(webbrowser2, 'open')
     def test_search_entity_advanced(self, mock_open):
+        self.set_config_values({'query_limit': 25})
         result = self.lookup.search_entity('foo', 'search:123', adv=True)
         self.assertTrue(result)
         url = mock_open.call_args[0][0]
@@ -232,6 +234,7 @@ class BrowserLookupTest(PicardTestCase):
 
     @patch.object(webbrowser2, 'open')
     def test_search_entity_mbid_lookup_force_browser(self, mock_open):
+        self.set_config_values({'query_limit': 25})
         with patch.object(self.lookup, 'mbid_lookup') as mock_lookup:
             entity = 'artist'
             mbid = '4836aa50-a9ae-490a-983b-cfc8efca92de'
diff --git a/ui/options_advanced.ui b/ui/options_advanced.ui
index ff7bc50c7..7f91979eb 100644
--- a/ui/options_advanced.ui
+++ b/ui/options_advanced.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>570</width>
-    <height>435</height>
+    <height>455</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
@@ -20,13 +20,65 @@
       <property name="spacing">
        <number>2</number>
       </property>
-      <item row="5" column="0">
-       <widget class="QCheckBox" name="recursively_add_files">
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_ignore_regex">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="text">
-         <string>Include sub-folders when adding files from folder</string>
+         <string>Ignore file paths matching the following regular expression:</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
+      <item row="8" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QLabel" name="label_request_limit">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Max. number of entities to return per MusicBrainz query</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="query_limit">
+          <property name="accelerated">
+           <bool>true</bool>
+          </property>
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
+           <number>100</number>
+          </property>
+          <property name="value">
+           <number>50</number>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="regex_error">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLineEdit" name="ignore_regex"/>
+      </item>
       <item row="6" column="0" rowspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <property name="sizeConstraint">
@@ -78,26 +130,10 @@
         </item>
        </layout>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_ignore_regex">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
+      <item row="5" column="0">
+       <widget class="QCheckBox" name="recursively_add_files">
         <property name="text">
-         <string>Ignore file paths matching the following regular expression:</string>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="regex_error">
-        <property name="text">
-         <string/>
+         <string>Include sub-folders when adding files from folder</string>
         </property>
        </widget>
       </item>
@@ -108,9 +144,6 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLineEdit" name="ignore_regex"/>
-      </item>
      </layout>
     </widget>
    </item>
@@ -188,6 +221,7 @@
   <tabstop>ignore_hidden_files</tabstop>
   <tabstop>recursively_add_files</tabstop>
   <tabstop>ignore_track_duration_difference_under</tabstop>
+  <tabstop>query_limit</tabstop>
   <tabstop>completeness_ignore_videos</tabstop>
   <tabstop>completeness_ignore_pregap</tabstop>
   <tabstop>completeness_ignore_data</tabstop>

From 9250d0155999285a1203ac3ab0a9cbeb4ddbed77 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Mon, 20 Jun 2022 21:11:50 +0200
Subject: [PATCH 15/19] PICARD-2504: Increase MB web service query limit to 50

---
 picard/const/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/picard/const/__init__.py b/picard/const/__init__.py
index 210db1d25..0229dd84f 100644
--- a/picard/const/__init__.py
+++ b/picard/const/__init__.py
@@ -142,7 +142,7 @@ PLUGINS_API = {
 }
 
 # Default query limit
-QUERY_LIMIT = 25
+QUERY_LIMIT = 50
 
 # Maximum number of covers to draw in a stack in CoverArtThumbnail
 MAX_COVERS_TO_STACK = 4

From 680654b2447342b3ad6e5d7a5a18bdb39aa29035 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Mon, 20 Jun 2022 21:38:46 +0200
Subject: [PATCH 16/19] PICARD-2504: Add query_limit to option profiles

---
 picard/profile.py                |  5 +++++
 picard/ui/ui_options_advanced.py | 12 ++++++------
 ui/options_advanced.ui           |  4 ++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/picard/profile.py b/picard/profile.py
index 038450f39..ce46376df 100644
--- a/picard/profile.py
+++ b/picard/profile.py
@@ -158,6 +158,11 @@ class UserProfileGroups():
                 N_("Ignore track duration difference under x seconds"),
                 ["ignore_track_duration_difference_under", "label_track_duration_diff"]
             ),
+            SettingDesc(
+                "query_limit",
+                N_("Maximum number of entities to return per MusicBrainz query"),
+                ["query_limit", "label_query_limit"]
+            ),
             SettingDesc("completeness_ignore_videos", N_("Completeness check ignore: Video tracks"), ["completeness_ignore_videos"]),
             SettingDesc("completeness_ignore_pregap", N_("Completeness check ignore: Pregap tracks"), ["completeness_ignore_pregap"]),
             SettingDesc("completeness_ignore_data", N_("Completeness check ignore: Data tracks"), ["completeness_ignore_data"]),
diff --git a/picard/ui/ui_options_advanced.py b/picard/ui/ui_options_advanced.py
index d79bcd68a..e5aba0055 100644
--- a/picard/ui/ui_options_advanced.py
+++ b/picard/ui/ui_options_advanced.py
@@ -29,14 +29,14 @@ class Ui_AdvancedOptionsPage(object):
         self.gridlayout.addWidget(self.label_ignore_regex, 1, 0, 1, 1)
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.label_request_limit = QtWidgets.QLabel(self.groupBox)
+        self.label_query_limit = QtWidgets.QLabel(self.groupBox)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label_request_limit.sizePolicy().hasHeightForWidth())
-        self.label_request_limit.setSizePolicy(sizePolicy)
-        self.label_request_limit.setObjectName("label_request_limit")
-        self.horizontalLayout_2.addWidget(self.label_request_limit)
+        sizePolicy.setHeightForWidth(self.label_query_limit.sizePolicy().hasHeightForWidth())
+        self.label_query_limit.setSizePolicy(sizePolicy)
+        self.label_query_limit.setObjectName("label_query_limit")
+        self.horizontalLayout_2.addWidget(self.label_query_limit)
         self.query_limit = QtWidgets.QSpinBox(self.groupBox)
         self.query_limit.setAccelerated(True)
         self.query_limit.setMinimum(1)
@@ -133,7 +133,7 @@ class Ui_AdvancedOptionsPage(object):
         _translate = QtCore.QCoreApplication.translate
         self.groupBox.setTitle(_("Advanced options"))
         self.label_ignore_regex.setText(_("Ignore file paths matching the following regular expression:"))
-        self.label_request_limit.setText(_("Max. number of entities to return per MusicBrainz query"))
+        self.label_query_limit.setText(_("Maximum number of entities to return per MusicBrainz query"))
         self.label_track_duration_diff.setText(_("Ignore track duration difference under this number of seconds"))
         self.recursively_add_files.setText(_("Include sub-folders when adding files from folder"))
         self.ignore_hidden_files.setText(_("Ignore hidden files"))
diff --git a/ui/options_advanced.ui b/ui/options_advanced.ui
index 7f91979eb..13b33dda6 100644
--- a/ui/options_advanced.ui
+++ b/ui/options_advanced.ui
@@ -39,7 +39,7 @@
       <item row="8" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
-         <widget class="QLabel" name="label_request_limit">
+         <widget class="QLabel" name="label_query_limit">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
             <horstretch>0</horstretch>
@@ -47,7 +47,7 @@
            </sizepolicy>
           </property>
           <property name="text">
-           <string>Max. number of entities to return per MusicBrainz query</string>
+           <string>Maximum number of entities to return per MusicBrainz query</string>
           </property>
          </widget>
         </item>

From ec8c71ab63e7ca6e3579cd045e7a842abcc07a94 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Tue, 21 Jun 2022 08:12:30 +0200
Subject: [PATCH 17/19] PICARD-2504: Limit query limit choice to 25, 50, 75 and
 100

---
 picard/ui/options/advanced.py    |  4 ++--
 picard/ui/ui_options_advanced.py | 16 ++++++++++-----
 ui/options_advanced.ui           | 34 ++++++++++++++++++++++----------
 3 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/picard/ui/options/advanced.py b/picard/ui/options/advanced.py
index 6da9ecb2b..35cb862f3 100644
--- a/picard/ui/options/advanced.py
+++ b/picard/ui/options/advanced.py
@@ -72,7 +72,7 @@ class AdvancedOptionsPage(OptionsPage):
         self.ui.ignore_hidden_files.setChecked(config.setting["ignore_hidden_files"])
         self.ui.recursively_add_files.setChecked(config.setting["recursively_add_files"])
         self.ui.ignore_track_duration_difference_under.setValue(config.setting["ignore_track_duration_difference_under"])
-        self.ui.query_limit.setValue(config.setting["query_limit"])
+        self.ui.query_limit.setCurrentText(str(config.setting["query_limit"]))
         self.ui.completeness_ignore_videos.setChecked(config.setting["completeness_ignore_videos"])
         self.ui.completeness_ignore_pregap.setChecked(config.setting["completeness_ignore_pregap"])
         self.ui.completeness_ignore_data.setChecked(config.setting["completeness_ignore_data"])
@@ -86,7 +86,7 @@ class AdvancedOptionsPage(OptionsPage):
         config.setting["ignore_hidden_files"] = self.ui.ignore_hidden_files.isChecked()
         config.setting["recursively_add_files"] = self.ui.recursively_add_files.isChecked()
         config.setting["ignore_track_duration_difference_under"] = self.ui.ignore_track_duration_difference_under.value()
-        config.setting["query_limit"] = self.ui.query_limit.value()
+        config.setting["query_limit"] = self.ui.query_limit.currentText()
         config.setting["completeness_ignore_videos"] = self.ui.completeness_ignore_videos.isChecked()
         config.setting["completeness_ignore_pregap"] = self.ui.completeness_ignore_pregap.isChecked()
         config.setting["completeness_ignore_data"] = self.ui.completeness_ignore_data.isChecked()
diff --git a/picard/ui/ui_options_advanced.py b/picard/ui/ui_options_advanced.py
index e5aba0055..d88779bca 100644
--- a/picard/ui/ui_options_advanced.py
+++ b/picard/ui/ui_options_advanced.py
@@ -37,12 +37,17 @@ class Ui_AdvancedOptionsPage(object):
         self.label_query_limit.setSizePolicy(sizePolicy)
         self.label_query_limit.setObjectName("label_query_limit")
         self.horizontalLayout_2.addWidget(self.label_query_limit)
-        self.query_limit = QtWidgets.QSpinBox(self.groupBox)
-        self.query_limit.setAccelerated(True)
-        self.query_limit.setMinimum(1)
-        self.query_limit.setMaximum(100)
-        self.query_limit.setProperty("value", 50)
+        self.query_limit = QtWidgets.QComboBox(self.groupBox)
+        self.query_limit.setCurrentText("50")
         self.query_limit.setObjectName("query_limit")
+        self.query_limit.addItem("")
+        self.query_limit.setItemText(0, "25")
+        self.query_limit.addItem("")
+        self.query_limit.setItemText(1, "50")
+        self.query_limit.addItem("")
+        self.query_limit.setItemText(2, "75")
+        self.query_limit.addItem("")
+        self.query_limit.setItemText(3, "100")
         self.horizontalLayout_2.addWidget(self.query_limit)
         self.gridlayout.addLayout(self.horizontalLayout_2, 8, 0, 1, 1)
         self.regex_error = QtWidgets.QLabel(self.groupBox)
@@ -119,6 +124,7 @@ class Ui_AdvancedOptionsPage(object):
         self.vboxlayout.addWidget(self.groupBox_2)
 
         self.retranslateUi(AdvancedOptionsPage)
+        self.query_limit.setCurrentIndex(1)
         QtCore.QMetaObject.connectSlotsByName(AdvancedOptionsPage)
         AdvancedOptionsPage.setTabOrder(self.ignore_regex, self.ignore_hidden_files)
         AdvancedOptionsPage.setTabOrder(self.ignore_hidden_files, self.recursively_add_files)
diff --git a/ui/options_advanced.ui b/ui/options_advanced.ui
index 13b33dda6..638a1eb0e 100644
--- a/ui/options_advanced.ui
+++ b/ui/options_advanced.ui
@@ -52,19 +52,33 @@
          </widget>
         </item>
         <item>
-         <widget class="QSpinBox" name="query_limit">
-          <property name="accelerated">
-           <bool>true</bool>
+         <widget class="QComboBox" name="query_limit">
+          <property name="currentText">
+           <string notr="true">50</string>
           </property>
-          <property name="minimum">
+          <property name="currentIndex">
            <number>1</number>
           </property>
-          <property name="maximum">
-           <number>100</number>
-          </property>
-          <property name="value">
-           <number>50</number>
-          </property>
+          <item>
+           <property name="text">
+            <string notr="true">25</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string notr="true">50</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string notr="true">75</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string notr="true">100</string>
+           </property>
+          </item>
          </widget>
         </item>
        </layout>

From eb74f499d1bc630b7f96a9a70d57b8f446a3892b Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Wed, 22 Jun 2022 08:47:00 +0200
Subject: [PATCH 18/19] PICARD-2505: Sanitize cover art type before using it as
 filename

Fixes accidental folder creation for types "matrix/runout" or "raw/unedited".
---
 picard/coverart/image.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/picard/coverart/image.py b/picard/coverart/image.py
index 858be1011..10e7246e8 100644
--- a/picard/coverart/image.py
+++ b/picard/coverart/image.py
@@ -43,6 +43,7 @@ from PyQt5.QtCore import (
 from picard import log
 from picard.config import get_config
 from picard.const import DEFAULT_COVER_IMAGE_FILENAME
+from picard.const.sys import IS_WIN
 from picard.coverart.utils import (
     Id3ImageType,
     image_type_as_id3_num,
@@ -55,6 +56,7 @@ from picard.util import (
     imageinfo,
     is_absolute_path,
     periodictouch,
+    sanitize_filename,
 )
 from picard.util.scripttofilename import script_to_filename
 
@@ -331,7 +333,8 @@ class CoverArtImage:
             return
         config = get_config()
         if config.setting["image_type_as_filename"] and not self.is_front_image():
-            filename = self.maintype
+            win_compat = IS_WIN or config.setting["windows_compatibility"]
+            filename = sanitize_filename(self.maintype, win_compat=win_compat)
             log.debug("Make cover filename from types: %r -> %r",
                       self.types, filename)
         else:

From 9c0e3733146ff15fdf9058788d6674cbecd5fea4 Mon Sep 17 00:00:00 2001
From: Kamil <skelly37@protonmail.com>
Date: Sun, 26 Jun 2022 14:14:35 +0200
Subject: [PATCH 19/19] timeout added to pytest (#2122)

timeout added to pytest
---
 .github/workflows/run-tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 3b4e18a46..40502624d 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -35,6 +35,7 @@ jobs:
         isort --check-only --diff --recursive picard test
     - name: Test with pytest
       if: always()
+      timeout-minutes: 30
       run: |
         pip install pytest pytest-randomly pytest-cov
         pytest --verbose --cov=picard --cov-report xml:coverage.xml test
@@ -81,6 +82,7 @@ jobs:
       env:
         DEPENDENCIES: ${{ matrix.dependencies }}
     - name: Test with pytest
+      timeout-minutes: 30
       run: |
         pip install pytest pytest-randomly pytest-cov
         pytest --verbose test