Skip to content
This repository was archived by the owner on Apr 8, 2025. It is now read-only.

Commit 411b3ee

Browse files
committed
Merge pull request #112 from sindrig/crash-in-search
Fix error when shuffling in search albums
2 parents 04e002b + 07cd124 commit 411b3ee

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

spoppy/menus.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
import threading
33
import webbrowser
44
from collections import namedtuple
5+
from itertools import chain
56

67
from spotify import TrackAvailability
78

89
from . import responses
910
from .http_server import oAuthServerThread
11+
from .radio import Recommendations
1012
from .search import search
1113
from .util import (format_album, format_track, get_duration_from_s,
1214
single_char_with_timeout, sorted_menu_items)
13-
from .radio import Recommendations
1415

1516
logger = logging.getLogger(__name__)
1617

@@ -244,7 +245,7 @@ def include_playlist(playlist):
244245
for i, playlist in playlists:
245246
menu_item = PlayListSelected(self.navigator)
246247
menu_item.playlist = playlist.link.as_playlist()
247-
results[str(i+1).rjust(4)] = MenuValue(
248+
results[str(i + 1).rjust(4)] = MenuValue(
248249
menu_item.playlist.name, menu_item
249250
)
250251
return results
@@ -393,6 +394,14 @@ def get_options_from_search(self):
393394
)
394395
return results
395396

397+
def get_mock_playlist(self):
398+
track_results = list(chain(*[
399+
album.tracks for album in self.search.results.results
400+
]))
401+
return MockPlaylist(
402+
self.get_mock_playlist_name(), track_results
403+
)
404+
396405

397406
class TrackSearch(Menu):
398407
is_searching = False
@@ -513,7 +522,7 @@ def get_options(self):
513522
self.get_tracks()
514523
if track.availability != TrackAvailability.UNAVAILABLE
515524
):
516-
results[str(i+1).rjust(4)] = MenuValue(
525+
results[str(i + 1).rjust(4)] = MenuValue(
517526
format_track(track), self.select_song(i)
518527
)
519528
if results:

0 commit comments

Comments
 (0)