Skip to content

Commit 2f32c35

Browse files
s-n-gs-n-g
committed
removing Remote Control Server old style requests
1 parent 725f36d commit 2f32c35

File tree

2 files changed

+32
-45
lines changed

2 files changed

+32
-45
lines changed

‎pyradio/radio.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9298,8 +9298,6 @@ def _restart_remote_control_server(self):
92989298
def _open_playlist_and_station_from_station_history(self, stationFile, h_item):
92999299
num = self._open_and_check_station_in_playlist(stationFile, h_item[-1], h_item[1])
93009300
if num == -1:
9301-
''' Continue going through history items '''
9302-
func()
93039301
return
93049302
self._set_rename_stations()
93059303
self._cnf.stations = list(self._reading_stations)

‎pyradio/server.py

Lines changed: 32 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -471,12 +471,6 @@ def __init__(self, bind_ip, bind_port, commands):
471471
self._bind_ip = sys_ip.IPs[1]
472472
self._bind_port = bind_port
473473
self._commands = commands
474-
self._html_data = {
475-
'|ALERT|': '',
476-
'|ALERT_TYPE|': '',
477-
'|CONTENT|': '',
478-
'|IP|': '{0}:{1}'.format(self._bind_ip, self._bind_port)
479-
}
480474

481475
@property
482476
def ip(self):
@@ -608,7 +602,7 @@ def _handle_client_connection(self, address, request):
608602
self._send_raw(received)
609603
else:
610604
self._commands['/log']()
611-
self._send_text(self._text['/log'], alert_type='alert-success')
605+
self._send_text(self._text['/log'])
612606
elif self._path in ('/like', '/l'):
613607
if self._is_html:
614608
received = self._commands['/html_like']()
@@ -617,7 +611,7 @@ def _handle_client_connection(self, address, request):
617611
else:
618612
if self.sel()[1] > -1:
619613
self._commands['/like']()
620-
self._send_text(self._text['/like'], alert_type='alert-success')
614+
self._send_text(self._text['/like'])
621615
else:
622616
self._send_text(self._text['/idle'])
623617
elif self._path in ('/mute', '/m'):
@@ -627,7 +621,7 @@ def _handle_client_connection(self, address, request):
627621
self._send_raw(received)
628622
else:
629623
if self.sel()[1] > -1:
630-
self._send_text('Player mute toggled!', alert_type='alert-success')
624+
self._send_text('Player mute toggled!')
631625
self._commands['/mute']()
632626
else:
633627
self._send_text(self._text['/idle'])
@@ -639,13 +633,13 @@ def _handle_client_connection(self, address, request):
639633
else:
640634
if self.sel()[1] > -1:
641635
if self.muted():
642-
self._send_text('Player is muted!', alert_type='alert-danger')
636+
self._send_text('Player is muted!')
643637
else:
644638
out = self._commands['/volumesave']()
645639
if out:
646-
self._send_text('Volume saved', alert_type='alert-success')
640+
self._send_text('Volume saved')
647641
else:
648-
self._send_text('Volume not saved', alert_type='alert-success')
642+
self._send_text('Volume not saved')
649643
else:
650644
self._send_text(self._text['/idle'])
651645
elif self._path in ('/volumeup', '/vu'):
@@ -656,10 +650,10 @@ def _handle_client_connection(self, address, request):
656650
else:
657651
if self.sel()[1] > -1:
658652
if self.muted():
659-
self._send_text('Player is muted!', alert_type='alert-danger')
653+
self._send_text('Player is muted!')
660654
else:
661655
self._commands['/volumeup']()
662-
self._send_text(self._text['/volumeup'], alert_type='alert-success')
656+
self._send_text(self._text['/volumeup'])
663657
else:
664658
self._send_text(self._text['/idle'])
665659
elif self._path in ('/volumedown', '/vd'):
@@ -670,21 +664,21 @@ def _handle_client_connection(self, address, request):
670664
else:
671665
if self.sel()[1] > -1:
672666
if self.muted():
673-
self._send_text('Player is muted!', alert_type='alert-danger')
667+
self._send_text('Player is muted!')
674668
else:
675669
self._commands['/volumedown']()
676-
self._send_text(self._text['/volumedown'], alert_type='alert-success')
670+
self._send_text(self._text['/volumedown'])
677671
else:
678672
self._send_text(self._text['/idle'])
679673
elif self._path == '/quit':
680674
if not self._is_html:
681675
self._send_text(self._text['/quit'])
682676
elif self._path in ('', '/'):
683677
if self._is_html:
684-
self._send_text('', alert_type='')
678+
self._send_text('')
685679
self.send_song_title(self.song_title())
686680
else:
687-
self._send_text(self._text['/'], alert_type='')
681+
self._send_text(self._text['/'])
688682
elif self._path in ('/i', '/info'):
689683
if self._is_html:
690684
received = self._commands['/html_info']()
@@ -702,7 +696,7 @@ def _handle_client_connection(self, address, request):
702696
self._send_raw(received)
703697
else:
704698
if self.can_send_command():
705-
self._send_text(self._text['/next'], alert_type='alert-success')
699+
self._send_text(self._text['/next'])
706700
self._commands['/next']()
707701
else:
708702
self._send_text(self._text['/perm'])
@@ -713,7 +707,7 @@ def _handle_client_connection(self, address, request):
713707
self._send_raw(received)
714708
else:
715709
if self.can_send_command():
716-
self._send_text(self._text['/previous'], alert_type='alert-success')
710+
self._send_text(self._text['/previous'])
717711
self._commands['/previous']()
718712
else:
719713
self._send_text(self._text['/perm'])
@@ -728,11 +722,11 @@ def _handle_client_connection(self, address, request):
728722
llen = len(self.config().stations_history.items)
729723
l_item = self.config().stations_history.item
730724
if l_item == -1 or llen == 0:
731-
self._send_text('No items in history!', alert_type='alert-danger')
725+
self._send_text('No items in history!')
732726
elif l_item + 1 < llen:
733727
go_on = True
734728
if go_on:
735-
self._send_text(self._text['/histnext'], alert_type='alert-success')
729+
self._send_text(self._text['/histnext'])
736730
self._commands['/histnext']()
737731
else:
738732
self._send_text('Already at last history item!')
@@ -749,7 +743,7 @@ def _handle_client_connection(self, address, request):
749743
llen = len(self.config().stations_history.items)
750744
l_item = self.config().stations_history.item
751745
if l_item == -1 or llen == 0:
752-
self._send_text('No items in history!', alert_type='alert-danger')
746+
self._send_text('No items in history!')
753747
go_on = False
754748
elif l_item == 0:
755749
go_on = False
@@ -773,10 +767,10 @@ def _handle_client_connection(self, address, request):
773767
else:
774768
if self.can_send_command():
775769
if self.sel()[1] > -1:
776-
self._send_text(self._text['/stop'], alert_type='alert-success')
770+
self._send_text(self._text['/stop'])
777771
self._commands['/stop']()
778772
else:
779-
self._send_text(self._text['/start'], alert_type='alert-success')
773+
self._send_text(self._text['/start'])
780774
self._commands['/start']()
781775
else:
782776
self._send_text(self._text['/perm'])
@@ -785,7 +779,7 @@ def _handle_client_connection(self, address, request):
785779
if self.can_send_command():
786780
ret = self._parse()
787781
if ret is None:
788-
self._send_text(self._text['/error'], alert_type='alert-danger')
782+
self._send_text(self._text['/error'])
789783
else:
790784
has_error = False
791785
if ret == '/stations':
@@ -802,7 +796,7 @@ def _handle_client_connection(self, address, request):
802796
try:
803797
ret = int(ret)
804798
except (ValueError, TypeError):
805-
self._send_text(self._text['/error'], alert_type='alert-danger')
799+
self._send_text(self._text['/error'])
806800
has_error = True
807801
if not has_error:
808802
# ret = ret -1 if ret > 0 else 0
@@ -836,12 +830,12 @@ def _handle_client_connection(self, address, request):
836830
self._send_text(self._text['/error'], alert-danger)
837831
else:
838832
if sp[1] not in ('playlists', 'pl'):
839-
self._send_text(self._text['/error'], alert_type='alert-danger')
833+
self._send_text(self._text['/error'])
840834
else:
841835
# get the numbers
842836
pl, st = self._get_numbers(sp[-1])
843837
if pl is None:
844-
self._send_text(self._text['/error'], alert_type='alert-danger')
838+
self._send_text(self._text['/error'])
845839
else:
846840
go_on = True
847841
try:
@@ -925,7 +919,7 @@ def _handle_client_connection(self, address, request):
925919
else:
926920
ret = self._parse()
927921
if ret is None:
928-
self._send_text(self._text['/error'], alert_type='alert-danger')
922+
self._send_text(self._text['/error'])
929923
elif ret.startswith('/'):
930924
if ret == '/stations':
931925
if self._is_html:
@@ -956,12 +950,12 @@ def _handle_client_connection(self, address, request):
956950
ret = int(ret) - 1
957951
except (ValueError, TypeError):
958952
go_on = False
959-
self._send_text(self._text['/error'], alert_type='alert-danger')
953+
self._send_text(self._text['/error'])
960954
if go_on:
961955
try:
962956
playlist_name = self.lists()[2][-1][ret][0]
963957
except IndexError:
964-
self._send_text('Error: Playlist not found (id={})'.format(ret+1), alert_type='alert-danger')
958+
self._send_text('Error: Playlist not found (id={})'.format(ret+1))
965959
go_on = False
966960
if go_on:
967961
in_file, out = self.config().read_playlist_for_server(
@@ -982,11 +976,11 @@ def _handle_client_connection(self, address, request):
982976
)
983977
else:
984978
if self._is_html:
985-
self._send_text('Error reading playlist: <b>{}</b>'.format(playlist_name), alert_type='alert-danger')
979+
self._send_raw('<div class="alert txt-center alert-danger">Error reading playlist: <b>{}</b></div>'.format(playlist_name))
986980
else:
987-
self._send_text('Error reading playlist: "{}"'.format(playlist_name), alert_type='alert-danger')
981+
self._send_text('Error reading playlist: "{}"'.format(playlist_name))
988982
else:
989-
self._send_text(self._text['/error'], alert_type='alert-danger')
983+
self._send_text(self._text['/error'])
990984

991985
return True
992986

@@ -1050,16 +1044,13 @@ def _send_raw(self, msg):
10501044
except socket.error as e:
10511045
self.error = e
10521046

1053-
def _send_text(self,
1054-
msg, alert_type='alert-info',
1055-
content='', put_script=False
1047+
def _send_text(
1048+
self, msg,
1049+
put_script=False
10561050
):
10571051
if msg.startswith('retry: '):
10581052
return
10591053
if self._is_html:
1060-
self._html_data['|ALERT|'] = msg
1061-
self._html_data['|ALERT_TYPE|'] = alert_type
1062-
self._html_data['|CONTENT|'] = content
10631054
self._send_html(put_script=put_script)
10641055
return
10651056
f_msg = msg + '\n'
@@ -1089,8 +1080,6 @@ def _send_text(self,
10891080

10901081
def _send_html(self, msg=None, put_script=False):
10911082
f_msg = self._html + '\n'
1092-
for n in self._html_data.keys():
1093-
f_msg = f_msg.replace(n, self._html_data[n])
10941083
if put_script:
10951084
f_msg = self._insert_html_script(f_msg)
10961085
if PY2:

0 commit comments

Comments
 (0)