- removing HTML from server response for stations list text request

- fixing #249 - Cannot type # in radio station name
- working on scheduler (n/a)

Author: s-n-g

pyradio/config_window.py

@@ -3179,8 +3179,16 @@ class PyRadioSelectStation(PyRadioSelectPlaylist):
 
     _default_playlist = ''
 
-    def __init__(self, parent, config_path, registers_dir, default_playlist, default_station,
-                 global_functions=None, is_from_schedule=False):
+    def __init__(
+            self,
+            parent,
+            config_path,
+            registers_dir,
+            default_playlist,
+            default_station,
+            global_functions=None,
+            is_from_schedule=False
+        ):
         self._default_playlist = default_playlist
         self._orig_default_playlist = default_playlist
         if logger.isEnabledFor(logging.INFO):

pyradio/messages_system.py

@@ -73,6 +73,7 @@ class PyRadioMessagesSystem(object):
             'M_SCHEDULE_INFO',
             'M_SCHEDULE_ERROR',
             'M_REC_IS_ON_NO_DIR_HEADLESS',
+            'M_SCHEDULE_INFO',
             )
 
     _two_arg_list = (

pyradio/radio.py

@@ -732,6 +732,7 @@ def __init__(self, pyradio_config,
             curses.KEY_PREVIOUS: self._play_previous_station,
             curses.ascii.SO: self._play_next_station,
             curses.KEY_NEXT: self._play_next_station,
+            ord('#'): self._resize_with_number_sign,
             # ord('d'): self._html_song_title,
             # ord('b'): self._show_schedule_editor,
         }
@@ -6012,20 +6013,6 @@ def keypress(self, char):
                     callback_function=self.refreshBody)
             return
 
-        # if char == ord('1'):
-        #     logger.error('self._cnf.recording_dir = "/home/spiros/pyradio-mkvs"')
-        #     self._cnf.recording_dir = '/home/spiros/home-at-homepc/00000'
-        #     return
-
-        if char in (ord('#'), curses.KEY_RESIZE):
-            self._i_am_resizing = True
-            self._normal_mode_resize()
-            if not self._limited_width_mode:
-                if not self._limited_height_mode:
-                    self._do_display_notify()
-            self._i_am_resizing = False
-            return
-
         if self.ws.operation_mode == self.ws.MESSAGING_MODE:
             ret = self._messaging_win.keypress(char)
             if ret:
@@ -6780,10 +6767,11 @@ def keypress(self, char):
                 self.ws.operation_mode = self.ws.SCHEDULE_STATION_SELECT_MODE
                 if self._schedule_station_select_win is None:
                     self._schedule_station_select_win = PyRadioSelectStation(
-                        self.bodyWin,
-                        self._cnf.stations_dir,
-                        self._simple_schedule.playlist,
-                        self._simple_schedule.station,
+                        parent=self.bodyWin,
+                        config_path=self._cnf.stations_dir,
+                        registers_dir=self._cnf.registers_dir,
+                        default_playlist=self._simple_schedule.playlist,
+                        default_station=self._simple_schedule.station,
                         is_from_schedule=True,
                         global_functions=self._global_functions
                     )
@@ -9094,6 +9082,15 @@ def keypress(self, char):
                 # else:
                 #     self._update_status_bar_right(status_suffix='')
 
+    def _resize_with_number_sign(self):
+        logger.error('\n\nresize with number sign\n\n')
+        self._i_am_resizing = True
+        self._normal_mode_resize()
+        if not self._limited_width_mode:
+            if not self._limited_height_mode:
+                self._do_display_notify()
+        self._i_am_resizing = False
+
     def _jump_and_play_selection(self, jumpnr=None):
         self._jump_to_jumpnr('', jumpnr)
         self.playSelection()

pyradio/schedule.py

@@ -232,9 +232,9 @@ def get_repeating_dates(self, in_date, count=-1):
             if in_date[-4] == 'day':
                 ll = list(rrule(DAILY, count=count, dtstart=start_date))
             elif in_date[-4] == 'week':
-                ll = list(rrule(WEEKLY, dtstart=in_date[0], count=count))
+                ll = list(rrule(WEEKLY, dtstart=in_date[1], count=count))
             elif in_date[-4] == 'month':
-                ll = list(rrule(MONTHLY, dtstart=in_date[0], count=count))
+                ll = list(rrule(MONTHLY, dtstart=in_date[1], count=count))
             elif in_date[-4] in days.keys():
                 ll = list(rrule(WEEKLY, count=count, wkst=SU, byweekday=(days[in_date[-4]],), dtstart=start_date))
 

pyradio/server.py

@@ -1775,7 +1775,7 @@ def _handle_client_connection(self, address, request):
                                         )
                                     else:
                                         self._send_text(
-                                            self._list_stations(playlist_name, out)
+                                            self._list_stations(playlist_name, out).replace(r'<b>', '').replace(r'</b>', '')
                                         )
                                 else:
                                     if self._is_html:
@@ -1979,7 +1979,7 @@ def _list_stations(
                     else:
                         out.append(n[0])
                 else:
-                    out.append(n[0])
+                        out.append(n[0])
             p_name = basename(self.playlist_in_editor()[:-4])
         else:
             out = stations