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

Merge pull request #20 from hhm0/appname_extname

Browse source 
extension name as subsonic API client name
This commit is contained in:
Frederick Gnodtke 2017-08-14 07:53:36 +02:00 • committed by GitHub
commit 8d7cd3ff01
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mopidy_subidy/backend.py
View file

@ -1,3 +1,4 @@
import mopidy_subidy
from mopidy_subidy import library, playback, playlists, subsonic_api from mopidy_subidy import library, playback, playlists, subsonic_api
from mopidy import backend from mopidy import backend
import pykka import pykka
@ -10,6 +11,7 @@ class SubidyBackend(pykka.ThreadingActor, backend.Backend):
url=subidy_config['url'], url=subidy_config['url'],
username=subidy_config['username'], username=subidy_config['username'],
password=subidy_config['password'], password=subidy_config['password'],
app_name=mopidy_subidy.SubidyExtension.dist_name,
legacy_auth=subidy_config['legacy_auth'], legacy_auth=subidy_config['legacy_auth'],
api_version=subidy_config['api_version']) api_version=subidy_config['api_version'])
self.library = library.SubidyLibraryProvider(backend=self) self.library = library.SubidyLibraryProvider(backend=self)

5
mopidy_subidy/subsonic_api.py
View file

@ -37,7 +37,7 @@ def diritem_sort_key(item):
return (isdir, key) return (isdir, key)
class SubsonicApi(): class SubsonicApi():
def __init__(self, url, username, password, legacy_auth, api_version): def __init__(self, url, username, password, app_name, legacy_auth, api_version):
parsed = urlparse(url) parsed = urlparse(url)
self.port = parsed.port if parsed.port else \ self.port = parsed.port if parsed.port else \
443 if parsed.scheme == 'https' else 80 443 if parsed.scheme == 'https' else 80
@ -48,6 +48,7 @@ class SubsonicApi():
password, password,
self.port, self.port,
parsed.path + '/rest', parsed.path + '/rest',
appName=app_name,
legacyAuth=legacy_auth, legacyAuth=legacy_auth,
apiVersion=api_version) apiVersion=api_version)
self.url = url + '/rest' self.url = url + '/rest'
@ -63,7 +64,7 @@ class SubsonicApi():
def get_subsonic_uri(self, view_name, params, censor=False): def get_subsonic_uri(self, view_name, params, censor=False):
di_params = {} di_params = {}
di_params.update(params) di_params.update(params)
di_params.update(c='mopidy') di_params.update(c=self.connection.appName)
di_params.update(v=self.connection.apiVersion) di_params.update(v=self.connection.apiVersion)
if censor: if censor:
di_params.update(u='*****', p='*****') di_params.update(u='*****', p='*****')