fix: downloading sfh songs (and bump version to 0.3.2)

FlafyDev · Sep 8, 2024 · a5a7bd0 · a5a7bd0
1 parent 5271416
commit a5a7bd0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.3.2
+###### 08-09-2024
+
+- <cl>Fixed</c> being unable to download SFH songs
+
+
 ## v0.3.1
 ###### 16-08-2024
 

diff --git a/mod.json b/mod.json
@@ -4,7 +4,7 @@
     "win": "2.206",
     "android": "2.206"
   },
-  "version": "0.3.1",
+  "version": "0.3.2",
   "id": "flafy.autonong",
   "name": "Auto Nong",
   "developer": "Flafy",
@@ -51,13 +51,13 @@
       "type": "file",
       "default": "yt-dlp.exe"
     },
-    "indexes": {
+    "indexes2": {
       "name": "Indexes",
       "description": "Auto Nong indexes.\nFrom indexes the mod knows where to fetch the songs from.",
       "type": "custom",
       "default": [
         "https://cdn.jsdelivr.net/gh/FlafyDev/auto-nong-indexes@dist/official.json.gz",
-        "https://cdn.jsdelivr.net/gh/FlafyDev/auto-nong-indexes@dist/sfh-rooot.json.gz"
+        "https://cdn.jsdelivr.net/gh/FlafyDev/auto-nong-indexes@dist/sfh.json.gz"
       ]
     },
     "show-level-popup": {

diff --git a/src/main.cpp b/src/main.cpp
@@ -6,8 +6,8 @@
 
 $on_mod(Loaded) {
   Mod::get()->addCustomSetting<MultiStringSettingValue>(
-      "indexes", Mod::get()
-                     ->getSettingDefinition("indexes")
+      "indexes2", Mod::get()
+                     ->getSettingDefinition("indexes2")
                      ->get<CustomSetting>()
                      ->json->get<std::vector<std::string>>("default"));
   Mod::get()->addCustomSetting<ANClearPPBlacklistSettingValue>("_blacklistPPClear", 0);
@@ -20,5 +20,5 @@
 
   // Reload the indexes on change
   listenForSettingChanges(
-      "indexes", +[](MultiStringSettingStruct value) { AutoNongManager::get()->loadIndexes(); });
+      "indexes2", +[](MultiStringSettingStruct value) { AutoNongManager::get()->loadIndexes(); });
 }
diff --git a/src/managers/auto_nong_manager.cpp b/src/managers/auto_nong_manager.cpp
@@ -406,7 +406,7 @@ void AutoNongManager::downloadSong(std::shared_ptr<ANSong> song, std::optional<i
 
 void AutoNongManager::loadIndexes() {
   std::vector<std::string> indexes =
-      Mod::get()->getSettingValue<MultiStringSettingStruct>("indexes").m_strings;
+      Mod::get()->getSettingValue<MultiStringSettingStruct>("indexes2").m_strings;
 
   unloadAllIndexes();
   loadLocalIndex();

diff --git a/src/ui/multi_string_setting.cpp b/src/ui/multi_string_setting.cpp
@@ -153,7 +153,7 @@ bool MultiStringSettingNode::init(MultiStringSettingValue *value, float width) {
   menu->setID("inputs-menu");
 
   // No way to get the JSON without hardcoding the setting ID...
-  auto settingJson = Mod::get()->getSettingDefinition("indexes")->get<CustomSetting>()->json;
+  auto settingJson = Mod::get()->getSettingDefinition("indexes2")->get<CustomSetting>()->json;
   m_defaultValue = settingJson->get<std::vector<std::string>>("default");
   m_name = settingJson->get<std::string>("name");
   m_description = settingJson->get<std::string>("description");