stations icons are now being cached in the DATA_DIR, folder

stations-logos

Author: s-n-g

pyradio/client.py

@@ -157,7 +157,6 @@ def _get_files(self):
                         path.join(state_dir, 'server-headless.txt'),
                         path.join(state_dir, 'server.txt')
                         )
-            print(f'{self._files}')
 
     def print_addresses(self):
         self._get_files()

pyradio/config.py

@@ -1380,6 +1380,8 @@ class PyRadioConfig(PyRadioStations):
 
     need_to_fix_desktop_file_icon = False
 
+    notification_image_file = None
+
     def __init__(self, user_config_dir=None, headless=False):
         # keep old recording / new recording dir
         self.rec_dirs = ()
@@ -2089,6 +2091,50 @@ def read_config(self, distro_config=False):
     def re_read_config(self):
         self._read_config()
         self.xdg.ensure_paths_exist()
+        self.create_stations_images_dir()
+
+    def create_stations_images_dir(self, to_console=False):
+        if int(self.enable_notifications) >= 0:
+            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
+
+
+            src_dir = path.join(
+                    getenv(
+                        'XDG_CONFIG_HOME',
+                        path.join(path.expanduser('~'), '.config')),
+                    'pyradio', 'data', 'stations-logos'
+                    )
+            if path.exists(src_dir) and \
+                    src_dir != self.stations_images_dir:
+                try:
+                    # Copy files, remove directories is source
+                    for item in listdir(src_dir):
+                        src_path = path.join(src_dir, item)
+                        dst_path = path.join(self.stations_images_dir, item)
+                        if path.isfile(src_path):
+                            copyfile(src_path, dst_path)
+                        elif path.isdir(src_path):
+                            remove_tree(src_path)  # Remove directory instead of copying it
+
+                    # Check if any directories were left after removing them in the first loop
+                    for item in listdir(src_dir):
+                        src_path = path.join(src_dir, item)
+                        if path.isfile(src_path):
+                            remove(src_path)
+                        elif path.isdir(src_path):
+                            remove_tree(src_path)
+
+                    # Remove the source directory itself
+                    remove_tree(src_dir)
+                except Exception as e:
+                    # If an error occurs, we do not care :)
+                    pass
+        return True
 
     def _read_config(self, distro_config=False):
         xdg_compliant_read_from_file = False
@@ -2368,6 +2414,8 @@ def _read_config(self, distro_config=False):
                 print('[magenta]XDG Dirs[/magenta] found; enabling [magenta]XDG Base compliant[/magenta] operation')
                 self.xdg_compliant = True
                 self.need_to_fix_desktop_file_icon = True
+        ''' do this here to get XDG state '''
+        self.stations_images_dir = path.join(self.data_dir, 'stations-logos')
 
     def _make_sure_dirs_exist(self):
         if self.opts['recording_dir'][1] == '':

pyradio/log.py

@@ -88,7 +88,9 @@ def __init__(self, config, get_web_song_title):
         self.width = None
         self._get_startup_window_title()
         self._enable_notifications = int(self._cnf.enable_notifications)
-        self._repeat_notification = RepeatDesktopNotification(lambda: self._enable_notifications)
+        self._repeat_notification = RepeatDesktopNotification(
+                self._cnf, lambda: self._enable_notifications
+                )
         self._get_icon_path()
 
     def __del__(self):
@@ -372,7 +374,7 @@ def _set_web_title(self, msg):
 
 
     def _get_icon_path(self):
-        self.icon_path = None
+        self.icon_path = self._cnf.notification_image_file
         if self.icon_path is None:
             if platform_system().lower().startswith('win'):
                 the_path = (
@@ -422,6 +424,7 @@ def _show_notification(self, msg):
                 self._desktop_notification_thread = None
                 return
 
+            self._get_icon_path()
             if platform.lower().startswith('win'):
                 if HAS_WIN10TOAST:
                     d_title, d_msg = self._get_desktop_notification_data(msg)
@@ -727,7 +730,8 @@ def set_win_title(msg=None):
 
 class RepeatDesktopNotification(object):
 
-    def __init__(self, timeout):
+    def __init__(self, config, timeout):
+        self._cnf = config
         self._a_lock = self._start_time = None
         self.timeout = timeout
 
@@ -835,16 +839,17 @@ def _populate_notification_command(self, a_notification_command, d_title, d_msg)
             if 'MSG' in notification_command[i]:
                 notification_command[i] = notification_command[i].replace('MSG', d_msg)
             if 'ICON' in notification_command[i]:
-                if platform.lower().startswith('win'):
-                    icon = self.icon_path
-                else:
-                    temp_dir = gettempdir()
-                    ic = (
-                        join(temp_dir, 'station.jpg'),
-                        join(temp_dir, 'station.png'),
-                        self.icon_path
-                    )
-                    icon = [x for x in ic if exists(x)][0]
+                # if platform.lower().startswith('win'):
+                #     icon = self.icon_path
+                # else:
+                #     ic = (
+                #         join(self._cnf.stations_images_dir, 'station.jpg'),
+                #         join(self._cnf.stations_images_dir, 'station.png'),
+                #         self.icon_path
+                #     )
+                #     logger.error('\n\nic\n{}\n'.format(ic))
+                #     icon = [x for x in ic if exists(x)][0]
+                icon = self.icon_path
                 notification_command[i] = notification_command[i].replace('ICON', icon)
         return notification_command
 

pyradio/main.py

@@ -394,6 +394,8 @@ def shell():
 
     with pyradio_config_file(user_config_dir, args.headless) as pyradio_config:
         read_config(pyradio_config)
+        if not pyradio_config.create_stations_images_dir(True):
+            return
 
         if not system().lower().startswith('darwin') and \
                 not system().lower().startswith('win'):

pyradio/radio.py

@@ -425,9 +425,9 @@ def __init__(self, pyradio_config,
                  record=False):
         temp_dir = gettempdir()
         self._station_images = (
-            join(temp_dir, 'station.jpg'),
-            join(temp_dir, 'station.png'),
-            join(temp_dir, 'station-icon.raw'),
+            join(pyradio_config.stations_images_dir, 'station.jpg'),
+            join(pyradio_config.stations_images_dir, 'station.png'),
+            join(pyradio_config.stations_images_dir, 'station-icon.raw'),
         )
         self._message_system_default_operation_mode = self.ws.MESSAGING_MODE
         self._request_recording = record
@@ -2256,6 +2256,7 @@ def playSelection(self, restart=False):
             self.playing = self._last_played_station_id
         else:
             self._remove_station_images()
+            self._cnf.notification_image_file = None
             if self._cnf.enable_notifications and \
                     self._cnf.use_station_icon and \
                     not platform.startswith('win'):
@@ -2265,6 +2266,7 @@ def playSelection(self, restart=False):
                     self.log.write(msg='Downloading icon...')
                     self._download_station_image(
                         self.stations[self.selection][3]['image'],
+                        self.stations[self.selection][0],
                         lambda: self.stop_update_notification_thread
                     )
             # if self._cnf.browsing_station_service:
@@ -2458,18 +2460,39 @@ def _show_player_is_stopped(self, from_update_thread=False):
             help_msg=True, suffix=self._status_suffix, counter=''
         )
 
-    def _download_station_image(self, url, stop):
+    def _download_station_image(self, url, station_name, stop):
         threading.Thread(
             target=self._thread_download_station_image,
-            args=(url, stop),
+            args=(url, station_name, self._notification_icon, stop),
         ).start()
 
-    def _thread_download_station_image(self, url, stop):
+    def _notification_icon(self, a_name):
+        if path.exists(a_name):
+            self._cnf.notification_image_file = a_name
+            if logger.isEnabledFor(logging.DEBUG):
+                logger.debug('Notification image: "{}"'.format(self._cnf.notification_image_file))
+        else:
+            if logger.isEnabledFor(logging.DEBUG):
+                logger.debug('Notification image is invalid; reverting to default...')
+
+
+    def _thread_download_station_image(
+            self,
+            url,
+            station_name,
+            update_icon_name_function,
+            stop
+            ):
         if url:
             if logger.isEnabledFor(logging.DEBUG):
                 logger.debug('+++ downloading icon...')
-                logger.error('\n\n{}\n\n'.format(self._station_images))
-            file_to_write = self._station_images[0] if url.endswith('.jpg') else self._station_images[1]
+            template_image = self._station_images[0] if url.endswith('.jpg') else self._station_images[1]
+            file_to_write = template_image.replace('station.', station_name.replace(' ', '_') + '.')
+            if path.exists(file_to_write):
+                if logger.isEnabledFor(logging.DEBUG):
+                    logger.debug('+++ icon download: aleready downloaded...')
+                update_icon_name_function(file_to_write)
+                return
             if stop():
                 if logger.isEnabledFor(logging.DEBUG):
                     logger.debug('+++ icon download: asked to stop. Stopping...')
@@ -2503,6 +2526,7 @@ def _thread_download_station_image(self, url, stop):
                     self._remove_station_images()
                 if logger.isEnabledFor(logging.DEBUG):
                     logger.debug('+++ icon downloaded...')
+                update_icon_name_function(file_to_write)
             else:
                 if logger.isEnabledFor(logging.DEBUG):
                     logger.debug('+++ icon downloaded, but already exists...')