fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-02-25 09:03:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move all the QUrl building to util.build_qurl

Browse Source
This commit is contained in:
Wieland Hoffmann
2015-10-05 23:18:57 +02:00
parent 87fecf40f2
commit fb627c84bc
5 changed files with 87 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/plugins/albumartist_website.py
View File

@@ -77,10 +77,12 @@ class AlbumArtistWebsite:
if self.website_queue.append(artistId, (track, album)):
host = config.setting["server_host"]
port = config.setting["server_port"]
path = "/ws/2/%s/%s?inc=%s" % ('artist', artistId, 'url-rels')
path = "/ws/2/%s/%s" % ('artist', artistId)
queryargs = {"inc": "url-rels"}
return album.tagger.xmlws.get(host, port, path,
partial(self.website_process, artistId),
xml=True, priority=True, important=False)
xml=True, priority=True, important=False,
queryargs=queryargs)
def website_process(self, artistId, response, reply, error):
if error:

15
picard/browser/filelookup.py
View File

@@ -22,7 +22,7 @@ from PyQt4 import QtCore
import os.path
import re
from picard import log
from picard.util import webbrowser2
from picard.util import webbrowser2, build_qurl
class FileLookup(object):
@@ -32,11 +32,8 @@ class FileLookup(object):
self.localPort = int(localPort)
self.port = port
def _url(self, path, params={}, scheme='http'):
url = QtCore.QUrl()
url.setScheme(scheme if self.port != 443 else 'https')
url.setHost(self.server)
url.setPort(self.port if scheme != 'https' else 443)
def _url(self, path, params={}):
url = build_qurl(self.server, self.port)
url.setPath(path)
if self.localPort:
params['tport'] = self.localPort
@@ -44,8 +41,8 @@ class FileLookup(object):
url.addQueryItem(k, unicode(v))
return url.toEncoded()
def _build_launch(self, path, params={}, scheme='http'):
return self.launch(self._url(path, params, scheme))
def _build_launch(self, path, params={}):
return self.launch(self._url(path, params))
def launch(self, url):
log.debug("webbrowser2: %s" % url)
@@ -123,4 +120,4 @@ class FileLookup(object):
return self._build_launch('/taglookup', params)
def collectionLookup(self, userid):
return self._build_launch('/user/%s/collections' % userid, scheme='https')
return self._build_launch('/user/%s/collections' % userid)

10
picard/oauth.py
View File

@@ -28,6 +28,7 @@ from picard.const import (
MUSICBRAINZ_OAUTH_CLIENT_ID,
MUSICBRAINZ_OAUTH_CLIENT_SECRET,
)
from picard.util import build_qurl
class OAuthManager(object):
@@ -69,14 +70,7 @@ class OAuthManager(object):
def get_authorization_url(self, scopes):
host, port = config.setting['server_host'], config.setting['server_port']
url = QUrl()
if (host in MUSICBRAINZ_SERVERS and port == 80) or port == 443:
url.setScheme("https")
else:
url.setScheme("http")
if port != 80:
url.setPort(port)
url.setHost(host)
url = build_qurl(host, port)
url.setPath("/oauth2/authorize")
url.addQueryItem("response_type", "code")
url.addQueryItem("client_id", MUSICBRAINZ_OAUTH_CLIENT_ID)

21
picard/util/__init__.py
View File

@@ -31,6 +31,7 @@ from PyQt4 import QtCore
from string import Template
# Required for compatibility with lastfmplus which imports this from here rather than loading it direct.
from functools import partial
from picard.const import MUSICBRAINZ_SERVERS
class LockableObject(QtCore.QObject):
@@ -380,3 +381,23 @@ def album_artist_from_path(filename, album, artist):
elif not artist and len(dirs) >= 2:
artist = dirs[-2]
return album, artist
def build_qurl(host, port=80, mblogin=False):
"""
Builds and returns a QUrl object from `host` and `port` and
automatically enables HTTPS if necessary.
Setting `mblogin` to True forces HTTPS.
"""
url = QtCore.QUrl()
url.setHost(host)
url.setPort(port)
if (mblogin or # Login is required
port == 443 or # HTTPS port
(host in MUSICBRAINZ_SERVERS and port == 80)): # We know MB supports HTTPS
url.setScheme("https")
url.setPort(443)
else:
url.setScheme("http")
return url

91
picard/webservice.py
View File

@@ -46,6 +46,7 @@ from picard.const import (ACOUSTID_KEY,
CAA_PORT,
MUSICBRAINZ_SERVERS)
from picard.oauth import OAuthManager
from picard.util import build_qurl
COUNT_REQUESTS_DELAY_MS = 250
@@ -188,15 +189,12 @@ class XmlWebService(QtCore.QObject):
def _start_request_continue(self, method, host, port, path, data, handler, xml,
mblogin=False, cacheloadcontrol=None, refresh=None,
access_token=None):
if (mblogin and host in MUSICBRAINZ_SERVERS and port == 80) or port == 443:
urlstring = "https://%s%s" % (host, path)
elif port is None or port == 80:
urlstring = "http://%s%s" % (host, path)
else:
urlstring = "http://%s:%d%s" % (host, port, path)
log.debug("%s %s", method, urlstring)
url = QUrl.fromEncoded(urlstring)
access_token=None, queryargs=None):
url = build_qurl(host, port)
url.setPath(path)
if queryargs is not None:
qargs_list = [(k, unicode(v)) for k, v in queryargs.iteritems()]
url.setEncodedQueryItems(qargs_list)
request = QtNetwork.QNetworkRequest(url)
if mblogin and access_token:
request.setRawHeader("Authorization", "Bearer %s" % access_token)
@@ -223,12 +221,13 @@ class XmlWebService(QtCore.QObject):
self._active_requests[reply] = (request, handler, xml, refresh)
def _start_request(self, method, host, port, path, data, handler, xml,
mblogin=False, cacheloadcontrol=None, refresh=None):
mblogin=False, cacheloadcontrol=None, refresh=None,
queryargs=None):
def start_request_continue(access_token=None):
self._start_request_continue(
method, host, port, path, data, handler, xml,
mblogin=mblogin, cacheloadcontrol=cacheloadcontrol, refresh=refresh,
access_token=access_token)
access_token=access_token, queryargs=queryargs)
if mblogin and path != "/oauth2/token":
self.oauth_manager.get_access_token(start_request_continue)
else:
@@ -314,22 +313,22 @@ class XmlWebService(QtCore.QObject):
reply.deleteLater()
def get(self, host, port, path, handler, xml=True, priority=False,
important=False, mblogin=False, cacheloadcontrol=None, refresh=False):
important=False, mblogin=False, cacheloadcontrol=None, refresh=False, queryargs=None):
func = partial(self._start_request, "GET", host, port, path, None,
handler, xml, mblogin, cacheloadcontrol=cacheloadcontrol, refresh=refresh)
handler, xml, mblogin, cacheloadcontrol=cacheloadcontrol, refresh=refresh, queryargs=queryargs)
return self.add_task(func, host, port, priority, important=important)
def post(self, host, port, path, data, handler, xml=True, priority=False, important=False, mblogin=True):
def post(self, host, port, path, data, handler, xml=True, priority=False, important=False, mblogin=True, queryargs=None):
log.debug("POST-DATA %r", data)
func = partial(self._start_request, "POST", host, port, path, data, handler, xml, mblogin)
func = partial(self._start_request, "POST", host, port, path, data, handler, xml, mblogin, queryargs=queryargs)
return self.add_task(func, host, port, priority, important=important)
def put(self, host, port, path, data, handler, priority=True, important=False, mblogin=True):
func = partial(self._start_request, "PUT", host, port, path, data, handler, False, mblogin)
def put(self, host, port, path, data, handler, priority=True, important=False, mblogin=True, queryargs=None):
func = partial(self._start_request, "PUT", host, port, path, data, handler, False, mblogin, queryargs=queryargs)
return self.add_task(func, host, port, priority, important=important)
def delete(self, host, port, path, handler, priority=True, important=False, mblogin=True):
func = partial(self._start_request, "DELETE", host, port, path, None, handler, False, mblogin)
def delete(self, host, port, path, handler, priority=True, important=False, mblogin=True, queryargs=None):
func = partial(self._start_request, "DELETE", host, port, path, None, handler, False, mblogin, queryargs=queryargs)
return self.add_task(func, host, port, priority, important=important)
def stop(self):
@@ -420,15 +419,18 @@ class XmlWebService(QtCore.QObject):
except:
pass
def _get_by_id(self, entitytype, entityid, handler, inc=[], params=[],
def _get_by_id(self, entitytype, entityid, handler, inc=[], queryargs=None,
priority=False, important=False, mblogin=False, refresh=False):
host = config.setting["server_host"]
port = config.setting["server_port"]
path = "/ws/2/%s/%s?inc=%s" % (entitytype, entityid, "+".join(inc))
if params:
path += "&" + "&".join(params)
path = "/ws/2/%s/%s" % (entitytype, entityid)
if queryargs is None:
queryargs = {}
if len(inc) > 0:
queryargs["inc"] = "+".join(inc)
return self.get(host, port, path, handler,
priority=priority, important=important, mblogin=mblogin, refresh=refresh)
priority=priority, important=important, mblogin=mblogin,
refresh=refresh, queryargs=queryargs)
def get_release_by_id(self, releaseid, handler, inc=[],
priority=False, important=False, mblogin=False, refresh=False):
@@ -442,7 +444,7 @@ class XmlWebService(QtCore.QObject):
def lookup_discid(self, discid, handler, priority=True, important=True, refresh=False):
inc = ['artist-credits', 'labels']
return self._get_by_id('discid', discid, handler, inc, params=["cdstubs=no"],
return self._get_by_id('discid', discid, handler, inc, queryargs={"cdstubs": "no"},
priority=priority, important=important, refresh=refresh)
def _find(self, entitytype, handler, kwargs):
@@ -459,12 +461,12 @@ class XmlWebService(QtCore.QObject):
query.append('%s:(%s)' % (name, value))
if query:
filters.append(('query', ' '.join(query)))
params = []
queryargs = {}
for name, value in filters:
value = QUrl.toPercentEncoding(unicode(value))
params.append('%s=%s' % (str(name), value))
path = "/ws/2/%s/?%s" % (entitytype, "&".join(params))
return self.get(host, port, path, handler)
queryargs[str(name)] = value
path = "/ws/2/%s" % (entitytype)
return self.get(host, port, path, handler, queryargs=queryargs)
def find_releases(self, handler, **kwargs):
return self._find('release', handler, kwargs)
@@ -475,9 +477,12 @@ class XmlWebService(QtCore.QObject):
def _browse(self, entitytype, handler, kwargs, inc=[], priority=False, important=False):
host = config.setting["server_host"]
port = config.setting["server_port"]
params = "&".join(["%s=%s" % (k, v) for k, v in kwargs.items()])
path = "/ws/2/%s?%s&inc=%s" % (entitytype, params, "+".join(inc))
return self.get(host, port, path, handler, priority=priority, important=important)
path = "/ws/2/%s" % (entitytype)
queryargs = kwargs
if len(inc) > 0:
queryargs["inc"] = "+".join(inc)
return self.get(host, port, path, handler, priority=priority,
important=important, queryargs=queryargs)
def browse_releases(self, handler, priority=True, important=True, **kwargs):
inc = ["media", "labels"]
@@ -527,10 +532,16 @@ class XmlWebService(QtCore.QObject):
def get_collection(self, id, handler, limit=100, offset=0):
host, port = config.setting['server_host'], config.setting['server_port']
path = "/ws/2/collection"
queryargs = None
if id is not None:
inc = ["releases", "artist-credits", "media"]
path += "/%s/releases?inc=%s&limit=%d&offset=%d" % (id, "+".join(inc), limit, offset)
return self.get(host, port, path, handler, priority=True, important=True, mblogin=True)
path += "/%s/releases" % (id)
queryargs = {}
queryargs["inc"] = "+".join(inc)
queryargs["limit"] = limit
queryargs["offset"] = offset
return self.get(host, port, path, handler, priority=True, important=True,
mblogin=True, queryargs=queryargs)
def get_collection_list(self, handler):
return self.get_collection(None, handler)
@@ -539,14 +550,20 @@ class XmlWebService(QtCore.QObject):
while releases:
ids = ";".join(releases if len(releases) <= 400 else releases[:400])
releases = releases[400:]
yield "/ws/2/collection/%s/releases/%s?client=%s" % (id, ids, CLIENT_STRING)
yield "/ws/2/collection/%s/releases/%s" % (id, ids)
def _get_client_queryarg(self):
return {"client": CLIENT_STRING}
def put_to_collection(self, id, releases, handler):
host, port = config.setting['server_host'], config.setting['server_port']
for path in self._collection_request(id, releases):
self.put(host, port, path, "", handler)
self.put(host, port, path, "", handler,
queryargs=self._get_client_queryarg())
def delete_from_collection(self, id, releases, handler):
host, port = config.setting['server_host'], config.setting['server_port']
for path in self._collection_request(id, releases):
self.delete(host, port, path, handler)
self.delete(host, port, path, handler,
queryargs=self._get_client_queryarg)