fixes

Author: aw-was-here

docs/input/remote.md

@@ -7,8 +7,8 @@ might even be more than on DJ on different computers swapping back and
 forth!
 
 **What's Now Playing** supports a configuration where each setup has
-their own app configuration running.  One or more installation on
-DJ computers sending the track information to a central one.  That
+their own app configuration running.  One or more installations on
+DJ computers send the track information to a central one.  That
 central one will then perform any additional lookups and send the
 output to anything configured such as Twitch.
 

nowplaying/inputs/icecast.py

@@ -10,12 +10,14 @@
 import struct
 import urllib.parse
 from collections.abc import Callable
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     import nowplaying.config
+    from PySide6.QtCore import QSettings
     from PySide6.QtWidgets import QWidget
 
+
 logging.config.dictConfig({
     'version': 1,
     'disable_existing_loggers': True,
@@ -222,19 +224,19 @@ def install(self) -> bool:
 
 #### Settings UI methods
 
-    def defaults(self, qsettings: Any) -> None:
+    def defaults(self, qsettings: "QSettings") -> None:
         ''' (re-)set the default configuration values for this plugin '''
         qsettings.setValue('icecast/port', '8000')
 
-    def load_settingsui(self, qwidget: Any) -> None:
+    def load_settingsui(self, qwidget: "QWidget") -> None:
         ''' load values from config and populate page '''
         qwidget.port_lineedit.setText(self.config.cparser.value('icecast/port'))  # type: ignore
 
-    def save_settingsui(self, qwidget: Any) -> None:
+    def save_settingsui(self, qwidget: "QWidget") -> None:
         ''' take the settings page and save it '''
         self.config.cparser.setValue('icecast/port', qwidget.port_lineedit.text())  # type: ignore
 
-    def desc_settingsui(self, qwidget: Any) -> None:
+    def desc_settingsui(self, qwidget: "QWidget") -> None:
         ''' provide a description for the plugins page '''
         qwidget.setText('Icecast is a streaming broadcast protocol.'
                         '  This setting should be used for butt, MIXXX, and many others.')

nowplaying/inputs/jriver.py

@@ -17,6 +17,7 @@
 
 if TYPE_CHECKING:
     import nowplaying.config
+    from PySide6.QtCore import QSettings
     from PySide6.QtWidgets import QWidget
 
 
@@ -361,7 +362,7 @@ async def stop(self) -> None:
         self._connection_failed = False
         self._last_error_log_time = 0  # Reset logging timer
 
-    def defaults(self, qsettings: "QWidget") -> None:
+    def defaults(self, qsettings: "QSettings") -> None:
         qsettings.setValue('jriver/host', None)
         qsettings.setValue('jriver/port', '52199')
         qsettings.setValue('jriver/username', None)

nowplaying/inputs/mpris2.py

@@ -14,7 +14,7 @@
 import pathlib
 import sys
 import urllib
-import urllib.request
+import urllib.parse
 
 try:
     from dbus_fast.aio import MessageBus

nowplaying/inputs/remote.py

@@ -14,7 +14,7 @@
 
 if TYPE_CHECKING:
     import nowplaying.config
-
+    from PySide6.QtCore import QSettings
 
 class Plugin(InputPlugin):  # pylint: disable=too-many-instance-attributes
     ''' handler for NowPlaying '''
@@ -24,7 +24,9 @@ def __init__(self,
                  qsettings: QWidget | None = None):
         super().__init__(config=config, qsettings=qsettings)
         self.displayname = "Remote"
-        self.remotedbfile: str = config.cparser.value('remote/remotedb', type=str)
+        self.remotedbfile = pathlib.Path(
+                QStandardPaths.standardLocations(
+                    QStandardPaths.CacheLocation)[0]).joinpath('remotedb').joinpath("remote.db")
         self.remotedb: nowplaying.db.MetadataDB | None = None
         self.mixmode = "newest"
         self.event_handler = None
@@ -40,21 +42,16 @@ def _reset_meta(self):
         ''' reset the metadata '''
         self.metadata = {'artist': None, 'title': None, 'filename': None}
 
-    def defaults(self, qsettings: QWidget) -> None:
-        dbfile: pathlib.Path = pathlib.Path(
-                QStandardPaths.standardLocations(
-                    QStandardPaths.CacheLocation)[0]).joinpath('remotedb').joinpath("remote.db")
-        self.config.cparser.setValue('remote/remotedb', str(dbfile))
-
     async def setup_watcher(self):
         ''' set up a custom watch on the m3u dir so meta info
             can update on change'''
 
         if self.observer:
             return
 
+        self.remotedbfile.unlink(missing_ok=True)
         logging.info("Opening %s for input", self.remotedbfile)
-        self.observer = nowplaying.db.DBWatcher(databasefile=self.remotedbfile)
+        self.observer = nowplaying.db.DBWatcher(databasefile=str(self.remotedbfile))
         self.observer.start(customhandler=self._read_track)
 
     def _read_track(self, event):
@@ -76,7 +73,7 @@ def _read_track(self, event):
     async def start(self):
         ''' setup the watcher to run in a separate thread '''
         await self.setup_watcher()
-        self.remotedb = nowplaying.db.MetadataDB(databasefile=self.remotedbfile)
+        self.remotedb = nowplaying.db.MetadataDB(databasefile=str(self.remotedbfile))
 
     async def getplayingtrack(self):
         ''' wrapper to call getplayingtrack '''
@@ -95,20 +92,20 @@ async def stop(self):
     def on_m3u_dir_button(self):
         ''' filename button clicked action'''
 
-    def connect_settingsui(self, qwidget, uihelp):
+    def connect_settingsui(self, qwidget: "QWidget", uihelp):
         ''' connect m3u button to filename picker'''
         self.qwidget = qwidget
         self.uihelp = uihelp
 
-    def load_settingsui(self, qwidget):
+    def load_settingsui(self, qwidget: "QWidget"):
         ''' draw the plugin's settings page '''
 
-    def verify_settingsui(self, qwidget):
+    def verify_settingsui(self, qwidget: "QWidget"):
         ''' no verification to do '''
 
-    def save_settingsui(self, qwidget):
+    def save_settingsui(self, qwidget: "QWidget"):
         ''' take the settings page and save it '''
 
-    def desc_settingsui(self, qwidget):
+    def desc_settingsui(self, qwidget: "QWidget"):
         ''' description '''
         qwidget.setText('Remote gets input from one or more other WNP setups.')

nowplaying/plugin.py

@@ -8,7 +8,7 @@
 
 if TYPE_CHECKING:
     import nowplaying.config
-
+    from PySide6.QtCore import QSettings # pylint: disable=no-name-in-module
 
 class WNPBasePlugin:
     ''' base class of plugins '''
@@ -34,7 +34,7 @@ def __init__(self,
 
 #### Settings UI methods
 
-    def defaults(self, qsettings: QWidget) -> None:
+    def defaults(self, qsettings: "QSettings") -> None:
         ''' (re-)set the default configuration values for this plugin '''
 
     def connect_settingsui(self, qwidget: QWidget, uihelp: object) -> None:

nowplaying/processes/trackpoll.py

@@ -423,28 +423,32 @@ async def _write_to_remote(self) -> None:
         except Exception:  # pylint: disable=broad-except
             logging.exception('Failed to write debug JSON: %s')
 
-        async with aiohttp.ClientSession() as session:
-            async with session.post(f'http://{server}:{port}/v1/remoteinput',
-                                    json=remote_data) as response:
-                logging.debug("Sending to %s:%s", server, port)
-                if response.status == 200:
-                    try:
-                        result = await response.json()
-                        dbid = result.get('dbid')
-                        logging.debug('Remote server accepted track update, dbid: %s', dbid)
-                    except Exception as exc:  # pylint: disable=broad-except
-                        logging.warning('Failed to parse remote server response: %s', exc)
-                elif response.status == 403:
-                    logging.error('Remote server authentication failed - check remote secret')
-                elif response.status == 405:
-                    logging.error('Remote server method not allowed - check endpoint')
-                else:
-                    try:
-                        error_data = await response.json()
-                        error_msg = error_data.get('error', 'Unknown error')
-                        logging.error('Remote server returned %s: %s', response.status, error_msg)
-                    except Exception:  # pylint: disable=broad-except
-                        logging.error('Remote server returned %s', response.status)
+        try:
+            async with aiohttp.ClientSession() as session:
+                async with session.post(f'http://{server}:{port}/v1/remoteinput',
+                                        json=remote_data) as response:
+                    logging.debug("Sending to %s:%s", server, port)
+                    if response.status == 200:
+                        try:
+                            result = await response.json()
+                            dbid = result.get('dbid')
+                            logging.debug('Remote server accepted track update, dbid: %s', dbid)
+                        except Exception as exc:  # pylint: disable=broad-except
+                            logging.warning('Failed to parse remote server response: %s', exc)
+                    elif response.status == 403:
+                        logging.error('Remote server authentication failed - check remote secret')
+                    elif response.status == 405:
+                        logging.error('Remote server method not allowed - check endpoint')
+                    else:
+                        try:
+                            error_data = await response.json()
+                            error_msg = error_data.get('error', 'Unknown error')
+                            logging.error('Remote server returned %s: %s', response.status, error_msg)
+                        except Exception:  # pylint: disable=broad-except
+                            logging.error('Remote server returned %s', response.status)
+
+        except Exception as exc:  # pylint: disable=broad-except
+            logging.exception('aiohttp setup failed: %s', exc)
 
     async def _half_delay_write(self):
         try:

nowplaying/remote_settings.py

@@ -12,7 +12,7 @@
     import nowplaying.config
 
 
-class BeamSettings:
+class RemoteSettings:
     """Handles beam/remote output settings UI."""
 
     def __init__(self):
@@ -77,9 +77,7 @@ def save_settings(self):
         self.config.cparser.setValue('remote/enabled', enabled)
 
         # Save server
-        server = self.widget.server_lineedit.text().strip()
-        if not server:
-            server = 'localhost'
+        server = self.widget.server_lineedit.text().strip() or 'localhost'
         self.config.cparser.setValue('remote/remote_server', server)
 
         # Save port
@@ -101,7 +99,6 @@ def save_settings(self):
     def verify(widget: 'QWidget') -> bool:
         """Verify beam settings."""
         # Basic validation - could be extended later
-        if widget.enable_checkbox.isChecked():
-            if not widget.server_lineedit.text().strip():
-                raise PluginVerifyError("Server field is required when beam output is enabled")
+        if widget.enable_checkbox.isChecked() and not widget.server_lineedit.text().strip():
+            raise PluginVerifyError("Server field is required when beam output is enabled")
         return True

nowplaying/settingsui.py

@@ -58,7 +58,7 @@ def __init__(self, tray: "nowplaying.tray.Tray"):
             'kick': nowplaying.kick.settings.KickSettings(),
             'kickchat': nowplaying.kick.settings.KickChatSettings(),
             'requests': nowplaying.trackrequests.RequestSettings(),
-            'remote': nowplaying.remote_settings.BeamSettings(),
+            'remote': nowplaying.remote_settings.RemoteSettings(),
         }
 
         self.uihelp = None

tests-qt/test_systemtray.py

@@ -8,7 +8,6 @@
 import pytest
 from PySide6.QtGui import QAction, QActionGroup, QIcon  # pylint: disable=import-error, no-name-in-module
 from PySide6.QtWidgets import QMenu, QSystemTrayIcon  # pylint: disable=import-error, no-name-in-module
-from PySide6.QtCore import QFileSystemWatcher  # pylint: disable=import-error, no-name-in-module
 
 import nowplaying.systemtray  # pylint: disable=import-error