app/models.py

@@ -495,8 +495,8 @@ class Tracks(Base):
             path: str,
             title: Optional[str] = None,
             artist: Optional[str] = None,
-            duration: int = 0,
-            start_gap: int = 0,
+            duration: Optional[int] = None,
+            start_gap: Optional[int] = None,
             fade_at: Optional[int] = None,
             silence_at: Optional[int] = None,
             mtime: Optional[float] = None,

app/musicmuster.py

@@ -20,7 +20,6 @@ from PyQt5.QtWidgets import (
     QFileDialog,
     QInputDialog,
     QLabel,
-    QLineEdit,
     QListWidgetItem,
     QMainWindow,
 )
@@ -64,6 +63,7 @@ class Window(QMainWindow, Ui_MainWindow):
         self.timer: QTimer = QTimer()
         self.even_tick: bool = True
         self.playing: bool = False
+        self.connect_signals_slots()
         self.disable_play_next_controls()
 
         self.music: music.Music = music.Music()
@@ -79,9 +79,6 @@ class Window(QMainWindow, Ui_MainWindow):
         self.set_main_window_size()
         self.lblSumPlaytime: QLabel = QLabel("")
         self.statusbar.addPermanentWidget(self.lblSumPlaytime)
-        self.txtSearch = QLineEdit()
-        self.statusbar.addWidget(self.txtSearch)
-        self.txtSearch.setHidden(True)
 
         self.visible_playlist_tab: Callable[[], PlaylistTab] = \
             self.tabPlaylist.currentWidget
@@ -90,7 +87,6 @@ class Window(QMainWindow, Ui_MainWindow):
         self.enable_play_next_controls()
         self.check_audacity()
         self.timer.start(Config.TIMER_MS)
-        self.connect_signals_slots()
 
     def set_main_window_size(self) -> None:
         """Set size of window from database"""
@@ -186,7 +182,6 @@ class Window(QMainWindow, Ui_MainWindow):
         self.actionNewPlaylist.triggered.connect(self.create_playlist)
         self.actionOpenPlaylist.triggered.connect(self.open_playlist)
         self.actionPlay_next.triggered.connect(self.play_next)
-        self.actionSearch.triggered.connect(self.search_playlist)
         self.actionSearch_database.triggered.connect(self.search_database)
         self.actionSelect_next_track.triggered.connect(self.select_next_row)
         self.actionSelect_played_tracks.triggered.connect(self.select_played)
@@ -208,8 +203,6 @@ class Window(QMainWindow, Ui_MainWindow):
         self.btnStop.clicked.connect(self.stop)
         self.spnVolume.valueChanged.connect(self.change_volume)
         self.tabPlaylist.tabCloseRequested.connect(self.close_tab)
-        self.txtSearch.returnPressed.connect(self.search_playlist_return)
-        self.txtSearch.textChanged.connect(self.search_playlist_update)
 
         self.timer.timeout.connect(self.tick)
 
@@ -628,27 +621,9 @@ class Window(QMainWindow, Ui_MainWindow):
             dlg = DbDialog(self, session)
             dlg.exec()
 
-    def search_playlist(self):
-        """Show text box to search playlist"""
+    def open_playlist(self) -> None:
+        """Select and activate existing playlist"""
 
-        self.disable_play_next_controls()
-        self.txtSearch.setHidden(False)
-        self.txtSearch.setFocus()
-
-    def search_playlist_return(self):
-        """Close off search box when return pressed"""
-
-        self.txtSearch.setText("")
-        self.txtSearch.setHidden(True)
-        self.enable_play_next_controls()
-        self.visible_playlist_tab().set_filter("")
-
-    def search_playlist_update(self):
-        """Update search when search string changes"""
-
-        self.visible_playlist_tab().set_filter(self.txtSearch.text())
-
-    def open_playlist(self):
         with Session() as session:
             playlists = Playlists.get_closed(session)
             dlg = SelectPlaylistDialog(self, playlists=playlists,

app/playlists.py

@@ -136,7 +136,6 @@ class PlaylistTab(QTableWidget):
 
         self.itemSelectionChanged.connect(self._select_event)
 
-        self.row_filter: Optional[str] = None
         self.editing_cell: bool = False
         self.selecting_in_progress = False
         self.cellChanged.connect(self._cell_changed)
@@ -665,13 +664,6 @@ class PlaylistTab(QTableWidget):
             self.selecting_in_progress = False
             self._select_event()
 
-    def set_filter(self, text: Optional[str]) -> None:
-        """Filter rows to only show those containing text"""
-
-        self.row_filter = text
-        with Session() as session:
-            self.update_display(session)
-
     def set_selected_as_next(self) -> None:
         """Sets the select track as next to play"""
 
@@ -731,14 +723,6 @@ class PlaylistTab(QTableWidget):
             if row in notes:
                 # Extract note text from database to ignore section timings
                 note_text = self._get_row_notes_object(row, session).note
-                if self.row_filter:
-                    if self.row_filter not in note_text:
-                        self.hideRow(row)
-                        continue
-                    else:
-                        self.showRow(row)
-                else:
-                    self.showRow(row)
                 # Does the note have a start time?
                 row_time = self._get_note_text_time(note_text)
                 if row_time:
@@ -778,20 +762,6 @@ class PlaylistTab(QTableWidget):
             if section_start_row is not None:
                 section_time += track.duration
             # Render current track
-            if self.row_filter:
-                try:
-                    if (track.title
-                            and self.row_filter not in track.title
-                            and track.artist
-                            and self.row_filter not in track.artist):
-                        self.hideRow(row)
-                        continue
-                    else:
-                        self.showRow(row)
-                except TypeError:
-                    print(f"TypeError: {track=}")
-            else:
-                self.showRow(row)
             if row == current_row:
                 # Set start time
                 self._set_row_start_time(
@@ -906,7 +876,6 @@ class PlaylistTab(QTableWidget):
 
     def _context_menu(self, pos):  # review
 
-        assert self.menu
         self.menu.exec_(self.mapToGlobal(pos))
 
     def _copy_path(self, row: int) -> None:

app/ui/main_window.ui

@@ -782,6 +782,8 @@ border: 1px solid rgb(85, 87, 83);</string>
     <addaction name="actionAdd_note"/>
     <addaction name="action_Clear_selection"/>
     <addaction name="separator"/>
+    <addaction name="actionSelect_previous_track"/>
+    <addaction name="actionSelect_next_track"/>
     <addaction name="actionSetNext"/>
     <addaction name="separator"/>
     <addaction name="actionSelect_unplayed_tracks"/>
@@ -790,11 +792,6 @@ border: 1px solid rgb(85, 87, 83);</string>
     <addaction name="separator"/>
     <addaction name="actionDownload_CSV_of_played_tracks"/>
     <addaction name="actionExport_playlist"/>
-    <addaction name="separator"/>
-    <addaction name="actionSelect_next_track"/>
-    <addaction name="actionSelect_previous_track"/>
-    <addaction name="separator"/>
-    <addaction name="actionSearch"/>
    </widget>
    <widget class="QMenu" name="menu_Music">
     <property name="title">
@@ -1035,14 +1032,6 @@ border: 1px solid rgb(85, 87, 83);</string>
     <string>Download CSV of played tracks...</string>
    </property>
   </action>
-  <action name="actionSearch">
-   <property name="text">
-    <string>Search...</string>
-   </property>
-   <property name="shortcut">
-    <string>/</string>
-   </property>
-  </action>
  </widget>
  <resources>
   <include location="icons.qrc"/>

app/ui/main_window_ui.py

@@ -448,8 +448,6 @@ class Ui_MainWindow(object):
         self.actionImport.setObjectName("actionImport")
         self.actionDownload_CSV_of_played_tracks = QtWidgets.QAction(MainWindow)
         self.actionDownload_CSV_of_played_tracks.setObjectName("actionDownload_CSV_of_played_tracks")
-        self.actionSearch = QtWidgets.QAction(MainWindow)
-        self.actionSearch.setObjectName("actionSearch")
         self.menuFile.addAction(self.actionImport)
         self.menuFile.addSeparator()
         self.menuFile.addAction(self.actionE_xit)
@@ -464,6 +462,8 @@ class Ui_MainWindow(object):
         self.menuPlaylist.addAction(self.actionAdd_note)
         self.menuPlaylist.addAction(self.action_Clear_selection)
         self.menuPlaylist.addSeparator()
+        self.menuPlaylist.addAction(self.actionSelect_previous_track)
+        self.menuPlaylist.addAction(self.actionSelect_next_track)
         self.menuPlaylist.addAction(self.actionSetNext)
         self.menuPlaylist.addSeparator()
         self.menuPlaylist.addAction(self.actionSelect_unplayed_tracks)
@@ -472,11 +472,6 @@ class Ui_MainWindow(object):
         self.menuPlaylist.addSeparator()
         self.menuPlaylist.addAction(self.actionDownload_CSV_of_played_tracks)
         self.menuPlaylist.addAction(self.actionExport_playlist)
-        self.menuPlaylist.addSeparator()
-        self.menuPlaylist.addAction(self.actionSelect_next_track)
-        self.menuPlaylist.addAction(self.actionSelect_previous_track)
-        self.menuPlaylist.addSeparator()
-        self.menuPlaylist.addAction(self.actionSearch)
         self.menu_Music.addAction(self.actionPlay_next)
         self.menu_Music.addAction(self.actionSkip_next)
         self.menu_Music.addAction(self.actionFade)
@@ -565,6 +560,4 @@ class Ui_MainWindow(object):
         self.actionImport.setText(_translate("MainWindow", "Import..."))
         self.actionImport.setShortcut(_translate("MainWindow", "Ctrl+Shift+I"))
         self.actionDownload_CSV_of_played_tracks.setText(_translate("MainWindow", "Download CSV of played tracks..."))
-        self.actionSearch.setText(_translate("MainWindow", "Search..."))
-        self.actionSearch.setShortcut(_translate("MainWindow", "/"))
 import icons_rc