gcrkrause
/
mopidy-funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/mopidy
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'issue-17-invalid-lookup-uris' into 'master' 

Add a nicer log entry when an invalid lookup URI is requested (#17)

Closes #17

See merge request funkwhale/mopidy!13
main
Georg Krause 2021-08-23 18:55:19 +00:00
parent c1461b2e27 63cd47d377
commit 5392f5b705
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mopidy_funkwhale/library.py
View File

@ -375,9 +375,14 @@ class FunkwhaleLibraryProvider(backend.LibraryProvider):
"artist": lambda id: client.list_tracks({"artist": id})["results"], "artist": lambda id: client.list_tracks({"artist": id})["results"],
} }
type, id = parse_uri(uri) try:
payload = config[type](id) type, id = parse_uri(uri)
return [convert_to_track(row, cache=self.cache) for row in payload] except (IndexError, ValueError):
logger.info(f"Lookup failed: invalid uri '{uri}'")
return []
else:
payload = config[type](id)
return [convert_to_track(row, cache=self.cache) for row in payload]
def parse_uri(uri): def parse_uri(uri):

2
tests/test_library.py
View File

@ -97,7 +97,7 @@ def test_parse_uri(uri, expected):
@pytest.mark.parametrize("type", ["track", "album", "artist"]) @pytest.mark.parametrize("type", ["track", "album", "artist"])
def test_parse_uri(type): def test_to_ref(type):
obj = getattr(models, type.capitalize())(uri="hello:world", name="Hello") obj = getattr(models, type.capitalize())(uri="hello:world", name="Hello")
expected = getattr(models.Ref, type)(uri=obj.uri, name=obj.name) expected = getattr(models.Ref, type)(uri=obj.uri, name=obj.name)
assert mopidy_funkwhale.library.to_ref(obj) == expected assert mopidy_funkwhale.library.to_ref(obj) == expected