app/config.py

@@ -140,6 +140,6 @@ class Config(object):
     WIKIPEDIA_ON_NEXT = False
 
     # These rely on earlier definitions
-    HIDE_PLAYED_MODE = HIDE_PLAYED_MODE_TRACKS
+    HIDE_PLAYED_MODE = HIDE_PLAYED_MODE_SECTIONS
     IMPORT_DESTINATION = os.path.join(ROOT, "Singles")
     REPLACE_FILES_DEFAULT_DESTINATION = os.path.dirname(REPLACE_FILES_DEFAULT_SOURCE)

app/musicmuster.py

@@ -63,7 +63,6 @@ from sqlalchemy.orm.session import Session
 import stackprinter  # type: ignore
 
 # App imports
-from audacity_controller import AudacityController
 from classes import (
     ApplicationError,
     Filter,
@@ -73,8 +72,8 @@ from classes import (
 from config import Config
 from dialogs import TrackSelectDialog
 from file_importer import FileImporter
+from helpers import ask_yes_no, file_is_unreadable, get_name
 from log import log, log_call
-from helpers import ask_yes_no, file_is_unreadable, get_name, show_warning
 from models import db, Playdates, PlaylistRows, Playlists, Queries, Settings, Tracks
 from music_manager import RowAndTrack, track_sequence
 from playlistmodel import PlaylistModel, PlaylistProxyModel
@@ -1209,13 +1208,6 @@ class Window(QMainWindow):
         self.load_last_playlists()
         self.stop_autoplay = False
 
-        # Set up for Audacity
-        try:
-            self.ac: Optional[AudacityController] = AudacityController()
-        except ApplicationError as e:
-            self.ac = None
-            show_warning(self, "Audacity error", str(e))
-
     # # # # # # # # # # Overrides # # # # # # # # # #
 
     def closeEvent(self, event: Optional[QCloseEvent]) -> None:

app/playlists.py

@@ -34,6 +34,7 @@ from PyQt6.QtWidgets import (
 # import line_profiler
 
 # App imports
+from audacity_controller import AudacityController
 from classes import ApplicationError, Col, MusicMusterSignals, PlaylistStyle, TrackInfo
 from config import Config
 from dialogs import TrackSelectDialog
@@ -307,6 +308,13 @@ class PlaylistTab(QTableView):
         self.setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection)
         self.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
 
+        # Set up for Audacity
+        try:
+            self.ac: Optional[AudacityController] = AudacityController()
+        except ApplicationError as e:
+            self.ac = None
+            show_warning(self.musicmuster, "Audacity error", str(e))
+
         # Load model, set column widths
         self.setModel(model)
         self._set_column_widths()
@@ -538,8 +546,8 @@ class PlaylistTab(QTableView):
         track_path = base_model.get_row_info(model_row_number).path
 
         # Open/import in/from Audacity
-        if track_row and not this_is_current_row and self.musicmuster.ac:
+        if track_row and not this_is_current_row:
-            if track_path == self.musicmuster.ac.path:
+            if self.ac and track_path == self.ac.path:
                 # This track was opened in Audacity
                 self._add_context_menu(
                     "Update from Audacity",
@@ -649,8 +657,8 @@ class PlaylistTab(QTableView):
         that we have an edit open.
         """
 
-        if self.musicmuster.ac:
+        if self.ac:
-            self.musicmuster.ac.path = None
+            self.ac.path = None
 
     def clear_selection(self) -> None:
         """Unselect all tracks and reset drag mode"""
@@ -852,10 +860,10 @@ class PlaylistTab(QTableView):
         Import current Audacity track to passed row
         """
 
-        if not self.musicmuster.ac:
+        if not self.ac:
             return
         try:
-            self.ac.musicmuster.export()
+            self.ac.export()
             self._rescan(row_number)
         except ApplicationError as e:
             show_warning(self.musicmuster, "Audacity error", str(e))
@@ -912,16 +920,15 @@ class PlaylistTab(QTableView):
         Open track in passed row in Audacity
         """
 
-        if not self.musicmuster.ac:
-            return
-
         path = self.get_base_model().get_row_track_path(row_number)
         if not path:
             log.error(f"_open_in_audacity: can't get path for {row_number=}")
             return
 
         try:
-            self.musicmuster.ac.open(path)
+            if not self.ac:
+                self.ac = AudacityController()
+            self.ac.open(path)
         except ApplicationError as e:
             show_warning(self.musicmuster, "Audacity error", str(e))
 

pyproject.toml

@@ -33,7 +33,6 @@ dependencies = [
     "types-pyyaml>=6.0.12.20241230",
     "dogpile-cache>=1.3.4",
     "pdbpp>=0.10.3",
-    "filetype>=1.2.0",
 ]
 
 [dependency-groups]