Skip to content

Commit 606d4b5

Browse files
s-n-gs-n-g
committed
- save station volume: silently saving playlist when set
- changing volume save messages - removing "(not in vlc)" string from help messages (for volume)
1 parent 2c5cc3f commit 606d4b5

File tree

6 files changed

+33
-30
lines changed

6 files changed

+33
-30
lines changed

‎docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ <h2 id="table-of-contents">Table of Contents <span style="padding-left: 10px;"><
7171
<li><a href="#specifying-a-playlist-to-load-(command-line)">Specifying a playlist to load (command line)</a></li>
7272
<li><a href="#autoloading-playlists">Autoloading playlists</a></li>
7373
<li><a href="#managing-playlists-(within-pyradio)">Managing playlists (within PyRadio)</a></li>
74-
<li><a href="#managing-%22foreign%22-playlists">Managing “foreign” playlists</a></li>
74+
<li><a href="#managing-foreign-playlists">Managing “foreign” playlists</a>(#managing-“foreign”-playlists)</li>
7575
<li><a href="#playlist-history">Playlist history</a></li>
7676
</ul></li>
7777
<li><a href="#stations-history">Stations history</a></li>

‎pyradio/edit.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ def show(self, item=None):
534534
self._win.addstr(22 + step, 23, 'M', curses.color_pair(4))
535535
self._win.addstr('ute player / Save ', curses.color_pair(5))
536536
self._win.addstr('v', curses.color_pair(4))
537-
self._win.addstr('olume (not in vlc).', curses.color_pair(5))
537+
self._win.addstr('olume.', curses.color_pair(5))
538538
if step + 21 < self.maxY:
539539
self._win.addstr(23 + step, 5, kb2chr('t_tag'), curses.color_pair(4))
540540
self._win.addstr(' / ', curses.color_pair(5))
@@ -1108,7 +1108,7 @@ def show(self):
11081108
self._win.addstr(21 + adjust_line_Y, 23, 'M', curses.color_pair(4))
11091109
self._win.addstr('ute player / Save ', curses.color_pair(5))
11101110
self._win.addstr('v', curses.color_pair(4))
1111-
self._win.addstr('olume (not in vlc).', curses.color_pair(5))
1111+
self._win.addstr('olume.).', curses.color_pair(5))
11121112
if adjust_line_Y + 23 < self.maxY:
11131113
self._win.addstr(22 + adjust_line_Y, 5, kb2chr('t_tag'), curses.color_pair(4))
11141114
self._win.addstr(' / ', curses.color_pair(5))
@@ -1544,7 +1544,7 @@ def show(self):
15441544
self._win.addstr(21 + adjust_line_Y, 23, 'M', curses.color_pair(4))
15451545
self._win.addstr('ute player / Save ', curses.color_pair(5))
15461546
self._win.addstr('v', curses.color_pair(4))
1547-
self._win.addstr('olume (not in vlc).', curses.color_pair(5))
1547+
self._win.addstr('olume.', curses.color_pair(5))
15481548
if adjust_line_Y + 23 < self.maxY:
15491549
self._win.addstr(22 + adjust_line_Y, 5, 'W', curses.color_pair(4))
15501550
self._win.addstr(' / ', curses.color_pair(5))
@@ -2055,7 +2055,7 @@ def show(self):
20552055
self._win.addstr(20 + adjust_line_Y, 23, 'M', curses.color_pair(4))
20562056
self._win.addstr('ute player / Save ', curses.color_pair(5))
20572057
self._win.addstr('v', curses.color_pair(4))
2058-
self._win.addstr('olume (not in vlc).', curses.color_pair(5))
2058+
self._win.addstr('olume.', curses.color_pair(5))
20592059
if adjust_line_Y + 22 < self.maxY:
20602060
self._win.addstr(21 + adjust_line_Y, 5, kb2chr('t_tag'), curses.color_pair(4))
20612061
self._win.addstr(' / ', curses.color_pair(5))

‎pyradio/keyboard.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ def clear_input_queue():
158158
kbkey_orig['html_help'] = ( ord('h') , 'Open html help')
159159
kbkey_orig['station_volume'] = ( ord('v') , 'Set station volume')
160160

161-
162161
# ! RadioBrowser Keys:
163162
kbkey_orig['h_rb'] = ( None , 'RadioBrowser Keys')
164163
kbkey_orig['rb_vote'] = ( ord('V') , 'Vote for station')

‎pyradio/messages_system.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def set_text(self, parent, *args):
137137
138138
!Volume management
139139
{v_dn2}|/|{v_up1} or |{v_dn1}|/|{v_up2} |*| Change volume.
140-
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume (not in vlc).
140+
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume.
141141
142142
!Misc
143143
{open_playlist}| / |{s}| / |{reload} |*| |O|pen / |S|ave / |R|eload playlist.
@@ -287,7 +287,7 @@ def set_text(self, parent, *args):
287287
Esc|, |{q}|, |Left|, |{h} |*|Cancel.
288288
%Global functions (with \ on Line editor)
289289
{v_dn2}|/|{v_up1} or |{v_dn1}|/|{v_up2} |*| Change volume.
290-
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume (not in vlc).
290+
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume.
291291
{t_tag}| / |{tag} |*|Toggle title log / like a station.'''
292292
)),
293293

@@ -491,7 +491,7 @@ def set_text(self, parent, *args):
491491
Esc|, |{q}|, |Left|, |{h} |*| Close window.
492492
%Global functions (with \ on Line editor)
493493
{v_dn2}|/|{v_up1} or |{v_dn1}|/|{v_up2} |*| Change volume.
494-
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume (not in vlc).
494+
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume.
495495
{t_tag}| / |{tag} |*| Toggle title log / like a station.'''
496496
)),
497497

@@ -516,7 +516,7 @@ def set_text(self, parent, *args):
516516
Esc|, |{q} |*| Cancel.
517517
%Global functions
518518
{v_dn2}|/|{v_up1} or |{v_dn1}|/|{v_up2} |*| Change volume.
519-
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume (not in vlc).
519+
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume.
520520
{t_tag}| / |{tag} |*| Toggle title log / like a station.'''
521521
)),
522522

@@ -691,7 +691,7 @@ def set_text(self, parent, *args):
691691
__(|^N| is the same as |n| when not in a line editor).
692692
%Global functions (with \ on Line editor)
693693
{v_dn2}|/|{v_up1} or |{v_dn1}|/|{v_up2} |*| Change volume.
694-
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume (not in vlc).
694+
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume.
695695
{t_tag}| / |{tag} |*|Toggle title log / like a station.'''
696696
)),
697697

@@ -709,7 +709,7 @@ def set_text(self, parent, *args):
709709
Esc |*| Exit without saving.
710710
%Global functions (with \ on Line editor)
711711
{v_dn2}|/|{v_up1} or |{v_dn1}|/|{v_up2} |*| Change volume.
712-
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume (not in vlc).
712+
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume.
713713
{t_tag}| / |{tag} |*|Toggle title log / like a station.'''
714714
)),
715715

@@ -859,7 +859,7 @@ def set_text(self, parent, *args):
859859
Esc|, |{q}|, |Left|, |{h} |*| Cancel.
860860
%Global functions (with \ on Line editor)
861861
{v_dn2}|/|{v_up1} or |{v_dn1}|/|{v_up2} |*| Change volume.
862-
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume (not in vlc).
862+
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume.
863863
{t_tag}| / |{tag} |*|Toggle title log / like a station.'''
864864
)),
865865

@@ -875,7 +875,7 @@ def set_text(self, parent, *args):
875875
Esc|, |{q}|, |Left|, |{h} |*| Canel.
876876
%Global functions (with \ on Line editor)
877877
{v_dn2}|/|{v_up1} or |{v_dn1}|/|{v_up2} |*| Change volume.
878-
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume (not in vlc).
878+
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume.
879879
{t_tag}| / |{tag} |*|Toggle title log / like a station.'''
880880
)),
881881

@@ -892,7 +892,7 @@ def set_text(self, parent, *args):
892892
Esc|, |{q}|, |Left|, |{h} |*| Canel.
893893
%Global functions (with \ on Line editor)
894894
{v_dn2}|/|{v_up1} or |{v_dn1}|/|{v_up2} |*| Change volume.
895-
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume (not in vlc).
895+
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume.
896896
{t_tag}| / |{tag} |*|Toggle title log / like a station.'''
897897
)),
898898

@@ -907,7 +907,7 @@ def set_text(self, parent, *args):
907907
Esc|, |{q}|, |Left|, |{h} |*| Canel.
908908
%Global functions (with \ on Line editor)
909909
{v_dn2}|/|{v_up1} or |{v_dn1}|/|{v_up2} |*| Change volume.
910-
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume (not in vlc).
910+
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume.
911911
{t_tag}| / |{tag} |*|Toggle title log / like a station.'''
912912
)),
913913

@@ -920,7 +920,7 @@ def set_text(self, parent, *args):
920920
Esc|, |{q} |*| Cancel.
921921
%Global functions
922922
{v_dn2}|/|{v_up1} or |{v_dn1}|/|{v_up2} |*| Change volume.
923-
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume (not in vlc).
923+
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume.
924924
{t_tag}| / |{tag} |*|Toggle title log / like a station.'''
925925
)),
926926

@@ -943,7 +943,7 @@ def set_text(self, parent, *args):
943943
Esc|, |{q} |*| Cancel.
944944
%Global functions
945945
{v_dn2}|/|{v_up1} or |{v_dn1}|/|{v_up2} |*| Change volume.
946-
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume (not in vlc).
946+
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume.
947947
{t_tag}| / |{tag} |*|Toggle title log / like a station.'''
948948
)),
949949

@@ -1459,7 +1459,7 @@ def set_text(self, parent, *args):
14591459
14601460
%Global functions
14611461
{v_dn2}|/|{v_up1} or |{v_dn1}|/|{v_up2} |*| Change volume.
1462-
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume (not in vlc).
1462+
{mute}| / |{s_vol} |*| |M|ute player / Save |v|olume.
14631463
{t_tag}| / |{tag} |*|Toggle title log / like a station.'''
14641464
)),
14651465

‎pyradio/player.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ def _do_save_volume(self, config_string):
733733
if logger.isEnabledFor(logging.DEBUG):
734734
logger.debug('Volume not saved!!! (config file not found!!!)')
735735
return 'Volume not saved!!!'
736-
ret_strings = ('Volume: already saved...',
736+
ret_strings = ('Volume: no initial value set...',
737737
'Volume: {}% saved',
738738
'Volume: {}% NOT saved (Error writing file)',
739739
'Volume: NOT saved!')

‎pyradio/radio.py

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3407,7 +3407,7 @@ def _show_config_player_help(self):
34073407
Esc|, |q|, |Left|, |h |*| Cancel.
34083408
%Global functions (with \ on Line editor)
34093409
-|/|+| or |,|/|. |*| Change volume.
3410-
m| / |v |*| |M|ute player / Save |v|olume (not in vlc).
3410+
m| / |v |*| |M|ute player / Save |v|olume.
34113411
W| / |w |*| Toggle title log / like a station.'''
34123412
else:
34133413
if self._player_select_win.from_config:
@@ -3423,7 +3423,7 @@ def _show_config_player_help(self):
34233423
Esc|, |q|, |Left|, |h |*| Cancel.
34243424
%Global functions (with \ on Line editor)
34253425
-|/|+| or |,|/|. |*| Change volume.
3426-
m| / |v |*| |M|ute player / Save |v|olume (not in vlc).
3426+
m| / |v |*| |M|ute player / Save |v|olume.
34273427
W| / |w |*| Toggle title log / like a station.'''
34283428
else:
34293429
txt = r'''Up|, |j|, |Down|, |k |*|
@@ -3434,7 +3434,7 @@ def _show_config_player_help(self):
34343434
Esc|, |q|, |Left|, |h |*| Cancel.
34353435
%Global functions (with \ on Line editor)
34363436
-|/|+| or |,|/|. |*| Change volume.
3437-
m| / |v |*| |M|ute player / Save |v|olume (not in vlc).
3437+
m| / |v |*| |M|ute player / Save |v|olume.
34383438
W| / |w |*| Toggle title log / like a station.'''
34393439
return 'Player Extra Parameters Help', txt
34403440

@@ -6862,7 +6862,7 @@ def keypress(self, char):
68626862
self._check_to_open_playlist()
68636863
return
68646864
'''
6865-
End of pen Register - char = y
6865+
End of open Register - char = y
68666866

68676867
'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
68686868

@@ -6890,25 +6890,29 @@ def keypress(self, char):
68906890
if self.player.isPlaying():
68916891
if self.player.playback_is_on:
68926892
if self.player.buffering:
6893-
self.log.write(msg_id=STATES.BUFF_MSG, msg='Player is buffering; cannot save volume...')
6893+
self.log.write(msg_id=STATES.BUFF_MSG, msg='Player is buffering; cannot save station volume...')
68946894
self.player.threadUpdateTitle()
68956895
else:
68966896
logger.error(f'{self.player.volume = }')
68976897
if self.player.volume == -1:
68986898
''' inform no change '''
68996899
if (logger.isEnabledFor(logging.DEBUG)):
69006900
logger.debug('Volume is -1. Aborting...')
6901-
ret_string = 'Volume: already saved...'
6901+
ret_string = 'Station Volume: no initial value set...'
69026902
elif self.player.volume == -2:
69036903
if (logger.isEnabledFor(logging.DEBUG)):
69046904
logger.debug('Error saving volume...')
6905-
ret_string = 'Volume: NOT saved!'
6905+
ret_string = 'Station Volume: NOT saved (Error writing file)'
69066906
else:
69076907
if (logger.isEnabledFor(logging.DEBUG)):
69086908
logger.debug('Volume is {}%. Saving...'.format(self.player.volume))
6909-
ret_string = 'Volume: {}% saved'.format(self.player.volume)
6910-
self.stations[self.selection][Station.volume] = self.player.volume
6911-
self._cnf.dirty_playlist = True
6909+
if self.stations[self.selection][Station.volume] != self.player.volume:
6910+
ret_string = 'Station Volume: {}% saved'.format(self.player.volume)
6911+
self.stations[self.selection][Station.volume] = self.player.volume
6912+
self._cnf.dirty_playlist = True
6913+
self.saveCurrentPlaylist(report_success=False)
6914+
else:
6915+
ret_string = 'Station Volume: already saved!'
69126916

69136917
self.log.write(msg_id=STATES.VOLUME, msg=ret_string)
69146918
self.player.threadUpdateTitle()

0 commit comments

Comments
 (0)