diff --git a/picard/acoustid/__init__.py b/picard/acoustid/__init__.py index 8de8a00ad..2fb6d4ce9 100644 --- a/picard/acoustid/__init__.py +++ b/picard/acoustid/__init__.py @@ -36,7 +36,10 @@ from PyQt5 import QtCore from picard import log from picard.acoustid.json_helpers import parse_recording from picard.config import get_config -from picard.const import FPCALC_NAMES +from picard.const import ( + DEFAULT_FPCALC_THREADS, + FPCALC_NAMES, +) from picard.const.sys import IS_WIN from picard.file import File from picard.util import ( @@ -84,7 +87,7 @@ class AcoustIDClient(QtCore.QObject): def get_max_processes(self): config = get_config() - return config.setting['fpcalc_threads'] or 2 + return config.setting['fpcalc_threads'] or DEFAULT_FPCALC_THREADS def _on_lookup_finished(self, task, document, http, error): doc = {} diff --git a/picard/const/__init__.py b/picard/const/__init__.py index cdd68dab3..cc9dff11d 100644 --- a/picard/const/__init__.py +++ b/picard/const/__init__.py @@ -56,6 +56,7 @@ ACOUSTID_KEY = 'v8pQ6oyB' ACOUSTID_HOST = 'api.acoustid.org' ACOUSTID_PORT = 443 FPCALC_NAMES = ['fpcalc', 'pyfpcalc'] +DEFAULT_FPCALC_THREADS = 2 # MB OAuth client credentials MUSICBRAINZ_OAUTH_CLIENT_ID = 'ACa9wsDX19cLp-AeEP-vVw' diff --git a/picard/ui/options/fingerprinting.py b/picard/ui/options/fingerprinting.py index 6bae8524e..06a2698c6 100644 --- a/picard/ui/options/fingerprinting.py +++ b/picard/ui/options/fingerprinting.py @@ -39,6 +39,7 @@ from picard.config import ( TextOption, get_config, ) +from picard.const import DEFAULT_FPCALC_THREADS from picard.util import webbrowser2 from picard.ui.options import ( @@ -71,7 +72,7 @@ class FingerprintingOptionsPage(OptionsPage): TextOption("setting", "fingerprinting_system", "acoustid"), TextOption("setting", "acoustid_fpcalc", ""), TextOption("setting", "acoustid_apikey", ""), - IntOption("setting", "fpcalc_threads", 2), + IntOption("setting", "fpcalc_threads", DEFAULT_FPCALC_THREADS), ] def __init__(self, parent=None):