- Remote Control Client: hiding "retry: " responses; displaying "Command executed"

- Adding config parameter remove_station_icons, to remove downloaded files on program exit

Author: s-n-g

pyradio/client.py

@@ -106,24 +106,14 @@ def last_reply(self):
                     '(headless)' if self._type == 0 else ''
                     )
         if self._last_reply:
-            # out = None
-            # ss = self._last_reply.splitlines()
-            # for n in range(0, len(ss)):
-            #     if ss[n] == '':
-            #         out = ss[n+1:]
-            #         break
-            # if out:
-            #     if self._type == -1:
-            #         return '\n'.join(out)
-            #     else:
-            #         return server_id + '\n' +  '\n'.join(out)
-            return server_id + '\n' + self._last_reply if server_id else self._last_reply
-
+            if 'retry: ' in self._last_reply:
+                self._last_reply = 'Command executed\n'
+            return server_id + self._last_reply if server_id else self._last_reply
         # empty reply
         if self._type == -1:
-            return 'Command executed'
+            return 'Command executed\n'
         else:
-            return server_id + '\nCommand Executed'
+            return server_id + 'Command Executed\n'
 
     def _get_files(self):
         if self._files is None:

pyradio/config

@@ -78,6 +78,16 @@ enable_notifications = -1
 # Default value: True
 use_station_icon = True
 
+# Cached Station Icons Handling
+# If use_station_incon is True, stations' icons will be saved under the
+# DATA_DIR, in a folder called staions-logos.
+# If this option is True (the default), all files under this folder will be
+# deleted at program exit. Otherwise, all downloaded logos will remain in the
+# folder for future use.
+#
+# Default value: True
+remove_station_icons = True
+
 # Connection timeout
 # PyRadio will wait for this number of seconds to get a station/server message
 # indicating that playback has actually started. If this does not happen

pyradio/config.py

@@ -1289,6 +1289,7 @@ class PyRadioConfig(PyRadioStations):
     opts['enable_mouse'] = ['Enable mouse support: ', False]
     opts['enable_notifications'] = ['Enable notifications: ', '-1']
     opts['use_station_icon'] = ['    Use station icon: ', True]
+    opts['remove_station_icons'] = ['    Remove cached icons: ', True]
     opts['recording_dir'] = ['Recordings dir: ', '']
     opts['resource_opener'] = ['Resource Opener: ', 'auto']
     opts['conn_title'] = ['Connection Options: ', '']
@@ -1521,6 +1522,15 @@ def use_station_icon(self, val):
         self.opts['use_station_icon'][1] = val
         self.opts['dirty_config'][1] = True
 
+    @property
+    def remove_station_icons(self):
+        return self.opts['remove_station_icons'][1]
+
+    @remove_station_icons.setter
+    def remove_station_icons(self, val):
+        self.opts['remove_station_icons'][1] = val
+        self.opts['dirty_config'][1] = True
+
     @property
     def player(self):
         return self.opts['player'][1]
@@ -2094,15 +2104,16 @@ def re_read_config(self):
         self.create_stations_images_dir()
 
     def create_stations_images_dir(self, to_console=False):
-        if int(self.enable_notifications) >= 0:
+        if int(self.enable_notifications) >= 0 and \
+                self.use_station_icon and \
+                not sys.platform.startswith('win'):
             try:
                 makedirs(self.stations_images_dir, exist_ok = True)
             except:
                 if to_console:
                     print('[red]Error[/red]: Cannot create fir: "{}"\n'.format(self.stations_images_dir))
                     return False
-
-
+            # move old dir if necessary
             src_dir = path.join(
                     getenv(
                         'XDG_CONFIG_HOME',
@@ -2236,6 +2247,11 @@ def _read_config(self, distro_config=False):
                     self.opts['use_station_icon'][1] = False
                 else:
                     self.opts['use_station_icon'][1] = True
+            elif sp[0] == 'remove_station_icons':
+                if sp[1].lower() == 'false':
+                    self.opts['remove_station_icons'][1] = False
+                else:
+                    self.opts['remove_station_icons'][1] = True
             elif sp[0] == 'confirm_station_deletion':
                 if sp[1].lower() == 'false':
                     self.opts['confirm_station_deletion'][1] = False

pyradio/config_window.py

@@ -69,6 +69,7 @@ class PyRadioConfigWindow(object):
     _help_text.append(['If this options is enabled, the mouse can be used to scroll the playlist, start, stop and mute the player, adjust its volume etc.', '|', 'Mouse support is highly terminal dependent, that\'s why it is disabled by default.', '|', 'Default value: False'])
     _help_text.append(['If this options is enabled, a Desktop Notification will be displayed using the notification daemon / service.', '|', 'If enabled but no notification is displayed, please refer to', 'https://github.com/coderholic/pyradio/desktop-notification.md', '|', 'Valid values are:', '   -1: disabled ', '    0: enabled (no repetition) ', '    x: repeat every x seconds ', '|', 'Default value: -1'])
     _help_text.append(['Notice: Not applicable on Windows!', '|',  'Online Radio Directory Services (like RadioBrowser) will usually provide an icon for the stations they advertise.', '|', 'PyRadio can use this icon (provided that one exists and is of JPG or PNG format) while displaying Desktop Notifications.', '|', 'Setting this option to True, will enable the behavior above.', '|', 'If this option is False, the default icon will be used.', '|', 'Default value: True'])
+    _help_text.append(['Notice: Not applicable on Windows!', '|', 'If the previous option is enabled, Stations Icons will be cached.', '|', 'If this option is set to True, all icons will be deleted at program exit.', '|', 'If set to False, the icons will be available for future use.', '|', 'Default value: True'])
     _help_text.append([ 'This is the folder where recorded files will be saved', '|', 'Tip: When you open the window "h" will display HTML help about this parameter (not in Line Editor).', '|', 'Default value: "pyradio-recordings" in home dir' ])
     _help_text.append(['This is a Linux (et al) only parameter. It has no effect on Windows or MacOS.', '|',
                        'A Resource Opener is a program used to open files passed to it as arguments. PyRadio will use it to open either directories or HTML files.', '|',
@@ -985,7 +986,8 @@ def keypress(self, char):
                     sel == 'auto_save_playlist' or \
                     sel == 'force_http' or \
                     sel == 'remote_control_server_auto_start' or \
-                    sel == 'use_station_icon':
+                    sel == 'use_station_icon' or \
+                    sel == 'remove_station_icons':
                 self._config_options[sel][1] = not self._config_options[sel][1]
                 # # if sel == 'open_last_playlist':
                 # #     if self._config_options[sel][1]:

pyradio/radio.py

@@ -2091,6 +2091,7 @@ def ctrl_c_handler(self, signum, frame, save_playlist=True):
                 self._remote_control_server = None
         self.restore_colors()
         self._remove_station_images()
+        self._remove_icons()
 
     def _wait_for_threads(self):
         self.log._stop_desktop_notification_thread = True
@@ -2231,6 +2232,17 @@ def _remove_station_images(self):
                 except:
                     pass
 
+    def _remove_icons(self):
+        ''' remove the stations-logos directory '''
+        if int(self._cnf.enable_notifications) >= 0 and \
+                self._cnf.use_station_icon and \
+                self._cnf.remove_station_icons and \
+                not sys.platform.startswith('win'):
+            if self._cnf.stations_images_dir:
+                if path.exists(self._cnf.stations_images_dir):
+                    from shutil import rmtree
+                    rmtree(self._cnf.stations_images_dir, ignore_errors=True)
+
     def playSelection(self, restart=False):
         ''' start playback using current selection
             if restart = True, start the station that has
@@ -2475,7 +2487,6 @@ def _notification_icon(self, a_name):
             if logger.isEnabledFor(logging.DEBUG):
                 logger.debug('Notification image is invalid; reverting to default...')
 
-
     def _thread_download_station_image(
             self,
             url,
@@ -7017,6 +7028,8 @@ def keypress(self, char):
                                 if logger.isEnabledFor(logging.DEBUG):
                                     logger.debug('Asked to move recordings but source and target are the same\nsource: {0}\ntarget: {1}'.format(self._cnf.xdg._old_dirs[self._cnf.xdg.RECORDINGS], self._cnf.xdg._new_dirs[self._cnf.xdg.RECORDINGS]))
 
+                        self._cnf.create_stations_images_dir()
+
                     elif ret == 1:
                         ''' config not modified '''
                         self._show_notification_with_delay(