Merge pull request #6 from Kapilarny/conn

autoupdater fixes

Author: Kapilarny

updater/lib/src/downloader.cpp

@@ -5,6 +5,7 @@
 #include <winhttp.h>
 
 #include "logger.h"
+#include "game_type.h"
 
 Version GetLatestJAPIVersion() {
     std::vector<uint8_t> buffer = DownloadFile("raw.githubusercontent.com/Kapilarny/JAPI/master/version.txt");
@@ -261,7 +262,7 @@ void DownloadJAPI(Version version) {
 void CreateSteamAppID() {
     // Create steam_appid.txt
     std::ofstream steam_appid("steam_appid.txt", std::ios::out | std::ios::trunc);
-    steam_appid << "1372110";
+    steam_appid << GetGameData().steam_appid;
     steam_appid.close();
 
     JINFO("Created steam_appid.txt");

updater/lib/src/game_type.cpp

@@ -0,0 +1,34 @@
+#include "game_type.h"
+
+#include <filesystem>
+
+#include "logger.h"
+
+GameData::GameData() {
+    if(std::filesystem::exists("ASBR.exe")) {
+        JINFO("Detected ASBR.exe, assuming ASBR");
+
+        this->game_type = GameType::ASBR;
+        this->game_file = "ASBR.exe";
+        this->steam_appid = "1372110";
+    } else if(std::filesystem::exists("NSUNSC.exe")) {
+        JINFO("Detected NSUNSC.exe, assuming Connections");
+
+        this->game_type = GameType::CONNECTIONS;
+        this->game_file = "NSUNSC.exe";
+        this->steam_appid = "1020790";
+    } else {
+        JFATAL("Could not detect game type");
+        exit(1);
+    }
+}
+
+static GameData game_data;
+
+GameData& GetGameData() {
+    if(game_data.game_type == GameType::NONE) {
+        game_data = GameData();
+    }
+
+    return game_data;
+}

updater/lib/src/game_type.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <string>
+#include <stdint.h>
+
+enum class GameType {
+    NONE = -1,
+    ASBR = 0,
+    CONNECTIONS = 1
+};
+
+typedef struct GameData {
+    GameData();
+
+    GameType game_type;
+    std::string game_file;
+    std::string steam_appid;
+} GameData;
+
+GameData& GetGameData();

updater/lib/src/main.h

@@ -7,7 +7,7 @@
 
 #define JAPI_UPDATER_MAJOR 1
 #define JAPI_UPDATER_MINOR 1
-#define JAPI_UPDATER_PATCH 1
+#define JAPI_UPDATER_PATCH 2
 
 typedef struct Version {
     uint32_t major;

updater/lib/src/updater.cpp

@@ -9,14 +9,19 @@
 #include "utils.h"
 #include "logger.h"
 
-#include "updater.h"
+#include "game_type.h"
 
 void SaveConfig(toml::table& config) {
     std::ofstream config_file("japi/config/updater.cfg", std::ios::out | std::ios::trunc);
     config_file << config;
 }
 
 int UpdaterMain() {
+    if(GetGameData().game_type == GameType::NONE) {
+        JFATAL("Could not detect game type");
+        return 1;
+    }
+
     // Check if japi/ exists
     if (!std::filesystem::exists("japi")) {
         std::filesystem::create_directory("japi");

updater/lib/src/utils.cpp

@@ -4,6 +4,7 @@
 #include <stdio.h>
 
 #include "logger.h"
+#include "game_type.h"
 
 void LaunchGame() {
     // Run ASBR.exe
@@ -19,7 +20,8 @@ void LaunchGame() {
     GetCurrentDirectoryA(MAX_PATH, current_directory);
 
     // Append the ASBR.exe path
-    strcat(current_directory, "\\ASBR.exe");
+    std::string str = "\\" + GetGameData().game_file;
+    strcat(current_directory, str.c_str());
 
     JINFO(current_directory);