app/config.py

@@ -14,7 +14,6 @@ class Config(object):
     COLOUR_NEXT_PLAYLIST = "#ffc107"
     COLOUR_NOTES_PLAYLIST = "#b8daff"
     COLOUR_PREVIOUS_HEADER = "#f8d7da"
-    COLOUR_UNREADABLE = "#dc3545"
     COLOUR_WARNING_TIMER = "#ffc107"
     DBFS_FADE = -12
     DBFS_SILENCE = -50

app/helpers.py

@@ -18,8 +18,6 @@ def get_relative_date(past_date, reference_date=None):
         return "get_relative_date() past_date is after relative_date"
 
     weeks, days = divmod((reference_date - past_date).days, 7)
-    if weeks == days == 0:
-        return "Today"
     return f"{weeks} weeks, {days} days ago"
 
 

app/model.py

@@ -317,17 +317,10 @@ class PlaylistTracks(Base):
         else:
             # Destination playlist has tracks; add to end
             new_row = max_row + 1
-        try:
         record = session.query(PlaylistTracks).filter(
             PlaylistTracks.playlist_id == from_playlist_id,
-                PlaylistTracks.row == row).one()
-        except NoResultFound:
-            # Issue #38?
-            ERROR(
-                f"No rows matched in query: "
-                f"PlaylistTracks.playlist_id == {from_playlist_id}, "
-                f"PlaylistTracks.row == {row}"
-            )
+            PlaylistTracks.row == row
+        ).one()
         record.playlist_id = to_playlist_id
         record.row = new_row
         session.commit()

app/musicmuster.py

@@ -291,11 +291,6 @@ class Window(QMainWindow, Ui_MainWindow):
         self.previous_track_position = self.music.fade()
         self.end_of_track_actions()
 
-    def file_is_readable(self, path):
-        "Return True if path is readable else False"
-
-        return os.access(self.next_track.path, os.R_OK)
-
     def insert_note(self):
         "Add non-track row to playlist"
 
@@ -420,7 +415,7 @@ class Window(QMainWindow, Ui_MainWindow):
                 self.next_track = Tracks.get_track(session, next_track_id)
                 self.next_track_playlist_tab = self.current_track_playlist_tab
                 # Check we can read it
-                if not self.file_is_readable(self.next_track.path, os.R_OK):
+                if not os.access(self.next_track.path, os.R_OK):
                     self.show_warning(
                         "Can't read next track",
                         self.next_track.path)

app/playlists.py

@@ -155,8 +155,6 @@ class PlaylistTab(QTableWidget):
                     self.menu.addSeparator()
                 act_delete = self.menu.addAction('Delete')
                 act_delete.triggered.connect(lambda: self._delete_row(row))
-                act_delete = self.menu.addAction('Info')
-                act_delete.triggered.connect(lambda: self._info_row(row))
 
         return super(PlaylistTab, self).eventFilter(source, event)
 
@@ -276,9 +274,6 @@ class PlaylistTab(QTableWidget):
         # Scroll to new row
         self.scrollToItem(titleitem, QAbstractItemView.PositionAtCenter)
 
-        if not self._track_path_is_readable(track.id):
-            self._meta_set_unreadable(row)
-
         if repaint:
             self._save_playlist(session)
             self._repaint(clear_selection=False)
@@ -534,6 +529,11 @@ class PlaylistTab(QTableWidget):
         duration = Tracks.get_duration(session, self._get_row_id(row))
         return start + timedelta(milliseconds=duration)
 
+    def _can_read_track(self, track):
+        "Check track file is readable"
+
+        return os.access(track.path, os.R_OK)
+
     def _context_menu(self, pos):
 
         self.menu.exec_(self.mapToGlobal(pos))
@@ -608,30 +608,6 @@ class PlaylistTab(QTableWidget):
         except ValueError:
             return None
 
-    def _info_row(self, row):
-        "Display popup with info re row"
-
-        id = self._get_row_id(row)
-        if row in self._meta_get_notes():
-            note_text = self.item(row, self.COL_TITLE).text()
-            txt = f"Note: {note_text}"
-        else:
-            with Session() as session:
-                track = Tracks.get_track(session, id)
-            if not track:
-                txt = f"Track not found (track.id={id})"
-            else:
-                txt = f"""
-                    Title: {track.title}\n
-                    Artist: {track.artist}\n
-                    Path: {track.path}"""
-        info = QMessageBox(self)
-        info.setIcon(QMessageBox.Information)
-        info.setText(txt)
-        info.setStandardButtons(QMessageBox.Ok)
-        info.setDefaultButton(QMessageBox.Cancel)
-        info.exec()
-
     def _is_below(self, pos, index):
         rect = self.visualRect(index)
         margin = 2
@@ -748,11 +724,6 @@ class PlaylistTab(QTableWidget):
 
         return self._meta_find("note", one=False)
 
-    def _meta_get_unreadable(self):
-        "Return rows marked as unreadable, or None"
-
-        return self._meta_find("unreadable", one=False)
-
     def _meta_set_current(self, row):
         "Mark row as current track"
 
@@ -774,11 +745,6 @@ class PlaylistTab(QTableWidget):
 
         self._meta_set(row, "note")
 
-    def _meta_set_unreadable(self, row):
-        "Mark row as unreadable"
-
-        self._meta_set(row, "unreadable")
-
     def _meta_set(self, row, metadata):
         "Set row metadata"
 
@@ -797,9 +763,8 @@ class PlaylistTab(QTableWidget):
 
     def _set_next(self, row):
         """
-        If passed row is track row, check track is readable and, if it is,
-        set that track as the next track to be played and return track_id.
-        Otherwise return None.
+        If passed row is track row, set that track as the next track to
+        be played and return track_id. Otherwise return None.
         """
 
         DEBUG(f"_set_next({row})")
@@ -809,12 +774,9 @@ class PlaylistTab(QTableWidget):
 
         track_id = self._get_row_id(row)
         if track_id:
-            if self._track_path_is_readable(track_id):
             self._meta_set_next(self.currentRow())
-                self.master_process.set_next_track(track_id)
-            else:
-                self._meta_set_unreadable(self.currentRow())
             self._repaint()
+            self.master_process.set_next_track(track_id)
 
     def _repaint(self, clear_selection=True):
         "Set row colours, fonts, etc"
@@ -831,7 +793,6 @@ class PlaylistTab(QTableWidget):
             current = self._meta_get_current()
             next = self._meta_get_next()
             notes = self._meta_get_notes()
-            unreadable = self._meta_get_unreadable()
 
             # Set colours and start times
             next_start_time = None
@@ -852,13 +813,6 @@ class PlaylistTab(QTableWidget):
                     )
                     self._set_row_bold(row)
 
-                elif row in unreadable:
-                    # Set colour
-                    self._set_row_colour(
-                        row, QColor(Config.COLOUR_UNREADABLE)
-                    )
-                    self._set_row_bold(row)
-
                 elif row == current:
                     # Set start time
                     self._set_row_start_time(
@@ -1036,9 +990,3 @@ class PlaylistTab(QTableWidget):
             time_str = ""
         item = QTableWidgetItem(time_str)
         self.setItem(row, self.COL_START_TIME, item)
-
-    def _track_path_is_readable(self, track_id):
-        "Returns True if track path is readable, else False"
-
-        with Session() as session:
-            return os.access(Tracks.get_path(session, track_id), os.R_OK)