5 Commits

Author SHA1 Message Date
Dark98 f02c4185b6 Merge branch 'dev' of https://github.com/DarkStore-3DS/DarkStore 2022-08-06 15:17:38 +01:00
Dark98 475962810e %NDS% -> %ROMS% 2022-08-06 15:09:23 +01:00
Dark98 c191abb2e4 Fix Incorrect String 2022-08-06 12:31:33 +01:00
Dark98 3180f0346d Fix Incorrect String 2022-08-06 12:28:40 +01:00
Dark98 59b3e015bd HomeBrew -> Homebrew 2022-08-06 09:27:30 +01:00
26 changed files with 67 additions and 67 deletions
+4 -4
View File
@@ -61,8 +61,8 @@ public:
std::string _3dsxPath() const { return this->v_3dsxPath; };
void _3dsxPath(const std::string &v) { this->v_3dsxPath = v; if (!this->changesMade) this->changesMade = true; };
std::string ndsPath() const { return this->v_ndsPath; };
void ndsPath(const std::string &v) { this->v_ndsPath = v; if (!this->changesMade) this->changesMade = true; };
std::string romsPath() const { return this->v_romsPath; };
void romsPath(const std::string &v) { this->v_romsPath = v; if (!this->changesMade) this->changesMade = true; };
std::string archPath() const { return this->v_archivePath; };
void archPath(const std::string &v) { this->v_archivePath = v; if (!this->changesMade) this->changesMade = true; };
@@ -117,8 +117,8 @@ private:
nlohmann::json json;
bool changesMade = false;
std::string v_language = "en", v_lastStore = "darkstore-homebrew.unistore",
v_3dsxPath = "sdmc:/3ds", v_ndsPath = "sdmc:/roms/nds", v_archivePath = "sdmc:",
std::string v_language = "en", v_lastStore = "darkstore-homebrew.store",
v_3dsxPath = "sdmc:/3ds", v_romsPath = "sdmc:/roms", v_archivePath = "sdmc:",
v_shortcutPath = "sdmc:/3ds/DarkStore/shortcuts", v_firmPath = "sdmc:/luma/payloads", v_theme = "Default";
bool v_list = false, v_autoUpdate = true, v_metadata = true, v_updateCheck = true, v_updateNightly = false,
+5 -5
View File
@@ -1,14 +1,14 @@
{
"DarkStore HomeBrew": {
"title": "DarkStore HomeBrew",
"DarkStore Homebrew": {
"title": "DarkStore Homebrew",
"author": "Dark98",
"url": "https://ds.dark98.co.uk/app/darkstore-homebrew.unistore",
"description": "DarkStore 3DS HomeBrew"
"url": "https://ds.dark98.co.uk/app/darkstore-homebrew.store",
"description": "DarkStore 3DS Homebrew"
},
"DarkStore-NDS":{
"title":"DarkStore-NDS",
"author":"Dark98",
"url":"https://ds.dark98.co.uk/app/darkstore-nds.unistore",
"url":"https://ds.dark98.co.uk/app/darkstore-nds.store",
"description":"NDS Stuff"
}
}
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "Bruhloading compatibruh font...",
"DOWNLOADING_SPRITE_SHEET": "Bruhloading Bruhsheet...",
"DOWNLOADING_SPRITE_SHEET2": "Bruhloading Bruhsheet %i of %i...",
"DOWNLOADING_DEFAULT_STORE": "Bruhloading HomeBrew Store...",
"DOWNLOADING_DEFAULT_STORE": "Bruhloading Homebrew Store...",
"DONLOADING_DARKSTORE": "Bruhloading DarkStore...",
"DOWNLOADING_STORE": "Bruhloading Store...",
"ENTER_DESC_SHORTCUT": "Enter the shortbrut description.",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "Bruhing Bruhsheet %i of %i...",
"UPDATING_STORE": "Bruhpdating Store...",
"VERSION": "Bruhsion"
}
}
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "Download kompatibel modem",
"DOWNLOADING_SPRITE_SHEET": "Downloader Spritesheet...",
"DOWNLOADING_SPRITE_SHEET2": "Downloader Spritesheet %i af %i...",
"DOWNLOADING_DEFAULT_STORE": "Downloader HomeBrew Store...",
"DOWNLOADING_DEFAULT_STORE": "Downloader Homebrew Store...",
"DONLOADING_DARKSTORE": "Downloader DarkStore...",
"DOWNLOADING_STORE": "Downloader Store...",
"ENTER_DESC_SHORTCUT": "Indtast klubbens beskrivelse.",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "Indlæser Spritesheet %i af %i...",
"UPDATING_STORE": "Opdaterer Store...",
"VERSION": "Version"
}
}
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "Kompatible Schriftart wird heruntergeladen...",
"DOWNLOADING_SPRITE_SHEET": "Lade Spritesheet herunter...",
"DOWNLOADING_SPRITE_SHEET2": "Lade Spritesheet herunter... %i von %i",
"DOWNLOADING_DEFAULT_STORE": "Lade HomeBrew Store herunter...",
"DOWNLOADING_DEFAULT_STORE": "Lade Homebrew Store herunter...",
"DONLOADING_DARKSTORE": "Lade DarkStore herunter...",
"DOWNLOADING_STORE": "Lade Store herunter...",
"ENTER_DESC_SHORTCUT": "Gebe die Verknüpfungs-Beschreibung ein.",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "Aktualisiere Spritesheet %i von %i...",
"UPDATING_STORE": "Aktualisiere Store...",
"VERSION": "Version"
}
}
+2 -2
View File
@@ -24,7 +24,7 @@
"CHANGE_3DSX_PATH": "Change 3DSX path",
"CHANGE_ARCHIVE_PATH": "Change archive path",
"CHANGE_FIRM_PATH": "Change firm path",
"CHANGE_NDS_PATH": "Change NDS path",
"CHANGE_ROMS_PATH": "Change ROMS path",
"CHANGE_SHORTCUT_PATH": "Change shortcut path",
"CHECK_STORE_UPDATES": "Checking for Store updates...",
"CHECK_DS_UPDATES": "Checking for DarkStore updates...",
@@ -56,7 +56,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "Downloading compatible font...",
"DOWNLOADING_SPRITE_SHEET": "Downloading Spritesheet...",
"DOWNLOADING_SPRITE_SHEET2": "Downloading Spritesheet %i of %i...",
"DOWNLOADING_DEFAULT_STORE": "Downloading HomeBrew Store...",
"DOWNLOADING_DEFAULT_STORE": "Downloading Homebrew Store...",
"DONLOADING_DARKSTORE": "Downloading DarkStore...",
"DOWNLOADING_STORE": "Downloading Store...",
"ENTER_DESC_SHORTCUT": "Enter the shortcut description.",
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "Descargando fuente compatible...",
"DOWNLOADING_SPRITE_SHEET": "Descargando Spritesheet...",
"DOWNLOADING_SPRITE_SHEET2": "Descargando Spritesheet %i de %i...",
"DOWNLOADING_DEFAULT_STORE": "Descargando HomeBrew Store...",
"DOWNLOADING_DEFAULT_STORE": "Descargando Homebrew Store...",
"DONLOADING_DARKSTORE": "Descargando DarkStore...",
"DOWNLOADING_STORE": "Descargando Store...",
"ENTER_DESC_SHORTCUT": "Introduce la descripción del acceso directo.",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "Actualizando Spritesheet %i de %i...",
"UPDATING_STORE": "Actualizando Store...",
"VERSION": "Versión"
}
}
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "Téléchargement d'une police compatible...",
"DOWNLOADING_SPRITE_SHEET": "Téléchargement de la feuille de Sprites...",
"DOWNLOADING_SPRITE_SHEET2": "Téléchargement de la feuille de Sprites %i de %i...",
"DOWNLOADING_DEFAULT_STORE": "Téléchargement de HomeBrew Store...",
"DOWNLOADING_DEFAULT_STORE": "Téléchargement de Homebrew Store...",
"DONLOADING_DARKSTORE": "Téléchargement de DarkStore...",
"DOWNLOADING_STORE": "Téléchargement de l'Store...",
"ENTER_DESC_SHORTCUT": "Entrez la description du raccourci.",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "Mise a jour des sprites: %i/%i...",
"UPDATING_STORE": "Mise à jour de l'Store...",
"VERSION": "Version"
}
}
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "Kompatibilis karakterkészlet letöltése...",
"DOWNLOADING_SPRITE_SHEET": "A spritelap letöltése...",
"DOWNLOADING_SPRITE_SHEET2": "A spritelap letöltése %i/%i...",
"DOWNLOADING_DEFAULT_STORE": "HomeBrew Store letöltése...",
"DOWNLOADING_DEFAULT_STORE": "Homebrew Store letöltése...",
"DONLOADING_DARKSTORE": "Az DarkStore letöltése...",
"DOWNLOADING_STORE": "Store letöltése...",
"ENTER_DESC_SHORTCUT": "Add meg a parancsikon leírását.",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "A spritelap frissítése %i/%i...",
"UPDATING_STORE": "Store frissítése...",
"VERSION": "Verzió"
}
}
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "Download caratteri compatibili in corso...",
"DOWNLOADING_SPRITE_SHEET": "Download dello Spritesheet in corso...",
"DOWNLOADING_SPRITE_SHEET2": "Donwload dello Spritesheet %i di %i...",
"DOWNLOADING_DEFAULT_STORE": "Scaricamento di HomeBrew Store...",
"DOWNLOADING_DEFAULT_STORE": "Scaricamento di Homebrew Store...",
"DONLOADING_DARKSTORE": "Download di DarkStore in corso...",
"DOWNLOADING_STORE": "Download dell'Store in corso...",
"ENTER_DESC_SHORTCUT": "Inserisci la descrizione della scorciatoia.",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "Aggiornamento dello Spritesheet %i di %i...",
"UPDATING_STORE": "Aggiornamento dell'Store...",
"VERSION": "Versione"
}
}
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "互換性のあるフォントをダウンロードしています……",
"DOWNLOADING_SPRITE_SHEET": "スプライトシートをダウンロードしています……",
"DOWNLOADING_SPRITE_SHEET2": "スプライトシート%i/%iをダウンロードしています……",
"DOWNLOADING_DEFAULT_STORE": "HomeBrew Storeをダウンロードしています……",
"DOWNLOADING_DEFAULT_STORE": "Homebrew Storeをダウンロードしています……",
"DONLOADING_DARKSTORE": "DarkStoreをダウンロードしています……",
"DOWNLOADING_STORE": "Storeをダウンロードしています……",
"ENTER_DESC_SHORTCUT": "ショートカットの説明を入力します。",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "スプライトシート%i/%iを更新しています……",
"UPDATING_STORE": "Storeを更新しています……",
"VERSION": "バージョン"
}
}
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "호환되는 폰트 다운로드 중...",
"DOWNLOADING_SPRITE_SHEET": "스프라이트시트 다운로드 중...",
"DOWNLOADING_SPRITE_SHEET2": "스프라이트시트 다운로드 중 %i / %i...",
"DOWNLOADING_DEFAULT_STORE": "HomeBrew Store 다운로드 중...",
"DOWNLOADING_DEFAULT_STORE": "Homebrew Store 다운로드 중...",
"DONLOADING_DARKSTORE": "DarkStore 다운로드 중...",
"DOWNLOADING_STORE": "Store 다운로드 중...",
"ENTER_DESC_SHORTCUT": "바로가기 설명을 입력해주세요.",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "스프라이트시트 업데이트 중 %i / %i...",
"UPDATING_STORE": "Store 업데이트 중...",
"VERSION": "버전"
}
}
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "Downloading compatible font...",
"DOWNLOADING_SPRITE_SHEET": "Downloading Spritesheet...",
"DOWNLOADING_SPRITE_SHEET2": "Downloading Spritesheet %i of %i...",
"DOWNLOADING_DEFAULT_STORE": "Downloading HomeBrew Store...",
"DOWNLOADING_DEFAULT_STORE": "Downloading Homebrew Store...",
"DONLOADING_DARKSTORE": "Downloading DarkStore...",
"DOWNLOADING_STORE": "Downloading Store...",
"ENTER_DESC_SHORTCUT": "Enter the shortcut description.",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "Updating Spritesheet %i of %i...",
"UPDATING_STORE": "Updating Store...",
"VERSION": "Version"
}
}
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "Pobieranie kompatybilnej czcionki...",
"DOWNLOADING_SPRITE_SHEET": "Pobieranie tekstur...",
"DOWNLOADING_SPRITE_SHEET2": "Pobieranie tekstury %i z %i...",
"DOWNLOADING_DEFAULT_STORE": "Pobieranie HomeBrew Store...",
"DOWNLOADING_DEFAULT_STORE": "Pobieranie Homebrew Store...",
"DONLOADING_DARKSTORE": "Pobieranie DarkStore...",
"DOWNLOADING_STORE": "Pobieranie Store...",
"ENTER_DESC_SHORTCUT": "Wprowadź opis skrótu.",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "Aktualizowanie tekstury %i z %i...",
"UPDATING_STORE": "Aktualizowanie Store...",
"VERSION": "Wersja"
}
}
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "Baixando fonte compatível...",
"DOWNLOADING_SPRITE_SHEET": "Baixando spritesheet...",
"DOWNLOADING_SPRITE_SHEET2": "Baixando spritesheet %i de %i...",
"DOWNLOADING_DEFAULT_STORE": "Baixando HomeBrew Store...",
"DOWNLOADING_DEFAULT_STORE": "Baixando Homebrew Store...",
"DONLOADING_DARKSTORE": "Baixando DarkStore...",
"DOWNLOADING_STORE": "Baixando Store...",
"ENTER_DESC_SHORTCUT": "Insira a descrição do atalho.",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "Atualizando spritesheet %i de %i...",
"UPDATING_STORE": "Atualizando a Store...",
"VERSION": "Versão"
}
}
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "A descarregar fonte compatível...",
"DOWNLOADING_SPRITE_SHEET": "A descarregar ficha de sprites...",
"DOWNLOADING_SPRITE_SHEET2": "A descarregar ficha de sprites %i de %i...",
"DOWNLOADING_DEFAULT_STORE": "A descarregar HomeBrew Store...",
"DOWNLOADING_DEFAULT_STORE": "A descarregar Homebrew Store...",
"DONLOADING_DARKSTORE": "A descarregar DarkStore...",
"DOWNLOADING_STORE": "A descarregar Store...",
"ENTER_DESC_SHORTCUT": "Introduz a descrição do atalho.",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "A atualizar ficha de sprites %i de %i...",
"UPDATING_STORE": "A atualizar Store...",
"VERSION": "Versão"
}
}
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "Загрузка совместимого шрифта...",
"DOWNLOADING_SPRITE_SHEET": "Загрузка таблицы спрайтов...",
"DOWNLOADING_SPRITE_SHEET2": "Загрузка таблицы спрайтов %i из %i...",
"DOWNLOADING_DEFAULT_STORE": "Загрузка HomeBrew Store...",
"DOWNLOADING_DEFAULT_STORE": "Загрузка Homebrew Store...",
"DONLOADING_DARKSTORE": "Загрузка DarkStore...",
"DOWNLOADING_STORE": "Загрузка Store...",
"ENTER_DESC_SHORTCUT": "Введите описание ярлыка.",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "Загрузка таблицы спрайтов %i из %i...",
"UPDATING_STORE": "Обновление Store...",
"VERSION": "Версия"
}
}
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "Uyumlu yazı tipi indiriliyor...",
"DOWNLOADING_SPRITE_SHEET": "Model Tablosu İndiriliyor...",
"DOWNLOADING_SPRITE_SHEET2": "%i / %i Model Tablosu İndiriliyor...",
"DOWNLOADING_DEFAULT_STORE": "HomeBrew Store İndiriliyor...",
"DOWNLOADING_DEFAULT_STORE": "Homebrew Store İndiriliyor...",
"DONLOADING_DARKSTORE": "DarkStore İndiriliyor...",
"DOWNLOADING_STORE": "Store İndiriliyor...",
"ENTER_DESC_SHORTCUT": "Kısayol açıklaması gir.",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "%i / %i Model Tablosu Güncelleniyor...",
"UPDATING_STORE": "Store Güncelleniyor...",
"VERSION": "Sürüm"
}
}
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "Завантаження сумісного шрифту...",
"DOWNLOADING_SPRITE_SHEET": "Завантаження таблиці спрайтів...",
"DOWNLOADING_SPRITE_SHEET2": "Завантаження таблиці спрайтів %i із %i...",
"DOWNLOADING_DEFAULT_STORE": "Завантаження HomeBrew Store...",
"DOWNLOADING_DEFAULT_STORE": "Завантаження Homebrew Store...",
"DONLOADING_DARKSTORE": "Завантаження DarkStore...",
"DOWNLOADING_STORE": "Завантаження Store...",
"ENTER_DESC_SHORTCUT": "Введіть опис скорочення.",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "Оновлення таблиці спрайтів %i із %i...",
"UPDATING_STORE": "Оновлення Store...",
"VERSION": "Версія"
}
}
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "正在下载兼容字体……",
"DOWNLOADING_SPRITE_SHEET": "正在下载贴图集……",
"DOWNLOADING_SPRITE_SHEET2": "正在下载贴图集 %i / %i……",
"DOWNLOADING_DEFAULT_STORE": "正在下载 HomeBrew Store……",
"DOWNLOADING_DEFAULT_STORE": "正在下载 Homebrew Store……",
"DONLOADING_DARKSTORE": "正在下载 DarkStore……",
"DOWNLOADING_STORE": "正在下载 Store",
"ENTER_DESC_SHORTCUT": "输入快捷方式描述。",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "正在更新贴图集 %i / %i……",
"UPDATING_STORE": "正在更新 Store...",
"VERSION": "版本"
}
}
+2 -2
View File
@@ -55,7 +55,7 @@
"DOWNLOADING_COMPATIBLE_FONT": "正在下載兼容字型...",
"DOWNLOADING_SPRITE_SHEET": "正在下載精靈表...",
"DOWNLOADING_SPRITE_SHEET2": "正在下載精靈表 %i 之 %i...",
"DOWNLOADING_DEFAULT_STORE": "正在下載 HomeBrew Store...",
"DOWNLOADING_DEFAULT_STORE": "正在下載 Homebrew Store...",
"DONLOADING_DARKSTORE": "正在下載 DarkStore...",
"DOWNLOADING_STORE": "正在下載 Store...",
"ENTER_DESC_SHORTCUT": "鍵入捷徑描述。",
@@ -142,4 +142,4 @@
"UPDATING_SPRITE_SHEET2": "正在更新精靈表 %i 之 %i...",
"UPDATING_STORE": "正在更新 Store...",
"VERSION": "版本"
}
}
+6 -6
View File
@@ -83,7 +83,7 @@ static const Structs::ButtonPos Theme = { 40, 196, 280, 24 }; // Themes.
static const std::vector<std::string> mainStrings = { "LANGUAGE", "SELECT_STORE", "AUTO_UPDATE_SETTINGS_BTN", "GUI_SETTINGS_BTN", "DIRECTORY_SETTINGS_BTN", "CREDITS", "EXIT_APP" };
static const std::vector<std::string> dirStrings = { "CHANGE_3DSX_PATH", "3DSX_IN_FOLDER", "CHANGE_NDS_PATH", "CHANGE_ARCHIVE_PATH", "CHANGE_SHORTCUT_PATH", "CHANGE_FIRM_PATH" };
static const std::vector<std::string> dirStrings = { "CHANGE_3DSX_PATH", "3DSX_IN_FOLDER", "CHANGE_ROMS_PATH", "CHANGE_ARCHIVE_PATH", "CHANGE_SHORTCUT_PATH", "CHANGE_FIRM_PATH" };
extern std::vector<std::pair<std::string, std::string>> Themes;
/* Note: Украïнська is spelled using a latin i with dieresis to work in the system font */
@@ -333,7 +333,7 @@ static void SettingsHandleMain(int &page, bool &dspSettings, int &storeMode, int
Here you can..
- Change the Directory of...
- 3DSX, NDS & Archives.
- 3DSX, ROMS & Archives.
int &page: Reference to the page.
int &selection: Reference to the Selection.
@@ -377,8 +377,8 @@ static void SettingsHandleDir(int &page, int &selection) {
config->_3dsxInFolder(!config->_3dsxInFolder());
} else if (touching(touch, dirButtons[2])) {
const std::string path = Overlays::SelectDir(config->ndsPath(), Lang::get("SELECT_DIR"));
if (path != "") config->ndsPath(path);
const std::string path = Overlays::SelectDir(config->romsPath(), Lang::get("SELECT_DIR"));
if (path != "") config->romsPath(path);
} else if (touching(touch, dirButtons[3])) {
const std::string path = Overlays::SelectDir(config->archPath(), Lang::get("SELECT_DIR"));
@@ -408,8 +408,8 @@ static void SettingsHandleDir(int &page, int &selection) {
break;
case 2:
path = Overlays::SelectDir(config->ndsPath(), Lang::get("SELECT_DIR"));
if (path != "") config->ndsPath(path);
path = Overlays::SelectDir(config->romsPath(), Lang::get("SELECT_DIR"));
if (path != "") config->romsPath(path);
break;
case 3:
+1 -1
View File
@@ -44,7 +44,7 @@ extern void DisplayChangelog();
Initialized meta, store and StoreEntry class and:
- Downloads DarkStore-HomeBrew.. in case nothing exist.
- Downloads DarkStore-Homebrew.. in case nothing exist.
*/
MainScreen::MainScreen() {
StoreUtils::meta = std::make_unique<Meta>();
+2 -2
View File
@@ -129,7 +129,7 @@ Config::Config() {
if (this->json.contains("AutoUpdate")) this->autoupdate(this->getBool("AutoUpdate"));
if (this->json.contains("_3DSX_Path")) this->_3dsxPath(this->getString("_3DSX_Path"));
if (this->json.contains("_3DSX_InFolder")) this->_3dsxInFolder(this->getBool("_3DSX_InFolder"));
if (this->json.contains("NDS_Path")) this->ndsPath(this->getString("NDS_Path"));
if (this->json.contains("ROMS_Path")) this->romsPath(this->getString("ROMS_Path"));
if (this->json.contains("Archive_Path")) this->archPath(this->getString("Archive_Path"));
if (this->json.contains("Firm_Path")) this->firmPath(this->getString("Firm_Path"));
if (this->json.contains("MetaData")) this->metadata(this->getBool("MetaData"));
@@ -169,7 +169,7 @@ void Config::save() {
this->setBool("AutoUpdate", this->autoupdate());
this->setString("_3DSX_Path", this->_3dsxPath());
this->setBool("_3DSX_InFolder", this->_3dsxInFolder());
this->setString("NDS_Path", this->ndsPath());
this->setString("ROMS_Path", this->romsPath());
this->setString("Archive_Path", this->archPath());
this->setString("Firm_Path", this->firmPath());
this->setBool("MetaData", this->metadata());
+1 -1
View File
@@ -942,7 +942,7 @@ void UpdateAction() {
return;
}
ScriptUtils::installFile("sdmc:/DarkStore.cia", false, Lang::get("INSTALL_UNIVERSAL_UPDATER"), true);
ScriptUtils::installFile("sdmc:/DarkStore.cia", false, Lang::get("INSTALL_DARKSTORE"), true);
ScriptUtils::removeFile("sdmc:/DarkStore.cia", true);
Msg::waitMsg(Lang::get("UPDATE_DONE"));
exiting = true;
+10 -10
View File
@@ -53,7 +53,7 @@ Result ScriptUtils::removeFile(const std::string &file, bool isARG) {
out = std::regex_replace(file, std::regex("%ARCHIVE_DEFAULT%"), config->archPath());
out = std::regex_replace(out, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2"));
out = std::regex_replace(out, std::regex("%3DSX%"), config->_3dsxPath());
out = std::regex_replace(out, std::regex("%NDS%"), config->ndsPath());
out = std::regex_replace(out, std::regex("%ROMS%"), config->romsPath());
out = std::regex_replace(out, std::regex("%FIRM%"), config->firmPath());
Result ret = NONE;
@@ -97,13 +97,13 @@ Result ScriptUtils::copyFile(const std::string &source, const std::string &desti
_source = std::regex_replace(source, std::regex("%ARCHIVE_DEFAULT%"), config->archPath());
_source = std::regex_replace(_source, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2"));
_source = std::regex_replace(_source, std::regex("%3DSX%"), config->_3dsxPath());
_source = std::regex_replace(_source, std::regex("%NDS%"), config->ndsPath());
_source = std::regex_replace(_source, std::regex("%ROMS%"), config->romsPath());
_source = std::regex_replace(_source, std::regex("%FIRM%"), config->firmPath());
_dest = std::regex_replace(destination, std::regex("%ARCHIVE_DEFAULT%"), config->archPath());
_dest = std::regex_replace(_dest, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2"));
_dest = std::regex_replace(_dest, std::regex("%3DSX%"), config->_3dsxPath());
_dest = std::regex_replace(_dest, std::regex("%NDS%"), config->ndsPath());
_dest = std::regex_replace(_dest, std::regex("%ROMS%"), config->romsPath());
_dest = std::regex_replace(_dest, std::regex("%FIRM%"), config->firmPath());
if (isARG) {
@@ -141,13 +141,13 @@ Result ScriptUtils::renameFile(const std::string &oldName, const std::string &ne
old = std::regex_replace(oldName, std::regex("%ARCHIVE_DEFAULT%"), config->archPath());
old = std::regex_replace(old, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2"));
old = std::regex_replace(old, std::regex("%3DSX%"), config->_3dsxPath());
old = std::regex_replace(old, std::regex("%NDS%"), config->ndsPath());
old = std::regex_replace(old, std::regex("%ROMS%"), config->romsPath());
old = std::regex_replace(old, std::regex("%FIRM%"), config->firmPath());
_new = std::regex_replace(newName, std::regex("%ARCHIVE_DEFAULT%"), config->archPath());
_new = std::regex_replace(_new, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2"));
_new = std::regex_replace(_new, std::regex("%3DSX%"), config->_3dsxPath());
_new = std::regex_replace(_new, std::regex("%NDS%"), config->ndsPath());
_new = std::regex_replace(_new, std::regex("%ROMS%"), config->romsPath());
_new = std::regex_replace(_new, std::regex("%FIRM%"), config->firmPath());
/* TODO: Kinda avoid that? */
@@ -161,7 +161,7 @@ Result ScriptUtils::downloadRelease(const std::string &repo, const std::string &
std::string out;
out = std::regex_replace(output, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2"));
out = std::regex_replace(out, std::regex("%3DSX%"), config->_3dsxPath());
out = std::regex_replace(out, std::regex("%NDS%"), config->ndsPath());
out = std::regex_replace(out, std::regex("%ROMS%"), config->romsPath());
out = std::regex_replace(out, std::regex("%ARCHIVE_DEFAULT%"), config->archPath());
out = std::regex_replace(out, std::regex("%FIRM%"), config->firmPath());
@@ -205,7 +205,7 @@ Result ScriptUtils::downloadFile(const std::string &file, const std::string &out
std::string out;
out = std::regex_replace(output, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2"));
out = std::regex_replace(out, std::regex("%3DSX%"), config->_3dsxPath());
out = std::regex_replace(out, std::regex("%NDS%"), config->ndsPath());
out = std::regex_replace(out, std::regex("%ROMS%"), config->romsPath());
out = std::regex_replace(out, std::regex("%ARCHIVE_DEFAULT%"), config->archPath());
out = std::regex_replace(out, std::regex("%FIRM%"), config->firmPath());
@@ -251,7 +251,7 @@ void ScriptUtils::installFile(const std::string &file, bool updatingSelf, const
in = std::regex_replace(file, std::regex("%ARCHIVE_DEFAULT%"), config->archPath());
in = std::regex_replace(in, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2"));
in = std::regex_replace(in, std::regex("%3DSX%"), config->_3dsxPath());
in = std::regex_replace(in, std::regex("%NDS%"), config->ndsPath());
in = std::regex_replace(in, std::regex("%ROMS%"), config->romsPath());
in = std::regex_replace(in, std::regex("%FIRM%"), config->firmPath());
if (isARG) {
@@ -282,13 +282,13 @@ Result ScriptUtils::extractFile(const std::string &file, const std::string &inpu
in = std::regex_replace(file, std::regex("%ARCHIVE_DEFAULT%"), config->archPath());
in = std::regex_replace(in, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2"));
in = std::regex_replace(in, std::regex("%3DSX%"), config->_3dsxPath());
in = std::regex_replace(in, std::regex("%NDS%"), config->ndsPath());
in = std::regex_replace(in, std::regex("%ROMS%"), config->romsPath());
in = std::regex_replace(in, std::regex("%FIRM%"), config->firmPath());
out = std::regex_replace(output, std::regex("%ARCHIVE_DEFAULT%"), config->archPath());
out = std::regex_replace(out, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2"));
out = std::regex_replace(out, std::regex("%3DSX%"), config->_3dsxPath());
out = std::regex_replace(out, std::regex("%NDS%"), config->ndsPath());
out = std::regex_replace(out, std::regex("%ROMS%"), config->romsPath());
out = std::regex_replace(out, std::regex("%FIRM%"), config->firmPath());
if (isARG) {