New station inserted to playlist

Author: s-n-g

pyradio/config.py

@@ -485,6 +485,7 @@ def insert_station(self, station, target):
             d.appendleft(station)
             d.rotate(target)
             self.stations = list(d)
+        self.dirty_playlist = True
         return True, self.number_of_stations
 
     def move_station(self, source, target):
@@ -512,6 +513,7 @@ def move_station(self, source, target):
         d.rotate(target)
         self.stations = list(d)
         self.number_of_stations = len(self.stations)
+        self.dirty_playlist = True
         return True
 
     def switch_stations(self, source, target):

pyradio/edit.py

@@ -439,7 +439,7 @@ def keypress(self, char):
                 elif self._focus == 3:
                     # ok
                     self._return_station()
-                    ret = -1
+                    ret = 1
                 elif self._focus == 4:
                     # cancel
                     self.new_station = None

pyradio/radio.py

@@ -1036,12 +1036,9 @@ def _format_playlist_line(self, lineNum, pad, station):
     def _print_help(self):
         #logger.error('DE \n\nself.ws.operation_mode = {}'.format(self.ws.operation_mode))
         if self.ws.operation_mode in self._display_help.keys():
-            #logger.error('DE in display help')
             self._display_help[self.ws.operation_mode]()
         else:
-            #logger.error('DE in redisplay')
             self._redisplay[self.ws.operation_mode]()
-        #logger.error('DE end _print_help')
 
     def _show_playlist_recovered(self):
         txt = 'Playlist recoverd!'
@@ -1098,7 +1095,6 @@ def _show_main_help(self):
         self._show_help(txt, mode_to_set=self.ws.MAIN_HELP_MODE)
 
     def _show_main_help_page_2(self):
-        logger.error('DE I am here: _show_main_help_page_2')
         txt = """a| / |A            |Add / append new station.
                  e                |Edit station.
                  E                |Change station's encoding.
@@ -2207,6 +2203,28 @@ def keypress(self, char):
                 self.ws.close_window()
                 self._station_editor = None
                 self.refreshBody()
+            elif ret == 1:
+                # ok
+                if self.ws.operation_mode == self.ws.EDIT_STATION_MODE:
+                    if self.stations[self.selection] != self._station_editor.new_station:
+                        self._cnf.dirty_playlist = True
+                    self.stations[self.selection] = self._station_editor.new_station
+                else:
+                    if self._station_editor.append:
+                        self.stations.append(self._station_editor.new_station)
+                        self.number_of_items = len(self.stations)
+                        self.selection = self.number_of_items - 1
+                        self.startPos = self.number_of_items - self.bodyMaxY + 2
+                    else:
+                        pass
+                        ret, self.number_of_items = self._cnf.insert_station(self._station_editor.new_station, self.selection + 1)
+                        self.stations = self._cnf.stations
+                        self.selection += 1
+                        if self.selection >= self.startPos + self.bodyMaxY - 2:
+                            self.startPos += 1
+
+                self.ws.close_window()
+                self.refreshBody()
             elif ret == 2:
                 # display line editor help
                 self._show_line_editor_help()
@@ -2809,7 +2827,7 @@ def keypress(self, char):
                 if char in ( ord('a'), ord('A') ):
                     self._station_editor = PyRadioEditor(self.stations, self.selection, self.bodyWin)
                     if char == ord('A'):
-                        self._station_editor.apend = True
+                        self._station_editor.append = True
                     self._station_editor.show()
                     self._station_editor.item = [ '', '', '' ]
                     self.ws.operation_mode = self.ws.ADD_STATION_MODE

pyradio/simple_curses_widgets.py

@@ -304,7 +304,7 @@ def keypress(self, win, char):
          returns:
             2: display help
             1: get next char
-            0: exit edit mode, string isvalid
+            0: exit edit mode, string is valid
            -1: cancel
         """
         word_delim = (' ', '-', '_', '+', '=',