fix: always set downloaded song as active

Author: Fleeym

jukebox/jukebox/managers/nong_manager.cpp

@@ -9,8 +9,6 @@
 #include <unordered_map>
 #include <utility>
 
-#include <fmt/chrono.h>
-#include <fmt/core.h>
 #include <fmt/format.h>
 #include <Geode/Result.hpp>
 #include <Geode/binding/LevelTools.hpp>
@@ -22,6 +20,7 @@
 
 #include <jukebox/compat/compat.hpp>
 #include <jukebox/compat/v2.hpp>
+#include <jukebox/events/song_download_finished.hpp>
 #include <jukebox/managers/index_manager.hpp>
 #include <jukebox/nong/nong.hpp>
 #include <jukebox/nong/nong_serialize.hpp>
@@ -39,16 +38,17 @@ std::optional<Nongs*> NongManager::getNongs(int songID) {
     return m_manifest.m_nongs[songID].get();
 }
 
-bool NongManager::isNongVerifiedForLevelSong(int levelID, int songID, std::string_view uniqueID) {
+bool NongManager::isNongVerifiedForLevelSong(int levelID, int songID,
+                                             std::string_view uniqueID) {
     // List the verified nongs for the given level and song
-    std::vector<std::string> verifiedNongs = NongManager::get().getVerifiedNongsForLevel(
-        levelID,
-        {songID}
-    );
-    return std::find(verifiedNongs.begin(), verifiedNongs.end(), uniqueID) != verifiedNongs.end();
+    std::vector<std::string> verifiedNongs =
+        NongManager::get().getVerifiedNongsForLevel(levelID, {songID});
+    return std::find(verifiedNongs.begin(), verifiedNongs.end(), uniqueID) !=
+           verifiedNongs.end();
 }
 
-std::vector<std::string> NongManager::getVerifiedNongsForLevel(int levelID, std::vector<int> songIDs) {
+std::vector<std::string> NongManager::getVerifiedNongsForLevel(
+    int levelID, std::vector<int> songIDs) {
     std::vector<std::string> verifiedNongs;
 
     for (const int songID : songIDs) {
@@ -57,8 +57,9 @@ std::vector<std::string> NongManager::getVerifiedNongsForLevel(int levelID, std:
         if (!nongs.has_value()) {
             continue;
         }
-        
-        // For each indexSong, check if it contains the given levelID in its verifiedLevelIDs field.
+
+        // For each indexSong, check if it contains the given levelID in its
+        // verifiedLevelIDs field.
         for (auto indexSong : nongs.value()->indexSongs()) {
             auto& ids = indexSong->verifiedLevelIDs;
 
@@ -480,4 +481,22 @@ std::filesystem::path NongManager::generateSongFilePath(
     return destination;
 }
 
+ListenerResult NongManager::onDownloadFinished(event::SongDownloadFinished* e) {
+    const auto nongsOpt = this->getNongs(e->destination()->metadata()->gdID);
+
+    if (!nongsOpt) {
+        return ListenerResult::Propagate;
+    }
+
+    Nongs* nongs = nongsOpt.value();
+
+    if (GEODE_UNWRAP_IF_ERR(
+            err, nongs->setActive(e->destination()->metadata()->uniqueID))) {
+        log::error("Failed to set newly downloaded song {} as active: {}",
+                   e->destination()->metadata()->uniqueID, err);
+    }
+
+    return ListenerResult::Propagate;
+}
+
 };  // namespace jukebox

jukebox/jukebox/managers/nong_manager.hpp

@@ -12,6 +12,7 @@
 #include <Geode/utils/Task.hpp>
 
 #include <jukebox/events/get_song_info.hpp>
+#include <jukebox/events/song_download_finished.hpp>
 #include <jukebox/events/song_error.hpp>
 #include <jukebox/nong/nong.hpp>
 
@@ -37,13 +38,16 @@ class NongManager {
     }
 
     geode::Result<> saveNongs(std::optional<int> saveId = std::nullopt);
-    geode::EventListener<geode::EventFilter<jukebox::event::SongError>>
+    geode::EventListener<geode::EventFilter<event::SongError>>
         m_songErrorListener;
-    geode::EventListener<geode::EventFilter<jukebox::event::GetSongInfo>>
+    geode::EventListener<geode::EventFilter<event::GetSongInfo>>
         m_songInfoListener;
+    geode::EventListener<geode::EventFilter<event::SongDownloadFinished>>
+        m_downloadFinishedListener = {this, &NongManager::onDownloadFinished};
     geode::Result<std::unique_ptr<Nongs>> loadNongsFromPath(
         const std::filesystem::path& path);
 
+    geode::ListenerResult onDownloadFinished(event::SongDownloadFinished* e);
     geode::Result<> migrateV2();
 
 public:
@@ -99,26 +103,31 @@ class NongManager {
     std::optional<Nongs*> getNongs(int songID);
 
     /**
-     * Returns all the uniqueIDs of nongs that are verified for the given level ID
+     * Returns all the uniqueIDs of nongs that are verified for the given level
+     * ID
      *
      * @param levelID the id of the level
      * @param songIDs list of all the song ids to check their nongs
-     * @return List of all uniqueIDs of nongs that are verified for the given level ID
+     * @return List of all uniqueIDs of nongs that are verified for the given
+     * level ID
      */
-    std::vector<std::string> getVerifiedNongsForLevel(int levelID, std::vector<int> songIDs);
+    std::vector<std::string> getVerifiedNongsForLevel(int levelID,
+                                                      std::vector<int> songIDs);
 
     /**
      * Returns whether the nong is verified for the a song in a level
      *
      * @param levelID the id of the level
      * @param songID the id of a song in the level
      * @param uniqueID the id of the nong
-     * @return Boolean for whether the nong is verified 
+     * @return Boolean for whether the nong is verified
      */
-    bool isNongVerifiedForLevelSong(int levelID, int songID, std::string_view uniqueID);
+    bool isNongVerifiedForLevelSong(int levelID, int songID,
+                                    std::string_view uniqueID);
 
     /**
-     * Checks if the given level has a verified song for any of the given song IDs
+     * Checks if the given level has a verified song for any of the given song
+     * IDs
      *
      * @param levelID the id of the level
      * @param songIDs list of all the song ids to check

jukebox/jukebox/ui/list/nong_list.cpp

@@ -92,8 +92,6 @@ bool NongList::init(std::vector<int>& songIds, const cocos2d::CCSize& size,
     return true;
 }
 
-void NongList::setDownloadProgress(std::string uniqueID, float progress) {}
-
 void NongList::build() {
     if (m_list->m_contentLayer->getChildrenCount() > 0) {
         m_list->m_contentLayer->removeAllChildrenWithCleanup(true);
@@ -428,12 +426,6 @@ ListenerResult NongList::onDownloadFinish(event::SongDownloadFinished* e) {
         i->removeFromParentAndCleanup(true);
     }
 
-    auto res = nongs->setActive(e->destination()->metadata()->uniqueID);
-    if (!res) {
-        log::error("Failed to set newly downloaded song {} as active: {}",
-                   e->destination()->metadata()->uniqueID, res.unwrapErr());
-    }
-
     this->addSongToList(e->destination(), nongs, true);
 
     // Remove "you have no local songs label"

jukebox/jukebox/ui/list/nong_list.hpp

@@ -20,14 +20,14 @@
 
 namespace jukebox {
 
-class NongList : public cocos2d::CCNode {
+class NongList final : public cocos2d::CCNode {
 public:
     enum class ListType { Single = 0, Multiple = 1 };
 
 protected:
     std::vector<int> m_songIds;
-    geode::ScrollLayer* m_list;
-    cocos2d::extension::CCScale9Sprite* m_bg;
+    geode::ScrollLayer* m_list = nullptr;
+    cocos2d::extension::CCScale9Sprite* m_bg = nullptr;
     std::optional<int> m_currentSong = std::nullopt;
     std::optional<int> m_levelID;
 
@@ -58,7 +58,6 @@ class NongList : public cocos2d::CCNode {
     void build();
     void onBack(cocos2d::CCObject*);
     void onSelectSong(int songId);
-    void setDownloadProgress(std::string uniqueID, float progress);
 
     static NongList* create(
         std::vector<int>& songIds, const cocos2d::CCSize& size,