From df237bbe3a9c7bdfed0188d5cf9ffd0e1e8cce91 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Mon, 13 Sep 2021 18:13:48 +0200
Subject: [PATCH] Improve error handling and messaging to user

---
 core/include/area_data.h |  2 +-
 core/src/area_data.cpp   | 20 ++++++++++++--------
 core/src/packets.cpp     |  7 +++----
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/core/include/area_data.h b/core/include/area_data.h
index 8d6692e..b270f24 100644
--- a/core/include/area_data.h
+++ b/core/include/area_data.h
@@ -814,7 +814,7 @@ class AreaData : public QObject {
     /**
      * @brief Adds a song to the Jukeboxs queue.
      */
-    bool addJukeboxSong(QString f_song);
+    QString addJukeboxSong(QString f_song);
 
   public slots:
 
diff --git a/core/src/area_data.cpp b/core/src/area_data.cpp
index 93f8a36..f11d05d 100644
--- a/core/src/area_data.cpp
+++ b/core/src/area_data.cpp
@@ -533,20 +533,24 @@ void AreaData::toggleJukebox()
     }
 }
 
-bool AreaData::addJukeboxSong(QString f_song)
+QString AreaData::addJukeboxSong(QString f_song)
 {
     if(!m_jukebox_queue.contains(f_song)) {
         if (m_jukebox_queue.size() == 0) {
-            emit playJukeboxSong(AOPacket("MC",{f_song,QString::number(-1)}), index());
-            m_jukebox_timer->start(ConfigManager::songInformation(f_song) * 1000);
-            setCurrentMusic(f_song);
-            setMusicPlayedBy("Jukebox");
+            int l_song_duration = ConfigManager::songInformation(f_song);
+            if (l_song_duration >= 0) {
+                emit playJukeboxSong(AOPacket("MC",{f_song,QString::number(-1)}), index());
+                m_jukebox_timer->start(l_song_duration * 1000);
+                setCurrentMusic(f_song);
+                setMusicPlayedBy("Jukebox");
+                m_jukebox_queue.append(f_song);
+                return "Song added to Jukebox.";
+            }
         }
-        m_jukebox_queue.append(f_song);
-        return true;
+        return "Unable to add song. Duration shorther than 1.";
     }
     else {
-        return false;
+        return "Unable to add song. Song already in Jukebox.";
     }
 }
 
diff --git a/core/src/packets.cpp b/core/src/packets.cpp
index 9f3670c..52c37c3 100644
--- a/core/src/packets.cpp
+++ b/core/src/packets.cpp
@@ -322,13 +322,12 @@ void AOClient::pktChangeMusic(AreaData* area, int argc, QStringList argv, AOPack
 
             //Jukebox intercepts the direct playing of messages.
             if (area->isjukeboxEnabled()) {
-                if (area->addJukeboxSong(l_final_song))
-                    sendServerMessage("Song added to jukebox.");
-                else
-                    sendServerMessage("Unable to add. Song already in jukebox.");
+                QString l_jukebox_reply = area->addJukeboxSong(l_final_song);
+                sendServerMessage(l_jukebox_reply);
                 return;
             }
 
+
             AOPacket l_music_change("MC", {l_final_song, argv[1], m_showname, "1", "0", l_effects});
             area->setCurrentMusic(l_final_song);
             area->setMusicPlayedBy(m_showname);