WIP V3: remove references to HEADER_NOTES_COLUMN in playlists.py
This commit is contained in:
Keith Edmunds
parent
0f77cef37a
commit
0d2dad9f3c
150
app/playlists.py
150
app/playlists.py
@ -55,7 +55,7 @@ if TYPE_CHECKING:
|
||||
from musicmuster import Window
|
||||
from playlistmodel import PlaylistModel
|
||||
|
||||
HEADER_NOTES_COLUMN = 2
|
||||
# HEADER_NOTES_COLUMN = 2
|
||||
|
||||
|
||||
class EscapeDelegate(QStyledItemDelegate):
|
||||
@ -1369,18 +1369,18 @@ class PlaylistTab(QTableView):
|
||||
|
||||
return self._get_row_userdata(row_number, self.ROW_LAST_PLAYED)
|
||||
|
||||
def _get_row_note(self, row_number: int) -> str:
|
||||
"""Return note on this row_number or null string if none"""
|
||||
# def _get_row_note(self, row_number: int) -> str:
|
||||
# """return note on this row_number or null string if none"""
|
||||
|
||||
track_id = self._get_row_track_id(row_number)
|
||||
if track_id:
|
||||
item_note = self.item(row_number, ROW_NOTES)
|
||||
else:
|
||||
item_note = self.item(row_number, HEADER_NOTES_COLUMN)
|
||||
if not item_note:
|
||||
return ""
|
||||
# track_id = self._get_row_track_id(row_number)
|
||||
# if track_id:
|
||||
# item_note = self.item(row_number, row_notes)
|
||||
# else:
|
||||
# item_note = self.item(row_number, header_notes_column)
|
||||
# if not item_note:
|
||||
# return ""
|
||||
|
||||
return item_note.text()
|
||||
# return item_note.text()
|
||||
|
||||
def _get_row_path(self, row_number: int) -> str:
|
||||
"""
|
||||
@ -1678,47 +1678,47 @@ class PlaylistTab(QTableView):
|
||||
|
||||
return None
|
||||
|
||||
def _remove_track(self, row_number: int) -> None:
|
||||
"""Remove track from row, making it a section header"""
|
||||
# def _remove_track(self, row_number: int) -> None:
|
||||
# """Remove track from row, making it a section header"""
|
||||
|
||||
# Get confirmation
|
||||
if not ask_yes_no(
|
||||
"Remove music", "Really remove the music track from this row?"
|
||||
):
|
||||
return
|
||||
# # Get confirmation
|
||||
# if not ask_yes_no(
|
||||
# "Remove music", "Really remove the music track from this row?"
|
||||
# ):
|
||||
# return
|
||||
|
||||
# Update playlist_rows record
|
||||
with Session() as session:
|
||||
plr = self._get_row_plr(session, row_number)
|
||||
if not plr:
|
||||
return
|
||||
# # Update playlist_rows record
|
||||
# with Session() as session:
|
||||
# plr = self._get_row_plr(session, row_number)
|
||||
# if not plr:
|
||||
# return
|
||||
|
||||
plr.track_id = None
|
||||
# We can't have null text
|
||||
if not plr.note:
|
||||
plr.note = Config.TEXT_NO_TRACK_NO_NOTE
|
||||
session.flush()
|
||||
# plr.track_id = None
|
||||
# # We can't have null text
|
||||
# if not plr.note:
|
||||
# plr.note = Config.TEXT_NO_TRACK_NO_NOTE
|
||||
# session.flush()
|
||||
|
||||
# Clear track text items
|
||||
for i in range(2, len(columns)):
|
||||
_ = self._set_item_text(row_number, i, "")
|
||||
# Remove row duration
|
||||
self._set_row_duration(row_number, 0)
|
||||
# Remove row start gap
|
||||
self._set_row_start_gap(row_number, None)
|
||||
# Remote track_id from row
|
||||
_ = self._set_row_userdata(row_number, self.ROW_TRACK_ID, 0)
|
||||
# Span the rows
|
||||
self.setSpan(row_number, HEADER_NOTES_COLUMN, 1, len(columns) - 1)
|
||||
# Set note text in correct column for section head
|
||||
self._set_row_header_text(session, row_number, plr.note)
|
||||
self.clear_selection()
|
||||
# # Clear track text items
|
||||
# for i in range(2, len(columns)):
|
||||
# _ = self._set_item_text(row_number, i, "")
|
||||
# # Remove row duration
|
||||
# self._set_row_duration(row_number, 0)
|
||||
# # Remove row start gap
|
||||
# self._set_row_start_gap(row_number, None)
|
||||
# # Remote track_id from row
|
||||
# _ = self._set_row_userdata(row_number, self.ROW_TRACK_ID, 0)
|
||||
# # Span the rows
|
||||
# self.setSpan(row_number, HEADER_NOTES_COLUMN, 1, len(columns) - 1)
|
||||
# # Set note text in correct column for section head
|
||||
# self._set_row_header_text(session, row_number, plr.note)
|
||||
# self.clear_selection()
|
||||
|
||||
# Save playlist to ensure correct detection of new header
|
||||
# row
|
||||
self.save_playlist(session)
|
||||
# Set track start/end times after track list is populated
|
||||
self._update_start_end_times(session)
|
||||
# # Save playlist to ensure correct detection of new header
|
||||
# # row
|
||||
# self.save_playlist(session)
|
||||
# # Set track start/end times after track list is populated
|
||||
# self._update_start_end_times(session)
|
||||
|
||||
def _reorder_rows(self, source_row_numbers: List[int]) -> None:
|
||||
"""
|
||||
@ -2107,38 +2107,38 @@ class PlaylistTab(QTableView):
|
||||
|
||||
return self._set_item_text(row_number, END_TIME, time_str)
|
||||
|
||||
def _set_row_header_text(
|
||||
self, session: scoped_session, row_number: int, text: str
|
||||
) -> None:
|
||||
"""
|
||||
Set header text and row colour
|
||||
"""
|
||||
# def _set_row_header_text(
|
||||
# self, session: scoped_session, row_number: int, text: str
|
||||
# ) -> None:
|
||||
# """
|
||||
# Set header text and row colour
|
||||
# """
|
||||
|
||||
# Sanity check: this should be a header row and thus not have a
|
||||
# track associate
|
||||
if self._get_row_track_id(row_number):
|
||||
if os.environ["MM_ENV"] == "PRODUCTION":
|
||||
send_mail(
|
||||
Config.ERRORS_TO,
|
||||
Config.ERRORS_FROM,
|
||||
"playlists:_set_row_header_text() called on track row",
|
||||
stackprinter.format(),
|
||||
)
|
||||
print(
|
||||
f"playists:_set_row_header_text() called on track row ({row_number=}, {text=}"
|
||||
)
|
||||
# stackprinter.show(add_summary=True, style="darkbg")
|
||||
return
|
||||
# # Sanity check: this should be a header row and thus not have a
|
||||
# # track associate
|
||||
# if self._get_row_track_id(row_number):
|
||||
# if os.environ["MM_ENV"] == "PRODUCTION":
|
||||
# send_mail(
|
||||
# Config.ERRORS_TO,
|
||||
# Config.ERRORS_FROM,
|
||||
# "playlists:_set_row_header_text() called on track row",
|
||||
# stackprinter.format(),
|
||||
# )
|
||||
# print(
|
||||
# f"playists:_set_row_header_text() called on track row ({row_number=}, {text=}"
|
||||
# )
|
||||
# # stackprinter.show(add_summary=True, style="darkbg")
|
||||
# return
|
||||
|
||||
# Set text
|
||||
_ = self._set_item_text(row_number, HEADER_NOTES_COLUMN, text)
|
||||
# # Set text
|
||||
# _ = self._set_item_text(row_number, HEADER_NOTES_COLUMN, text)
|
||||
|
||||
# Set colour
|
||||
note_colour = NoteColours.get_colour(session, text)
|
||||
if not note_colour:
|
||||
note_colour = Config.COLOUR_NOTES_PLAYLIST
|
||||
# # Set colour
|
||||
# note_colour = NoteColours.get_colour(session, text)
|
||||
# if not note_colour:
|
||||
# note_colour = Config.COLOUR_NOTES_PLAYLIST
|
||||
|
||||
self._set_row_colour(row_number, note_colour)
|
||||
# self._set_row_colour(row_number, note_colour)
|
||||
|
||||
def _set_row_last_played_time(
|
||||
self, row_number: int, last_played: datetime
|
||||
|
||||
Loading…
Reference in New Issue
Block a user