carsten/LinedanceAfspiller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Med install

Browse Source
This commit is contained in:
Carsten Kvist
2026-04-10 15:09:37 +02:00
parent e5a4711004
commit 0f54f6d908
8 changed files with 229 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
linedance-app/ui/main_window.py
View File

@@ -439,9 +439,11 @@ class MainWindow(QMainWindow):
songs = []
for row in songs_raw:
with get_db() as conn:
dances = conn.execute(
"SELECT dance_name FROM song_dances "
"WHERE song_id=? ORDER BY dance_order",
dances_raw = conn.execute(
"SELECT sd.dance_name, dl.name as level_name "
"FROM song_dances sd "
"LEFT JOIN dance_levels dl ON dl.id = sd.level_id "
"WHERE sd.song_id=? ORDER BY sd.dance_order",
(row["id"],)
).fetchall()
songs.append({
@@ -454,7 +456,8 @@ class MainWindow(QMainWindow):
"local_path": row["local_path"],
"file_format": row["file_format"],
"file_missing": bool(row["file_missing"]),
"dances": [d["dance_name"] for d in dances],
"dances": [d["dance_name"] for d in dances_raw],
"dance_levels": [d["level_name"] or "" for d in dances_raw],
})
self._library_panel.load_songs(songs)
count = len(songs)
@@ -836,15 +839,13 @@ class MainWindow(QMainWindow):
self._vu.reset()
# Markér den afspillede sang
prev_idx = self._current_idx
self._playlist_panel.mark_played(prev_idx)
self._playlist_panel.mark_played(self._current_idx)
# Synkroniser event-status til den gemte navngivne liste
self._sync_event_status_to_playlist()
# Find næste afspilbare sang — fra 0 hvis ingen sang var i gang
search_from = max(0, prev_idx + 1)
ni = self._playlist_panel.next_playable_idx(search_from)
# Find første ikke-afspillede og ikke-skippede sang fra TOPPEN
ni = self._playlist_panel.next_playable_idx()
next_song = self._playlist_panel.get_song(ni) if ni is not None else None
if next_song:
self._current_idx = ni