From 798943289401604fb7892109d5ddf65aaf537112 Mon Sep 17 00:00:00 2001 From: hhm Date: Thu, 9 Feb 2017 23:34:30 -0500 Subject: [PATCH 1/2] B"H add py-sonic legacy auth support --- README.md | 1 + mopidy_subidy/__init__.py | 1 + mopidy_subidy/backend.py | 3 ++- mopidy_subidy/ext.conf | 2 +- mopidy_subidy/subsonic_api.py | 5 +++-- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1c1524d..cb7875c 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ enabled=True url=https://path.to/your/subsonic/server username=subsonic_username password=your_secret_password +legacy_auth = (optional; setting to yes may solve some connection errors) ``` ## State of this plugin diff --git a/mopidy_subidy/__init__.py b/mopidy_subidy/__init__.py index 2705ef1..3b01da2 100644 --- a/mopidy_subidy/__init__.py +++ b/mopidy_subidy/__init__.py @@ -22,6 +22,7 @@ class SubidyExtension(ext.Extension): schema['url'] = config.String() schema['username'] = config.String() schema['password'] = config.Secret() + schema['legacy_auth'] = config.Boolean(optional=True) return schema def setup(self, registry): diff --git a/mopidy_subidy/backend.py b/mopidy_subidy/backend.py index 7b791aa..b757d32 100644 --- a/mopidy_subidy/backend.py +++ b/mopidy_subidy/backend.py @@ -9,7 +9,8 @@ class SubidyBackend(pykka.ThreadingActor, backend.Backend): self.subsonic_api = subsonic_api.SubsonicApi( url=subidy_config['url'], username=subidy_config['username'], - password=subidy_config['password']) + password=subidy_config['password'], + legacy_auth=subidy_config['legacy_auth']) self.library = library.SubidyLibraryProvider(backend=self) self.playback = playback.SubidyPlaybackProvider(audio=audio, backend=self) self.playlists = playlists.SubidyPlaylistsProvider(backend=self) diff --git a/mopidy_subidy/ext.conf b/mopidy_subidy/ext.conf index 07f3f97..354ca00 100644 --- a/mopidy_subidy/ext.conf +++ b/mopidy_subidy/ext.conf @@ -3,4 +3,4 @@ enabled = true url = username = password = - +legacy_auth = no diff --git a/mopidy_subidy/subsonic_api.py b/mopidy_subidy/subsonic_api.py index b431e0c..2c519e5 100644 --- a/mopidy_subidy/subsonic_api.py +++ b/mopidy_subidy/subsonic_api.py @@ -16,7 +16,7 @@ MAX_SEARCH_RESULTS = 100 ref_sort_key = lambda ref: ref.name class SubsonicApi(): - def __init__(self, url, username, password): + def __init__(self, url, username, password, legacy_auth): parsed = urlparse(url) self.port = parsed.port if parsed.port else \ 443 if parsed.scheme == 'https' else 80 @@ -26,7 +26,8 @@ class SubsonicApi(): username, password, self.port, - parsed.path + '/rest') + parsed.path + '/rest', + legacyAuth=legacy_auth) self.url = url + '/rest' self.username = username self.password = password From 69dd11014592b52b180c6e309b89d4b648fd3f32 Mon Sep 17 00:00:00 2001 From: hhm Date: Thu, 23 Feb 2017 10:16:29 -0500 Subject: [PATCH 2/2] B"H fix styling in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cb7875c..efcbef8 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ enabled=True url=https://path.to/your/subsonic/server username=subsonic_username password=your_secret_password -legacy_auth = (optional; setting to yes may solve some connection errors) +legacy_auth=(optional; setting to yes may solve some connection errors) ``` ## State of this plugin