Fix end of track signalling

app/helpers.py

@@ -370,7 +370,7 @@ def show_OK(parent: QMainWindow, title: str, msg: str) -> None:
     QMessageBox.information(parent, title, msg, buttons=QMessageBox.StandardButton.Ok)
 
 
-def show_warning(parent: QMainWindow, title: str, msg: str) -> None:
+def show_warning(parent: Optional[QMainWindow], title: str, msg: str) -> None:
     """Display a warning to user"""
 
     QMessageBox.warning(parent, title, msg, buttons=QMessageBox.StandardButton.Cancel)

app/musicmuster.py

@@ -157,8 +157,8 @@ class PreviewManager:
         self.intro: Optional[int] = None
         self.path: str = ""
         self.row_number: Optional[int] = None
-        self.track_id: int = 0
         self.start_time: Optional[dt.datetime] = None
+        self.track_id: int = 0
 
     def back(self, ms: int) -> None:
         """
@@ -220,7 +220,7 @@ class PreviewManager:
         if not mixer.music.get_busy():
             return
 
-        mixer.music.set_pos(0)
+        mixer.music.rewind()
         self.start_time = dt.datetime.now()
 
     def set_intro(self, ms: int) -> None:
@@ -1144,12 +1144,12 @@ class Window(QMainWindow, Ui_MainWindow):
 
         # Show closing volume graph
         if track_sequence.current.fade_graph:
-            log.error("issue223: play_next: set up fade_graph")
+            log.debug("issue223: play_next: set up fade_graph")
             track_sequence.current.fade_graph.GraphWidget = self.widgetFadeVolume
             track_sequence.current.fade_graph.clear()
             track_sequence.current.fade_graph.plot()
         else:
-            log.error("issue223: play_next: No fade_graph")
+            log.debug("issue223: play_next: No fade_graph")
 
         # Disable play next controls
         self.catch_return_key = True
@@ -1246,7 +1246,7 @@ class Window(QMainWindow, Ui_MainWindow):
         Create log entry
         """
 
-        log.debug("quicklog")
+        log.debug("quicklog timestamp; entry follows")
 
         # Get log text
         dlg: QInputDialog = QInputDialog(self)
@@ -1591,16 +1591,18 @@ class Window(QMainWindow, Ui_MainWindow):
                 # Update intro counter if applicable and, if updated, return
                 # because playing an intro takes precedence over timing a
                 # preview.
-                remaining_ms = track_sequence.current.time_remaining_intro()
-                if remaining_ms > 0:
-                    self.label_intro_timer.setText(f"{remaining_ms / 1000:.1f}")
-                    if remaining_ms <= Config.INTRO_SECONDS_WARNING_MS:
+                intro_ms_remaining = track_sequence.current.time_remaining_intro()
+                if intro_ms_remaining > 0:
+                    self.label_intro_timer.setText(f"{intro_ms_remaining / 1000:.1f}")
+                    if intro_ms_remaining <= Config.INTRO_SECONDS_WARNING_MS:
                         self.label_intro_timer.setStyleSheet(
                             f"background: {Config.COLOUR_WARNING_TIMER}"
                         )
                     return
                 else:
-                    self.label_intro_timer.setStyleSheet("")
+                    if self.label_intro_timer.styleSheet() != "":
+                        self.label_intro_timer.setStyleSheet("")
+                        self.label_intro_timer.setText("0.0")
             except AttributeError:
                 # currnent track ended during servicing tick
                 pass

app/trackmanager.py

@@ -19,6 +19,9 @@ from PyQt6.QtCore import (
     QThread,
     QThreadPool,
 )
+from pyqtgraph import PlotWidget
+from pyqtgraph.graphicsItems.PlotDataItem import PlotDataItem  # type: ignore
+from pyqtgraph.graphicsItems.LinearRegionItem import LinearRegionItem  # type: ignore
 
 # App imports
 from classes import MusicMusterSignals
@@ -28,6 +31,7 @@ from models import db, PlaylistRows, Tracks
 from helpers import (
     file_is_unreadable,
     get_audio_segment,
+    show_warning,
 )
 
 lock = threading.Lock()
@@ -68,7 +72,7 @@ class _AddFadeCurve(QObject):
 
 
 class _FadeCurve:
-    GraphWidget = None
+    GraphWidget: Optional[PlotWidget] = None
 
     def __init__(
         self, track_path: str, track_fade_at: int, track_silence_at: int
@@ -94,7 +98,8 @@ class _FadeCurve:
         # Calculate the factor to map milliseconds of track to array
         self.ms_to_array_factor = len(self.graph_array) / (self.end_ms - self.start_ms)
 
-        self.region = None
+        self.curve: Optional[PlotDataItem] = None
+        self.region: Optional[LinearRegionItem] = None
 
     def clear(self) -> None:
         """Clear the current graph"""
@@ -105,7 +110,8 @@ class _FadeCurve:
     def plot(self) -> None:
         if self.GraphWidget:
             self.curve = self.GraphWidget.plot(self.graph_array)
-            self.curve.setPen(Config.FADE_CURVE_FOREGROUND)
+            if self.curve:
+                self.curve.setPen(Config.FADE_CURVE_FOREGROUND)
 
     def tick(self, play_time) -> None:
         """Update volume fade curve"""
@@ -124,15 +130,16 @@ class _FadeCurve:
             self.GraphWidget.addItem(self.region)
 
         # Update region position
-        log.debug("issue223: _FadeCurve: update region")
-        self.region.setRegion([0, ms_of_graph * self.ms_to_array_factor])
+        if self.region:
+            log.debug("issue223: _FadeCurve: update region")
+            self.region.setRegion([0, ms_of_graph * self.ms_to_array_factor])
 
 
 class _FadeTrack(QRunnable):
     def __init__(self, player: vlc.MediaPlayer, fade_seconds) -> None:
         super().__init__()
-        self.player = player
-        self.fade_seconds = fade_seconds
+        self.player: vlc.MediaPlayer = player
+        self.fade_seconds: int = fade_seconds
 
     def run(self) -> None:
         """
@@ -168,9 +175,9 @@ class _Music:
     def __init__(self, name) -> None:
         self.VLC = vlc.Instance()
         self.VLC.set_user_agent(name, name)
-        self.player = None
-        self.name = name
-        self.max_volume = Config.VLC_VOLUME_DEFAULT
+        self.player: Optional[vlc.MediaPlayer] = None
+        self.name: str = name
+        self.max_volume: int = Config.VLC_VOLUME_DEFAULT
         self.start_dt: Optional[dt.datetime] = None
 
     def adjust_by_ms(self, ms: int) -> None:
@@ -182,14 +189,17 @@ class _Music:
         elapsed_ms = self.get_playtime()
         position = self.get_position()
         if not position:
-            position = 0
-        new_position = max(0, position + ((position * ms) / elapsed_ms))
+            position = 0.0
+        new_position = max(0.0, position + ((position * ms) / elapsed_ms))
         self.set_position(new_position)
         # Adjus start time so elapsed time calculations are correct
         if new_position == 0:
             self.start_dt = dt.datetime.now()
         else:
-            self.start_dt -= dt.timedelta(milliseconds=ms)
+            if self.start_dt:
+                self.start_dt -= dt.timedelta(milliseconds=ms)
+            else:
+                self.start_dt = dt.datetime.now() - dt.timedelta(milliseconds=ms)
 
     def stop(self) -> None:
         """Immediately stop playing"""
@@ -235,9 +245,12 @@ class _Music:
             self.player = None
 
         pool = QThreadPool.globalInstance()
-        fader = _FadeTrack(p, fade_seconds=fade_seconds)
-        pool.start(fader)
-        self.start_dt = None
+        if pool:
+            fader = _FadeTrack(p, fade_seconds=fade_seconds)
+            pool.start(fader)
+            self.start_dt = None
+        else:
+            log.error("_Music: failed to allocate QThreadPool")
 
     def get_playtime(self) -> int:
         """
@@ -300,6 +313,10 @@ class _Music:
             return None
 
         media = self.VLC.media_new_path(path)
+        if media is None:
+            log.error(f"_Music:play: failed to create media ({path=})")
+            show_warning(None, "Error loading file", f"Cannot play file ({path})")
+            return
         self.player = media.player_new_from_media()
         if self.player:
             _ = self.player.play()
@@ -322,8 +339,11 @@ class _Music:
                         self.set_volume(Config.VLC_VOLUME_DEFAULT)
                         log.error(f"Reset from {volume=}")
                 sleep(0.1)
+        else:
+            log.error("_Music:play: failed to create media player")
+            show_warning(None, "Media player", "Unable to create media player")
 
-    def set_position(self, position: int) -> None:
+    def set_position(self, position: float) -> None:
         """
         Set player position
         """
@@ -339,7 +359,7 @@ class _Music:
         if not self.player:
             return
 
-        if set_default:
+        if set_default and volume:
             self.max_volume = volume
 
         if volume is None:
@@ -485,19 +505,6 @@ class _TrackManager:
 
         self.player.adjust_by_ms(ms)
 
-    def move_to_intro_end(self, buffer: int = Config.PREVIEW_END_BUFFER_MS) -> None:
-        """
-        Move play position to 'buffer' milliseconds before end of intro.
-
-        If no intro defined, do nothing.
-        """
-
-        if self.intro is None:
-            return
-
-        new_position = max(0, self.intro - Config.PREVIEW_END_BUFFER_MS)
-        self.player.adjust_by_ms(new_position - self.time_playing())
-
     def play(self, position: Optional[float] = None) -> None:
         """Play track"""
 
@@ -507,7 +514,7 @@ class _TrackManager:
 
         self.player.play(self.path, start_time=now, position=position)
 
-        self.end_time = self.start_time + dt.timedelta(milliseconds=self.duration)
+        self.end_time = now + dt.timedelta(milliseconds=self.duration)
 
         # Calculate time fade_graph should start updating
         if self.fade_at:
@@ -530,6 +537,8 @@ class _TrackManager:
         Send end of track signal unless we are a preview player
         """
 
+        self.signals.track_ended_signal.emit()
+
     def stop(self, fade_seconds: int = 0) -> None:
         """
         Stop this track playing

app/ui/main_window_ui.py

@@ -841,4 +841,4 @@ class Ui_MainWindow(object):
 
 
 from infotabs import InfoTabs
-from pyqtgraph import PlotWidget
+from pyqtgraph import PlotWidget  # type: ignore