tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/src/core/updates.cpp b/src/core/updates.cpp
2index cb9ca39..4dc5dfb 100644
3--- a/src/core/updates.cpp
4+++ b/src/core/updates.cpp
5@@ -24,8 +24,8 @@
6 #endif
7
8 const InstalledVersionsInfo InstalledVersionsInfo::Default {
9- /* retroArchVersion */ RetroArchVersion{ Version{ 0, 0, 0 }, false },
10- /* parallelVersion */ Version{ 0, 0, 0 },
11+ /* retroArchVersion */ RetroArchVersion{ Version{ @retroArchVersion@ }, true },
12+ /* parallelVersion */ Version{ @parallelN64CoreVersion@ },
13 /* lastUpdateCheck */ 0
14 };
15
16@@ -41,15 +41,7 @@ template<> void JsonSerializer::serialize<RetroArchVersion>( JsonWriter &jw, con
17 }
18
19 template<> RetroArchVersion JsonSerializer::parse<RetroArchVersion>( const Json &json ) {
20- Version version = Version{ 0, 0, 0 };
21- if( json[P_VERSION].exists() ) {
22- version = parse<Version>( json[P_VERSION] );
23- }
24-
25- return RetroArchVersion {
26- version,
27- json[P_LOCK].getOrDefault<bool>( false )
28- };
29+ return InstalledVersionsInfo::Default.retroArchVersion;
30 }
31
32 static constexpr char P_RETROARCH[] = "retroarch";
33@@ -67,44 +59,15 @@ template<> void JsonSerializer::serialize<InstalledVersionsInfo>( JsonWriter &jw
34 }
35
36 template<> InstalledVersionsInfo JsonSerializer::parse<InstalledVersionsInfo>( const Json &json ) {
37- Version parallelVersion;
38- try {
39- parallelVersion = parse<Version>( json[P_PARALLEL] );
40- } catch( ... ) {
41- parallelVersion = { 0, 0, 0 };
42- }
43-
44- RetroArchVersion retroVersion;
45- try {
46- retroVersion = parse<RetroArchVersion>( json[P_RETROARCH] );
47- } catch( ... ) {
48- retroVersion = RetroArchVersion{ Version{ 0, 0, 0 }, false };
49- }
50-
51- return InstalledVersionsInfo {
52- retroVersion,
53- parallelVersion,
54- json[P_LAST_CHECKED].get<int64>()
55- };
56+ return InstalledVersionsInfo::Default;
57 }
58
59 template<> ParallelCoreVersion JsonSerializer::parse<ParallelCoreVersion>( const Json &json ) {
60-#if defined(__linux__)
61- const Json &vjson = json["linux_x64"];
62-#elif defined(_WIN32)
63- const Json &vjson = json["windows_x64"];
64-#elif defined(__APPLE__)
65- const Json &vjson = AppleUtil::shouldUseArmCore() ? json["macos_arm64"] : json["macos_x64"];
66-#else
67- const Json &vjson = json;
68- static_assert( false );
69-#endif
70-
71 return ParallelCoreVersion{
72- JsonSerializer::parse<Version>( vjson["version"] ),
73- vjson["sha1"].get<string>(),
74- vjson["zipSignature"].get<string>(),
75- vjson["url"].get<string>()
76+ InstalledVersionsInfo::Default.parallelVersion,
77+ "",
78+ "",
79+ ""
80 };
81 }
82
83@@ -169,6 +132,7 @@ void RetroUpdater::checkForUpdates(
84 bool waitForCoreUpdates,
85 bool forceUpdate
86 ) {
87+ return;
88 InstalledVersionsInfo installedVersions = FileController::loadInstalledVersions();
89
90 if( forceUpdate || checkSchedule( installedVersions ) ) {