From 0b91cf7da4924adc62ba55b4f8ca8bb4add2e154 Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Sat, 15 Oct 2022 17:42:37 +0100 Subject: [PATCH 1/5] WIP: carts --- .envrc | 3 + alembic.ini | 1 + app/config.py | 4 + app/models.py | 62 ++++++ app/musicmuster.py | 181 ++++++++++++++++-- app/ui/dlg_Cart.ui | 142 ++++++++++++++ app/ui/dlg_SearchDatabase.ui | 12 +- app/ui/dlg_cart_ui.py | 54 ++++++ app/ui/main_window.ui | 31 ++- app/ui/main_window_ui.py | 17 +- migrations/versions/6730f03317df_add_carts.py | 41 ++++ 11 files changed, 516 insertions(+), 32 deletions(-) create mode 100644 app/ui/dlg_Cart.ui create mode 100644 app/ui/dlg_cart_ui.py create mode 100644 migrations/versions/6730f03317df_add_carts.py diff --git a/.envrc b/.envrc index 2db726b..af5d92a 100644 --- a/.envrc +++ b/.envrc @@ -6,6 +6,9 @@ if on_git_branch master; then elif on_git_branch carts; then export MM_ENV="DEVELOPMENT" export MM_DB="mysql+mysqldb://dev_musicmuster:dev_musicmuster@localhost/dev_musicmuster_carts" +elif on_git_branch newcarts; then + export MM_ENV="DEVELOPMENT" + export MM_DB="mysql+mysqldb://dev_musicmuster:dev_musicmuster@localhost/dev_musicmuster_carts" else export MM_ENV="DEVELOPMENT" export MM_DB="mysql+mysqldb://dev_musicmuster:dev_musicmuster@localhost/dev_musicmuster" diff --git a/alembic.ini b/alembic.ini index 892de8d..2f32637 100644 --- a/alembic.ini +++ b/alembic.ini @@ -42,6 +42,7 @@ prepend_sys_path = . sqlalchemy.url = SET # sqlalchemy.url = mysql+mysqldb://musicmuster:musicmuster@localhost/musicmuster_prod # sqlalchemy.url = mysql+mysqldb://dev_musicmuster:dev_musicmuster@localhost/dev_musicmuster +# sqlalchemy.url = mysql+mysqldb://dev_musicmuster:dev_musicmuster@localhost/dev_musicmuster_carts [post_write_hooks] # post_write_hooks defines scripts or Python functions that are run diff --git a/app/config.py b/app/config.py index 2c65adb..aa837d4 100644 --- a/app/config.py +++ b/app/config.py @@ -9,9 +9,13 @@ class Config(object): BITRATE_LOW_THRESHOLD = 192 BITRATE_OK_THRESHOLD = 300 CHECK_AUDACITY_AT_STARTUP = True + CART_DIRECTORY = "/home/kae/radio/CartTracks" COLOUR_BITRATE_LOW = "#ffcdd2" COLOUR_BITRATE_MEDIUM = "#ffeb6f" COLOUR_BITRATE_OK = "#dcedc8" + COLOUR_CART_ERROR = "#dc3545" + COLOUR_CART_PLAYING = "#248f24" + COLOUR_CART_READY = "#ffc107" COLOUR_CURRENT_HEADER = "#d4edda" COLOUR_CURRENT_PLAYLIST = "#7eca8f" COLOUR_CURRENT_TAB = "#248f24" diff --git a/app/models.py b/app/models.py index 6986377..2ecc0e3 100644 --- a/app/models.py +++ b/app/models.py @@ -51,6 +51,68 @@ Base = declarative_base() # Database classes +class Carts(Base): + __tablename__ = 'carts' + + id: int = Column(Integer, primary_key=True, autoincrement=True) + cart_number = Column(Integer, nullable=False, unique=True) + name = Column(String(256), index=True) + duration = Column(Integer, index=True) + path = Column(String(2048), index=False) + enabled = Column(Boolean, default=False, nullable=False) + + def __repr__(self) -> str: + return ( + f"" + ) + + def __init__(self, session: Session, cart_number: int, name: str = None, + duration: int = None, path: str = None, + enabled: bool = True) -> None: + """Create new cart""" + + self.cart_number = cart_number + self.name = name + self.duration = duration + self.path = path + self.enabled = enabled + + session.add(self) + session.commit() + + @classmethod + def enabled_carts(cls, session: Session) -> List["Carts"]: + """Return a list of all active carts""" + + return ( + session.execute( + select(Carts) + .where(Carts.enabled.is_(True)) + .order_by(Carts.cart_number) + ) + .scalars() + .all() + ) + + @classmethod + def get_or_create(cls, session: Session, cart_number: int) -> "Carts": + """ + Return cart with passed cart number, or create a record if + none exists. + """ + + try: + return ( + session.execute( + select(Carts) + .where(Carts.cart_number == cart_number) + ).scalar_one() + ) + except NoResultFound: + return Carts(session, cart_number) + + class NoteColours(Base): __tablename__ = 'notecolours' diff --git a/app/musicmuster.py b/app/musicmuster.py index 0ef906c..9e19450 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -9,8 +9,8 @@ import threading from datetime import datetime, timedelta from typing import List, Optional -from PyQt5.QtCore import QDate, QEvent, Qt, QTime, QTimer -from PyQt5.QtGui import QColor, QPalette +from PyQt5.QtCore import QDate, QEvent, Qt, QSize, QTime, QTimer +from PyQt5.QtGui import QColor, QPalette, QFont from PyQt5.QtWidgets import ( QApplication, QDialog, @@ -21,6 +21,7 @@ from PyQt5.QtWidgets import ( QListWidgetItem, QMainWindow, QMessageBox, + QPushButton, ) from dbconfig import engine, Session @@ -29,18 +30,20 @@ import music from models import ( Base, + Carts, Playdates, PlaylistRows, Playlists, Settings, Tracks ) +from config import Config from playlists import PlaylistTab from sqlalchemy.orm.exc import DetachedInstanceError +from ui.dlg_cart_ui import Ui_DialogCartEdit # type: ignore from ui.dlg_search_database_ui import Ui_Dialog # type: ignore from ui.dlg_SelectPlaylist_ui import Ui_dlgSelectPlaylist # type: ignore from ui.downloadcsv_ui import Ui_DateSelect # type: ignore -from config import Config from ui.main_window_ui import Ui_MainWindow # type: ignore from utilities import check_db, update_bitrates @@ -90,36 +93,110 @@ class Window(QMainWindow, Ui_MainWindow): self.statusbar.addWidget(self.txtSearch) self.txtSearch.setHidden(True) self.hide_played_tracks = False + self.carts = {} self.visible_playlist_tab: Callable[[], PlaylistTab] = \ self.tabPlaylist.currentWidget self.load_last_playlists() + self.carts_init() self.enable_play_next_controls() self.timer.start(Config.TIMER_MS) self.connect_signals_slots() - def about(self) -> None: - """Get git tag and database name""" + def cart_add(self) -> None: + """Add a cart""" - try: - git_tag = str( - subprocess.check_output( - ['git', 'describe'], stderr=subprocess.STDOUT - ) - ).strip('\'b\\n') - except subprocess.CalledProcessError as exc_info: - git_tag = str(exc_info.output) + pass + + def cart_button(self, cart: Carts) -> QPushButton: + """Create a cart pushbutton""" + + btn = QPushButton(self) + btn.setEnabled(True) + btn.setMinimumSize(QSize(147, 61)) + font = QFont() + font.setPointSize(14) + btn.setFont(font) + btn.setObjectName("cart_" + str(cart.cart_number)) + btn.setText(cart.name) + btn.clicked.connect(self.cart_click) + # Insert button on left of cart space after existing buttons + self.horizontalLayout_Carts.insertWidget(len(self.carts), btn) + + return btn + + def cart_click(self) -> None: + """Handle cart click""" + + # print(f"cart_click({self.sender()=})") + # print(f"{self.carts[self.sender()]['name']}") + btn = self.sender() + cart = self.carts[btn] + if helpers.file_is_readable(cart['path']): + cart['player'].play() + self.carts[btn]['playing'] = True + colour = Config.COLOUR_CART_PLAYING + else: + colour = Config.COLOUR_CART_ERROR + btn.setStyleSheet("background-color: " + colour + ";\n") + + def cart_edit(self, cart_number: int) -> None: + """Edit carts""" with Session() as session: - dbname = session.bind.engine.url.database + cart = Carts.get_or_create(session, cart_number) + dlg = CartDialog(self, cart, cart_number) + if dlg.exec(): + name = dlg.ui.lineEditName.text() + if not name: + QMessageBox.warning(self, "Error", "Name required") + return + path = dlg.path + if not path: + QMessageBox.warning(self, "Error", "Filename required") + return + cart.name = name + cart.path = path + if cart.path: + tags = helpers.get_tags(cart.path) + cart.duration = tags['duration'] + cart.enabled = dlg.ui.chkEnabled.isChecked() + session.add(cart) + session.commit() - QMessageBox.information( - self, - "About", - f"MusicMuster {git_tag}\n\nDatabase: {dbname}", - QMessageBox.Ok - ) + def carts_init(self) -> None: + """Initialse carts data structures""" + + with Session() as session: + for cart in Carts.enabled_carts(session): + btn = self.cart_button(cart) + + self.carts[btn] = {} + self.carts[btn]['name'] = cart.name + self.carts[btn]['duration'] = cart.duration + self.carts[btn]['path'] = cart.path + self.carts[btn]['playing'] = False + player = self.music.VLC.media_player_new(cart.path) + player.audio_set_volume(Config.VOLUME_VLC_DEFAULT) + self.carts[btn]['player'] = player + if helpers.file_is_readable(cart.path): + colour = Config.COLOUR_CART_READY + else: + colour = Config.COLOUR_CART_ERROR + btn.setStyleSheet("background-color: " + colour + ";\n") + + def cart_tick(self) -> None: + """Cart clock actions""" + + for btn, cart in self.carts.items(): + if cart['playing']: + if not cart['player'].is_playing(): + # Cart has finished playing + cart['playing'] = False + cart['player'].set_position(0) + colour = Config.COLOUR_CART_READY + btn.setStyleSheet("background-color: " + colour + ";\n") def clear_selection(self) -> None: """ Clear selected row""" @@ -205,8 +282,10 @@ class Window(QMainWindow, Ui_MainWindow): def connect_signals_slots(self) -> None: self.action_About.triggered.connect(self.about) + self.actionAdd_cart.triggered.connect(self.cart_add) self.action_Clear_selection.triggered.connect(self.clear_selection) self.actionDebug.triggered.connect(self.debug) + self.actionAdd_cart.triggered.connect(self.cart_add) self.actionClosePlaylist.triggered.connect(self.close_playlist_tab) self.actionDownload_CSV_of_played_tracks.triggered.connect( self.download_played_tracks) @@ -438,6 +517,28 @@ class Window(QMainWindow, Ui_MainWindow): self.stop_playing(fade=True) + def about(self) -> None: + """Get git tag and database name""" + + try: + git_tag = str( + subprocess.check_output( + ['git', 'describe'], stderr=subprocess.STDOUT + ) + ).strip('\'b\\n') + except subprocess.CalledProcessError as exc_info: + git_tag = str(exc_info.output) + + with Session() as session: + dbname = session.bind.engine.url.database + + QMessageBox.information( + self, + "About", + f"MusicMuster {git_tag}\n\nDatabase: {dbname}", + QMessageBox.Ok + ) + def get_one_track(self, session: Session) -> Optional[Tracks]: """Show dialog box to select one track and return it to caller""" @@ -987,6 +1088,8 @@ class Window(QMainWindow, Ui_MainWindow): # Update TOD clock self.lblTOD.setText(datetime.now().strftime(Config.TOD_TIME_FORMAT)) + # Update carts + self.cart_tick() self.even_tick = not self.even_tick if not self.even_tick: @@ -1079,6 +1182,44 @@ class Window(QMainWindow, Ui_MainWindow): self.hdrNextTrack.setText("") +class CartDialog(QDialog): + """Edit cart details""" + + def __init__(self, parent: QMainWindow, + cart: Optional[Carts], + cart_number: int) -> None: + """ + Manage carts + """ + + super().__init__(parent) + self.ui = Ui_DialogCartEdit() + self.ui.setupUi(self) + self.ui.chkEnabled.setChecked(True) + self.path = "" + + self.ui.windowTitle = "Edit Cart " + str(cart_number) + + if cart: + self.ui.lineEditName.setText(cart.name) + self.path = cart.path + + self.ui.lblPath.setText(self.path) + self.ui.btnFile.clicked.connect(self.choose_file) + + def choose_file(self) -> None: + """File select""" + + dlg = QFileDialog() + dlg.setFileMode(QFileDialog.ExistingFile) + dlg.setViewMode(QFileDialog.Detail) + dlg.setDirectory(Config.CART_DIRECTORY) + dlg.setNameFilter("Music files (*.flac *.mp3)") + if dlg.exec_(): + self.path = dlg.selectedFiles()[0] + self.ui.lblPath.setText(self.path) + + class DbDialog(QDialog): """Select track from database""" diff --git a/app/ui/dlg_Cart.ui b/app/ui/dlg_Cart.ui new file mode 100644 index 0000000..4eff2bd --- /dev/null +++ b/app/ui/dlg_Cart.ui @@ -0,0 +1,142 @@ + + + DialogCartEdit + + + + 0 + 0 + 400 + 171 + + + + Carts + + + + + 200 + 140 + 171 + 32 + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + 10 + 60 + 76 + 19 + + + + &Name: + + + lineEditName + + + + + + 90 + 60 + 291 + 27 + + + + + + + + + + 10 + 10 + 371 + 41 + + + + xxx + + + Qt::PlainText + + + true + + + + + + 10 + 100 + 100 + 27 + + + + &File + + + + + + 280 + 100 + 104 + 25 + + + + &Enabled + + + + + + + buttonBox + accepted() + DialogCartEdit + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + DialogCartEdit + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/app/ui/dlg_SearchDatabase.ui b/app/ui/dlg_SearchDatabase.ui index c8af805..f05d251 100644 --- a/app/ui/dlg_SearchDatabase.ui +++ b/app/ui/dlg_SearchDatabase.ui @@ -13,8 +13,8 @@ Dialog - - + + @@ -121,14 +121,8 @@ - + - - - 0 - 0 - - diff --git a/app/ui/dlg_cart_ui.py b/app/ui/dlg_cart_ui.py new file mode 100644 index 0000000..9a97170 --- /dev/null +++ b/app/ui/dlg_cart_ui.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- + +# Form implementation generated from reading ui file 'app/ui/dlg_Cart.ui' +# +# Created by: PyQt5 UI code generator 5.15.6 +# +# 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_DialogCartEdit(object): + def setupUi(self, DialogCartEdit): + DialogCartEdit.setObjectName("DialogCartEdit") + DialogCartEdit.resize(400, 171) + self.buttonBox = QtWidgets.QDialogButtonBox(DialogCartEdit) + self.buttonBox.setGeometry(QtCore.QRect(200, 140, 171, 32)) + self.buttonBox.setOrientation(QtCore.Qt.Horizontal) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok) + self.buttonBox.setObjectName("buttonBox") + self.label = QtWidgets.QLabel(DialogCartEdit) + self.label.setGeometry(QtCore.QRect(10, 60, 76, 19)) + self.label.setObjectName("label") + self.lineEditName = QtWidgets.QLineEdit(DialogCartEdit) + self.lineEditName.setGeometry(QtCore.QRect(90, 60, 291, 27)) + self.lineEditName.setInputMask("") + self.lineEditName.setObjectName("lineEditName") + self.lblPath = QtWidgets.QLabel(DialogCartEdit) + self.lblPath.setGeometry(QtCore.QRect(10, 10, 371, 41)) + self.lblPath.setTextFormat(QtCore.Qt.PlainText) + self.lblPath.setWordWrap(True) + self.lblPath.setObjectName("lblPath") + self.btnFile = QtWidgets.QPushButton(DialogCartEdit) + self.btnFile.setGeometry(QtCore.QRect(10, 100, 100, 27)) + self.btnFile.setObjectName("btnFile") + self.chkEnabled = QtWidgets.QCheckBox(DialogCartEdit) + self.chkEnabled.setGeometry(QtCore.QRect(280, 100, 104, 25)) + self.chkEnabled.setObjectName("chkEnabled") + self.label.setBuddy(self.lineEditName) + + self.retranslateUi(DialogCartEdit) + self.buttonBox.accepted.connect(DialogCartEdit.accept) # type: ignore + self.buttonBox.rejected.connect(DialogCartEdit.reject) # type: ignore + QtCore.QMetaObject.connectSlotsByName(DialogCartEdit) + + def retranslateUi(self, DialogCartEdit): + _translate = QtCore.QCoreApplication.translate + DialogCartEdit.setWindowTitle(_translate("DialogCartEdit", "Carts")) + self.label.setText(_translate("DialogCartEdit", "&Name:")) + self.lblPath.setText(_translate("DialogCartEdit", "xxx")) + self.btnFile.setText(_translate("DialogCartEdit", "&File")) + self.chkEnabled.setText(_translate("DialogCartEdit", "&Enabled")) diff --git a/app/ui/main_window.ui b/app/ui/main_window.ui index 753d0c7..14d72ee 100644 --- a/app/ui/main_window.ui +++ b/app/ui/main_window.ui @@ -291,6 +291,23 @@ padding-left: 8px; + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + Qt::Vertical @@ -325,7 +342,7 @@ padding-left: 8px; - + background-color: rgb(192, 191, 188) @@ -844,10 +861,17 @@ padding-left: 8px; + + + &Carts + + + + @@ -1132,6 +1156,11 @@ padding-left: 8px; Debug + + + Add &cart... + + diff --git a/app/ui/main_window_ui.py b/app/ui/main_window_ui.py index cd812ce..869924a 100644 --- a/app/ui/main_window_ui.py +++ b/app/ui/main_window_ui.py @@ -158,6 +158,11 @@ class Ui_MainWindow(object): self.frame_4.setFrameShadow(QtWidgets.QFrame.Raised) self.frame_4.setObjectName("frame_4") self.gridLayout_4.addWidget(self.frame_4, 1, 0, 1, 1) + self.horizontalLayout_Carts = QtWidgets.QHBoxLayout() + self.horizontalLayout_Carts.setObjectName("horizontalLayout_Carts") + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout_Carts.addItem(spacerItem) + self.gridLayout_4.addLayout(self.horizontalLayout_Carts, 2, 0, 1, 1) self.splitter = QtWidgets.QSplitter(self.centralwidget) self.splitter.setOrientation(QtCore.Qt.Vertical) self.splitter.setObjectName("splitter") @@ -171,7 +176,7 @@ class Ui_MainWindow(object): self.tabInfolist.setTabsClosable(True) self.tabInfolist.setMovable(True) self.tabInfolist.setObjectName("tabInfolist") - self.gridLayout_4.addWidget(self.splitter, 2, 0, 1, 1) + self.gridLayout_4.addWidget(self.splitter, 3, 0, 1, 1) self.frame_5 = QtWidgets.QFrame(self.centralwidget) self.frame_5.setStyleSheet("background-color: rgb(192, 191, 188)") self.frame_5.setFrameShape(QtWidgets.QFrame.StyledPanel) @@ -363,7 +368,7 @@ class Ui_MainWindow(object): self.gridLayout_3.addWidget(self.btnHidePlayed, 1, 0, 1, 1) self.horizontalLayout.addWidget(self.frame_3) self.horizontalLayout_2.addLayout(self.horizontalLayout) - self.gridLayout_4.addWidget(self.frame_5, 3, 0, 1, 1) + self.gridLayout_4.addWidget(self.frame_5, 4, 0, 1, 1) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(MainWindow) self.menubar.setGeometry(QtCore.QRect(0, 0, 1280, 26)) @@ -376,6 +381,8 @@ class Ui_MainWindow(object): self.menuSearc_h.setObjectName("menuSearc_h") self.menuHelp = QtWidgets.QMenu(self.menubar) self.menuHelp.setObjectName("menuHelp") + self.menu_Carts = QtWidgets.QMenu(self.menubar) + self.menu_Carts.setObjectName("menu_Carts") MainWindow.setMenuBar(self.menubar) self.statusbar = QtWidgets.QStatusBar(MainWindow) self.statusbar.setEnabled(True) @@ -482,6 +489,8 @@ class Ui_MainWindow(object): self.actionNew_from_template.setObjectName("actionNew_from_template") self.actionDebug = QtWidgets.QAction(MainWindow) self.actionDebug.setObjectName("actionDebug") + self.actionAdd_cart = QtWidgets.QAction(MainWindow) + self.actionAdd_cart.setObjectName("actionAdd_cart") self.menuFile.addAction(self.actionNewPlaylist) self.menuFile.addAction(self.actionOpenPlaylist) self.menuFile.addAction(self.actionClosePlaylist) @@ -521,10 +530,12 @@ class Ui_MainWindow(object): self.menuSearc_h.addAction(self.actionSelect_previous_track) self.menuHelp.addAction(self.action_About) self.menuHelp.addAction(self.actionDebug) + self.menu_Carts.addAction(self.actionAdd_cart) self.menubar.addAction(self.menuFile.menuAction()) self.menubar.addAction(self.menuPlaylist.menuAction()) self.menubar.addAction(self.menuSearc_h.menuAction()) self.menubar.addAction(self.menuHelp.menuAction()) + self.menubar.addAction(self.menu_Carts.menuAction()) self.retranslateUi(MainWindow) self.tabPlaylist.setCurrentIndex(-1) @@ -563,6 +574,7 @@ class Ui_MainWindow(object): self.menuPlaylist.setTitle(_translate("MainWindow", "Sho&wtime")) self.menuSearc_h.setTitle(_translate("MainWindow", "&Search")) self.menuHelp.setTitle(_translate("MainWindow", "&Help")) + self.menu_Carts.setTitle(_translate("MainWindow", "&Carts")) self.actionPlay_next.setText(_translate("MainWindow", "&Play next")) self.actionPlay_next.setShortcut(_translate("MainWindow", "Return")) self.actionSkipToNext.setText(_translate("MainWindow", "Skip to &next")) @@ -617,5 +629,6 @@ class Ui_MainWindow(object): self.actionSave_as_template.setText(_translate("MainWindow", "Save as template...")) self.actionNew_from_template.setText(_translate("MainWindow", "New from template...")) self.actionDebug.setText(_translate("MainWindow", "Debug")) + self.actionAdd_cart.setText(_translate("MainWindow", "Add &cart...")) from infotabs import InfoTabs import icons_rc diff --git a/migrations/versions/6730f03317df_add_carts.py b/migrations/versions/6730f03317df_add_carts.py new file mode 100644 index 0000000..e66f706 --- /dev/null +++ b/migrations/versions/6730f03317df_add_carts.py @@ -0,0 +1,41 @@ +"""Add carts + +Revision ID: 6730f03317df +Revises: b4f524e2140c +Create Date: 2022-09-13 19:41:33.181752 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '6730f03317df' +down_revision = 'b4f524e2140c' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('carts', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('cart_number', sa.Integer(), nullable=False), + sa.Column('name', sa.String(length=256), nullable=True), + sa.Column('duration', sa.Integer(), nullable=True), + sa.Column('path', sa.String(length=2048), nullable=True), + sa.Column('enabled', sa.Boolean(), nullable=False), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('cart_number') + ) + op.create_index(op.f('ix_carts_duration'), 'carts', ['duration'], unique=False) + op.create_index(op.f('ix_carts_name'), 'carts', ['name'], unique=False) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_index(op.f('ix_carts_name'), table_name='carts') + op.drop_index(op.f('ix_carts_duration'), table_name='carts') + op.drop_table('carts') + # ### end Alembic commands ### From ef17b359e2c7bc6201326a470a64cfd883c4210a Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Sat, 15 Oct 2022 17:57:44 +0100 Subject: [PATCH 2/5] Put KAE in debug logging strings --- app/musicmuster.py | 4 ++-- app/playlists.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/musicmuster.py b/app/musicmuster.py index 9e19450..94b7719 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -943,7 +943,7 @@ class Window(QMainWindow, Ui_MainWindow): def show_current(self) -> None: """Scroll to show current track""" - log.debug(f"musicmuster.show_current()") + log.debug(f"KAE: musicmuster.show_current()") if self.current_track_playlist_tab != self.visible_playlist_tab: self.tabPlaylist.setCurrentWidget(self.current_track_playlist_tab) self.tabPlaylist.currentWidget().scroll_current_to_top() @@ -951,7 +951,7 @@ class Window(QMainWindow, Ui_MainWindow): def show_next(self) -> None: """Scroll to show next track""" - log.debug(f"musicmuster.show_next()") + log.debug(f"KAE: musicmuster.show_next()") if self.next_track_playlist_tab != self.visible_playlist_tab: self.tabPlaylist.setCurrentWidget(self.next_track_playlist_tab) self.tabPlaylist.currentWidget().scroll_next_to_top() diff --git a/app/playlists.py b/app/playlists.py index 756ff5a..1992c27 100644 --- a/app/playlists.py +++ b/app/playlists.py @@ -823,17 +823,17 @@ class PlaylistTab(QTableWidget): def scroll_current_to_top(self) -> None: """Scroll currently-playing row to top""" - log.debug("playlists.scroll_current_to_top()") + log.debug("KAE: playlists.scroll_current_to_top()") current_row = self._get_current_track_row() - log.debug(f"playlists.scroll_current_to_top(), {current_row=}") + log.debug(f"KAE: playlists.scroll_current_to_top(), {current_row=}") self._scroll_to_top(current_row) def scroll_next_to_top(self) -> None: """Scroll nextly-playing row to top""" - log.debug("playlists.scroll_next_to_top()") + log.debug("KAE: playlists.scroll_next_to_top()") next_row = self._get_next_track_row() - log.debug(f"playlists.scroll_next_to_top(), {next_row=}") + log.debug(f"KAE: playlists.scroll_next_to_top(), {next_row=}") self._scroll_to_top(next_row) def set_search(self, text: str) -> None: From a649fa8c592608c5631d874f26dc7eb406b08573 Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Sat, 15 Oct 2022 20:15:30 +0100 Subject: [PATCH 3/5] WIP: Carts --- app/config.py | 2 ++ app/models.py | 12 ++++++------ app/musicmuster.py | 24 +++++++++++++++++++----- app/ui/main_window.ui | 3 +-- app/ui/main_window_ui.py | 3 +-- 5 files changed, 29 insertions(+), 15 deletions(-) diff --git a/app/config.py b/app/config.py index aa837d4..cdcf179 100644 --- a/app/config.py +++ b/app/config.py @@ -10,12 +10,14 @@ class Config(object): BITRATE_OK_THRESHOLD = 300 CHECK_AUDACITY_AT_STARTUP = True CART_DIRECTORY = "/home/kae/radio/CartTracks" + CARTS_COUNT = 10 COLOUR_BITRATE_LOW = "#ffcdd2" COLOUR_BITRATE_MEDIUM = "#ffeb6f" COLOUR_BITRATE_OK = "#dcedc8" COLOUR_CART_ERROR = "#dc3545" COLOUR_CART_PLAYING = "#248f24" COLOUR_CART_READY = "#ffc107" + COLOUR_CART_UNCONFIGURED = "#f2f2f2" COLOUR_CURRENT_HEADER = "#d4edda" COLOUR_CURRENT_PLAYLIST = "#7eca8f" COLOUR_CURRENT_TAB = "#248f24" diff --git a/app/models.py b/app/models.py index 2ecc0e3..067d78b 100644 --- a/app/models.py +++ b/app/models.py @@ -63,12 +63,12 @@ class Carts(Base): def __repr__(self) -> str: return ( - f"" ) def __init__(self, session: Session, cart_number: int, name: str = None, - duration: int = None, path: str = None, + duration: int = None, path: str = None, enabled: bool = True) -> None: """Create new cart""" @@ -82,18 +82,18 @@ class Carts(Base): session.commit() @classmethod - def enabled_carts(cls, session: Session) -> List["Carts"]: - """Return a list of all active carts""" + def all_as_dict(cls, session: Session) -> dict: + """Return a dictionary of all carts keyed by cart number""" - return ( + result = ( session.execute( select(Carts) - .where(Carts.enabled.is_(True)) .order_by(Carts.cart_number) ) .scalars() .all() ) + return {a.id: a for a in result} @classmethod def get_or_create(cls, session: Session, cart_number: int) -> "Carts": diff --git a/app/musicmuster.py b/app/musicmuster.py index 94b7719..bd050cd 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -110,7 +110,7 @@ class Window(QMainWindow, Ui_MainWindow): pass def cart_button(self, cart: Carts) -> QPushButton: - """Create a cart pushbutton""" + """Create a cart pushbutton and set it disabled""" btn = QPushButton(self) btn.setEnabled(True) @@ -121,6 +121,7 @@ class Window(QMainWindow, Ui_MainWindow): btn.setObjectName("cart_" + str(cart.cart_number)) btn.setText(cart.name) btn.clicked.connect(self.cart_click) + btn.setEnabled(False) # Insert button on left of cart space after existing buttons self.horizontalLayout_Carts.insertWidget(len(self.carts), btn) @@ -169,7 +170,15 @@ class Window(QMainWindow, Ui_MainWindow): """Initialse carts data structures""" with Session() as session: - for cart in Carts.enabled_carts(session): + carts_in_db = Carts.all_as_dict(session) + # Number carts from 1 for humanity + for cart_number in range(1, Config.CARTS_COUNT + 1): + if cart_number in carts_in_db: + cart = carts_in_db[cart_number] + else: + cart = Carts(session, cart_number, + name=f"Cart #{cart_number}") + btn = self.cart_button(cart) self.carts[btn] = {} @@ -180,10 +189,15 @@ class Window(QMainWindow, Ui_MainWindow): player = self.music.VLC.media_player_new(cart.path) player.audio_set_volume(Config.VOLUME_VLC_DEFAULT) self.carts[btn]['player'] = player - if helpers.file_is_readable(cart.path): - colour = Config.COLOUR_CART_READY + if cart.path: + if helpers.file_is_readable(cart.path): + colour = Config.COLOUR_CART_READY + btn.setEnabled(True) + else: + colour = Config.COLOUR_CART_ERROR else: - colour = Config.COLOUR_CART_ERROR + colour = Config.COLOUR_CART_UNCONFIGURED + btn.setStyleSheet("background-color: " + colour + ";\n") def cart_tick(self) -> None: diff --git a/app/ui/main_window.ui b/app/ui/main_window.ui index 14d72ee..9d1c073 100644 --- a/app/ui/main_window.ui +++ b/app/ui/main_window.ui @@ -865,7 +865,6 @@ padding-left: 8px; &Carts - @@ -1158,7 +1157,7 @@ padding-left: 8px; - Add &cart... + Edit cart &1... diff --git a/app/ui/main_window_ui.py b/app/ui/main_window_ui.py index 869924a..b05f9e3 100644 --- a/app/ui/main_window_ui.py +++ b/app/ui/main_window_ui.py @@ -530,7 +530,6 @@ class Ui_MainWindow(object): self.menuSearc_h.addAction(self.actionSelect_previous_track) self.menuHelp.addAction(self.action_About) self.menuHelp.addAction(self.actionDebug) - self.menu_Carts.addAction(self.actionAdd_cart) self.menubar.addAction(self.menuFile.menuAction()) self.menubar.addAction(self.menuPlaylist.menuAction()) self.menubar.addAction(self.menuSearc_h.menuAction()) @@ -629,6 +628,6 @@ class Ui_MainWindow(object): self.actionSave_as_template.setText(_translate("MainWindow", "Save as template...")) self.actionNew_from_template.setText(_translate("MainWindow", "New from template...")) self.actionDebug.setText(_translate("MainWindow", "Debug")) - self.actionAdd_cart.setText(_translate("MainWindow", "Add &cart...")) + self.actionAdd_cart.setText(_translate("MainWindow", "Edit cart &1...")) from infotabs import InfoTabs import icons_rc From 1899aac9ae3fd9cfe51ec58b29f99e2cf75eb4dc Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Fri, 21 Oct 2022 22:41:38 +0100 Subject: [PATCH 4/5] Implement carts --- app/models.py | 14 --- app/musicmuster.py | 178 ++++++++++++++++++--------------- app/ui/dlg_Cart.ui | 206 ++++++++++++++++++++++----------------- app/ui/dlg_cart_ui.py | 63 +++++++----- app/ui/main_window.ui | 6 -- app/ui/main_window_ui.py | 4 - 6 files changed, 256 insertions(+), 215 deletions(-) diff --git a/app/models.py b/app/models.py index 067d78b..4540c3b 100644 --- a/app/models.py +++ b/app/models.py @@ -81,20 +81,6 @@ class Carts(Base): session.add(self) session.commit() - @classmethod - def all_as_dict(cls, session: Session) -> dict: - """Return a dictionary of all carts keyed by cart number""" - - result = ( - session.execute( - select(Carts) - .order_by(Carts.cart_number) - ) - .scalars() - .all() - ) - return {a.id: a for a in result} - @classmethod def get_or_create(cls, session: Session, cart_number: int) -> "Carts": """ diff --git a/app/musicmuster.py b/app/musicmuster.py index bd050cd..24a6201 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -48,6 +48,42 @@ from ui.main_window_ui import Ui_MainWindow # type: ignore from utilities import check_db, update_bitrates +class CartButton(QPushButton): + """Button for playing carts""" + + def __init__(self, parent: QMainWindow, cart: Carts): + """Create a cart pushbutton and set it disabled""" + + super().__init__(parent) + self.parent = parent + self.cart_id = cart.id + self.path = cart.path + self.player = None + self.is_playing = False + + self.clicked.connect(self.parent.cart_click) + self.setEnabled(True) + self.setMinimumSize(QSize(147, 61)) + font = QFont() + font.setPointSize(14) + self.setFont(font) + self.setObjectName("cart_" + str(cart.cart_number)) + + def __repr__(self) -> str: + return ( + f"" + ) + + def event(self, event): + if event.type() == QEvent.MouseButtonRelease: + if event.button() == Qt.RightButton: + self.parent.cart_edit(self, event) + return True + + return super().event(event) + + class TrackData: def __init__(self, track): self.id = track.id @@ -104,50 +140,28 @@ class Window(QMainWindow, Ui_MainWindow): self.timer.start(Config.TIMER_MS) self.connect_signals_slots() - def cart_add(self) -> None: - """Add a cart""" - - pass - - def cart_button(self, cart: Carts) -> QPushButton: - """Create a cart pushbutton and set it disabled""" - - btn = QPushButton(self) - btn.setEnabled(True) - btn.setMinimumSize(QSize(147, 61)) - font = QFont() - font.setPointSize(14) - btn.setFont(font) - btn.setObjectName("cart_" + str(cart.cart_number)) - btn.setText(cart.name) - btn.clicked.connect(self.cart_click) - btn.setEnabled(False) - # Insert button on left of cart space after existing buttons - self.horizontalLayout_Carts.insertWidget(len(self.carts), btn) - - return btn - def cart_click(self) -> None: """Handle cart click""" - # print(f"cart_click({self.sender()=})") - # print(f"{self.carts[self.sender()]['name']}") btn = self.sender() - cart = self.carts[btn] - if helpers.file_is_readable(cart['path']): - cart['player'].play() - self.carts[btn]['playing'] = True + if helpers.file_is_readable(btn.path): + btn.player.play() + btn.is_playing = True colour = Config.COLOUR_CART_PLAYING else: colour = Config.COLOUR_CART_ERROR btn.setStyleSheet("background-color: " + colour + ";\n") - def cart_edit(self, cart_number: int) -> None: - """Edit carts""" + def cart_edit(self, btn: CartButton, event: QEvent): + """Handle context menu for cart button""" with Session() as session: - cart = Carts.get_or_create(session, cart_number) - dlg = CartDialog(self, cart, cart_number) + cart = session.query(Carts).get(btn.cart_id) + if cart is None: + log.ERROR("cart_edit: cart not found") + return + + dlg = CartDialog(parent=self, session=session, cart=cart) if dlg.exec(): name = dlg.ui.lineEditName.text() if not name: @@ -157,58 +171,71 @@ class Window(QMainWindow, Ui_MainWindow): if not path: QMessageBox.warning(self, "Error", "Filename required") return - cart.name = name - cart.path = path - if cart.path: + if cart.path and helpers.file_is_readable(cart.path): tags = helpers.get_tags(cart.path) cart.duration = tags['duration'] + cart.enabled = dlg.ui.chkEnabled.isChecked() + cart.name = name + cart.path = path + session.add(cart) session.commit() + self.cart_configure(cart, btn) + def carts_init(self) -> None: """Initialse carts data structures""" with Session() as session: - carts_in_db = Carts.all_as_dict(session) # Number carts from 1 for humanity for cart_number in range(1, Config.CARTS_COUNT + 1): - if cart_number in carts_in_db: - cart = carts_in_db[cart_number] - else: + cart = session.query(Carts).get(cart_number) + if cart is None: cart = Carts(session, cart_number, name=f"Cart #{cart_number}") - btn = self.cart_button(cart) + btn = CartButton(self, cart) + # Insert button on left of cart space starting at + # location zero + self.horizontalLayout_Carts.insertWidget(cart.id - 1, btn) + # Configure button + self.cart_configure(cart, btn) - self.carts[btn] = {} - self.carts[btn]['name'] = cart.name - self.carts[btn]['duration'] = cart.duration - self.carts[btn]['path'] = cart.path - self.carts[btn]['playing'] = False - player = self.music.VLC.media_player_new(cart.path) - player.audio_set_volume(Config.VOLUME_VLC_DEFAULT) - self.carts[btn]['player'] = player - if cart.path: - if helpers.file_is_readable(cart.path): - colour = Config.COLOUR_CART_READY - btn.setEnabled(True) - else: - colour = Config.COLOUR_CART_ERROR - else: - colour = Config.COLOUR_CART_UNCONFIGURED + def cart_configure(self, cart: Carts, btn: CartButton) -> None: + """Configure button with cart data""" - btn.setStyleSheet("background-color: " + colour + ";\n") + btn.setEnabled(False) + if cart.path: + if helpers.file_is_readable(cart.path): + colour = Config.COLOUR_CART_READY + btn.path = cart.path + btn.player = self.music.VLC.media_player_new(cart.path) + btn.player.audio_set_volume(Config.VOLUME_VLC_DEFAULT) + if cart.enabled: + btn.setEnabled(True) + else: + colour = Config.COLOUR_CART_ERROR + else: + colour = Config.COLOUR_CART_UNCONFIGURED + + btn.setStyleSheet("background-color: " + colour + ";\n") + btn.setText(cart.name) def cart_tick(self) -> None: """Cart clock actions""" - for btn, cart in self.carts.items(): - if cart['playing']: - if not cart['player'].is_playing(): + for i in range(self.horizontalLayout_Carts.count()): + btn = self.horizontalLayout_Carts.itemAt(i).widget() + if not btn: + continue + if btn.is_playing: + if not btn.player.is_playing(): # Cart has finished playing - cart['playing'] = False - cart['player'].set_position(0) + btn.is_playing = False + # Setting to position 0 doesn't seem to work + btn.player = self.music.VLC.media_player_new(btn.path) + btn.player.audio_set_volume(Config.VOLUME_VLC_DEFAULT) colour = Config.COLOUR_CART_READY btn.setStyleSheet("background-color: " + colour + ";\n") @@ -296,10 +323,8 @@ class Window(QMainWindow, Ui_MainWindow): def connect_signals_slots(self) -> None: self.action_About.triggered.connect(self.about) - self.actionAdd_cart.triggered.connect(self.cart_add) self.action_Clear_selection.triggered.connect(self.clear_selection) self.actionDebug.triggered.connect(self.debug) - self.actionAdd_cart.triggered.connect(self.cart_add) self.actionClosePlaylist.triggered.connect(self.close_playlist_tab) self.actionDownload_CSV_of_played_tracks.triggered.connect( self.download_played_tracks) @@ -1199,26 +1224,25 @@ class Window(QMainWindow, Ui_MainWindow): class CartDialog(QDialog): """Edit cart details""" - def __init__(self, parent: QMainWindow, - cart: Optional[Carts], - cart_number: int) -> None: + def __init__(self, parent: QMainWindow, session: Session, + cart: Carts) -> None: """ Manage carts """ super().__init__(parent) + self.parent = parent + self.session = session + self.ui = Ui_DialogCartEdit() self.ui.setupUi(self) - self.ui.chkEnabled.setChecked(True) - self.path = "" - - self.ui.windowTitle = "Edit Cart " + str(cart_number) - - if cart: - self.ui.lineEditName.setText(cart.name) - self.path = cart.path - + self.path = cart.path self.ui.lblPath.setText(self.path) + self.ui.lineEditName.setText(cart.name) + self.ui.chkEnabled.setChecked(cart.enabled) + + self.ui.windowTitle = "Edit Cart " + str(cart.id) + self.ui.btnFile.clicked.connect(self.choose_file) def choose_file(self) -> None: diff --git a/app/ui/dlg_Cart.ui b/app/ui/dlg_Cart.ui index 4eff2bd..41be25d 100644 --- a/app/ui/dlg_Cart.ui +++ b/app/ui/dlg_Cart.ui @@ -6,103 +6,125 @@ 0 0 - 400 - 171 + 564 + 148 Carts - - - - 200 - 140 - 171 - 32 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - 10 - 60 - 76 - 19 - - - - &Name: - - - lineEditName - - - - - - 90 - 60 - 291 - 27 - - - - - - - - - - 10 - 10 - 371 - 41 - - - - xxx - - - Qt::PlainText - - - true - - - - - - 10 - 100 - 100 - 27 - - - - &File - - - - - - 280 - 100 - 104 - 25 - - - - &Enabled - - + + + + + + 56 + 16777215 + + + + &Name: + + + lineEditName + + + + + + + + + + + + + + &Enabled + + + + + + + + 56 + 16777215 + + + + File: + + + lblPath + + + + + + + + 0 + 0 + + + + + 301 + 41 + + + + + + + Qt::PlainText + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + 31 + 16777215 + + + + ... + + + + + + + Qt::Horizontal + + + + 116 + 20 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + diff --git a/app/ui/dlg_cart_ui.py b/app/ui/dlg_cart_ui.py index 9a97170..919d7ec 100644 --- a/app/ui/dlg_cart_ui.py +++ b/app/ui/dlg_cart_ui.py @@ -14,31 +14,50 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_DialogCartEdit(object): def setupUi(self, DialogCartEdit): DialogCartEdit.setObjectName("DialogCartEdit") - DialogCartEdit.resize(400, 171) + DialogCartEdit.resize(564, 148) + self.gridLayout = QtWidgets.QGridLayout(DialogCartEdit) + self.gridLayout.setObjectName("gridLayout") + self.label = QtWidgets.QLabel(DialogCartEdit) + self.label.setMaximumSize(QtCore.QSize(56, 16777215)) + self.label.setObjectName("label") + self.gridLayout.addWidget(self.label, 0, 0, 1, 1) + self.lineEditName = QtWidgets.QLineEdit(DialogCartEdit) + self.lineEditName.setInputMask("") + self.lineEditName.setObjectName("lineEditName") + self.gridLayout.addWidget(self.lineEditName, 0, 1, 1, 2) + self.chkEnabled = QtWidgets.QCheckBox(DialogCartEdit) + self.chkEnabled.setObjectName("chkEnabled") + self.gridLayout.addWidget(self.chkEnabled, 0, 3, 1, 1) + self.label_2 = QtWidgets.QLabel(DialogCartEdit) + self.label_2.setMaximumSize(QtCore.QSize(56, 16777215)) + self.label_2.setObjectName("label_2") + self.gridLayout.addWidget(self.label_2, 1, 0, 1, 1) + self.lblPath = QtWidgets.QLabel(DialogCartEdit) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lblPath.sizePolicy().hasHeightForWidth()) + self.lblPath.setSizePolicy(sizePolicy) + self.lblPath.setMinimumSize(QtCore.QSize(301, 41)) + self.lblPath.setText("") + self.lblPath.setTextFormat(QtCore.Qt.PlainText) + self.lblPath.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) + self.lblPath.setWordWrap(True) + self.lblPath.setObjectName("lblPath") + self.gridLayout.addWidget(self.lblPath, 1, 1, 1, 1) + self.btnFile = QtWidgets.QPushButton(DialogCartEdit) + self.btnFile.setMaximumSize(QtCore.QSize(31, 16777215)) + self.btnFile.setObjectName("btnFile") + self.gridLayout.addWidget(self.btnFile, 1, 3, 1, 1) + spacerItem = QtWidgets.QSpacerItem(116, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout.addItem(spacerItem, 2, 1, 1, 1) self.buttonBox = QtWidgets.QDialogButtonBox(DialogCartEdit) - self.buttonBox.setGeometry(QtCore.QRect(200, 140, 171, 32)) self.buttonBox.setOrientation(QtCore.Qt.Horizontal) self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok) self.buttonBox.setObjectName("buttonBox") - self.label = QtWidgets.QLabel(DialogCartEdit) - self.label.setGeometry(QtCore.QRect(10, 60, 76, 19)) - self.label.setObjectName("label") - self.lineEditName = QtWidgets.QLineEdit(DialogCartEdit) - self.lineEditName.setGeometry(QtCore.QRect(90, 60, 291, 27)) - self.lineEditName.setInputMask("") - self.lineEditName.setObjectName("lineEditName") - self.lblPath = QtWidgets.QLabel(DialogCartEdit) - self.lblPath.setGeometry(QtCore.QRect(10, 10, 371, 41)) - self.lblPath.setTextFormat(QtCore.Qt.PlainText) - self.lblPath.setWordWrap(True) - self.lblPath.setObjectName("lblPath") - self.btnFile = QtWidgets.QPushButton(DialogCartEdit) - self.btnFile.setGeometry(QtCore.QRect(10, 100, 100, 27)) - self.btnFile.setObjectName("btnFile") - self.chkEnabled = QtWidgets.QCheckBox(DialogCartEdit) - self.chkEnabled.setGeometry(QtCore.QRect(280, 100, 104, 25)) - self.chkEnabled.setObjectName("chkEnabled") + self.gridLayout.addWidget(self.buttonBox, 2, 2, 1, 2) self.label.setBuddy(self.lineEditName) + self.label_2.setBuddy(self.lblPath) self.retranslateUi(DialogCartEdit) self.buttonBox.accepted.connect(DialogCartEdit.accept) # type: ignore @@ -49,6 +68,6 @@ class Ui_DialogCartEdit(object): _translate = QtCore.QCoreApplication.translate DialogCartEdit.setWindowTitle(_translate("DialogCartEdit", "Carts")) self.label.setText(_translate("DialogCartEdit", "&Name:")) - self.lblPath.setText(_translate("DialogCartEdit", "xxx")) - self.btnFile.setText(_translate("DialogCartEdit", "&File")) self.chkEnabled.setText(_translate("DialogCartEdit", "&Enabled")) + self.label_2.setText(_translate("DialogCartEdit", "File:")) + self.btnFile.setText(_translate("DialogCartEdit", "...")) diff --git a/app/ui/main_window.ui b/app/ui/main_window.ui index 9d1c073..7257ceb 100644 --- a/app/ui/main_window.ui +++ b/app/ui/main_window.ui @@ -861,16 +861,10 @@ padding-left: 8px; - - - &Carts - - - diff --git a/app/ui/main_window_ui.py b/app/ui/main_window_ui.py index b05f9e3..f9a5378 100644 --- a/app/ui/main_window_ui.py +++ b/app/ui/main_window_ui.py @@ -381,8 +381,6 @@ class Ui_MainWindow(object): self.menuSearc_h.setObjectName("menuSearc_h") self.menuHelp = QtWidgets.QMenu(self.menubar) self.menuHelp.setObjectName("menuHelp") - self.menu_Carts = QtWidgets.QMenu(self.menubar) - self.menu_Carts.setObjectName("menu_Carts") MainWindow.setMenuBar(self.menubar) self.statusbar = QtWidgets.QStatusBar(MainWindow) self.statusbar.setEnabled(True) @@ -534,7 +532,6 @@ class Ui_MainWindow(object): self.menubar.addAction(self.menuPlaylist.menuAction()) self.menubar.addAction(self.menuSearc_h.menuAction()) self.menubar.addAction(self.menuHelp.menuAction()) - self.menubar.addAction(self.menu_Carts.menuAction()) self.retranslateUi(MainWindow) self.tabPlaylist.setCurrentIndex(-1) @@ -573,7 +570,6 @@ class Ui_MainWindow(object): self.menuPlaylist.setTitle(_translate("MainWindow", "Sho&wtime")) self.menuSearc_h.setTitle(_translate("MainWindow", "&Search")) self.menuHelp.setTitle(_translate("MainWindow", "&Help")) - self.menu_Carts.setTitle(_translate("MainWindow", "&Carts")) self.actionPlay_next.setText(_translate("MainWindow", "&Play next")) self.actionPlay_next.setShortcut(_translate("MainWindow", "Return")) self.actionSkipToNext.setText(_translate("MainWindow", "Skip to &next")) From f42261277e59c22c0bb95873a9ff31d489641710 Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Fri, 21 Oct 2022 22:54:50 +0100 Subject: [PATCH 5/5] Carts: tidy up code --- app/config.py | 2 +- app/musicmuster.py | 47 +++++++++++++++++++++++----------------------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/app/config.py b/app/config.py index cdcf179..8e4f0e1 100644 --- a/app/config.py +++ b/app/config.py @@ -56,7 +56,7 @@ class Config(object): FADE_TIME = 3000 INFO_TAB_TITLE_LENGTH = 15 LAST_PLAYED_TODAY_STRING = "Today" - LOG_LEVEL_STDERR = logging.DEBUG + LOG_LEVEL_STDERR = logging.ERROR LOG_LEVEL_SYSLOG = logging.DEBUG LOG_NAME = "musicmuster" MAIL_PASSWORD = os.environ.get('MAIL_PASSWORD') diff --git a/app/musicmuster.py b/app/musicmuster.py index 24a6201..e4733ba 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -61,7 +61,6 @@ class CartButton(QPushButton): self.player = None self.is_playing = False - self.clicked.connect(self.parent.cart_click) self.setEnabled(True) self.setMinimumSize(QSize(147, 61)) font = QFont() @@ -75,7 +74,9 @@ class CartButton(QPushButton): f"path={self.path}, is_playing={self.is_playing}>" ) - def event(self, event): + def event(self, event: QEvent) -> bool: + """Allow right click even when button is disabled""" + if event.type() == QEvent.MouseButtonRelease: if event.button() == Qt.RightButton: self.parent.cart_edit(self, event) @@ -129,7 +130,6 @@ class Window(QMainWindow, Ui_MainWindow): self.statusbar.addWidget(self.txtSearch) self.txtSearch.setHidden(True) self.hide_played_tracks = False - self.carts = {} self.visible_playlist_tab: Callable[[], PlaylistTab] = \ self.tabPlaylist.currentWidget @@ -140,6 +140,26 @@ class Window(QMainWindow, Ui_MainWindow): self.timer.start(Config.TIMER_MS) self.connect_signals_slots() + def cart_configure(self, cart: Carts, btn: CartButton) -> None: + """Configure button with cart data""" + + btn.setEnabled(False) + if cart.path: + if helpers.file_is_readable(cart.path): + colour = Config.COLOUR_CART_READY + btn.path = cart.path + btn.player = self.music.VLC.media_player_new(cart.path) + btn.player.audio_set_volume(Config.VOLUME_VLC_DEFAULT) + if cart.enabled: + btn.setEnabled(True) + else: + colour = Config.COLOUR_CART_ERROR + else: + colour = Config.COLOUR_CART_UNCONFIGURED + + btn.setStyleSheet("background-color: " + colour + ";\n") + btn.setText(cart.name) + def cart_click(self) -> None: """Handle cart click""" @@ -196,32 +216,13 @@ class Window(QMainWindow, Ui_MainWindow): name=f"Cart #{cart_number}") btn = CartButton(self, cart) + btn.clicked.connect(self.cart_click) # Insert button on left of cart space starting at # location zero self.horizontalLayout_Carts.insertWidget(cart.id - 1, btn) # Configure button self.cart_configure(cart, btn) - def cart_configure(self, cart: Carts, btn: CartButton) -> None: - """Configure button with cart data""" - - btn.setEnabled(False) - if cart.path: - if helpers.file_is_readable(cart.path): - colour = Config.COLOUR_CART_READY - btn.path = cart.path - btn.player = self.music.VLC.media_player_new(cart.path) - btn.player.audio_set_volume(Config.VOLUME_VLC_DEFAULT) - if cart.enabled: - btn.setEnabled(True) - else: - colour = Config.COLOUR_CART_ERROR - else: - colour = Config.COLOUR_CART_UNCONFIGURED - - btn.setStyleSheet("background-color: " + colour + ";\n") - btn.setText(cart.name) - def cart_tick(self) -> None: """Cart clock actions"""