Merge branch 'dev'

This commit is contained in:
Keith Edmunds 2023-10-04 08:12:34 +01:00
commit 89057da7de
2 changed files with 2 additions and 3 deletions

View File

@ -134,7 +134,7 @@ class Playdates(Base):
__tablename__ = "playdates"
id: int = Column(Integer, primary_key=True, autoincrement=True)
lastplayed = Column(DateTime, index=True, default=None)
lastplayed: datetime = Column(DateTime, index=True)
track_id = Column(Integer, ForeignKey("tracks.id"))
track: "Tracks" = relationship("Tracks", back_populates="playdates")

View File

@ -1967,9 +1967,8 @@ class DbDialog(QDialog):
track_text = (
f"{track.title} - {track.artist} "
f"[{helpers.ms_to_mmss(track.duration)}] "
f"({helpers.get_relative_date(last_played)})"
)
if show_last_played:
track_text += f"({helpers.get_relative_date(last_played)})"
t.setText(track_text)
t.setData(Qt.ItemDataRole.UserRole, track)
self.ui.matchList.addItem(t)