93 lines
2.7 KiB
Diff
93 lines
2.7 KiB
Diff
|
diff --git a/src/core/updates.cpp b/src/core/updates.cpp
|
||
|
|
index 403290b..f7d6547 100644
|
||
|
|
--- a/src/core/updates.cpp
|
||
|
|
+++ b/src/core/updates.cpp
|
||
|
|
@@ -30,8 +30,8 @@
|
||
|
|
#endif
|
||
|
|
|
||
|
|
const InstalledVersionsInfo InstalledVersionsInfo::Default {
|
||
|
|
- /* retroArchVersion */ RetroArchVersion{ Version{ 0, 0, 0 }, false },
|
||
|
|
- /* parallelVersion */ Version{ 0, 0, 0 },
|
||
|
|
+ /* retroArchVersion */ RetroArchVersion{ Version{ @retroArchVersion@ }, true },
|
||
|
|
+ /* parallelVersion */ Version{ @parallelN64CoreVersion@ },
|
||
|
|
/* lastUpdateCheck */ 0
|
||
|
|
};
|
||
|
|
|
||
|
|
@@ -47,15 +47,7 @@ template<> void JsonSerializer::serialize<RetroArchVersion>( JsonWriter &jw, con
|
||
|
|
}
|
||
|
|
|
||
|
|
template<> RetroArchVersion JsonSerializer::parse<RetroArchVersion>( const Json &json ) {
|
||
|
|
- Version version = Version{ 0, 0, 0 };
|
||
|
|
- if( json[P_VERSION].exists() ) {
|
||
|
|
- version = parse<Version>( json[P_VERSION] );
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- return RetroArchVersion {
|
||
|
|
- version,
|
||
|
|
- json[P_LOCK].getOrDefault<bool>( false )
|
||
|
|
- };
|
||
|
|
+ return InstalledVersionsInfo::Default.retroArchVersion;
|
||
|
|
}
|
||
|
|
|
||
|
|
static constexpr char P_RETROARCH[] = "retroarch";
|
||
|
|
@@ -73,47 +65,14 @@ template<> void JsonSerializer::serialize<InstalledVersionsInfo>( JsonWriter &jw
|
||
|
|
}
|
||
|
|
|
||
|
|
template<> InstalledVersionsInfo JsonSerializer::parse<InstalledVersionsInfo>( const Json &json ) {
|
||
|
|
- Version parallelVersion;
|
||
|
|
- try {
|
||
|
|
- parallelVersion = parse<Version>( json[P_PARALLEL] );
|
||
|
|
- } catch( ... ) {
|
||
|
|
- parallelVersion = { 0, 0, 0 };
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- RetroArchVersion retroVersion;
|
||
|
|
- try {
|
||
|
|
- retroVersion = parse<RetroArchVersion>( json[P_RETROARCH] );
|
||
|
|
- } catch( ... ) {
|
||
|
|
- retroVersion = RetroArchVersion{ Version{ 0, 0, 0 }, false };
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- return InstalledVersionsInfo {
|
||
|
|
- retroVersion,
|
||
|
|
- parallelVersion,
|
||
|
|
- json[P_LAST_CHECKED].get<int64>()
|
||
|
|
- };
|
||
|
|
+ return InstalledVersionsInfo::Default;
|
||
|
|
}
|
||
|
|
|
||
|
|
template<> ParallelCoreVersion JsonSerializer::parse<ParallelCoreVersion>( const Json &json ) {
|
||
|
|
-#if defined(__linux__)
|
||
|
|
- const Json &vjson = json["linux_x64"];
|
||
|
|
-#elif defined(_WIN32)
|
||
|
|
- #ifdef _WIN64
|
||
|
|
- const Json &vjson = json["windows_x64"];
|
||
|
|
- #else
|
||
|
|
- const Json &vjson = json["windows_x86"];
|
||
|
|
- #endif
|
||
|
|
-#elif defined(__APPLE__)
|
||
|
|
- const Json &vjson = AppleUtil::shouldUseArmCore() ? json["macos_arm64"] : json["macos_x64"];
|
||
|
|
-#else
|
||
|
|
- const Json &vjson = json;
|
||
|
|
- static_assert( false );
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
return ParallelCoreVersion{
|
||
|
|
- JsonSerializer::parse<Version>( vjson["version"] ),
|
||
|
|
- vjson["sha1"].get<string>(),
|
||
|
|
- vjson["url"].get<string>()
|
||
|
|
+ InstalledVersionsInfo::Default.parallelVersion,
|
||
|
|
+ "",
|
||
|
|
+ ""
|
||
|
|
};
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -178,6 +137,7 @@ void RetroUpdater::checkForUpdates(
|
||
|
|
bool waitForCoreUpdates,
|
||
|
|
bool forceUpdate
|
||
|
|
) {
|
||
|
|
+ return;
|
||
|
|
InstalledVersionsInfo installedVersions = FileController::loadInstalledVersions();
|
||
|
|
|
||
|
|
if( forceUpdate || checkSchedule( installedVersions ) ) {
|