From 050414d8828d92144f9e4efde0a4deebda6bb0fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= Date: Sat, 9 Apr 2011 12:32:51 +0200 Subject: [PATCH] Correctly handle authentication when loading albums with private data --- picard/album.py | 6 ++---- picard/webservice.py | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/picard/album.py b/picard/album.py index a31d09f3d..06d9ace43 100644 --- a/picard/album.py +++ b/picard/album.py @@ -356,10 +356,8 @@ class Album(DataObject, Item): if self.config.setting['enable_ratings']: require_authentication = True inc += ['user-ratings'] - if require_authentication: - self.tagger.xmlws.setUser(self.config.setting["username"], - self.config.setting["password"]) - self.tagger.xmlws.get_release_by_id(self.id, self._release_request_finished, inc=inc) + self.tagger.xmlws.get_release_by_id(self.id, self._release_request_finished, inc=inc, + mblogin=require_authentication) def run_when_loaded(self, func): if self.loaded: diff --git a/picard/webservice.py b/picard/webservice.py index de8dd7590..68e860783 100644 --- a/picard/webservice.py +++ b/picard/webservice.py @@ -213,14 +213,14 @@ class XmlWebService(QtCore.QObject): else: self._queue.insert(position, func) if len(self._queue) == 1: func() - def _get_by_id(self, entitytype, entityid, handler, inc=[]): + def _get_by_id(self, entitytype, entityid, handler, inc=[], mblogin=False): host = self.config.setting["server_host"] port = self.config.setting["server_port"] path = "/ws/1/%s/%s?type=xml&inc=%s" % (entitytype, entityid, "+".join(inc)) - self.get(host, port, path, handler) + self.get(host, port, path, handler, mblogin=mblogin) - def get_release_by_id(self, releaseid, handler, inc=[]): - self._get_by_id('release', releaseid, handler, inc) + def get_release_by_id(self, releaseid, handler, inc=[], mblogin=False): + self._get_by_id('release', releaseid, handler, inc, mblogin=mblogin) def get_track_by_id(self, releaseid, handler, inc=[]): self._get_by_id('track', releaseid, handler, inc)