lubiana/mopidy-subidy
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Activity Actions

Merge branch 'urlencode_uris' of https://github.com/hhm0/mopidy-subidy into hhm0-urlencode_uris

Browse source
This commit is contained in:
Frederick 2017-03-22 08:59:02 +01:00
commit 8ab48138c3
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
mopidy_subidy/subsonic_api.py
View file

@ -1,4 +1,5 @@
from urlparse import urlparse from urlparse import urlparse
from urllib import urlencode
import libsonic import libsonic
import logging import logging
import itertools import itertools
@ -58,13 +59,22 @@ class SubsonicApi():
logger.error('Unabled to reach subsonic server: %s' % e) logger.error('Unabled to reach subsonic server: %s' % e)
exit() exit()
def get_subsonic_uri(self, view_name, params, censor=False):
di_params = {}
di_params.update(params)
di_params.update(c='mopidy')
di_params.update(v=self.connection.apiVersion)
if censor:
params.update(u='*****', p='*****')
else:
params.update(u=self.username, p=self.password)
return '{}/{}.view?{}'.format(self.url, view_name, urlencode(params))
def get_song_stream_uri(self, song_id): def get_song_stream_uri(self, song_id):
template = '%s/stream.view?id=%s&u=%s&p=%s&c=mopidy&v=1.14' return self.get_subsonic_uri('stream', dict(id=song_id))
return template % (self.url, song_id, self.username, self.password)
def get_censored_song_stream_uri(self, song_id): def get_censored_song_stream_uri(self, song_id):
template = '%s/stream.view?id=%s&u=******&p=******&c=mopidy&v=1.14' return self.get_subsonic_uri('stream', dict(id=song_id), True)
return template % (self.url, song_id)
def find_raw(self, query, exclude_artists=False, exclude_albums=False, exclude_songs=False): def find_raw(self, query, exclude_artists=False, exclude_albums=False, exclude_songs=False):
try: try: