aboutsummaryrefslogtreecommitdiff
path: root/src-tauri
diff options
context:
space:
mode:
Diffstat (limited to 'src-tauri')
-rw-r--r--src-tauri/src/constants.rs18
-rw-r--r--src-tauri/src/mod_management/mod.rs10
-rw-r--r--src-tauri/src/northstar/mod.rs8
-rw-r--r--src-tauri/src/platform_specific/windows.rs4
-rw-r--r--src-tauri/src/repair_and_verify/mod.rs7
5 files changed, 24 insertions, 23 deletions
diff --git a/src-tauri/src/constants.rs b/src-tauri/src/constants.rs
index 79c93f61..73cb6fb3 100644
--- a/src-tauri/src/constants.rs
+++ b/src-tauri/src/constants.rs
@@ -10,3 +10,21 @@ pub const MASTER_SERVER_URL: &str = "https://northstar.tf";
// server list endpoint
pub const SERVER_BROWSER_ENDPOINT: &str = "/client/servers";
+
+// List of core Northstar mods
+pub const CORE_MODS: [&str; 3] = [
+ "Northstar.Client",
+ "Northstar.Custom",
+ "Northstar.CustomServers",
+];
+
+// List of Thunderstoremods that shouldn't be installable
+// as they behave different than common Squirrel mods
+pub const BLACKLISTED_MODS: [&str; 3] = [
+ "northstar-Northstar",
+ "northstar-NorthstarReleaseCandidate",
+ "ebkr-r2modman",
+];
+
+// Titanfall2 game IDs on Origin/EA-App
+pub const TITANFALL2_ORIGIN_IDS: [&str; 2] = ["Origin.OFR.50.0001452", "Origin.OFR.50.0001456"];
diff --git a/src-tauri/src/mod_management/mod.rs b/src-tauri/src/mod_management/mod.rs
index 75d63972..d2b5040b 100644
--- a/src-tauri/src/mod_management/mod.rs
+++ b/src-tauri/src/mod_management/mod.rs
@@ -1,4 +1,6 @@
// This file contains various mod management functions
+
+use app::constants::{BLACKLISTED_MODS, CORE_MODS};
use async_recursion::async_recursion;
use anyhow::{anyhow, Result};
@@ -12,14 +14,6 @@ use app::GameInstall;
use json5;
-use crate::northstar::CORE_MODS;
-
-pub const BLACKLISTED_MODS: [&str; 3] = [
- "northstar-Northstar",
- "northstar-NorthstarReleaseCandidate",
- "ebkr-r2modman",
-];
-
#[derive(Debug, Clone)]
struct ParsedThunderstoreModString {
author_name: String,
diff --git a/src-tauri/src/northstar/mod.rs b/src-tauri/src/northstar/mod.rs
index 8adfeec2..a043632c 100644
--- a/src-tauri/src/northstar/mod.rs
+++ b/src-tauri/src/northstar/mod.rs
@@ -1,13 +1,7 @@
//! This module deals with handling things around Northstar such as
//! - getting version number
-pub const CORE_MODS: [&str; 3] = [
- "Northstar.Client",
- "Northstar.Custom",
- "Northstar.CustomServers",
-];
-
-use crate::check_mod_version_number;
+use crate::{check_mod_version_number, constants::CORE_MODS};
use anyhow::anyhow;
/// Returns the current Northstar version number as a string
diff --git a/src-tauri/src/platform_specific/windows.rs b/src-tauri/src/platform_specific/windows.rs
index ad2ba6df..21772b91 100644
--- a/src-tauri/src/platform_specific/windows.rs
+++ b/src-tauri/src/platform_specific/windows.rs
@@ -1,9 +1,7 @@
/// Windows specific code
use anyhow::{anyhow, Result};
-use crate::check_is_valid_game_path;
-
-const TITANFALL2_ORIGIN_IDS: [&str; 2] = ["Origin.OFR.50.0001452", "Origin.OFR.50.0001456"];
+use crate::{check_is_valid_game_path, constants::TITANFALL2_ORIGIN_IDS};
/// Runs a powershell command and parses output to get Titanfall2 install location on Origin
pub fn origin_install_location_detection() -> Result<String, anyhow::Error> {
diff --git a/src-tauri/src/repair_and_verify/mod.rs b/src-tauri/src/repair_and_verify/mod.rs
index 5d58dfaf..9d020f15 100644
--- a/src-tauri/src/repair_and_verify/mod.rs
+++ b/src-tauri/src/repair_and_verify/mod.rs
@@ -1,10 +1,7 @@
-use crate::{
- mod_management::{rebuild_enabled_mods_json, set_mod_enabled_status},
- northstar::CORE_MODS,
-};
+use crate::mod_management::{rebuild_enabled_mods_json, set_mod_enabled_status};
use anyhow::anyhow;
/// Contains various functions to repair common issues and verifying installation
-use app::{get_enabled_mods, GameInstall};
+use app::{constants::CORE_MODS, get_enabled_mods, GameInstall};
/// Verifies Titanfall2 game files
#[tauri::command]