kae/musicmuster
1
0
Fork 0
Code Issues 28 Pull Requests Projects Releases 1 Activity

Add successive tracks below those just added

Browse Source
This commit is contained in:
Keith Edmunds 2023-12-17 14:33:24 +00:00
parent 2bf1e442be
commit e43c9f3b17
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/dialogs.py
View File

@ -10,6 +10,7 @@ from helpers import (
get_relative_date, get_relative_date,
ms_to_mmss, ms_to_mmss,
) )
from log import log
from models import Settings, Tracks from models import Settings, Tracks
from playlistmodel import PlaylistModel from playlistmodel import PlaylistModel
from ui.dlg_TrackSelect_ui import Ui_Dialog # type: ignore from ui.dlg_TrackSelect_ui import Ui_Dialog # type: ignore
@ -69,22 +70,27 @@ class TrackSelectDialog(QDialog):
track = item.data(Qt.ItemDataRole.UserRole) track = item.data(Qt.ItemDataRole.UserRole)
note = self.ui.txtNote.text() note = self.ui.txtNote.text()
if not (track or note):
return
track_id = None track_id = None
if track: if track:
track_id = track.id track_id = track.id
if not track_id: if note and not track_id:
if note:
self.source_model.insert_row(self.new_row_number, track_id, note) self.source_model.insert_row(self.new_row_number, track_id, note)
self.ui.txtNote.clear() self.ui.txtNote.clear()
return self.new_row_number += 1
else:
# No note, no track
return return
self.ui.txtNote.clear() self.ui.txtNote.clear()
self.select_searchtext() self.select_searchtext()
if track_id is None:
log.error("track_id is None and should not be")
return
# Check whether track is already in playlist # Check whether track is already in playlist
move_existing = False move_existing = False
existing_prd = self.source_model.is_track_in_playlist(track_id) existing_prd = self.source_model.is_track_in_playlist(track_id)
@ -110,6 +116,8 @@ class TrackSelectDialog(QDialog):
else: else:
self.source_model.insert_row(self.new_row_number, track_id, note) self.source_model.insert_row(self.new_row_number, track_id, note)
self.new_row_number += 1
def add_selected_and_close(self) -> None: def add_selected_and_close(self) -> None:
"""Handle Add and Close button""" """Handle Add and Close button"""

3
app/log.py
View File

@ -32,7 +32,8 @@ stderr = colorlog.StreamHandler()
stderr.setLevel(Config.LOG_LEVEL_STDERR) stderr.setLevel(Config.LOG_LEVEL_STDERR)
stderr.addFilter(local_filter) stderr.addFilter(local_filter)
stderr_fmt = colorlog.ColoredFormatter( stderr_fmt = colorlog.ColoredFormatter(
"%(log_color)s[%(asctime)s] %(leveltag)s: %(message)s", datefmt="%H:%M:%S" "%(log_color)s[%(asctime)s] %(filename)s:%(lineno)s %(leveltag)s:%(message)s",
datefmt="%H:%M:%S"
) )
stderr.setFormatter(stderr_fmt) stderr.setFormatter(stderr_fmt)
log.addHandler(stderr) log.addHandler(stderr)

2
app/musicmuster.py
View File

@ -1121,7 +1121,7 @@ class Window(QMainWindow, Ui_MainWindow):
volume = self.music.player.audio_get_volume() volume = self.music.player.audio_get_volume()
if volume < Config.VOLUME_VLC_DEFAULT: if volume < Config.VOLUME_VLC_DEFAULT:
self.music.set_volume() self.music.set_volume()
log.error(f"Reset from {volume=}") log.warn(f"Reset from {volume=}")
break break
sleep(0.1) sleep(0.1)

2
app/playlistmodel.py
View File

@ -529,7 +529,7 @@ class PlaylistModel(QAbstractTableModel):
If not given, return row number to add to end of model. If not given, return row number to add to end of model.
""" """
log.info(f"get_duplicate_rows({proposed_row_number=})") log.info(f"_get_new_row_number({proposed_row_number=})")
if proposed_row_number is None or proposed_row_number > len(self.playlist_rows): if proposed_row_number is None or proposed_row_number > len(self.playlist_rows):
# We are adding to the end of the list # We are adding to the end of the list