arreglado una fusionalidad rota en las actualizaciones

darkxex · May 24, 2023 · 9aaa9e7 · 9aaa9e7
1 parent bdd4020
commit 9aaa9e7
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 25 deletions.
diff --git a/Makefile b/Makefile
@@ -32,7 +32,7 @@ include $(DEVKITPRO)/libnx/switch_rules
 #---------------------------------------------------------------------------------
 VERSION_MAJOR := 2
 VERSION_MINOR := 7
-VERSION_MICRO := 3
+VERSION_MICRO := 4
 
 VERSION_EXDAT := 1
 APP_TITLE	:=	RipJKAnimeNX

diff --git a/Release.bat b/Release.bat
@@ -1,4 +1,5 @@
 @echo off
+set PATH=c:\devkitPro\msys2\usr\bin;%PATH%
 echo RipJKForwader ------------------------------------
 title RipJKForwader
 if not exist romfs\05B9DB505ABBE000.nsp (

diff --git a/out/RipJKAnimeNX.nro b/out/RipJKAnimeNX.nro
diff --git a/out/RipJKAnimeNX[05B9DB505ABBE000][v0].nsp b/out/RipJKAnimeNX[05B9DB505ABBE000][v0].nsp
diff --git a/romfs/V b/romfs/V
@@ -1 +1 @@
-2.7.3
+2.7.4
diff --git a/source/Networking.cpp b/source/Networking.cpp
@@ -427,11 +427,6 @@ bool CheckUpdates(bool force){
 					}
 
 					string Nurl= asset[0]["browser_download_url"];
-                    /*
-					if (config["Beta"] == 1) {
-						Nurl= config["Beta_URL"].get<string>();
-					}
-*/
 					//check if URl is ok
 					if (Nurl.find(".nsp") == string::npos) {
 						std::cout << "- NO " << Nurl <<std::endl;
@@ -449,23 +444,11 @@ bool CheckUpdates(bool force){
 					}
 					std::cout << "- OK " << Nurl <<std::endl;
 
-					string fileU=rootdirectory+"UPD/update."+Ver+".nsp";
+					string fileU=rootdirectory+"UPD/update."+New+".nsp";
 
 					//Have the update?
-					json UP;
-					bool needDown = true;
-					if (read_DB(UP,fileU+".json")) {
-						if(UP["update"] == New) {
-							needDown = false;
-						}
-
-					}
-					if (!isFileExist(fileU)) {
-						needDown = true;
-					}
 					std::cout << Ver << " -> " << New <<std::endl;
-
-					if (needDown) {
+					if (!isFileExist(fileU)) {
 						//Download New Update
                         fsdevDeleteDirectoryRecursively((rootdirectory+"UPD").c_str());
                         mkdir((rootdirectory+"UPD").c_str(), 0777);
@@ -475,9 +458,6 @@ bool CheckUpdates(bool force){
 							std::cout << "Download error" << New <<std::endl;
 							return false;
 						} else {
-							//Store update data
-							//UP["update"]=New;
-							//write_DB(UP,fileU+".json");
 							std::cout << Ver << " --> " << New <<std::endl;
 						}
 					}
@@ -519,4 +499,18 @@ bool CheckUpdates(bool force){
    On sd card root on the root dir of the app
    sdmc:/JK.config
    sdmc:/config/JK.config
- */
+//old stuff
+
+					if (config["Beta"] == 1) {
+						Nurl= config["Beta_URL"].get<string>();
+					}
+
+
+					json UP;
+					if (read_DB(UP,fileU+".json")) {
+						if(UP["update"] == New) {
+							needDown = false;
+						}
+					}
+
+*/