fix song cache

this change makes it so that you have to go to the settings screen to scan songs, over the game confusingly scanning songs before the game even allows you to do anything the first time. matches other game behaviours

Author: solamint

Encore/src/menus/cacheLoadingScreen.cpp

@@ -5,6 +5,7 @@
 #include "cacheLoadingScreen.h"
 
 #include <filesystem>
+#include <mutex>
 #include <thread>
 
 #include "gameMenu.h"
@@ -39,8 +40,8 @@ void cacheLoadingScreen::Load() {
 
 // todo(3drosalia): make another class for drawing these things without having to uh.
 // implement it in every menu class
-bool finished = false;
-bool started = false;
+std::atomic_bool finished = false;
+std::atomic_bool started = false;
 
 void LoadCache() {
     TheSongList.LoadCache(TheGameSettings.SongPaths);
@@ -111,11 +112,12 @@ void cacheLoadingScreen::Draw() {
     );
     if (!started) {
         started = true;
-        std::thread CacheLoader(LoadCache);
+        std::jthread CacheLoader(LoadCache);
         CacheLoader.detach();
     }
-    if (finished)
+    if (finished) {
         TheMenuManager.SwitchScreen(MAIN_MENU);
+    }
 }
 
 cacheLoadingScreen::~cacheLoadingScreen() {}

Encore/src/menus/gameMenu.cpp

@@ -393,7 +393,6 @@ void MainMenu::MainMenuScreen() {
             "Invalid song cache!"
         );
         // TheSongList.ScanSongs(TheGameSettings.SongPaths);
-        songsLoaded = false;
         DrawRectanglePro(
             { ((float)GetScreenWidth() / 2) - 125,
               ((float)GetScreenHeight() / 2) - 120,

Encore/src/song/songlist.cpp

@@ -185,7 +185,7 @@ void SongList::ScanFolder(const std::filesystem::path &folder) {
     std::filesystem::path infoPath = folder / "info.json";
     if (std::filesystem::exists(infoPath)) {
         Song song;
-        song.songInfoPath = (folder / "info.json");
+        song.songInfoPath = folder / "info.json";
         song.songDir = folder.string();
         for (auto &file : std::filesystem::directory_iterator(folder)) {
             if (file.path().stem() == "cover") {
@@ -197,7 +197,7 @@ void SongList::ScanFolder(const std::filesystem::path &folder) {
         songs.push_back(std::move(song));
     } else if (std::filesystem::exists(folder / "song.ini")) {
         Song song;
-        song.songInfoPath = (folder / "song.ini").string();
+        song.songInfoPath = folder / "song.ini";
         song.songDir = folder.string();
         song.LoadSongIni(folder);
         song.ini = true;
@@ -371,23 +371,23 @@ void SongList::LoadCache(const std::vector<std::filesystem::path> &songsFolder)
 
             jsonHashNew = picosha2::hash256_hex_string(jsonString);
         }
-
-        if (song.jsonHash != jsonHashNew) {
-            continue;
-        }
+        // todo: FIX THIS
+        //if (song.jsonHash != jsonHashNew) {
+        //    continue;
+        //}
         loadedSongs.insert(song.songDir);
-        songs.push_back(std::move(song));
+        this->songs.emplace_back(song);
 
     }
 
     SongCacheIn.close();
     size_t loadedSongCount = songs.size();
 
 
-    if (cachedSongCount != loadedSongCount || songs.size() != loadedSongCount) {
-        Encore::EncoreLog(LOG_INFO, "CACHE: Updating song cache");
-        WriteCache();
-    }
+    //if (cachedSongCount != loadedSongCount || songs.size() != loadedSongCount) {
+    //    Encore::EncoreLog(LOG_INFO, "CACHE: Updating song cache");
+    //    WriteCache();
+    //}
 
     // ScanSongs(songsFolder);
     sortList(SortType::Title);