diff --git a/app/config.py b/app/config.py index 37d4afc..8f49559 100644 --- a/app/config.py +++ b/app/config.py @@ -14,6 +14,7 @@ class Config(object): MAIL_USE_TLS = os.environ.get('MAIL_USE_TLS') is not None MYSQL_CONNECT = "mysql+mysqldb://songdb:songdb@localhost/songdb" ROOT = "/home/kae/music" + TIMER_MS = 500 config = Config diff --git a/app/musicmuster.py b/app/musicmuster.py index e1c2275..327a33d 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -4,9 +4,10 @@ import os import vlc import sys +from datetime import datetime from log import DEBUG, ERROR -from PyQt5.QtCore import Qt +from PyQt5.QtCore import Qt, QTimer from PyQt5.QtWidgets import QApplication, QDialog, QMainWindow from PyQt5.QtWidgets import QTableWidgetItem, QFileDialog, QListWidgetItem from threading import Timer @@ -124,6 +125,7 @@ class Window(QMainWindow, Ui_MainWindow): def __init__(self, parent=None): super().__init__(parent) self.setupUi(self) + self.timer = QTimer() self.connectSignalsSlots() self.music = Music() @@ -143,6 +145,8 @@ class Window(QMainWindow, Ui_MainWindow): if record.f_int is not None: self.playlist.setColumnWidth(column, record.f_int) + self.timer.start(Config.TIMER_MS) + def __del__(self): for column in range(self.playlist.columnCount()): name = f"playlist_col_{str(column)}_width" @@ -172,6 +176,7 @@ class Window(QMainWindow, Ui_MainWindow): self.actionPlay_selected.triggered.connect(self.play_next) self.actionPlay_next.triggered.connect(self.play_next) self.playlist.itemSelectionChanged.connect(self.set_next) + self.timer.timeout.connect(self.tick) def selectFromDatabase(self): dlg = DbDialog(self) @@ -214,6 +219,11 @@ class Window(QMainWindow, Ui_MainWindow): if self.music.set_next_track(track_id) != track_id: ERROR("Can't set next track") + def tick(self): + self.current_time.setText( + datetime.strftime(datetime.now(), "%H:%M:%S") + ) + def add_to_playlist(self, track): """ Add track to playlist diff --git a/notes.otl b/notes.otl index 80d1627..49d71ed 100644 --- a/notes.otl +++ b/notes.otl @@ -37,9 +37,9 @@ Playlist management Wikipedia for song title Song facts for song title Display - Remember window size - Remember dialog size - Remember playlist column sizes + ✓ Remember window size + ✓ Remember dialog size + ✓ Remember playlist column sizes Top: previous, current, next track Misc Logging