From f0d9b684df1852850996b3343f38c1af1da016f6 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 8 Nov 2023 14:02:47 +0100
Subject: [PATCH] Make default arch configurable

---
 librepomgr/serversetup.cpp        | 2 ++
 librepomgr/serversetup.h          | 2 ++
 srv/static/js/globalstatuspage.js | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/librepomgr/serversetup.cpp b/librepomgr/serversetup.cpp
index 48eadd5..c7a69af 100644
--- a/librepomgr/serversetup.cpp
+++ b/librepomgr/serversetup.cpp
@@ -486,6 +486,7 @@ void ServiceSetup::loadConfigFiles(bool doFirstTimeSetup)
             if (iniEntry.first.empty()) {
                 convertValue(iniEntry.second, "pacman_config_file_path", pacmanConfigFilePath);
                 convertValue(iniEntry.second, "working_directory", workingDirectory);
+                convertValue(iniEntry.second, "default_arch", defaultArch);
                 convertValue(iniEntry.second, "max_dbs", maxDbs);
                 convertValue(iniEntry.second, "package_cache_limit", packageCacheLimit);
             }
@@ -912,6 +913,7 @@ ServiceStatus::ServiceStatus(ServiceSetup &setup)
     , config(setup.config.computeStatus())
     , actions(setup.building.metaInfo)
     , presets(setup.building.presets)
+    , defaultArch(setup.defaultArch)
     , resourceUsage(setup)
 {
 }
diff --git a/librepomgr/serversetup.h b/librepomgr/serversetup.h
index fc4afc2..8436dbe 100644
--- a/librepomgr/serversetup.h
+++ b/librepomgr/serversetup.h
@@ -45,6 +45,7 @@ struct LIBREPOMGR_EXPORT ServiceSetup : public LibPkg::Lockable {
     std::string pacmanConfigFilePath = "/etc/pacman.conf";
     std::filesystem::path initialWorkingDirectory;
     std::string workingDirectory = "workingdir";
+    std::string defaultArch = "x86_64";
     std::string dbPath = "libpkg-1.db";
     std::uint32_t maxDbs = 512;
     std::size_t packageCacheLimit = 1000;
@@ -250,6 +251,7 @@ struct LIBREPOMGR_EXPORT ServiceStatus : public ReflectiveRapidJSON::JsonSeriali
     const LibPkg::Status config;
     const BuildActionMetaInfo &actions;
     const BuildPresets &presets;
+    const std::string &defaultArch;
     const ResourceUsage resourceUsage;
 };
 
diff --git a/srv/static/js/globalstatuspage.js b/srv/static/js/globalstatuspage.js
index 1a26480..a3f230d 100644
--- a/srv/static/js/globalstatuspage.js
+++ b/srv/static/js/globalstatuspage.js
@@ -5,7 +5,7 @@ import * as CustomRendering from './customrendering.js';
 import * as GenericRendering from './genericrendering.js';
 import * as Utils from './utils.js';
 
-const status = {repoNames: undefined, defaultArch: 'x86_64'};
+const status = {repoNames: undefined, defaultArch: undefined};
 
 export function queryGlobalStatus(additionalParams)
 {
@@ -97,6 +97,7 @@ function handleGlobalStatusUpdate(ajaxRequest)
         Utils.getAndEmptyElement('package-search-db', {'package-search-db-any': 'keep'}),
     ];
     status.repoNames = [];
+    status.defaultArch = responseJson.defaultArch || 'x86_64';
     dbStats.forEach(function (dbInfo) {
         const repoName = Utils.makeRepoName(dbInfo.name, dbInfo.arch);
         status.repoNames.push(repoName);