Fix PlayerMPD.prev/next() when stopped #2326
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hoffie
force-pushed
the
fix-prev-next-while-stopped
branch
from
a0e56d0
to
8cc0323
Compare
s-martin
approved these changes
Apr 8, 2024
pabera
reviewed
Apr 9, 2024
hoffie
force-pushed
the
fix-prev-next-while-stopped
branch
from
8cc0323
to
76b5c6d
Compare
Pull Request Test Coverage Report for Build 8661575867Details
💛 - Coveralls |
pabera
approved these changes
Apr 11, 2024
Open
|
No action could be a third option, but that could also be added in a later PR. |
hoffie
force-pushed
the
fix-prev-next-while-stopped
branch
2 times, most recently
from
3554511
to
f34bc74
Compare
Added now. As there have been further changes for #2327, this PR needs another review and new testing (I haven't tested the most recent state yet, maybe @IgorWalton can help?). |
pabera
reviewed
Apr 12, 2024
Comment on lines
248
to
272
| def decode_prev_next_actions(self): | ||
| end_of_playlist_next_action = cfg.setndefault('playermpd', 'end_of_playlist_next_action', value='').lower() | ||
| if end_of_playlist_next_action not in self.end_of_playlist_next_action_dict: | ||
| end_of_playlist_next_action = 'stop' | ||
| logger.error(f"Config playermpd.end_of_playlist_next_action must be one of " | ||
| f"{self.end_of_playlist_next_action.keys()}. " | ||
| f"Using default 'stop'") | ||
| self.end_of_playlist_next_action = self.end_of_playlist_next_action_dict[end_of_playlist_next_action] | ||
|
|
||
| stopped_prev_action = cfg.setndefault('playermpd', 'stopped_prev_action', value='').lower() | ||
| if stopped_prev_action not in self.stopped_prev_action_dict: | ||
| stopped_prev_action = 'prev' | ||
| logger.error(f"Config playermpd.stopped_prev_action must be one of " | ||
| f"{self.stopped_prev_action.keys()}. " | ||
| f"Using default 'prev'") | ||
| self.stopped_prev_action = self.stopped_prev_action_dict[stopped_prev_action] | ||
|
|
||
| stopped_next_action = cfg.setndefault('playermpd', 'stopped_prev_action', value='').lower() | ||
| if stopped_next_action not in self.stopped_prev_action_dict: | ||
| stopped_next_action = 'prev' | ||
| logger.error(f"Config playermpd.stopped_next_action must be one of " | ||
| f"{self.stopped_next_action.keys()}. " | ||
| f"Using default 'next'") | ||
| self.stopped_next_action = self.stopped_prev_action_dict[stopped_prev_action] | ||
|
|
There was a problem hiding this comment.
This has a few aspects that are redundant, or could be abstracted..
Tried to quickly wrap my head around this..
Could this maybe work? (method naming could probably improved :-) )
def get_config_action(cfg, section, option, default, valid_actions_dict, logger):
action = cfg.setndefault(section, option, value='').lower()
if action not in valid_actions_dict:
logger.error(f"Config {section}.{option} must be one of {valid_actions_dict.keys()}. Using default '{default}'")
action = default
return valid_actions_dict[action]
def decode_prev_next_actions(self):
self.end_of_playlist_next_action = get_config_action(
cfg, 'playermpd', 'end_of_playlist_next_action', 'stop',
self.end_of_playlist_next_action_dict, logger)
self.stopped_prev_action = get_config_action(
cfg, 'playermpd', 'stopped_prev_action', 'prev',
self.stopped_prev_action_dict, logger)
self.stopped_next_action = get_config_action(
cfg, 'playermpd', 'stopped_next_action', 'next',
self.stopped_next_action_dict, logger)
There was a problem hiding this comment.
This way, you might even be able to rethink how to define the actions in the first place (is decode_prev_next_actions then still required?
There was a problem hiding this comment.
Nice idea! I've taken your standalone function and put it into jukebox.utils, where similar functions live. I've reworked the prev/next logic to make use of that function directly.
hoffie
force-pushed
the
fix-prev-next-while-stopped
branch
from
f34bc74
to
1e770ea
Compare
This abstracts away the functionality to resolve a given config option to an action in a pre-defined dict. Co-authored-by: Christian Hoffmann <[email protected]>
* Avoid MPD-related crashes during all prev/next() calls. * Explicitly handle prev() in stopped state, configurable via `playermpd.stopped_prev_action`. * Explicitly handle next() in stopped state, configurable via `playermpd.stopped_next_action`. * Explicitly handle next() when reaching the end of the playlist: jukebox-daemon will now ignore the action by default (similar to v2). It can also be configured to rewind the playlist instead by setting the new config option `playermpd.end_of_playlist_next_action: rewind` or to stop playing. Fixes MiczFlor#2294 Fixes MiczFlor#2327 Co-authored-by: pabera <[email protected]>
hoffie
force-pushed
the
fix-prev-next-while-stopped
branch
from
1e770ea
to
ac24a06
Compare
pabera
approved these changes
Apr 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix PlayerMPD.prev/next() when stopped
playermpd.stopped_prev_action.playermpd.stopped_next_action.jukebox-daemon will now ignore the action by default (similar to v2).
It can also be configured to rewind the playlist instead by setting
the new config option
playermpd.end_of_playlist_next_action: rewindor to stop playing.
Fixes #2294
Fixes #2327