app/musicmuster.py

@@ -227,11 +227,8 @@ class Window(QMainWindow, Ui_MainWindow):
         self.move_source_model: Optional[PlaylistProxyModel] = None
         self.audacity_file_path: Optional[str] = None
         # Initialise Audacity access
-        try:
-            self.audacity_client = pipeclient.PipeClient()
-            log.info(f"{hex(id(self.audacity_client))=}")
-        except RuntimeError as e:
-            log.error(f"Unable to initialise Audacity: {str(e)}")
+        self.audacity_client = pipeclient.PipeClient()
+        log.info(f"{hex(id(self.audacity_client))=}")
 
         if Config.CARTS_HIDE:
             self.cartsWidget.hide()
@@ -789,8 +786,6 @@ class Window(QMainWindow, Ui_MainWindow):
             self.hide_played_tracks = True
             self.active_proxy_model().hide_played_tracks(True)
             self.btnHidePlayed.setText("Show played")
-        # Reset row heights
-        self.active_tab().resizeRowsToContents()
 
     def import_track(self) -> None:
         """Import track file"""
@@ -1127,20 +1122,20 @@ class Window(QMainWindow, Ui_MainWindow):
         if not track_sequence.now.path:
             log.error("No path for next track")
             return
-        self.music.play(track_sequence.now.path, position)
 
-        # Note that track is playing
-        track_sequence.now.start()
+        # Notify model
+        self.active_proxy_model().current_track_started()
+
+        # Note that track is now playing
         self.playing = True
 
         # Disable play next controls
         self.disable_play_next_controls()
 
-        # Notify model
-        self.active_proxy_model().current_track_started()
-
         # Update headers
         self.update_headers()
+        track_sequence.now.start()
+        self.music.play(track_sequence.now.path, position)
 
         # Ensure 100% volume
         # For as-yet unknown reasons. sometimes the volume gets
@@ -1493,7 +1488,7 @@ class Window(QMainWindow, Ui_MainWindow):
 
         tab = self.active_tab()
         if tab:
-            QTimer.singleShot(300, tab.resizeRowsToContents)
+            tab.resizeRowsToContents()
 
     def tick_10ms(self) -> None:
         """

app/pipeclient.py

@@ -81,7 +81,7 @@ import argparse
 
 
 if sys.version_info[0] < 3:
-    raise RuntimeError('PipeClient Error: Python 3.x required')
+    sys.exit('PipeClient Error: Python 3.x required')
 
 # Platform specific constants
 if sys.platform == 'win32':
@@ -156,7 +156,7 @@ class PipeClient():
         # Allow a little time for connection to be made.
         time.sleep(0.1)
         if not self._write_pipe:
-            raise RuntimeError('PipeClientError: Write pipe cannot be opened.')
+            sys.exit('PipeClientError: Write pipe cannot be opened.')
 
     def _write_pipe_open(self) -> None:
         """Open _write_pipe."""
@@ -187,7 +187,7 @@ class PipeClient():
         self._write_pipe.write(command + EOL)
         # Check that read pipe is alive
         if PipeClient.reader_pipe_broken.is_set():
-            raise RuntimeError('PipeClient: Read-pipe error.')
+            sys.exit('PipeClient: Read-pipe error.')
         try:
             self._write_pipe.flush()
             if self.timer:
@@ -196,7 +196,7 @@ class PipeClient():
             PipeClient.reply_ready.clear()
         except IOError as err:
             if err.errno == errno.EPIPE:
-                raise RuntimeError('PipeClient: Write-pipe error.')
+                sys.exit('PipeClient: Write-pipe error.')
             else:
                 raise
 

app/playlistmodel.py

@@ -68,8 +68,6 @@ class PlaylistRowData:
         self.played = False
         self.start_gap: Optional[int] = None
         self.title: str = ""
-        self.start_time: Optional[datetime] = None
-        self.end_time: Optional[datetime] = None
 
         self.plrid: int = plr.id
         self.plr_rownum: int = plr.plr_rownum
@@ -95,6 +93,12 @@ class PlaylistRowData:
         )
 
 
+@dataclass
+class StartEndTimes:
+    start_time: Optional[datetime] = None
+    end_time: Optional[datetime] = None
+
+
 class PlaylistModel(QAbstractTableModel):
     """
     The Playlist Model
@@ -123,6 +127,7 @@ class PlaylistModel(QAbstractTableModel):
         super().__init__(*args, **kwargs)
 
         self.playlist_rows: dict[int, PlaylistRowData] = {}
+        self.start_end_times: dict[int, StartEndTimes] = {}
         self.signals = MusicMusterSignals()
         self.played_tracks_hidden = False
 
@@ -254,7 +259,6 @@ class PlaylistModel(QAbstractTableModel):
         """
 
         row_number = track_sequence.now.plr_rownum
-        prd = self.playlist_rows[row_number]
 
         # Sanity check
         if not track_sequence.now.track_id:
@@ -285,8 +289,8 @@ class PlaylistModel(QAbstractTableModel):
                 log.error(f"Can't retrieve plr, {track_sequence.now.plr_id=}")
 
             # Update track times
-            prd.start_time = track_sequence.now.start_time
-            prd.end_time = track_sequence.now.end_time
+            self.start_end_times[row_number].start_time = track_sequence.now.start_time
+            self.start_end_times[row_number].end_time = track_sequence.now.end_time
 
             # Update colour and times for current row
             self.invalidate_row(row_number)
@@ -404,15 +408,17 @@ class PlaylistModel(QAbstractTableModel):
                 return QVariant()
 
         if column == Col.START_TIME.value:
-            start_time = prd.start_time
-            if start_time:
-                return QVariant(start_time.strftime(Config.TRACK_TIME_FORMAT))
+            if row in self.start_end_times:
+                start_time = self.start_end_times[row].start_time
+                if start_time:
+                    return QVariant(start_time.strftime(Config.TRACK_TIME_FORMAT))
             return QVariant()
 
         if column == Col.END_TIME.value:
-            end_time = prd.end_time
-            if end_time:
-                return QVariant(end_time.strftime(Config.TRACK_TIME_FORMAT))
+            if row in self.start_end_times:
+                end_time = self.start_end_times[row].end_time
+                if end_time:
+                    return QVariant(end_time.strftime(Config.TRACK_TIME_FORMAT))
             return QVariant()
 
         dispatch_table = {
@@ -1321,15 +1327,15 @@ class PlaylistModel(QAbstractTableModel):
         update_rows: List[int] = []
 
         for row_number in range(len(self.playlist_rows)):
+            stend = self.start_end_times[row_number] = StartEndTimes()
             prd = self.playlist_rows[row_number]
 
             # Reset start_time if this is the current row
             if row_number == track_sequence.now.plr_rownum:
-                prd.start_time = track_sequence.now.start_time
-                prd.end_time = track_sequence.now.end_time
-                update_rows.append(row_number)
+                stend.start_time = track_sequence.now.start_time
+                stend.end_time = track_sequence.now.end_time
                 if not next_start_time:
-                    next_start_time = prd.end_time
+                    next_start_time = stend.end_time
                 continue
 
             # Set start time for next row if we have a current track
@@ -1337,9 +1343,9 @@ class PlaylistModel(QAbstractTableModel):
                 row_number == track_sequence.next.plr_rownum
                 and track_sequence.now.end_time
             ):
-                prd.start_time = track_sequence.now.end_time
-                prd.end_time = prd.start_time + timedelta(milliseconds=prd.duration)
-                next_start_time = prd.end_time
+                stend.start_time = track_sequence.now.end_time
+                stend.end_time = stend.start_time + timedelta(milliseconds=prd.duration)
+                next_start_time = stend.end_time
                 update_rows.append(row_number)
                 continue
 
@@ -1356,39 +1362,31 @@ class PlaylistModel(QAbstractTableModel):
                 < row_number
                 < track_sequence.next.plr_rownum
             ):
-                prd.start_time = None
-                prd.end_time = None
                 update_rows.append(row_number)
                 continue
 
-            # Reset start time if timing in header
+            # Reset start time if timing in header or at current track
             if self.is_header_row(row_number):
                 header_time = get_embedded_time(prd.note)
                 if header_time:
                     next_start_time = header_time
-                continue
+            else:
+                # This is an unplayed track
+                # Don't schedule unplayable tracks
+                if file_is_unreadable(prd.path):
+                    continue
 
-            # This is an unplayed track
-            # Don't schedule unplayable tracks
-            if file_is_unreadable(prd.path):
-                continue
-
-            # Set start/end if we have a start time
-            if next_start_time is None:
-                continue
-
-            # Update start time of this row if it's incorrect
-            if prd.start_time != next_start_time:
-                prd.start_time = next_start_time
-                update_rows.append(row_number)
-
-            # Calculate next start time
-            next_start_time += timedelta(milliseconds=prd.duration)
-
-            # Update end time of this row if it's incorrect
-            if prd.end_time != next_start_time:
-                prd.end_time = next_start_time
-                if row_number not in update_rows:
+                # Set start/end if we have a start time
+                if next_start_time is None:
+                    continue
+                if stend.start_time != next_start_time:
+                    stend.start_time = next_start_time
+                    update_rows.append(row_number)
+                next_start_time += timedelta(
+                    milliseconds=self.playlist_rows[row_number].duration
+                )
+                if stend.end_time != next_start_time:
+                    stend.end_time = next_start_time
                     update_rows.append(row_number)
 
         # Update start/stop times of rows that have changed