sarsoo/Mixonomer
1
0
Fork 0
Code Issues 15 Pull Requests Actions Packages Projects Releases Wiki Activity

fixed enum error on fmchart playlists

Browse Source
This commit is contained in:
aj 2020-05-04 22:03:06 +01:00
parent bc1b59c7bd
commit a01b449325
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
music/tasks/run_user_playlist.py
View File

@ -7,11 +7,12 @@ from spotframework.engine.playlistengine import PlaylistEngine, PlaylistSource,
from spotframework.engine.processor.shuffle import Shuffle from spotframework.engine.processor.shuffle import Shuffle
from spotframework.engine.processor.sort import SortReleaseDate from spotframework.engine.processor.sort import SortReleaseDate
from spotframework.engine.processor.deduplicate import DeduplicateByName from spotframework.engine.processor.deduplicate import DeduplicateByName
from spotframework.model.uri import Uri from spotframework.model.uri import Uri
from spotfm.engine.chart_source import ChartSource from spotfm.engine.chart_source import ChartSource
from fmframework.net.network import Network
import music.db.database as database import music.db.database as database
from music.db.part_generator import PartGenerator from music.db.part_generator import PartGenerator
from music.model.user import User from music.model.user import User
@ -70,8 +71,16 @@ def run_user_playlist(username, playlist_name):
if user.lastfm_username is None: if user.lastfm_username is None:
logger.error(f'{username} has no associated last.fm username, chart source skipped') logger.error(f'{username} has no associated last.fm username, chart source skipped')
else: else:
chart_range = Network.Range.MONTH
try:
chart_range = Network.Range[playlist.chart_range]
except KeyError:
logger.error(f'invalid last.fm chart range found for '
f'{playlist_name}/{username} {playlist.chart_range}, defaulting to 1 month')
engine.sources.append(ChartSource(spotnet=net, fmnet=database.get_authed_lastfm_network(user))) engine.sources.append(ChartSource(spotnet=net, fmnet=database.get_authed_lastfm_network(user)))
params.append(ChartSource.Params(chart_range=playlist.chart_range, limit=playlist.chart_limit)) params.append(ChartSource.Params(chart_range=chart_range, limit=playlist.chart_limit))
else: else:
# INCLUDE SORT METHOD (no sorting for last.fm chart playlist) # INCLUDE SORT METHOD (no sorting for last.fm chart playlist)