sam/mopidy-radionet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't list pages if there is just a single page

Browse Source
This commit is contained in:
Eric van Blokland
2021-09-09 01:30:01 +02:00
parent 155f063ecc
commit 2f12cff16a
2 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
mopidy_radionet/library.py
View File

@@ -99,13 +99,19 @@ class RadioNetLibraryProvider(backend.LibraryProvider):
result.append(self.station_to_ref(item)) result.append(self.station_to_ref(item))
elif not page: elif not page:
pages = self._get_category_pages(category) pages = self._get_category_pages(category)
for index in range(pages): if pages == 1:
result.append( items = self._get_category(category, 1)
self.ref_directory( if items:
"radionet:{0}:{1}".format(category, str(index + 1)), for item in items:
str(index + 1), result.append(self.station_to_ref(item))
else:
for index in range(pages):
result.append(
self.ref_directory(
"radionet:{0}:{1}".format(category, str(index + 1)),
str(index + 1),
)
) )
)
else: else:
items = self._get_category(category, page) items = self._get_category(category, page)
if items: if items:
@@ -139,15 +145,21 @@ class RadioNetLibraryProvider(backend.LibraryProvider):
) )
elif not page: elif not page:
pages = self._get_sorted_category_pages(category, value) pages = self._get_sorted_category_pages(category, value)
for index in range(pages): if pages == 1:
result.append( items = self._get_sorted_category(category, value, sorting, 1)
self.ref_directory( if items:
"radionet:{0}:{1}:{2}:{3}".format( for item in items:
category, value, sorting, str(index + 1) result.append(self.station_to_ref(item))
), else:
str(index + 1), for index in range(pages):
result.append(
self.ref_directory(
"radionet:{0}:{1}:{2}:{3}".format(
category, value, sorting, str(index + 1)
),
str(index + 1),
)
) )
)
else: else:
items = self._get_sorted_category(category, value, sorting, page) items = self._get_sorted_category(category, value, sorting, page)
if items: if items:

27
tests/test_library.py
View File

@@ -13,8 +13,9 @@ def test_browse_localstations(library):
page_uri = results[0].uri if results is not None else None page_uri = results[0].uri if results is not None else None
assert page_uri is not None assert page_uri is not None
results = library.browse(page_uri) # 1 Page, not results
assert len(results) > 0 # results = library.browse(page_uri)
# assert len(results) > 0
def test_browse_topstations(library): def test_browse_topstations(library):
@@ -64,15 +65,16 @@ def test_browse_topics(library):
page_uri = results[0].uri if results is not None else None page_uri = results[0].uri if results is not None else None
assert page_uri is not None assert page_uri is not None
results = library.browse(page_uri) # 1 Page, not results
assert len(results) > 0 # results = library.browse(page_uri)
# assert len(results) > 0
def test_browse_languages(library): def test_browse_languages(library):
results = library.browse('radionet:languages'); results = library.browse('radionet:languages');
assert len(results) > 0 assert len(results) > 0
cat_uri = results[0].uri if results is not None else None cat_uri = results[5].uri if results is not None else None
assert cat_uri is not None assert cat_uri is not None
results = library.browse(cat_uri) results = library.browse(cat_uri)
@@ -87,8 +89,9 @@ def test_browse_languages(library):
page_uri = results[0].uri if results is not None else None page_uri = results[0].uri if results is not None else None
assert page_uri is not None assert page_uri is not None
results = library.browse(page_uri) # 1 Page, not results
assert len(results) > 0 # results = library.browse(page_uri)
# assert len(results) > 0
def test_browse_cities(library): def test_browse_cities(library):
@@ -110,8 +113,9 @@ def test_browse_cities(library):
page_uri = results[0].uri if results is not None else None page_uri = results[0].uri if results is not None else None
assert page_uri is not None assert page_uri is not None
results = library.browse(page_uri) # 1 Page, not results
assert len(results) > 0 # results = library.browse(page_uri)
# assert len(results) > 0
def test_browse_countries(library): def test_browse_countries(library):
@@ -133,8 +137,9 @@ def test_browse_countries(library):
page_uri = results[0].uri if results is not None else None page_uri = results[0].uri if results is not None else None
assert page_uri is not None assert page_uri is not None
results = library.browse(page_uri) # 1 Page, not results
assert len(results) > 0 # results = library.browse(page_uri)
# assert len(results) > 0
def test_browse_favorites(library): def test_browse_favorites(library):