Videre

ui/library_panel.py

@@ -41,9 +41,11 @@ class DraggableLibraryList(QListWidget):
 
 
 class LibraryPanel(QWidget):
-    song_selected   = pyqtSignal(dict)
-    add_to_playlist = pyqtSignal(dict)
-    scan_requested  = pyqtSignal()
+    song_selected     = pyqtSignal(dict)
+    add_to_playlist   = pyqtSignal(dict)
+    scan_requested    = pyqtSignal()
+    edit_tags_requested = pyqtSignal(dict)
+    send_mail_requested = pyqtSignal(dict)
 
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -68,16 +70,11 @@ class LibraryPanel(QWidget):
         header.addWidget(lbl)
         header.addStretch()
 
-        self._btn_scan = QPushButton("⟳  SCAN")
-        self._btn_scan.setFixedHeight(24)
-        self._btn_scan.setToolTip("Scan alle biblioteksmapper for nye og ændrede filer")
-        self._btn_scan.clicked.connect(self._on_scan_clicked)
-        header.addWidget(self._btn_scan)
-
-        btn_add = QPushButton("+ MAPPE")
-        btn_add.setFixedHeight(24)
-        btn_add.clicked.connect(self._add_folder)
-        header.addWidget(btn_add)
+        btn_manage = QPushButton("⚙  Mapper")
+        btn_manage.setFixedHeight(24)
+        btn_manage.setToolTip("Tilføj, fjern og scan musikbiblioteker")
+        btn_manage.clicked.connect(self._manage_libraries)
+        header.addWidget(btn_manage)
         layout.addLayout(header)
 
         # Scan status
@@ -128,14 +125,10 @@ class LibraryPanel(QWidget):
 
     def set_scanning(self, scanning: bool, status_text: str = ""):
         if scanning:
-            self._btn_scan.setEnabled(False)
-            self._btn_scan.setText("⟳  SCANNER...")
             self._scan_bar.show()
             self._scan_label.setText(status_text or "Starter...")
             self._scan_label.show()
         else:
-            self._btn_scan.setEnabled(True)
-            self._btn_scan.setText("⟳  SCAN")
             self._scan_bar.hide()
             self._scan_label.hide()
 
@@ -176,10 +169,20 @@ class LibraryPanel(QWidget):
         q = self._search.text().strip().lower()
         for song in self._filtered:
             dances = song.get("dances", [])
-            dance_str = "  ·  " + "  /  ".join(dances) if dances else ""
+            dance_levels = song.get("dance_levels", [])
             missing = song.get("file_missing", False)
+
+            # Byg dans-streng med niveau hvis tilgængeligt
+            dance_parts = []
+            for i, d in enumerate(dances):
+                lvl = dance_levels[i] if i < len(dance_levels) else ""
+                dance_parts.append(f"{d} / {lvl}" if lvl else d)
+            dance_str = "  ·  " + "  |  ".join(dance_parts) if dance_parts else ""
+
             line1 = ("⚠  " if missing else "") + song.get("title", "—")
-            line2 = f"  {song.get('artist','—')}  ·  {song.get('bpm',0)} BPM  ·  {song.get('file_format','').upper()}{dance_str}"
+            bpm = song.get("bpm", 0)
+            bpm_str = f"{bpm} BPM" if bpm else "? BPM"
+            line2 = f"  {song.get('artist','—')}  ·  {bpm_str}  ·  {song.get('file_format','').upper()}{dance_str}"
             item = QListWidgetItem(f"{line1}\n{line2}")
             item.setData(Qt.ItemDataRole.UserRole, song)
             if missing:
@@ -204,13 +207,63 @@ class LibraryPanel(QWidget):
         if not song:
             return
         menu = QMenu(self)
-        act_add  = menu.addAction("Tilføj til danseliste")
-        act_play = menu.addAction("Afspil")
+        act_add    = menu.addAction("Tilføj til danseliste")
+        act_play   = menu.addAction("Afspil")
+        menu.addSeparator()
+        act_tags   = menu.addAction("✎  Rediger dans-tags...")
+        act_bpm    = menu.addAction("♩  Analysér BPM")
+        menu.addSeparator()
+        send_menu  = menu.addMenu("Send til")
+        act_mail   = send_menu.addAction("✉  Send som mail")
         action = menu.exec(self._list.mapToGlobal(pos))
         if action == act_add:
             self.add_to_playlist.emit(song)
         elif action == act_play:
             self.song_selected.emit(song)
+        elif action == act_tags:
+            self.edit_tags_requested.emit(song)
+        elif action == act_bpm:
+            self._analyze_bpm(song)
+        elif action == act_mail:
+            self.send_mail_requested.emit(song)
+
+    def _analyze_bpm(self, song: dict):
+        """Analysér BPM i baggrundstråd og opdater biblioteket."""
+        path = song.get("local_path", "")
+        song_id = song.get("id", "")
+        if not path or not song_id:
+            return
+        from PyQt6.QtCore import QThread, pyqtSignal as _sig
+
+        class BpmWorker(QThread):
+            done = _sig(float)
+            def __init__(self, p, sid):
+                super().__init__()
+                self._p, self._sid = p, sid
+            def run(self):
+                from local.tag_reader import analyze_and_save_bpm
+                bpm = analyze_and_save_bpm(self._p, self._sid)
+                if bpm:
+                    self.done.emit(bpm)
+
+        self._bpm_worker = BpmWorker(path, song_id)
+
+        def on_bpm_done(bpm):
+            # Opdater sangen i _all_songs listen direkte
+            for s in self._all_songs:
+                if s.get("id") == song_id:
+                    s["bpm"] = int(round(bpm))
+                    break
+            self._do_search()
+
+        self._bpm_worker.done.connect(on_bpm_done)
+        self._bpm_worker.start()
+
+    def _manage_libraries(self):
+        from ui.library_manager import LibraryManagerDialog
+        dialog = LibraryManagerDialog(parent=self.window())
+        dialog.library_removed.connect(lambda _: self.scan_requested.emit())
+        dialog.exec()
 
     def _add_folder(self):
         from PyQt6.QtWidgets import QFileDialog