From e43c9f3b17aefd42781f2174dde7dff4c94f58be Mon Sep 17 00:00:00 2001
From: Keith Edmunds <kae@tiger-computing.co.uk>
Date: Sun, 17 Dec 2023 14:33:24 +0000
Subject: [PATCH] Add successive tracks below those just added

---
 app/dialogs.py       | 24 ++++++++++++++++--------
 app/log.py           |  3 ++-
 app/musicmuster.py   |  2 +-
 app/playlistmodel.py |  2 +-
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/app/dialogs.py b/app/dialogs.py
index 92c84fd..31e015a 100644
--- a/app/dialogs.py
+++ b/app/dialogs.py
@@ -10,6 +10,7 @@ from helpers import (
     get_relative_date,
     ms_to_mmss,
 )
+from log import log
 from models import Settings, Tracks
 from playlistmodel import PlaylistModel
 from ui.dlg_TrackSelect_ui import Ui_Dialog  # type: ignore
@@ -69,22 +70,27 @@ class TrackSelectDialog(QDialog):
                 track = item.data(Qt.ItemDataRole.UserRole)
 
         note = self.ui.txtNote.text()
+
+        if not (track or note):
+            return
+
         track_id = None
         if track:
             track_id = track.id
 
-        if not track_id:
-            if note:
-                self.source_model.insert_row(self.new_row_number, track_id, note)
-                self.ui.txtNote.clear()
-                return
-            else:
-                # No note, no track
-                return
+        if note and not track_id:
+            self.source_model.insert_row(self.new_row_number, track_id, note)
+            self.ui.txtNote.clear()
+            self.new_row_number += 1
+            return
 
         self.ui.txtNote.clear()
         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
         move_existing = False
         existing_prd = self.source_model.is_track_in_playlist(track_id)
@@ -110,6 +116,8 @@ class TrackSelectDialog(QDialog):
             else:
                 self.source_model.insert_row(self.new_row_number, track_id, note)
 
+        self.new_row_number += 1
+
     def add_selected_and_close(self) -> None:
         """Handle Add and Close button"""
 
diff --git a/app/log.py b/app/log.py
index cf83587..4248a40 100644
--- a/app/log.py
+++ b/app/log.py
@@ -32,7 +32,8 @@ stderr = colorlog.StreamHandler()
 stderr.setLevel(Config.LOG_LEVEL_STDERR)
 stderr.addFilter(local_filter)
 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)
 log.addHandler(stderr)
diff --git a/app/musicmuster.py b/app/musicmuster.py
index c47a1c3..2d062cf 100755
--- a/app/musicmuster.py
+++ b/app/musicmuster.py
@@ -1121,7 +1121,7 @@ class Window(QMainWindow, Ui_MainWindow):
                 volume = self.music.player.audio_get_volume()
                 if volume < Config.VOLUME_VLC_DEFAULT:
                     self.music.set_volume()
-                    log.error(f"Reset from {volume=}")
+                    log.warn(f"Reset from {volume=}")
                     break
             sleep(0.1)
 
diff --git a/app/playlistmodel.py b/app/playlistmodel.py
index 0955f0d..698831a 100644
--- a/app/playlistmodel.py
+++ b/app/playlistmodel.py
@@ -529,7 +529,7 @@ class PlaylistModel(QAbstractTableModel):
         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):
             # We are adding to the end of the list