From c016925b771764baa0fa6cb1bcb88a1dcabb322b Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Tue, 22 Oct 2013 08:52:43 +0200 Subject: [PATCH 1/3] Add constant for coverart archive host. Signed-off-by: Philipp Wolfer --- picard/coverart.py | 3 ++- picard/coverartarchive.py | 2 ++ picard/webservice.py | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/picard/coverart.py b/picard/coverart.py index 684d5f888..51ab5e76d 100644 --- a/picard/coverart.py +++ b/picard/coverart.py @@ -29,6 +29,7 @@ from functools import partial from picard import config, log from picard.metadata import Metadata, is_front_image from picard.util import mimetype, parse_amazon_url +from picard.coverartarchive import CAA_HOST from PyQt4.QtCore import QUrl, QObject # data transliterated from the perl stuff used to find cover art for the @@ -210,7 +211,7 @@ def coverart(album, metadata, release, try_list=None): % release.id) album._requests += 1 album.tagger.xmlws.download( - "coverartarchive.org", 80, "/release/%s/" % + CAA_HOST, 80, "/release/%s/" % metadata["musicbrainz_albumid"], partial(_caa_json_downloaded, album, metadata, release, try_list), priority=True, important=True) diff --git a/picard/coverartarchive.py b/picard/coverartarchive.py index 8ad268614..dab6b47f8 100644 --- a/picard/coverartarchive.py +++ b/picard/coverartarchive.py @@ -17,6 +17,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +CAA_HOST = "coverartarchive.org" + # list of types from http://musicbrainz.org/doc/Cover_Art/Types # order of declaration is preserved in selection box CAA_TYPES = [ diff --git a/picard/webservice.py b/picard/webservice.py index 63f44c3f2..505a7cacc 100644 --- a/picard/webservice.py +++ b/picard/webservice.py @@ -34,11 +34,12 @@ from PyQt4.QtGui import QDesktopServices from PyQt4.QtCore import QUrl, QXmlStreamReader from picard import PICARD_VERSION_STR, config, log from picard.const import ACOUSTID_KEY, ACOUSTID_HOST +from picard.coverartarchive import CAA_HOST REQUEST_DELAY = defaultdict(lambda: 1000) REQUEST_DELAY[(ACOUSTID_HOST, 80)] = 333 -REQUEST_DELAY[("coverartarchive.org", 80)] = 0 +REQUEST_DELAY[(CAA_HOST, 80)] = 0 USER_AGENT_STRING = 'MusicBrainz%%20Picard-%s' % PICARD_VERSION_STR From ffd5580a9a260c0d0f5788107f797d3a063a818c Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Tue, 22 Oct 2013 18:36:23 +0200 Subject: [PATCH 2/3] Added a constant for the coverart acrhive port. --- picard/coverart.py | 4 ++-- picard/coverartarchive.py | 1 + picard/webservice.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/picard/coverart.py b/picard/coverart.py index 51ab5e76d..f1f68d1b4 100644 --- a/picard/coverart.py +++ b/picard/coverart.py @@ -29,7 +29,7 @@ from functools import partial from picard import config, log from picard.metadata import Metadata, is_front_image from picard.util import mimetype, parse_amazon_url -from picard.coverartarchive import CAA_HOST +from picard.coverartarchive import CAA_HOST, CAA_PORT from PyQt4.QtCore import QUrl, QObject # data transliterated from the perl stuff used to find cover art for the @@ -211,7 +211,7 @@ def coverart(album, metadata, release, try_list=None): % release.id) album._requests += 1 album.tagger.xmlws.download( - CAA_HOST, 80, "/release/%s/" % + CAA_HOST, CAA_PORT, "/release/%s/" % metadata["musicbrainz_albumid"], partial(_caa_json_downloaded, album, metadata, release, try_list), priority=True, important=True) diff --git a/picard/coverartarchive.py b/picard/coverartarchive.py index dab6b47f8..2c38b1429 100644 --- a/picard/coverartarchive.py +++ b/picard/coverartarchive.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. CAA_HOST = "coverartarchive.org" +CAA_PORT = 80 # list of types from http://musicbrainz.org/doc/Cover_Art/Types # order of declaration is preserved in selection box diff --git a/picard/webservice.py b/picard/webservice.py index 505a7cacc..fdac7fdde 100644 --- a/picard/webservice.py +++ b/picard/webservice.py @@ -34,12 +34,12 @@ from PyQt4.QtGui import QDesktopServices from PyQt4.QtCore import QUrl, QXmlStreamReader from picard import PICARD_VERSION_STR, config, log from picard.const import ACOUSTID_KEY, ACOUSTID_HOST -from picard.coverartarchive import CAA_HOST +from picard.coverartarchive import CAA_HOST, CAA_PORT REQUEST_DELAY = defaultdict(lambda: 1000) REQUEST_DELAY[(ACOUSTID_HOST, 80)] = 333 -REQUEST_DELAY[(CAA_HOST, 80)] = 0 +REQUEST_DELAY[(CAA_HOST, CAA_PORT)] = 0 USER_AGENT_STRING = 'MusicBrainz%%20Picard-%s' % PICARD_VERSION_STR From 7339f7b1e314efbc5ec3ebce458d4b173e10df26 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Tue, 22 Oct 2013 18:39:40 +0200 Subject: [PATCH 3/3] Added a constant for the acoustid port. --- picard/const.py | 1 + picard/webservice.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/picard/const.py b/picard/const.py index 8803ce276..161d9a7ed 100644 --- a/picard/const.py +++ b/picard/const.py @@ -40,6 +40,7 @@ USER_PLUGIN_DIR = os.path.join(USER_DIR, "plugins") # AcoustID client API key ACOUSTID_KEY = '0zClDiGo' ACOUSTID_HOST = 'api.acoustid.org' +ACOUSTID_PORT = 80 FPCALC_NAMES = ['fpcalc', 'pyfpcalc'] # Various Artists MBID diff --git a/picard/webservice.py b/picard/webservice.py index fdac7fdde..5ebcf51b8 100644 --- a/picard/webservice.py +++ b/picard/webservice.py @@ -33,12 +33,12 @@ from PyQt4 import QtCore, QtNetwork from PyQt4.QtGui import QDesktopServices from PyQt4.QtCore import QUrl, QXmlStreamReader from picard import PICARD_VERSION_STR, config, log -from picard.const import ACOUSTID_KEY, ACOUSTID_HOST +from picard.const import ACOUSTID_KEY, ACOUSTID_HOST, ACOUSTID_PORT from picard.coverartarchive import CAA_HOST, CAA_PORT REQUEST_DELAY = defaultdict(lambda: 1000) -REQUEST_DELAY[(ACOUSTID_HOST, 80)] = 333 +REQUEST_DELAY[(ACOUSTID_HOST, ACOUSTID_PORT)] = 333 REQUEST_DELAY[(CAA_HOST, CAA_PORT)] = 0 USER_AGENT_STRING = 'MusicBrainz%%20Picard-%s' % PICARD_VERSION_STR @@ -413,7 +413,7 @@ class XmlWebService(QtCore.QObject): return '&'.join(filters) def query_acoustid(self, handler, **args): - host, port = ACOUSTID_HOST, 80 + host, port = ACOUSTID_HOST, ACOUSTID_PORT body = self._encode_acoustid_args(args) return self.post(host, port, '/v2/lookup', body, handler, mblogin=False) @@ -425,7 +425,7 @@ class XmlWebService(QtCore.QObject): args['mbid.%d' % i] = str(submission.recordingid) if submission.puid: args['puid.%d' % i] = str(submission.puid) - host, port = ACOUSTID_HOST, 80 + host, port = ACOUSTID_HOST, ACOUSTID_PORT body = self._encode_acoustid_args(args) return self.post(host, port, '/v2/submit', body, handler, mblogin=False)