fixing some things

Author: aw-was-here

nowplaying/config.py

@@ -236,6 +236,7 @@ def _defaults_chat_services(self, settings: QSettings) -> None:
     def _defaults_quirks(settings: QSettings) -> None:
         ''' default values for quirks '''
         settings.setValue('quirks/pollingobserver', False)
+        settings.setValue('quirks/pollinginterval', 5.0)
         settings.setValue('quirks/filesubst', False)
         settings.setValue('quirks/slashmode', 'nochange')
 

nowplaying/inputs/djuced.py

@@ -73,8 +73,9 @@ async def setup_watcher(self, configkey='djuced/directory'):
         self.event_handler.on_created = self._fs_event
 
         if self.config.cparser.value('quirks/pollingobserver', type=bool):
-            logging.debug('Using polling observer')
-            self.observer = PollingObserver(timeout=5)
+            polling_interval = self.config.cparser.value('quirks/pollinginterval', type=float)
+            logging.debug('Using polling observer with %s second interval', polling_interval)
+            self.observer = PollingObserver(timeout=polling_interval)
         else:
             logging.debug('Using fsevent observer')
             self.observer = Observer()

nowplaying/inputs/icecast.py

@@ -21,8 +21,6 @@
 #from nowplaying.exceptions import PluginVerifyError
 from nowplaying.inputs import InputPlugin
 
-METADATA = {}
-
 METADATALIST = ['artist', 'title', 'album', 'key', 'filename', 'bpm']
 
 PLAYLIST = ['name', 'filename']
@@ -31,9 +29,11 @@
 class IcecastProtocol(asyncio.Protocol):
     ''' a terrible implementation of the Icecast SOURCE protocol '''
 
-    def __init__(self):
+    def __init__(self, metadata_callback=None):
         self.streaming = False
         self.previous_page = b''
+        self.metadata_callback = metadata_callback
+        self._current_metadata = {}
 
     def connection_made(self, transport):
         ''' initial connection gives us a transport to use '''
@@ -89,29 +89,46 @@ def _parse_page(self, dataio):
                     self.previous_page = b''
             header_data = dataio.read(27)
 
-    @staticmethod
-    def _query_parse(data):
+    def _query_parse(self, data):
         ''' try to parse the query '''
-        global METADATA  # pylint: disable=global-statement
         logging.debug('Processing updinfo')
 
-        METADATA = {}
-        text = data.decode('utf-8').replace('GET ', 'http://localhost').split()[0]
-        url = urllib.parse.urlparse(text)
+        metadata = {}
+        try:
+            text = data.decode('utf-8').replace('GET ', 'http://localhost').split()[0]
+            url = urllib.parse.urlparse(text)
+        except UnicodeDecodeError:
+            logging.warning('Failed to decode icecast query data as UTF-8')
+            return
+        except (IndexError, ValueError) as error:
+            logging.warning('Failed to parse icecast query URL: %s', error)
+            return
         if url.path == '/admin/metadata':
-            query = urllib.parse.parse_qs(url.query)
+            query = urllib.parse.parse_qs(url.query, keep_blank_values=True)
             if query.get('mode') == ['updinfo']:
                 if query.get('artist'):
-                    METADATA['artist'] = query['artist'][0]
+                    metadata['artist'] = query['artist'][0]
                 if query.get('title'):
-                    METADATA['title'] = query['title'][0]
-                if query.get('song'):
-                    METADATA['title'], METADATA['artist'] = query['song'][0].split('-')
-
-    @staticmethod
-    def _parse_vorbis_comment(fh):  # pylint: disable=invalid-name
+                    metadata['title'] = query['title'][0]
+                if 'song' in query:
+                    song_text = query['song'][0].strip()
+                    if ' - ' not in song_text:
+                        # No separator found, treat entire string as title
+                        metadata['title'] = song_text
+                    else:
+                        # Split on first occurrence of ' - ' (with spaces)
+                        # This handles cases like "Artist - Song - Remix" correctly
+                        artist, title = song_text.split(' - ', 1)
+                        metadata['artist'] = artist.strip()
+                        metadata['title'] = title.strip()
+
+                # Update instance metadata and notify callback
+                self._current_metadata.update(metadata)
+                if self.metadata_callback:
+                    self.metadata_callback(self._current_metadata.copy())
+
+    def _parse_vorbis_comment(self, fh):  # pylint: disable=invalid-name
         ''' from tinytag, with slight modifications, pull out metadata '''
-        global METADATA  # pylint: disable=global-statement
         comment_type_to_attr_mapping = {
             'album': 'album',
             'albumartist': 'albumartist',
@@ -127,7 +144,7 @@ def _parse_vorbis_comment(fh):  # pylint: disable=invalid-name
         }
 
         logging.debug('Processing vorbis comment')
-        METADATA = {}
+        metadata = {}
 
         vendor_length = struct.unpack('I', fh.read(4))[0]
         fh.seek(vendor_length, os.SEEK_CUR)  # jump over vendor
@@ -141,7 +158,12 @@ def _parse_vorbis_comment(fh):  # pylint: disable=invalid-name
             if '=' in keyvalpair:
                 key, value = keyvalpair.split('=', 1)
                 if fieldname := comment_type_to_attr_mapping.get(key.lower()):
-                    METADATA[fieldname] = value
+                    metadata[fieldname] = value
+
+        # Update instance metadata and notify callback
+        self._current_metadata.update(metadata)
+        if self.metadata_callback:
+            self.metadata_callback(self._current_metadata.copy())
 
 
 class Plugin(InputPlugin):
@@ -154,6 +176,11 @@ def __init__(self, config=None, qsettings=None):
         self.server = None
         self.mode = None
         self.lastmetadata = {}
+        self._current_metadata = {}
+
+    def _metadata_callback(self, metadata):
+        ''' Callback to receive metadata from the protocol '''
+        self._current_metadata = metadata
 
     def install(self):
         ''' auto-install for Icecast '''
@@ -181,8 +208,8 @@ def desc_settingsui(self, qwidget):
 #### Data feed methods
 
     async def getplayingtrack(self):
-        ''' give back the metadata global '''
-        return METADATA
+        ''' give back the current metadata '''
+        return self._current_metadata
 
     async def getrandomtrack(self, playlist):
         return None
@@ -196,7 +223,10 @@ async def start_port(self, port):
         loop = asyncio.get_running_loop()
         logging.debug('Launching Icecast on %s', port)
         try:
-            self.server = await loop.create_server(IcecastProtocol, '', port)
+            # Create protocol factory that passes the metadata callback
+            def protocol_factory():
+                return IcecastProtocol(metadata_callback=self._metadata_callback)
+            self.server = await loop.create_server(protocol_factory, '', port)
         except Exception as error:  #pylint: disable=broad-except
             logging.error('Failed to launch icecast: %s', error)