Compare commits

..

No commits in common. "128fe2925f8a45eebab0e9ec4d1dd03f80ce7cd3" and "d3999ca63d0b8d2fc3c6e580cd2583b560b903c6" have entirely different histories.

3 changed files with 9 additions and 22 deletions

View File

@ -643,8 +643,6 @@ class PlaylistRows(Base):
number from starting_row to end of playlist number from starting_row to end of playlist
""" """
log.debug(f"(move_rows_down({playlist_id=}, {starting_row=}, {move_by=}")
session.execute( session.execute(
update(PlaylistRows) update(PlaylistRows)
.where( .where(

View File

@ -235,7 +235,6 @@ class Window(QMainWindow, Ui_MainWindow):
self.frame_6.hide() self.frame_6.hide()
else: else:
self.carts_init() self.carts_init()
self.disable_selection_timing = False
self.enable_play_next_controls() self.enable_play_next_controls()
self.clock_counter = 0 self.clock_counter = 0
self.timer10.start(10) self.timer10.start(10)
@ -996,11 +995,7 @@ class Window(QMainWindow, Ui_MainWindow):
unplayed_rows = self.active_proxy_model().get_unplayed_rows() unplayed_rows = self.active_proxy_model().get_unplayed_rows()
if not unplayed_rows: if not unplayed_rows:
return return
# We can get a race condition as selected rows change while
# moving so disable selected rows timing for move
self.disable_selection_timing = True
self.move_playlist_rows(unplayed_rows) self.move_playlist_rows(unplayed_rows)
self.disable_selection_timing = False
def new_from_template(self) -> None: def new_from_template(self) -> None:
"""Create new playlist from template""" """Create new playlist from template"""
@ -1135,7 +1130,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.warning(f"Reset from {volume=}") log.warn(f"Reset from {volume=}")
break break
sleep(0.1) sleep(0.1)

View File

@ -292,20 +292,15 @@ class PlaylistTab(QTableView):
if len(selected_rows) == 0: if len(selected_rows) == 0:
self.musicmuster.lblSumPlaytime.setText("") self.musicmuster.lblSumPlaytime.setText("")
else: else:
if not self.musicmuster.disable_selection_timing: selected_duration = self.source_model.get_rows_duration(
selected_duration = self.source_model.get_rows_duration( self.get_selected_rows()
self.get_selected_rows() )
if selected_duration > 0:
self.musicmuster.lblSumPlaytime.setText(
f"Selected duration: {ms_to_mmss(selected_duration)}"
) )
if selected_duration > 0:
self.musicmuster.lblSumPlaytime.setText(
f"Selected duration: {ms_to_mmss(selected_duration)}"
)
else:
self.musicmuster.lblSumPlaytime.setText("")
else: else:
log.info( self.musicmuster.lblSumPlaytime.setText("")
f"playlists.py.selectionChanged: {self.musicmuster.disable_selection_timing=}"
)
super().selectionChanged(selected, deselected) super().selectionChanged(selected, deselected)
@ -681,8 +676,7 @@ class PlaylistTab(QTableView):
return return
self.musicmuster.audacity_file_path = path self.musicmuster.audacity_file_path = path
escaped_path = path.replace('"', '\\"') cmd = f'Import2: Filename="{path}"'
cmd = f'Import2: Filename="{escaped_path}"'
status = self._audactity_command(cmd) status = self._audactity_command(cmd)
log.info(f"_open_in_audacity {path=}, {status=}") log.info(f"_open_in_audacity {path=}, {status=}")