fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-02-22 23:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly handle authentication when loading albums with private data

Browse Source
This commit is contained in:
Lukáš Lalinský
2011-04-09 12:32:51 +02:00
parent c765d853f9
commit 050414d882
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
picard/album.py
View File

@@ -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:

8
picard/webservice.py
View File

@@ -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)