From b5f7a44e04d9d995229e0420965a2bd3ec75a953 Mon Sep 17 00:00:00 2001
From: Gabriele Musco <gabmus@disroot.org>
Date: Mon, 3 Nov 2025 13:46:16 +0100
Subject: [PATCH] chore: default repo urls and branches in separate module

---
 src/builders/build_basalt.rs        |  9 ++++++---
 src/builders/build_libsurvive.rs    |  9 ++++++---
 src/builders/build_monado.rs        |  9 ++++++---
 src/builders/build_opencomposite.rs |  9 ++++++---
 src/builders/build_openhmd.rs       | 14 ++++++++++----
 src/builders/build_vapor.rs         |  9 ++++++---
 src/builders/build_wivrn.rs         |  9 ++++++---
 src/builders/build_xrizer.rs        | 14 ++++++++++----
 src/util/git_repos.rs               | 23 +++++++++++++++++++++++
 src/util/mod.rs                     |  1 +
 10 files changed, 80 insertions(+), 26 deletions(-)
 create mode 100644 src/util/git_repos.rs

diff --git a/src/builders/build_basalt.rs b/src/builders/build_basalt.rs
index 291fdc0..61c7e3f 100644
--- a/src/builders/build_basalt.rs
+++ b/src/builders/build_basalt.rs
@@ -3,7 +3,10 @@ use crate::{
     profile::Profile,
     termcolor::TermColor,
     ui::job_worker::job::WorkerJob,
-    util::file_utils::rm_rf,
+    util::{
+        file_utils::rm_rf,
+        git_repos::{DEFAULT_BASALT_BRANCH, DEFAULT_BASALT_REPO},
+    },
 };
 use std::{
     collections::{HashMap, VecDeque},
@@ -23,7 +26,7 @@ pub fn get_build_basalt_jobs(profile: &Profile, clean_build: bool) -> VecDeque<W
             .basalt
             .repo
             .as_ref()
-            .unwrap_or(&"https://gitlab.freedesktop.org/mateosss/basalt.git".into())
+            .unwrap_or(&DEFAULT_BASALT_REPO.into())
             .clone(),
         dir: profile.features.basalt.path.as_ref().unwrap().clone(),
         branch: profile
@@ -31,7 +34,7 @@ pub fn get_build_basalt_jobs(profile: &Profile, clean_build: bool) -> VecDeque<W
             .basalt
             .branch
             .as_ref()
-            .unwrap_or(&"main".into())
+            .unwrap_or(&DEFAULT_BASALT_BRANCH.into())
             .clone(),
     };
 
diff --git a/src/builders/build_libsurvive.rs b/src/builders/build_libsurvive.rs
index 9f59353..583c788 100644
--- a/src/builders/build_libsurvive.rs
+++ b/src/builders/build_libsurvive.rs
@@ -3,7 +3,10 @@ use crate::{
     profile::Profile,
     termcolor::TermColor,
     ui::job_worker::job::WorkerJob,
-    util::file_utils::rm_rf,
+    util::{
+        file_utils::rm_rf,
+        git_repos::{DEFAULT_LIBSURVIVE_BRANCH, DEFAULT_LIBSURVIVE_REPO},
+    },
 };
 use std::{
     collections::{HashMap, VecDeque},
@@ -23,7 +26,7 @@ pub fn get_build_libsurvive_jobs(profile: &Profile, clean_build: bool) -> VecDeq
             .libsurvive
             .repo
             .as_ref()
-            .unwrap_or(&"https://github.com/cntools/libsurvive".into())
+            .unwrap_or(&DEFAULT_LIBSURVIVE_REPO.into())
             .clone(),
         dir: profile.features.libsurvive.path.as_ref().unwrap().clone(),
         branch: profile
@@ -31,7 +34,7 @@ pub fn get_build_libsurvive_jobs(profile: &Profile, clean_build: bool) -> VecDeq
             .libsurvive
             .branch
             .as_ref()
-            .unwrap_or(&"master".into())
+            .unwrap_or(&DEFAULT_LIBSURVIVE_BRANCH.into())
             .clone(),
     };
 
diff --git a/src/builders/build_monado.rs b/src/builders/build_monado.rs
index 8837874..3efbd81 100644
--- a/src/builders/build_monado.rs
+++ b/src/builders/build_monado.rs
@@ -3,7 +3,10 @@ use crate::{
     profile::Profile,
     termcolor::TermColor,
     ui::job_worker::job::WorkerJob,
-    util::file_utils::rm_rf,
+    util::{
+        file_utils::rm_rf,
+        git_repos::{DEFAULT_MONADO_BRANCH, DEFAULT_MONADO_REPO},
+    },
 };
 use std::{
     collections::{HashMap, VecDeque},
@@ -21,13 +24,13 @@ pub fn get_build_monado_jobs(profile: &Profile, clean_build: bool) -> VecDeque<W
         repo: profile
             .xrservice_repo
             .as_ref()
-            .unwrap_or(&"https://gitlab.freedesktop.org/monado/monado".into())
+            .unwrap_or(&DEFAULT_MONADO_REPO.into())
             .clone(),
         dir: profile.xrservice_path.clone(),
         branch: profile
             .xrservice_branch
             .as_ref()
-            .unwrap_or(&"main".into())
+            .unwrap_or(&DEFAULT_MONADO_BRANCH.into())
             .clone(),
     };
 
diff --git a/src/builders/build_opencomposite.rs b/src/builders/build_opencomposite.rs
index ce6e2da..111720a 100644
--- a/src/builders/build_opencomposite.rs
+++ b/src/builders/build_opencomposite.rs
@@ -3,7 +3,10 @@ use crate::{
     profile::Profile,
     termcolor::TermColor,
     ui::job_worker::job::WorkerJob,
-    util::file_utils::rm_rf,
+    util::{
+        file_utils::rm_rf,
+        git_repos::{DEFAULT_OPENCOMPOSITE_BRANCH, DEFAULT_OPENCOMPOSITE_REPO},
+    },
 };
 use std::{
     collections::{HashMap, VecDeque},
@@ -22,14 +25,14 @@ pub fn get_build_opencomposite_jobs(profile: &Profile, clean_build: bool) -> Vec
             .ovr_comp
             .repo
             .as_ref()
-            .unwrap_or(&"https://gitlab.com/znixian/OpenOVR.git".into())
+            .unwrap_or(&DEFAULT_OPENCOMPOSITE_REPO.into())
             .clone(),
         dir: profile.ovr_comp.path.clone(),
         branch: profile
             .ovr_comp
             .branch
             .as_ref()
-            .unwrap_or(&"openxr".into())
+            .unwrap_or(&DEFAULT_OPENCOMPOSITE_BRANCH.into())
             .clone(),
     };
 
diff --git a/src/builders/build_openhmd.rs b/src/builders/build_openhmd.rs
index 1157eca..977bce3 100644
--- a/src/builders/build_openhmd.rs
+++ b/src/builders/build_openhmd.rs
@@ -1,6 +1,12 @@
 use crate::{
-    build_tools::git::Git, profile::Profile, termcolor::TermColor, ui::job_worker::job::WorkerJob,
-    util::file_utils::rm_rf,
+    build_tools::git::Git,
+    profile::Profile,
+    termcolor::TermColor,
+    ui::job_worker::job::WorkerJob,
+    util::{
+        file_utils::rm_rf,
+        git_repos::{DEFAULT_OPENHMD_BRANCH, DEFAULT_OPENHMD_REPO},
+    },
 };
 use std::{collections::VecDeque, path::Path};
 
@@ -17,7 +23,7 @@ pub fn get_build_openhmd_jobs(profile: &Profile, clean_build: bool) -> VecDeque<
             .openhmd
             .repo
             .as_ref()
-            .unwrap_or(&"https://github.com/thaytan/OpenHMD".into())
+            .unwrap_or(&DEFAULT_OPENHMD_REPO.into())
             .clone(),
         dir: profile.features.openhmd.path.as_ref().unwrap().clone(),
         branch: profile
@@ -25,7 +31,7 @@ pub fn get_build_openhmd_jobs(profile: &Profile, clean_build: bool) -> VecDeque<
             .openhmd
             .branch
             .as_ref()
-            .unwrap_or(&"rift-room-config".into())
+            .unwrap_or(&DEFAULT_OPENHMD_BRANCH.into())
             .clone(),
     };
 
diff --git a/src/builders/build_vapor.rs b/src/builders/build_vapor.rs
index 5a05932..a868aeb 100644
--- a/src/builders/build_vapor.rs
+++ b/src/builders/build_vapor.rs
@@ -3,7 +3,10 @@ use crate::{
     profile::Profile,
     termcolor::TermColor,
     ui::job_worker::job::WorkerJob,
-    util::file_utils::rm_rf,
+    util::{
+        file_utils::rm_rf,
+        git_repos::{DEFAULT_VAPOR_BRANCH, DEFAULT_VAPOR_REPO},
+    },
 };
 use std::{
     collections::{HashMap, VecDeque},
@@ -22,14 +25,14 @@ pub fn get_build_vapor_jobs(profile: &Profile, clean_build: bool) -> VecDeque<Wo
             .ovr_comp
             .repo
             .as_ref()
-            .unwrap_or(&"https://github.com/micheal65536/VapoR.git".into())
+            .unwrap_or(&DEFAULT_VAPOR_REPO.into())
             .clone(),
         dir: profile.ovr_comp.path.clone(),
         branch: profile
             .ovr_comp
             .branch
             .as_ref()
-            .unwrap_or(&"master".into())
+            .unwrap_or(&DEFAULT_VAPOR_BRANCH.into())
             .clone(),
     };
 
diff --git a/src/builders/build_wivrn.rs b/src/builders/build_wivrn.rs
index cd9d757..693c175 100644
--- a/src/builders/build_wivrn.rs
+++ b/src/builders/build_wivrn.rs
@@ -3,7 +3,10 @@ use crate::{
     profile::Profile,
     termcolor::TermColor,
     ui::job_worker::job::WorkerJob,
-    util::file_utils::rm_rf,
+    util::{
+        file_utils::rm_rf,
+        git_repos::{DEFAULT_WIVRN_BRANCH, DEFAULT_WIVRN_REPO},
+    },
 };
 use std::{
     collections::{HashMap, VecDeque},
@@ -21,13 +24,13 @@ pub fn get_build_wivrn_jobs(profile: &Profile, clean_build: bool) -> VecDeque<Wo
         repo: profile
             .xrservice_repo
             .as_ref()
-            .unwrap_or(&"https://github.com/WiVRn/WiVRn".into())
+            .unwrap_or(&DEFAULT_WIVRN_REPO.into())
             .clone(),
         dir: profile.xrservice_path.clone(),
         branch: profile
             .xrservice_branch
             .as_ref()
-            .unwrap_or(&"release".into())
+            .unwrap_or(&DEFAULT_WIVRN_BRANCH.into())
             .clone(),
     };
 
diff --git a/src/builders/build_xrizer.rs b/src/builders/build_xrizer.rs
index 6fc1b6b..e97e0ff 100644
--- a/src/builders/build_xrizer.rs
+++ b/src/builders/build_xrizer.rs
@@ -1,6 +1,12 @@
 use crate::{
-    build_tools::git::Git, profile::Profile, termcolor::TermColor, ui::job_worker::job::WorkerJob,
-    util::file_utils::rm_rf,
+    build_tools::git::Git,
+    profile::Profile,
+    termcolor::TermColor,
+    ui::job_worker::job::WorkerJob,
+    util::{
+        file_utils::rm_rf,
+        git_repos::{DEFAULT_XRIZER_BRANCH, DEFAULT_XRIZER_REPO},
+    },
 };
 use std::{collections::VecDeque, path::Path};
 
@@ -16,14 +22,14 @@ pub fn get_build_xrizer_jobs(profile: &Profile, clean_build: bool) -> VecDeque<W
             .ovr_comp
             .repo
             .as_ref()
-            .unwrap_or(&"https://github.com/Supreeeme/xrizer".into())
+            .unwrap_or(&DEFAULT_XRIZER_REPO.into())
             .clone(),
         dir: profile.ovr_comp.path.clone(),
         branch: profile
             .ovr_comp
             .branch
             .as_ref()
-            .unwrap_or(&"main".into())
+            .unwrap_or(&DEFAULT_XRIZER_BRANCH.into())
             .clone(),
     };
 
diff --git a/src/util/git_repos.rs b/src/util/git_repos.rs
new file mode 100644
index 0000000..c66c396
--- /dev/null
+++ b/src/util/git_repos.rs
@@ -0,0 +1,23 @@
+pub const DEFAULT_MONADO_REPO: &str = "https://gitlab.freedesktop.org/monado/monado";
+pub const DEFAULT_MONADO_BRANCH: &str = "main";
+
+pub const DEFAULT_BASALT_REPO: &str = "https://gitlab.freedesktop.org/mateosss/basalt.git";
+pub const DEFAULT_BASALT_BRANCH: &str = "main";
+
+pub const DEFAULT_LIBSURVIVE_REPO: &str = "https://github.com/cntools/libsurvive";
+pub const DEFAULT_LIBSURVIVE_BRANCH: &str = "master";
+
+pub const DEFAULT_OPENCOMPOSITE_REPO: &str = "https://gitlab.com/znixian/OpenOVR.git";
+pub const DEFAULT_OPENCOMPOSITE_BRANCH: &str = "openxr";
+
+pub const DEFAULT_OPENHMD_REPO: &str = "https://github.com/thaytan/OpenHMD";
+pub const DEFAULT_OPENHMD_BRANCH: &str = "rift-room-config";
+
+pub const DEFAULT_VAPOR_REPO: &str = "https://github.com/micheal65536/VapoR.git";
+pub const DEFAULT_VAPOR_BRANCH: &str = "master";
+
+pub const DEFAULT_WIVRN_REPO: &str = "https://github.com/WiVRn/WiVRn";
+pub const DEFAULT_WIVRN_BRANCH: &str = "release";
+
+pub const DEFAULT_XRIZER_REPO: &str = "https://github.com/Supreeeme/xrizer";
+pub const DEFAULT_XRIZER_BRANCH: &str = "main";
diff --git a/src/util/mod.rs b/src/util/mod.rs
index 0aded2a..c61c579 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -1,4 +1,5 @@
 pub mod file_utils;
+pub mod git_repos;
 pub mod hash;
 pub mod steam_library_folder;
 pub mod steamvr_utils;
-- 
2.51.2