diff --git a/app.py b/app.py index cfb571f..2c3f36c 100755 --- a/app.py +++ b/app.py @@ -99,7 +99,7 @@ class Track: """ Returns the millisecond/index of the point where the fade is down to fade_threshold and doesn't get louder again. - audio_segment - the sdlg_search_database_uiegment to find silence in + audio_segment - the segment to find silence in fade_threshold - the upper bound for how quiet is silent in dFBS chunk_size - chunk size for interating over the segment in ms """ @@ -125,6 +125,20 @@ class Track: ROOT = "/home/kae/music/" +def ms_to_mmss(ms, decimals=0): + if not ms: + return "-" + if ms < 0: + sign = "-" + else: + sign = "" + + minutes, remainder = divmod(ms, 60 * 1000) + seconds = remainder / 1000 + + return f"{sign}{minutes:.0f}:{seconds:02.{decimals}f}" + + class Window(QMainWindow, Ui_MainWindow): def __init__(self, parent=None): super().__init__(parent) @@ -147,27 +161,22 @@ class Window(QMainWindow, Ui_MainWindow): print(f"Column {column}: {self.playlist.columnWidth(column)}") print(f"Window height: {self.height()} Window width: {self.width()}") - def ms_to_mmss(self, ms, decimals=0): - if not ms: - return "-" - if ms < 0: - sign = "-" - else: - sign = "" - - minutes, remainder = divmod(ms, 60 * 1000) - seconds = remainder / 1000 - - return f"{sign}{minutes:.0f}:{seconds:02.{decimals}f}" - def connectSignalsSlots(self): self.fileButton.clicked.connect(self.selectFile) self.databaseButton.clicked.connect(self.selectDatabase) + self.actionPlay_selected.triggered.connect(self.play_selected) def selectDatabase(self): dlg = DbDialog(self) dlg.exec() + def play_selected(self): + if self.playlist.selectionModel().hasSelection(): + row = self.playlist.currentRow() + print(f"Play id={self.playlist.item(row, 0).text()}") + + print("play selected") + def selectFile(self): dlg = QFileDialog() dlg.setFileMode(QFileDialog.ExistingFile) @@ -190,11 +199,15 @@ class Window(QMainWindow, Ui_MainWindow): pl = self.playlist row = pl.rowCount() pl.insertRow(row) + item = QTableWidgetItem(str(track.id)) + pl.setItem(row, 0, item) + item = QTableWidgetItem(str(track.start_gap)) + pl.setItem(row, 1, item) item = QTableWidgetItem(track.title) pl.setItem(row, 2, item) item = QTableWidgetItem(track.artist) pl.setItem(row, 3, item) - item = QTableWidgetItem(self.ms_to_mmss(track.length)) + item = QTableWidgetItem(ms_to_mmss(track.duration)) pl.setItem(row, 4, item) item = QTableWidgetItem(track.path) pl.setItem(row, 7, item) @@ -215,7 +228,10 @@ class DbDialog(QDialog): self.ui.listWidget.clear() for track in matches: t = QListWidgetItem() - t.setText(track.title) + t.setText( + f"{track.title} - {track.artist} " + f"[{ms_to_mmss(track.duration)}]" + ) t.setData(Qt.UserRole, track.id) self.ui.listWidget.addItem(t) diff --git a/dlg_search_database_ui.py b/dlg_search_database_ui.py deleted file mode 100644 index 36df05f..0000000 --- a/dlg_search_database_ui.py +++ /dev/null @@ -1,49 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'ui/dlg_SearchDatabase.ui' -# -# Created by: PyQt5 UI code generator 5.15.2 -# -# WARNING: Any manual changes made to this file will be lost when pyuic5 is -# run again. Do not edit this file unless you know what you are doing. - - -from PyQt5 import QtCore, QtGui, QtWidgets - - -class Ui_Dialog(object): - def setupUi(self, Dialog): - Dialog.setObjectName("Dialog") - Dialog.resize(383, 272) - self.gridLayout_2 = QtWidgets.QGridLayout(Dialog) - self.gridLayout_2.setObjectName("gridLayout_2") - self.verticalLayout = QtWidgets.QVBoxLayout() - self.verticalLayout.setObjectName("verticalLayout") - self.gridLayout = QtWidgets.QGridLayout() - self.gridLayout.setObjectName("gridLayout") - self.label = QtWidgets.QLabel(Dialog) - self.label.setObjectName("label") - self.gridLayout.addWidget(self.label, 0, 0, 1, 1) - self.lineEdit = QtWidgets.QLineEdit(Dialog) - self.lineEdit.setObjectName("lineEdit") - self.gridLayout.addWidget(self.lineEdit, 0, 1, 1, 1) - self.verticalLayout.addLayout(self.gridLayout) - self.listWidget = QtWidgets.QListWidget(Dialog) - self.listWidget.setObjectName("listWidget") - self.verticalLayout.addWidget(self.listWidget) - self.buttonBox = QtWidgets.QDialogButtonBox(Dialog) - self.buttonBox.setOrientation(QtCore.Qt.Horizontal) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok) - self.buttonBox.setObjectName("buttonBox") - self.verticalLayout.addWidget(self.buttonBox) - self.gridLayout_2.addLayout(self.verticalLayout, 0, 0, 1, 1) - - self.retranslateUi(Dialog) - self.buttonBox.accepted.connect(Dialog.accept) - self.buttonBox.rejected.connect(Dialog.reject) - QtCore.QMetaObject.connectSlotsByName(Dialog) - - def retranslateUi(self, Dialog): - _translate = QtCore.QCoreApplication.translate - Dialog.setWindowTitle(_translate("Dialog", "Dialog")) - self.label.setText(_translate("Dialog", "Title:")) diff --git a/main_window_ui.py b/main_window_ui.py deleted file mode 100644 index 68b5ed1..0000000 --- a/main_window_ui.py +++ /dev/null @@ -1,218 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'ui/main_window.ui' -# -# Created by: PyQt5 UI code generator 5.11.3 -# -# WARNING! All changes made in this file will be lost! - -from PyQt5 import QtCore, QtGui, QtWidgets - -class Ui_MainWindow(object): - def setupUi(self, MainWindow): - MainWindow.setObjectName("MainWindow") - MainWindow.resize(768, 600) - self.centralwidget = QtWidgets.QWidget(MainWindow) - self.centralwidget.setObjectName("centralwidget") - self.verticalLayout = QtWidgets.QVBoxLayout(self.centralwidget) - self.verticalLayout.setObjectName("verticalLayout") - self.gridLayout_5 = QtWidgets.QGridLayout() - self.gridLayout_5.setHorizontalSpacing(10) - self.gridLayout_5.setObjectName("gridLayout_5") - self.start_box = QtWidgets.QGroupBox(self.centralwidget) - self.start_box.setObjectName("start_box") - self.gridLayout = QtWidgets.QGridLayout(self.start_box) - self.gridLayout.setObjectName("gridLayout") - self.label_elapsed_timer = QtWidgets.QLabel(self.start_box) - font = QtGui.QFont() - font.setFamily("Sans") - font.setPointSize(40) - font.setBold(True) - font.setWeight(75) - self.label_elapsed_timer.setFont(font) - self.label_elapsed_timer.setObjectName("label_elapsed_timer") - self.gridLayout.addWidget(self.label_elapsed_timer, 0, 0, 1, 1) - self.label_start_tod = QtWidgets.QLabel(self.start_box) - font = QtGui.QFont() - font.setFamily("DejaVu Sans") - font.setPointSize(16) - self.label_start_tod.setFont(font) - self.label_start_tod.setScaledContents(False) - self.label_start_tod.setObjectName("label_start_tod") - self.gridLayout.addWidget(self.label_start_tod, 1, 0, 1, 1) - self.gridLayout_5.addWidget(self.start_box, 0, 0, 1, 1) - self.fade_box = QtWidgets.QGroupBox(self.centralwidget) - self.fade_box.setObjectName("fade_box") - self.gridLayout_2 = QtWidgets.QGridLayout(self.fade_box) - self.gridLayout_2.setObjectName("gridLayout_2") - self.label_fade_timer = QtWidgets.QLabel(self.fade_box) - font = QtGui.QFont() - font.setFamily("Sans") - font.setPointSize(40) - font.setBold(True) - font.setWeight(75) - self.label_fade_timer.setFont(font) - self.label_fade_timer.setObjectName("label_fade_timer") - self.gridLayout_2.addWidget(self.label_fade_timer, 0, 0, 1, 1) - self.label_fade_tod = QtWidgets.QLabel(self.fade_box) - font = QtGui.QFont() - font.setFamily("DejaVu Sans") - font.setPointSize(16) - self.label_fade_tod.setFont(font) - self.label_fade_tod.setScaledContents(False) - self.label_fade_tod.setObjectName("label_fade_tod") - self.gridLayout_2.addWidget(self.label_fade_tod, 1, 0, 1, 1) - self.gridLayout_5.addWidget(self.fade_box, 0, 1, 1, 1) - self.silent_box = QtWidgets.QGroupBox(self.centralwidget) - self.silent_box.setStyleSheet("background-color: rgb(252, 233, 79);") - self.silent_box.setObjectName("silent_box") - self.gridLayout_3 = QtWidgets.QGridLayout(self.silent_box) - self.gridLayout_3.setObjectName("gridLayout_3") - self.label_silent_timer = QtWidgets.QLabel(self.silent_box) - font = QtGui.QFont() - font.setFamily("Sans") - font.setPointSize(40) - font.setBold(True) - font.setWeight(75) - self.label_silent_timer.setFont(font) - self.label_silent_timer.setObjectName("label_silent_timer") - self.gridLayout_3.addWidget(self.label_silent_timer, 0, 0, 1, 1) - self.label_silent_tod = QtWidgets.QLabel(self.silent_box) - font = QtGui.QFont() - font.setFamily("DejaVu Sans") - font.setPointSize(16) - self.label_silent_tod.setFont(font) - self.label_silent_tod.setScaledContents(False) - self.label_silent_tod.setObjectName("label_silent_tod") - self.gridLayout_3.addWidget(self.label_silent_tod, 1, 0, 1, 1) - self.gridLayout_5.addWidget(self.silent_box, 0, 2, 1, 1) - self.end_box = QtWidgets.QGroupBox(self.centralwidget) - self.end_box.setObjectName("end_box") - self.gridLayout_4 = QtWidgets.QGridLayout(self.end_box) - self.gridLayout_4.setObjectName("gridLayout_4") - self.label_end_timer = QtWidgets.QLabel(self.end_box) - font = QtGui.QFont() - font.setFamily("Sans") - font.setPointSize(40) - font.setBold(True) - font.setWeight(75) - self.label_end_timer.setFont(font) - self.label_end_timer.setObjectName("label_end_timer") - self.gridLayout_4.addWidget(self.label_end_timer, 0, 0, 1, 1) - self.label_end_tod = QtWidgets.QLabel(self.end_box) - font = QtGui.QFont() - font.setFamily("DejaVu Sans") - font.setPointSize(16) - self.label_end_tod.setFont(font) - self.label_end_tod.setScaledContents(False) - self.label_end_tod.setObjectName("label_end_tod") - self.gridLayout_4.addWidget(self.label_end_tod, 1, 0, 1, 1) - self.gridLayout_5.addWidget(self.end_box, 0, 3, 1, 1) - self.verticalLayout.addLayout(self.gridLayout_5) - self.current_track = QtWidgets.QLabel(self.centralwidget) - font = QtGui.QFont() - font.setFamily("Sans") - font.setPointSize(20) - self.current_track.setFont(font) - self.current_track.setStyleSheet("background-color: rgb(138, 226, 52);\n" -"border: 1px solid rgb(85, 87, 83);") - self.current_track.setObjectName("current_track") - self.verticalLayout.addWidget(self.current_track) - self.playlist = QtWidgets.QTableWidget(self.centralwidget) - self.playlist.setAlternatingRowColors(True) - self.playlist.setSelectionMode(QtWidgets.QAbstractItemView.ContiguousSelection) - self.playlist.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows) - self.playlist.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) - self.playlist.setRowCount(0) - self.playlist.setColumnCount(8) - self.playlist.setObjectName("playlist") - item = QtWidgets.QTableWidgetItem() - self.playlist.setHorizontalHeaderItem(0, item) - item = QtWidgets.QTableWidgetItem() - self.playlist.setHorizontalHeaderItem(1, item) - item = QtWidgets.QTableWidgetItem() - self.playlist.setHorizontalHeaderItem(2, item) - item = QtWidgets.QTableWidgetItem() - self.playlist.setHorizontalHeaderItem(3, item) - item = QtWidgets.QTableWidgetItem() - self.playlist.setHorizontalHeaderItem(4, item) - item = QtWidgets.QTableWidgetItem() - self.playlist.setHorizontalHeaderItem(5, item) - item = QtWidgets.QTableWidgetItem() - self.playlist.setHorizontalHeaderItem(6, item) - item = QtWidgets.QTableWidgetItem() - self.playlist.setHorizontalHeaderItem(7, item) - self.verticalLayout.addWidget(self.playlist) - self.fileButton = QtWidgets.QPushButton(self.centralwidget) - self.fileButton.setObjectName("fileButton") - self.verticalLayout.addWidget(self.fileButton) - self.databaseButton = QtWidgets.QPushButton(self.centralwidget) - self.databaseButton.setObjectName("databaseButton") - self.verticalLayout.addWidget(self.databaseButton) - self.current_time = QtWidgets.QLabel(self.centralwidget) - font = QtGui.QFont() - font.setFamily("DejaVu Sans") - font.setPointSize(25) - font.setBold(True) - font.setWeight(75) - self.current_time.setFont(font) - self.current_time.setObjectName("current_time") - self.verticalLayout.addWidget(self.current_time) - self.playlist.raise_() - self.current_time.raise_() - self.fileButton.raise_() - self.current_track.raise_() - self.databaseButton.raise_() - MainWindow.setCentralWidget(self.centralwidget) - self.menubar = QtWidgets.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 768, 18)) - self.menubar.setObjectName("menubar") - self.menuFile = QtWidgets.QMenu(self.menubar) - self.menuFile.setObjectName("menuFile") - MainWindow.setMenuBar(self.menubar) - self.statusbar = QtWidgets.QStatusBar(MainWindow) - self.statusbar.setStyleSheet("background-color: rgb(211, 215, 207);") - self.statusbar.setObjectName("statusbar") - MainWindow.setStatusBar(self.statusbar) - self.menubar.addAction(self.menuFile.menuAction()) - - self.retranslateUi(MainWindow) - QtCore.QMetaObject.connectSlotsByName(MainWindow) - - def retranslateUi(self, MainWindow): - _translate = QtCore.QCoreApplication.translate - MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow")) - self.start_box.setTitle(_translate("MainWindow", "Elapsed")) - self.label_elapsed_timer.setText(_translate("MainWindow", "2:46")) - self.label_start_tod.setText(_translate("MainWindow", "10:17:37")) - self.fade_box.setTitle(_translate("MainWindow", "Fade at")) - self.label_fade_timer.setText(_translate("MainWindow", "0:53")) - self.label_fade_tod.setText(_translate("MainWindow", "10:21:23")) - self.silent_box.setTitle(_translate("MainWindow", "Silent at")) - self.label_silent_timer.setText(_translate("MainWindow", "0:58")) - self.label_silent_tod.setText(_translate("MainWindow", "10:21:28")) - self.end_box.setTitle(_translate("MainWindow", "End at")) - self.label_end_timer.setText(_translate("MainWindow", "1:00")) - self.label_end_tod.setText(_translate("MainWindow", "10:21:30")) - self.current_track.setText(_translate("MainWindow", "After the goldrush - Neil Young [3:46]")) - item = self.playlist.horizontalHeaderItem(0) - item.setText(_translate("MainWindow", "Index")) - item = self.playlist.horizontalHeaderItem(1) - item.setText(_translate("MainWindow", "Skip silence")) - item = self.playlist.horizontalHeaderItem(2) - item.setText(_translate("MainWindow", "Title")) - item = self.playlist.horizontalHeaderItem(3) - item.setText(_translate("MainWindow", "Artist")) - item = self.playlist.horizontalHeaderItem(4) - item.setText(_translate("MainWindow", "Duration")) - item = self.playlist.horizontalHeaderItem(5) - item.setText(_translate("MainWindow", "End time")) - item = self.playlist.horizontalHeaderItem(6) - item.setText(_translate("MainWindow", "Autoplay next")) - item = self.playlist.horizontalHeaderItem(7) - item.setText(_translate("MainWindow", "Path")) - self.fileButton.setText(_translate("MainWindow", "Select file")) - self.databaseButton.setText(_translate("MainWindow", "Database")) - self.current_time.setText(_translate("MainWindow", "10:20:30")) - self.menuFile.setTitle(_translate("MainWindow", "Fi&le")) - diff --git a/model.py b/model.py index 6b7a27f..09b34f5 100644 --- a/model.py +++ b/model.py @@ -69,8 +69,10 @@ class Tracks(Base): @staticmethod def search_titles(text): - return session.query(Tracks).filter( - Tracks.title.ilike(f"%{text}%") + return ( + session.query(Tracks) + .filter(Tracks.title.ilike(f"%{text}%")) + .order_by(Tracks.title) ).all() @staticmethod diff --git a/ui/main_window.ui b/ui/main_window.ui index 15ee168..945f5d3 100644 --- a/ui/main_window.ui +++ b/ui/main_window.ui @@ -204,6 +204,9 @@ border: 1px solid rgb(85, 87, 83); + + QAbstractItemView::NoEditTriggers + true @@ -229,7 +232,7 @@ border: 1px solid rgb(85, 87, 83); - Skip silence + mss @@ -314,13 +317,28 @@ border: 1px solid rgb(85, 87, 83); Fi&le + + + Pla&ylist + + + + background-color: rgb(211, 215, 207); + + + Play selected + + + Return + +