refactor: Improvements to src-tauri

Signed-off-by: quexeky <git@quexeky.dev>

Cargo.toml

@@ -0,0 +1,14 @@
+[workspace]
+members = [
+    "client",
+    "database",
+    "src-tauri",
+    "process",
+    "remote",
+    "utils",
+    "cloud_saves",
+    "download_manager",
+    "games",
+]
+
+resolver = "3"

client/Cargo.toml

@@ -6,7 +6,6 @@ edition = "2024"
 [dependencies]
 bitcode = "0.6.7"
 database = { version = "0.1.0", path = "../database" }
-drop-consts = { version = "0.1.0", path = "../drop-consts" }
 log = "0.4.28"
 serde = { version = "1.0.228", features = ["derive"] }
 tauri = "2.8.5"

client/src/app_status.rs

@@ -9,4 +9,4 @@ pub enum AppStatus {
     SignedIn,
     SignedInNeedsReauth,
     ServerUnavailable,
-}
+}

client/src/compat.rs

@@ -1,11 +1,5 @@
-use std::{
-    ffi::OsStr,
-    path::PathBuf,
-    process::{Command, Stdio},
-    sync::LazyLock,
-};
+use std::{ffi::OsStr, path::PathBuf, process::{Command, Stdio}, sync::LazyLock};
 
-use drop_consts::{UMU_BASE_LAUNCHER_EXECUTABLE, UMU_INSTALL_DIRS};
 use log::info;
 
 pub static COMPAT_INFO: LazyLock<Option<CompatInfo>> = LazyLock::new(create_new_compat_info);
@@ -31,6 +25,9 @@ fn create_new_compat_info() -> Option<CompatInfo> {
     })
 }
 
+const UMU_BASE_LAUNCHER_EXECUTABLE: &str = "umu-run";
+const UMU_INSTALL_DIRS: [&str; 4] = ["/app/share", "/use/local/share", "/usr/share", "/opt"];
+
 fn get_umu_executable() -> Option<PathBuf> {
     if check_executable_exists(UMU_BASE_LAUNCHER_EXECUTABLE) {
         return Some(PathBuf::from(UMU_BASE_LAUNCHER_EXECUTABLE));

client/src/lib.rs

@@ -0,0 +1,4 @@
+pub mod autostart;
+pub mod user;
+pub mod app_status;
+pub mod compat;

client/src/user.rs

@@ -10,3 +10,4 @@ pub struct User {
     display_name: String,
     profile_picture_object_id: String,
 }
+

cloud_saves/Cargo.toml

@@ -6,7 +6,6 @@ edition = "2024"
 [dependencies]
 database = { version = "0.1.0", path = "../database" }
 dirs = "6.0.0"
-drop-consts = { version = "0.1.0", path = "../drop-consts" }
 log = "0.4.28"
 regex = "1.11.3"
 rustix = "1.1.2"

cloud_saves/src/backup_manager.rs

@@ -0,0 +1,105 @@
+use std::{collections::HashMap, path::PathBuf, str::FromStr};
+
+#[cfg(target_os = "linux")]
+use database::platform::Platform;
+use database::{db::DATA_ROOT_DIR, GameVersion};
+use log::warn;
+
+use crate::error::BackupError;
+
+use super::path::CommonPath;
+
+pub struct BackupManager<'a> {
+    pub current_platform: Platform,
+    pub sources: HashMap<(Platform, Platform), &'a (dyn BackupHandler + Sync + Send)>,
+}
+
+impl BackupManager<'_> {
+    pub fn new() -> Self {
+        BackupManager {
+            #[cfg(target_os = "windows")]
+            current_platform: Platform::Windows,
+
+            #[cfg(target_os = "macos")]
+            current_platform: Platform::MacOs,
+
+            #[cfg(target_os = "linux")]
+            current_platform: Platform::Linux,
+
+            sources: HashMap::from([
+                // Current platform to target platform
+                (
+                    (Platform::Windows, Platform::Windows),
+                    &WindowsBackupManager {} as &(dyn BackupHandler + Sync + Send),
+                ),
+                (
+                    (Platform::Linux, Platform::Linux),
+                    &LinuxBackupManager {} as &(dyn BackupHandler + Sync + Send),
+                ),
+                (
+                    (Platform::MacOs, Platform::MacOs),
+                    &MacBackupManager {} as &(dyn BackupHandler + Sync + Send),
+                ),
+                
+            ]),
+        }
+    }
+    
+}
+
+pub trait BackupHandler: Send + Sync {
+    fn root_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> { Ok(DATA_ROOT_DIR.join("games")) }
+    fn game_translate(&self, _path: &PathBuf, game: &GameVersion) -> Result<PathBuf, BackupError> { Ok(PathBuf::from_str(&game.game_id).unwrap()) }
+    fn base_translate(&self, path: &PathBuf, game: &GameVersion) -> Result<PathBuf, BackupError> { Ok(self.root_translate(path, game)?.join(self.game_translate(path, game)?)) }
+    fn home_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> { let c = CommonPath::Home.get().ok_or(BackupError::NotFound); println!("{:?}", c); c }
+    fn store_user_id_translate(&self, _path: &PathBuf, game: &GameVersion) -> Result<PathBuf, BackupError> { PathBuf::from_str(&game.game_id).map_err(|_| BackupError::ParseError) }
+    fn os_user_name_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> { Ok(PathBuf::from_str(&whoami::username()).unwrap()) }
+    fn win_app_data_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> { warn!("Unexpected Windows Reference in Backup <winAppData>"); Err(BackupError::InvalidSystem) }
+    fn win_local_app_data_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> { warn!("Unexpected Windows Reference in Backup <winLocalAppData>"); Err(BackupError::InvalidSystem) }
+    fn win_local_app_data_low_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> { warn!("Unexpected Windows Reference in Backup <winLocalAppDataLow>"); Err(BackupError::InvalidSystem) }
+    fn win_documents_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> { warn!("Unexpected Windows Reference in Backup <winDocuments>"); Err(BackupError::InvalidSystem) }
+    fn win_public_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> { warn!("Unexpected Windows Reference in Backup <winPublic>"); Err(BackupError::InvalidSystem) }
+    fn win_program_data_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> { warn!("Unexpected Windows Reference in Backup <winProgramData>"); Err(BackupError::InvalidSystem) }
+    fn win_dir_translate(&self, _path: &PathBuf,_game: &GameVersion) -> Result<PathBuf, BackupError> { warn!("Unexpected Windows Reference in Backup <winDir>"); Err(BackupError::InvalidSystem) }
+    fn xdg_data_translate(&self, _path: &PathBuf,_game: &GameVersion) -> Result<PathBuf, BackupError> { warn!("Unexpected XDG Reference in Backup <xdgData>"); Err(BackupError::InvalidSystem) }
+    fn xdg_config_translate(&self, _path: &PathBuf,_game: &GameVersion) -> Result<PathBuf, BackupError> { warn!("Unexpected XDG Reference in Backup <xdgConfig>"); Err(BackupError::InvalidSystem) }
+    fn skip_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> { Ok(PathBuf::new()) }
+}
+
+pub struct LinuxBackupManager {}
+impl BackupHandler for LinuxBackupManager {
+    fn xdg_config_translate(&self, _path: &PathBuf,_game: &GameVersion) -> Result<PathBuf, BackupError> {
+        Ok(CommonPath::Data.get().ok_or(BackupError::NotFound)?)
+    }
+    fn xdg_data_translate(&self, _path: &PathBuf,_game: &GameVersion) -> Result<PathBuf, BackupError> {
+        Ok(CommonPath::Config.get().ok_or(BackupError::NotFound)?)
+    }
+}
+pub struct WindowsBackupManager {}
+impl BackupHandler for WindowsBackupManager {
+    fn win_app_data_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> {
+        Ok(CommonPath::Config.get().ok_or(BackupError::NotFound)?)
+    }
+    fn win_local_app_data_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> {
+        Ok(CommonPath::DataLocal.get().ok_or(BackupError::NotFound)?)
+    }
+    fn win_local_app_data_low_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> {
+        Ok(CommonPath::DataLocalLow.get().ok_or(BackupError::NotFound)?)
+    }
+    fn win_dir_translate(&self, _path: &PathBuf,_game: &GameVersion) -> Result<PathBuf, BackupError> {
+        Ok(PathBuf::from_str("C:/Windows").unwrap())
+    }
+    fn win_documents_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> {
+        Ok(CommonPath::Document.get().ok_or(BackupError::NotFound)?)
+
+    }
+    fn win_program_data_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> {
+        Ok(PathBuf::from_str("C:/ProgramData").unwrap())
+    }
+    fn win_public_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> {
+        Ok(CommonPath::Public.get().ok_or(BackupError::NotFound)?)
+
+    }
+}
+pub struct MacBackupManager {}
+impl BackupHandler for MacBackupManager {}

cloud_saves/src/conditions.rs

@@ -2,6 +2,5 @@ use database::platform::Platform;
 
 #[derive(Clone, Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub enum Condition {
-    Os(Platform),
-    Other
+    Os(Platform)
 }

cloud_saves/src/lib.rs

@@ -1,8 +1,8 @@
-pub mod backup_manager;
 pub mod conditions;
-pub mod error;
 pub mod metadata;
+pub mod resolver;
+pub mod placeholder;
 pub mod normalise;
 pub mod path;
-pub mod placeholder;
-pub mod resolver;
+pub mod backup_manager;
+pub mod error;

cloud_saves/src/metadata.rs

@@ -1,6 +1,7 @@
 use database::GameVersion;
 
-use super::conditions::Condition;
+use super::conditions::{Condition};
+
 
 #[derive(Clone, Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct CloudSaveMetadata {
@@ -15,17 +16,15 @@ pub struct GameFile {
     pub id: Option<String>,
     pub data_type: DataType,
     pub tags: Vec<Tag>,
-    pub conditions: Vec<Condition>,
+    pub conditions: Vec<Condition>
 }
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize)]
 pub enum DataType {
     Registry,
     File,
-    Other,
+    Other
 }
-#[derive(
-    Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize,
-)]
+#[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub enum Tag {
     Config,
@@ -33,4 +32,4 @@ pub enum Tag {
     #[default]
     #[serde(other)]
     Other,
-}
+}

cloud_saves/src/normalise.rs

@@ -5,6 +5,7 @@ use regex::Regex;
 
 use super::placeholder::*;
 
+
 pub fn normalize(path: &str, os: Platform) -> String {
     let mut path = path.trim().trim_end_matches(['/', '\\']).replace('\\', "/");
 
@@ -13,25 +14,18 @@ pub fn normalize(path: &str, os: Platform) -> String {
     }
 
     static CONSECUTIVE_SLASHES: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"/{2,}").unwrap());
-    static UNNECESSARY_DOUBLE_STAR_1: LazyLock<Regex> =
-        LazyLock::new(|| Regex::new(r"([^/*])\*{2,}").unwrap());
-    static UNNECESSARY_DOUBLE_STAR_2: LazyLock<Regex> =
-        LazyLock::new(|| Regex::new(r"\*{2,}([^/*])").unwrap());
+    static UNNECESSARY_DOUBLE_STAR_1: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"([^/*])\*{2,}").unwrap());
+    static UNNECESSARY_DOUBLE_STAR_2: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\*{2,}([^/*])").unwrap());
     static ENDING_WILDCARD: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"(/\*)+$").unwrap());
     static ENDING_DOT: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"(/\.)$").unwrap());
     static INTERMEDIATE_DOT: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"(/\./)").unwrap());
     static BLANK_SEGMENT: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"(/\s+/)").unwrap());
     static APP_DATA: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"(?i)%appdata%").unwrap());
-    static APP_DATA_ROAMING: LazyLock<Regex> =
-        LazyLock::new(|| Regex::new(r"(?i)%userprofile%/AppData/Roaming").unwrap());
-    static APP_DATA_LOCAL: LazyLock<Regex> =
-        LazyLock::new(|| Regex::new(r"(?i)%localappdata%").unwrap());
-    static APP_DATA_LOCAL_2: LazyLock<Regex> =
-        LazyLock::new(|| Regex::new(r"(?i)%userprofile%/AppData/Local/").unwrap());
-    static USER_PROFILE: LazyLock<Regex> =
-        LazyLock::new(|| Regex::new(r"(?i)%userprofile%").unwrap());
-    static DOCUMENTS: LazyLock<Regex> =
-        LazyLock::new(|| Regex::new(r"(?i)%userprofile%/Documents").unwrap());
+    static APP_DATA_ROAMING: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"(?i)%userprofile%/AppData/Roaming").unwrap());
+    static APP_DATA_LOCAL: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"(?i)%localappdata%").unwrap());
+    static APP_DATA_LOCAL_2: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"(?i)%userprofile%/AppData/Local/").unwrap());
+    static USER_PROFILE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"(?i)%userprofile%").unwrap());
+    static DOCUMENTS: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"(?i)%userprofile%/Documents").unwrap());
 
     for (pattern, replacement) in [
         (&CONSECUTIVE_SLASHES, "/"),
@@ -72,9 +66,7 @@ pub fn normalize(path: &str, os: Platform) -> String {
 
 fn too_broad(path: &str) -> bool {
     println!("Path: {}", path);
-    use {
-        BASE, HOME, ROOT, STORE_USER_ID, WIN_APP_DATA, WIN_DIR, WIN_DOCUMENTS, XDG_CONFIG, XDG_DATA,
-    };
+    use {BASE, HOME, ROOT, STORE_USER_ID, WIN_APP_DATA, WIN_DIR, WIN_DOCUMENTS, XDG_CONFIG, XDG_DATA};
 
     let path_lower = path.to_lowercase();
 
@@ -85,9 +77,7 @@ fn too_broad(path: &str) -> bool {
     }
 
     for item in AVOID_WILDCARDS {
-        if path.starts_with(&format!("{}/*", item))
-            || path.starts_with(&format!("{}/{}", item, STORE_USER_ID))
-        {
+        if path.starts_with(&format!("{}/*", item)) || path.starts_with(&format!("{}/{}", item, STORE_USER_ID)) {
             return true;
         }
     }
@@ -134,6 +124,7 @@ fn too_broad(path: &str) -> bool {
             return true;
         }
     }
+    
 
     // Drive letters:
     let drives: Regex = Regex::new(r"^[a-zA-Z]:$").unwrap();
@@ -168,4 +159,4 @@ pub fn usable(path: &str) -> bool {
         && !path.starts_with("../")
         && !too_broad(path)
         && !unprintable.is_match(path)
-}
+}

cloud_saves/src/path.rs

@@ -13,12 +13,12 @@ pub enum CommonPath {
 
 impl CommonPath {
     pub fn get(&self) -> Option<PathBuf> {
-        static CONFIG: LazyLock<Option<PathBuf>> = LazyLock::new(dirs::config_dir);
-        static DATA: LazyLock<Option<PathBuf>> = LazyLock::new(dirs::data_dir);
-        static DATA_LOCAL: LazyLock<Option<PathBuf>> = LazyLock::new(dirs::data_local_dir);
-        static DOCUMENT: LazyLock<Option<PathBuf>> = LazyLock::new(dirs::document_dir);
-        static HOME: LazyLock<Option<PathBuf>> = LazyLock::new(dirs::home_dir);
-        static PUBLIC: LazyLock<Option<PathBuf>> = LazyLock::new(dirs::public_dir);
+        static CONFIG: LazyLock<Option<PathBuf>> = LazyLock::new(|| dirs::config_dir());
+        static DATA: LazyLock<Option<PathBuf>> = LazyLock::new(|| dirs::data_dir());
+        static DATA_LOCAL: LazyLock<Option<PathBuf>> = LazyLock::new(|| dirs::data_local_dir());
+        static DOCUMENT: LazyLock<Option<PathBuf>> = LazyLock::new(|| dirs::document_dir());
+        static HOME: LazyLock<Option<PathBuf>> = LazyLock::new(|| dirs::home_dir());
+        static PUBLIC: LazyLock<Option<PathBuf>> = LazyLock::new(|| dirs::public_dir());
 
         #[cfg(windows)]
         static DATA_LOCAL_LOW: LazyLock<Option<PathBuf>> = LazyLock::new(|| {

cloud_saves/src/placeholder.rs

@@ -48,4 +48,4 @@ pub const XDG_DATA: &str = "<xdgData>"; // %WINDIR% on Windows
 pub const XDG_CONFIG: &str = "<xdgConfig>"; // $XDG_DATA_HOME on Linux
 pub const SKIP: &str = "<skip>"; // $XDG_CONFIG_HOME on Linux
 
-pub static OS_USERNAME: LazyLock<String> = LazyLock::new(whoami::username);
+pub static OS_USERNAME: LazyLock<String> = LazyLock::new(|| whoami::username());

cloud_saves/src/resolver.rs

@@ -1,13 +1,17 @@
 use std::{
-    fs::{self, File, create_dir_all},
-    io::{self, Read, Write},
+    fs::{self, create_dir_all, File},
+    io::{self, ErrorKind, Read, Write},
     path::{Path, PathBuf},
+    thread::sleep,
+    time::Duration,
 };
 
 use crate::error::BackupError;
 
-use super::{backup_manager::BackupHandler, placeholder::*};
-use database::GameVersion;
+use super::{
+    backup_manager::BackupHandler, conditions::Condition, metadata::GameFile, placeholder::*,
+};
+use database::{platform::Platform, GameVersion};
 use log::{debug, warn};
 use rustix::path::Arg;
 use tempfile::tempfile;
@@ -26,7 +30,7 @@ pub fn resolve(meta: &mut CloudSaveMetadata) -> File {
             .iter()
             .find_map(|p| match p {
                 super::conditions::Condition::Os(os) => Some(os),
-                _ => None
+                _ => None,
             })
             .cloned()
         {
@@ -59,7 +63,7 @@ pub fn resolve(meta: &mut CloudSaveMetadata) -> File {
     let binding = serde_json::to_string(meta).unwrap();
     let serialized = binding.as_bytes();
     let mut file = tempfile().unwrap();
-    file.write_all(serialized).unwrap();
+    file.write(serialized).unwrap();
     tarball.append_file("metadata", &mut file).unwrap();
     tarball.into_inner().unwrap().finish().unwrap()
 }
@@ -92,7 +96,7 @@ pub fn extract(file: PathBuf) -> Result<(), BackupError> {
             .iter()
             .find_map(|p| match p {
                 super::conditions::Condition::Os(os) => Some(os),
-                _ => None
+                _ => None,
             })
             .cloned()
         {
@@ -111,7 +115,7 @@ pub fn extract(file: PathBuf) -> Result<(), BackupError> {
         };
 
         let new_path = parse_path(file.path.into(), handler, &manifest.game_version)?;
-        create_dir_all(new_path.parent().unwrap()).unwrap();
+        create_dir_all(&new_path.parent().unwrap()).unwrap();
 
         println!(
             "Current path {:?} copying to {:?}",
@@ -128,22 +132,23 @@ pub fn copy_item<P: AsRef<Path>>(src: P, dest: P) -> io::Result<()> {
     let src_path = src.as_ref();
     let dest_path = dest.as_ref();
 
-    let metadata = fs::metadata(src_path)?;
+    let metadata = fs::metadata(&src_path)?;
 
     if metadata.is_file() {
         // Ensure the parent directory of the destination exists for a file copy
         if let Some(parent) = dest_path.parent() {
             fs::create_dir_all(parent)?;
         }
-        fs::copy(src_path, dest_path)?;
+        fs::copy(&src_path, &dest_path)?;
     } else if metadata.is_dir() {
         // For directories, we call the recursive helper function.
         // The destination for the recursive copy is the `dest_path` itself.
-        copy_dir_recursive(src_path, dest_path)?;
+        copy_dir_recursive(&src_path, &dest_path)?;
     } else {
         // Handle other file types like symlinks if necessary,
         // for now, return an error or skip.
-        return Err(io::Error::other(
+        return Err(io::Error::new(
+            io::ErrorKind::Other,
             format!("Source {:?} is neither a file nor a directory", src_path),
         ));
     }
@@ -152,7 +157,7 @@ pub fn copy_item<P: AsRef<Path>>(src: P, dest: P) -> io::Result<()> {
 }
 
 fn copy_dir_recursive(src: &Path, dest: &Path) -> io::Result<()> {
-    fs::create_dir_all(dest)?;
+    fs::create_dir_all(&dest)?;
 
     for entry in fs::read_dir(src)? {
         let entry = entry?;
@@ -214,3 +219,43 @@ pub fn parse_path(
     println!("Final line: {:?}", &s);
     Ok(s)
 }
+
+pub fn test() {
+    let mut meta = CloudSaveMetadata {
+        files: vec![
+            GameFile {
+                path: String::from("<home>/favicon.png"),
+                id: None,
+                data_type: super::metadata::DataType::File,
+                tags: Vec::new(),
+                conditions: vec![Condition::Os(Platform::Linux)],
+            },
+            GameFile {
+                path: String::from("<home>/Documents/Pixel Art"),
+                id: None,
+                data_type: super::metadata::DataType::File,
+                tags: Vec::new(),
+                conditions: vec![Condition::Os(Platform::Linux)],
+            },
+        ],
+        game_version: GameVersion {
+            game_id: String::new(),
+            version_name: String::new(),
+            platform: Platform::Linux,
+            launch_command: String::new(),
+            launch_args: Vec::new(),
+            launch_command_template: String::new(),
+            setup_command: String::new(),
+            setup_args: Vec::new(),
+            setup_command_template: String::new(),
+            only_setup: true,
+            version_index: 0,
+            delta: false,
+            umu_id_override: None,
+        },
+        save_id: String::from("aaaaaaa"),
+    };
+    //resolve(&mut meta);
+
+    extract("save".into()).unwrap();
+}

database/Cargo.toml

@@ -4,10 +4,8 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-bitcode = "0.6.7"
 chrono = "0.4.42"
 dirs = "6.0.0"
-drop-consts = { version = "0.1.0", path = "../drop-consts" }
 log = "0.4.28"
 native_model = { version = "0.6.4", features = ["rmp_serde_1_3"], git = "https://github.com/Drop-OSS/native_model.git"}
 rustbreak = "2.0.0"

database/src/db.rs

@@ -3,18 +3,25 @@ use std::{
     sync::{Arc, LazyLock},
 };
 
-use drop_consts::DATA_ROOT_PREFIX;
 use rustbreak::{DeSerError, DeSerializer};
 use serde::{Serialize, de::DeserializeOwned};
 
-use crate::{interface::DatabaseImpls, models::DatabaseInterface};
+use crate::interface::{DatabaseImpls, DatabaseInterface};
 
 pub static DB: LazyLock<DatabaseInterface> = LazyLock::new(DatabaseInterface::set_up_database);
 
-pub static DATA_ROOT_DIR: LazyLock<PathBuf> = LazyLock::new(|| {
+
+#[cfg(not(debug_assertions))]
+static DATA_ROOT_PREFIX: &str = "drop";
+#[cfg(debug_assertions)]
+static DATA_ROOT_PREFIX: &str = "drop-debug";
+
+pub static DATA_ROOT_DIR: LazyLock<Arc<PathBuf>> = LazyLock::new(|| {
+    Arc::new(
         dirs::data_dir()
             .expect("Failed to get data dir")
-            .join(DATA_ROOT_PREFIX)
+            .join(DATA_ROOT_PREFIX),
+    )
 });
 
 // Custom JSON serializer to support everything we need
@@ -25,15 +32,16 @@ impl<T: native_model::Model + Serialize + DeserializeOwned> DeSerializer<T>
     for DropDatabaseSerializer
 {
     fn serialize(&self, val: &T) -> rustbreak::error::DeSerResult<Vec<u8>> {
-        native_model::encode(val).map_err(|e| DeSerError::Internal(e.to_string()))
+        native_model::encode(val)
+            .map_err(|e| DeSerError::Internal(e.to_string()))
     }
 
     fn deserialize<R: std::io::Read>(&self, mut s: R) -> rustbreak::error::DeSerResult<T> {
         let mut buf = Vec::new();
         s.read_to_end(&mut buf)
             .map_err(|e| rustbreak::error::DeSerError::Other(e.into()))?;
-        let (val, _version) =
-            native_model::decode(buf).map_err(|e| DeSerError::Internal(e.to_string()))?;
+        let (val, _version) = native_model::decode(buf)
+            .map_err(|e| DeSerError::Internal(e.to_string()))?;
         Ok(val)
     }
-}
+}

database/src/interface.rs

@@ -1,22 +1,19 @@
-use std::{
-    fs::{self, create_dir_all},
-    mem::ManuallyDrop,
-    ops::{Deref, DerefMut},
-    path::PathBuf,
-    sync::{RwLockReadGuard, RwLockWriteGuard},
-};
+use std::{fs::{self, create_dir_all}, mem::ManuallyDrop, ops::{Deref, DerefMut}, path::PathBuf, sync::{RwLockReadGuard, RwLockWriteGuard}};
 
 use chrono::Utc;
 use log::{debug, error, info, warn};
 use rustbreak::{PathDatabase, RustbreakError};
+use url::Url;
 
-use crate::{
-    db::{DropDatabaseSerializer, DATA_ROOT_DIR, DB},
-    models::{Database, DatabaseInterface},
-};
+use crate::{db::{DropDatabaseSerializer, DATA_ROOT_DIR, DB}, models::data::Database};
+
+pub type DatabaseInterface =
+    rustbreak::Database<Database, rustbreak::backend::PathBackend, DropDatabaseSerializer>;
 
 pub trait DatabaseImpls {
     fn set_up_database() -> DatabaseInterface;
+    fn database_is_set_up(&self) -> bool;
+    fn fetch_base_url(&self) -> Url;
 }
 impl DatabaseImpls for DatabaseInterface {
     fn set_up_database() -> DatabaseInterface {
@@ -82,6 +79,16 @@ impl DatabaseImpls for DatabaseInterface {
             PathDatabase::create_at_path(db_path, default).expect("Database could not be created")
         }
     }
+
+    fn database_is_set_up(&self) -> bool {
+        !borrow_db_checked().base_url.is_empty()
+    }
+
+    fn fetch_base_url(&self) -> Url {
+        let handle = borrow_db_checked();
+        Url::parse(&handle.base_url)
+            .unwrap_or_else(|_| panic!("Failed to parse base url {}", handle.base_url))
+    }
 }
 
 // TODO: Make the error relelvant rather than just assume that it's a Deserialize error

database/src/lib.rs

@@ -0,0 +1,21 @@
+#![feature(nonpoison_rwlock)]
+
+pub mod db;
+pub mod debug;
+pub mod models;
+pub mod platform;
+pub mod interface;
+
+pub use models::data::{
+    ApplicationTransientStatus,
+    Database,
+    DatabaseApplications,
+    DatabaseAuth,
+    DownloadType,
+    DownloadableMetadata,
+    GameDownloadStatus,
+    GameVersion,
+    Settings
+};
+pub use db::DB;
+pub use interface::{borrow_db_checked, borrow_db_mut_checked};

database/src/models.rs

@@ -0,0 +1,363 @@
+pub mod data {
+    use std::{hash::Hash, path::PathBuf};
+
+    use native_model::native_model;
+    use serde::{Deserialize, Serialize};
+
+    // NOTE: Within each version, you should NEVER use these types. 
+    // Declare it using the actual version that it is from, i.e. v1::Settings rather than just Settings from here
+
+    pub type GameVersion = v1::GameVersion;
+    pub type Database = v3::Database;
+    pub type Settings = v1::Settings;
+    pub type DatabaseAuth = v1::DatabaseAuth;
+
+    pub type GameDownloadStatus = v2::GameDownloadStatus;
+    pub type ApplicationTransientStatus = v1::ApplicationTransientStatus;
+    /**
+     * Need to be universally accessible by the ID, and the version is just a couple sprinkles on top
+     */
+    pub type DownloadableMetadata = v1::DownloadableMetadata;
+    pub type DownloadType = v1::DownloadType;
+    pub type DatabaseApplications = v2::DatabaseApplications;
+    // pub type DatabaseCompatInfo = v2::DatabaseCompatInfo;
+
+    use std::collections::HashMap;
+
+    impl PartialEq for DownloadableMetadata {
+        fn eq(&self, other: &Self) -> bool {
+            self.id == other.id && self.download_type == other.download_type
+        }
+    }
+    impl Hash for DownloadableMetadata {
+        fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+            self.id.hash(state);
+            self.download_type.hash(state);
+        }
+    }
+
+    mod v1 {
+        use serde_with::serde_as;
+        use std::{collections::HashMap, path::PathBuf};
+
+        use crate::platform::Platform;
+
+        use super::{Deserialize, Serialize, native_model};
+
+        fn default_template() -> String {
+            "{}".to_owned()
+        }
+
+        #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
+        #[serde(rename_all = "camelCase")]
+        #[native_model(id = 2, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
+        pub struct GameVersion {
+            pub game_id: String,
+            pub version_name: String,
+
+            pub platform: Platform,
+
+            pub launch_command: String,
+            pub launch_args: Vec<String>,
+            #[serde(default = "default_template")]
+            pub launch_command_template: String,
+
+            pub setup_command: String,
+            pub setup_args: Vec<String>,
+            #[serde(default = "default_template")]
+            pub setup_command_template: String,
+
+            pub only_setup: bool,
+
+            pub version_index: usize,
+            pub delta: bool,
+
+            pub umu_id_override: Option<String>,
+        }
+
+        #[serde_as]
+        #[derive(Serialize, Clone, Deserialize, Default)]
+        #[serde(rename_all = "camelCase")]
+        #[native_model(id = 3, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
+        pub struct DatabaseApplications {
+            pub install_dirs: Vec<PathBuf>,
+            // Guaranteed to exist if the game also exists in the app state map
+            pub game_statuses: HashMap<String, GameDownloadStatus>,
+            pub game_versions: HashMap<String, HashMap<String, GameVersion>>,
+            pub installed_game_version: HashMap<String, DownloadableMetadata>,
+
+            #[serde(skip)]
+            pub transient_statuses: HashMap<DownloadableMetadata, ApplicationTransientStatus>,
+        }
+
+        #[derive(Serialize, Deserialize, Clone, Debug)]
+        #[serde(rename_all = "camelCase")]
+        #[native_model(id = 4, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
+        pub struct Settings {
+            pub autostart: bool,
+            pub max_download_threads: usize,
+            pub force_offline: bool, // ... other settings ...
+        }
+        impl Default for Settings {
+            fn default() -> Self {
+                Self {
+                    autostart: false,
+                    max_download_threads: 4,
+                    force_offline: false,
+                }
+            }
+        }
+
+        // Strings are version names for a particular game
+        #[derive(Serialize, Clone, Deserialize)]
+        #[serde(tag = "type")]
+        #[native_model(id = 5, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
+        pub enum GameDownloadStatus {
+            Remote {},
+            SetupRequired {
+                version_name: String,
+                install_dir: String,
+            },
+            Installed {
+                version_name: String,
+                install_dir: String,
+            },
+        }
+
+        // Stuff that shouldn't be synced to disk
+        #[derive(Clone, Serialize, Deserialize, Debug)]
+        pub enum ApplicationTransientStatus {
+            Queued { version_name: String },
+            Downloading { version_name: String },
+            Uninstalling {},
+            Updating { version_name: String },
+            Validating { version_name: String },
+            Running {},
+        }
+
+        #[derive(serde::Serialize, Clone, Deserialize)]
+        #[native_model(id = 6, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
+        pub struct DatabaseAuth {
+            pub private: String,
+            pub cert: String,
+            pub client_id: String,
+            pub web_token: Option<String>,
+        }
+
+        #[native_model(id = 8, version = 1)]
+        #[derive(
+            Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, Clone, Copy,
+        )]
+        pub enum DownloadType {
+            Game,
+            Tool,
+            Dlc,
+            Mod,
+        }
+
+        #[native_model(id = 7, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
+        #[derive(Debug, Eq, PartialOrd, Ord, Serialize, Deserialize, Clone)]
+        #[serde(rename_all = "camelCase")]
+        pub struct DownloadableMetadata {
+            pub id: String,
+            pub version: Option<String>,
+            pub download_type: DownloadType,
+        }
+        impl DownloadableMetadata {
+            pub fn new(id: String, version: Option<String>, download_type: DownloadType) -> Self {
+                Self {
+                    id,
+                    version,
+                    download_type,
+                }
+            }
+        }
+
+        #[native_model(id = 1, version = 1)]
+        #[derive(Serialize, Deserialize, Clone, Default)]
+        pub struct Database {
+            #[serde(default)]
+            pub settings: Settings,
+            pub auth: Option<DatabaseAuth>,
+            pub base_url: String,
+            pub applications: DatabaseApplications,
+            pub prev_database: Option<PathBuf>,
+            pub cache_dir: PathBuf,
+        }
+    }
+
+    mod v2 {
+        use std::{collections::HashMap, path::PathBuf};
+
+        use serde_with::serde_as;
+
+        use super::{
+            Deserialize, Serialize, native_model, v1,
+        };
+
+        #[native_model(id = 1, version = 2, with = native_model::rmp_serde_1_3::RmpSerde, from = v1::Database)]
+        #[derive(Serialize, Deserialize, Clone, Default)]
+        pub struct Database {
+            #[serde(default)]
+            pub settings: v1::Settings,
+            pub auth: Option<v1::DatabaseAuth>,
+            pub base_url: String,
+            pub applications: v1::DatabaseApplications,
+            #[serde(skip)]
+            pub prev_database: Option<PathBuf>,
+            pub cache_dir: PathBuf,
+            pub compat_info: Option<DatabaseCompatInfo>,
+        }
+
+        #[native_model(id = 9, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
+        #[derive(Serialize, Deserialize, Clone, Default)]
+
+        pub struct DatabaseCompatInfo {
+            pub umu_installed: bool,
+        }
+
+        impl From<v1::Database> for Database {
+            fn from(value: v1::Database) -> Self {
+                Self {
+                    settings: value.settings,
+                    auth: value.auth,
+                    base_url: value.base_url,
+                    applications: value.applications,
+                    prev_database: value.prev_database,
+                    cache_dir: value.cache_dir,
+                    compat_info: None,
+                }
+            }
+        }
+        // Strings are version names for a particular game
+        #[derive(Serialize, Clone, Deserialize, Debug)]
+        #[serde(tag = "type")]
+        #[native_model(id = 5, version = 2, with = native_model::rmp_serde_1_3::RmpSerde, from = v1::GameDownloadStatus)]
+        pub enum GameDownloadStatus {
+            Remote {},
+            SetupRequired {
+                version_name: String,
+                install_dir: String,
+            },
+            Installed {
+                version_name: String,
+                install_dir: String,
+            },
+            PartiallyInstalled {
+                version_name: String,
+                install_dir: String,
+            },
+        }
+        impl From<v1::GameDownloadStatus> for GameDownloadStatus {
+            fn from(value: v1::GameDownloadStatus) -> Self {
+                match value {
+                    v1::GameDownloadStatus::Remote {} => Self::Remote {},
+                    v1::GameDownloadStatus::SetupRequired {
+                        version_name,
+                        install_dir,
+                    } => Self::SetupRequired {
+                        version_name,
+                        install_dir,
+                    },
+                    v1::GameDownloadStatus::Installed {
+                        version_name,
+                        install_dir,
+                    } => Self::Installed {
+                        version_name,
+                        install_dir,
+                    },
+                }
+            }
+        }
+        #[serde_as]
+        #[derive(Serialize, Clone, Deserialize, Default)]
+        #[serde(rename_all = "camelCase")]
+        #[native_model(id = 3, version = 2, with = native_model::rmp_serde_1_3::RmpSerde, from=v1::DatabaseApplications)]
+        pub struct DatabaseApplications {
+            pub install_dirs: Vec<PathBuf>,
+            // Guaranteed to exist if the game also exists in the app state map
+            pub game_statuses: HashMap<String, GameDownloadStatus>,
+            
+            pub game_versions: HashMap<String, HashMap<String, v1::GameVersion>>,
+            pub installed_game_version: HashMap<String, v1::DownloadableMetadata>,
+
+            #[serde(skip)]
+            pub transient_statuses: HashMap<v1::DownloadableMetadata, v1::ApplicationTransientStatus>,
+        }
+        impl From<v1::DatabaseApplications> for DatabaseApplications {
+            fn from(value: v1::DatabaseApplications) -> Self {
+                Self {
+                    game_statuses: value
+                        .game_statuses
+                        .into_iter()
+                        .map(|x| (x.0, x.1.into()))
+                        .collect::<HashMap<String, GameDownloadStatus>>(),
+                    install_dirs: value.install_dirs,
+                    game_versions: value.game_versions,
+                    installed_game_version: value.installed_game_version,
+                    transient_statuses: value.transient_statuses,
+                }
+            }
+        }
+    }
+    mod v3 {
+        use std::path::PathBuf;
+
+        use super::{
+            Deserialize, Serialize,
+            native_model, v2, v1,
+        };
+        #[native_model(id = 1, version = 3, with = native_model::rmp_serde_1_3::RmpSerde, from = v2::Database)]
+        #[derive(Serialize, Deserialize, Clone, Default)]
+        pub struct Database {
+            #[serde(default)]
+            pub settings: v1::Settings,
+            pub auth: Option<v1::DatabaseAuth>,
+            pub base_url: String,
+            pub applications: v2::DatabaseApplications,
+            #[serde(skip)]
+            pub prev_database: Option<PathBuf>,
+            pub cache_dir: PathBuf,
+            pub compat_info: Option<v2::DatabaseCompatInfo>,
+        }
+
+        impl From<v2::Database> for Database {
+            fn from(value: v2::Database) -> Self {
+                Self {
+                    settings: value.settings,
+                    auth: value.auth,
+                    base_url: value.base_url,
+                    applications: value.applications.into(),
+                    prev_database: value.prev_database,
+                    cache_dir: value.cache_dir,
+                    compat_info: None,
+                }
+            }
+        }
+    }
+
+    impl Database {
+        pub fn new<T: Into<PathBuf>>(
+            games_base_dir: T,
+            prev_database: Option<PathBuf>,
+            cache_dir: PathBuf,
+        ) -> Self {
+            Self {
+                applications: DatabaseApplications {
+                    install_dirs: vec![games_base_dir.into()],
+                    game_statuses: HashMap::new(),
+                    game_versions: HashMap::new(),
+                    installed_game_version: HashMap::new(),
+                    transient_statuses: HashMap::new(),
+                },
+                prev_database,
+                base_url: String::new(),
+                auth: None,
+                settings: Settings::default(),
+                cache_dir,
+                compat_info: None,
+            }
+        }
+
+    }
+}

database/src/platform.rs

@@ -1,23 +1,24 @@
 use serde::{Deserialize, Serialize};
 
+
 #[derive(Eq, Hash, PartialEq, Serialize, Deserialize, Clone, Copy, Debug)]
 pub enum Platform {
     Windows,
     Linux,
-    macOS,
+    MacOs,
 }
 
 impl Platform {
     #[cfg(target_os = "windows")]
     pub const HOST: Platform = Self::Windows;
     #[cfg(target_os = "macos")]
-    pub const HOST: Platform = Self::macOS;
+    pub const HOST: Platform = Self::MacOs;
     #[cfg(target_os = "linux")]
     pub const HOST: Platform = Self::Linux;
 
     pub fn is_case_sensitive(&self) -> bool {
         match self {
-            Self::Windows | Self::macOS => false,
+            Self::Windows | Self::MacOs => false,
             Self::Linux => true,
         }
     }
@@ -28,7 +29,7 @@ impl From<&str> for Platform {
         match value.to_lowercase().trim() {
             "windows" => Self::Windows,
             "linux" => Self::Linux,
-            "mac" | "macos" => Self::macOS,
+            "mac" | "macos" => Self::MacOs,
             _ => unimplemented!(),
         }
     }
@@ -39,8 +40,8 @@ impl From<whoami::Platform> for Platform {
         match value {
             whoami::Platform::Windows => Platform::Windows,
             whoami::Platform::Linux => Platform::Linux,
-            whoami::Platform::MacOS => Platform::macOS,
+            whoami::Platform::MacOS => Platform::MacOs,
             platform => unimplemented!("Playform {} is not supported", platform),
         }
     }
-}
+}

download_manager/src/download_manager_builder.rs

@@ -9,14 +9,11 @@ use std::{
 
 use database::DownloadableMetadata;
 use log::{debug, error, info, warn};
-use tauri::AppHandle;
+use tauri::{AppHandle, Emitter};
 use utils::{app_emit, lock, send};
 
-use crate::{
-    download_manager_frontend::DownloadStatus,
-    error::ApplicationDownloadError,
-    frontend_updates::{QueueUpdateEvent, QueueUpdateEventQueueData, StatsUpdateEvent},
-};
+
+use crate::{download_manager_frontend::DownloadStatus, error::ApplicationDownloadError, frontend_updates::{QueueUpdateEvent, QueueUpdateEventQueueData, StatsUpdateEvent}};
 
 use super::{
     download_manager_frontend::{DownloadManager, DownloadManagerSignal, DownloadManagerStatus},
@@ -292,10 +289,7 @@ impl DownloadManagerBuilder {
 
                 if validate_result {
                     download_agent.on_complete(&app_handle);
-                    send!(
-                        sender,
-                        DownloadManagerSignal::Completed(download_agent.metadata())
-                    );
+                    send!(sender, DownloadManagerSignal::Completed(download_agent.metadata()));
                     send!(sender, DownloadManagerSignal::UpdateUIQueue);
                     return;
                 }
@@ -376,7 +370,7 @@ impl DownloadManagerBuilder {
     fn push_ui_stats_update(&self, kbs: usize, time: usize) {
         let event_data = StatsUpdateEvent { speed: kbs, time };
 
-        app_emit!(&self.app_handle, "update_stats", event_data);
+        app_emit!(self.app_handle, "update_stats", event_data);
     }
     fn push_ui_queue_update(&self) {
         let queue = &self.download_queue.read();
@@ -395,6 +389,6 @@ impl DownloadManagerBuilder {
             .collect();
 
         let event_data = QueueUpdateEvent { queue: queue_objs };
-        app_emit!(&self.app_handle, "update_queue", event_data);
+        app_emit!(self.app_handle, "update_queue", event_data);
     }
 }

download_manager/src/download_manager_frontend.rs

@@ -14,6 +14,7 @@ use log::{debug, info};
 use serde::Serialize;
 use utils::{lock, send};
 
+
 use crate::error::ApplicationDownloadError;
 
 use super::{
@@ -79,7 +80,6 @@ pub enum DownloadStatus {
 /// The actual download queue may be accessed through the .`edit()` function,
 /// which provides raw access to the underlying queue.
 /// THIS EDITING IS BLOCKING!!!
-#[derive(Debug)]
 pub struct DownloadManager {
     terminator: Mutex<Option<JoinHandle<Result<(), ()>>>>,
     download_queue: Queue,
@@ -124,11 +124,8 @@ impl DownloadManager {
     }
     pub fn rearrange_string(&self, meta: &DownloadableMetadata, new_index: usize) {
         let mut queue = self.edit();
-        let current_index =
-            get_index_from_id(&mut queue, meta).expect("Failed to get meta index from id");
-        let to_move = queue
-            .remove(current_index)
-            .expect("Failed to remove meta at index from queue");
+        let current_index = get_index_from_id(&mut queue, meta).expect("Failed to get meta index from id");
+        let to_move = queue.remove(current_index).expect("Failed to remove meta at index from queue");
         queue.insert(new_index, to_move);
         send!(self.command_sender, DownloadManagerSignal::UpdateUIQueue);
     }

download_manager/src/downloadable.rs

@@ -3,6 +3,7 @@ use std::sync::Arc;
 use database::DownloadableMetadata;
 use tauri::AppHandle;
 
+
 use crate::error::ApplicationDownloadError;
 
 use super::{

download_manager/src/error.rs

@@ -1,9 +1,5 @@
-use humansize::{BINARY, format_size};
-use std::{
-    fmt::{Display, Formatter},
-    io,
-    sync::{Arc, mpsc::SendError},
-};
+use std::{fmt::{Display, Formatter}, io, sync::{mpsc::SendError, Arc}};
+use humansize::{format_size, BINARY};
 
 use remote::error::RemoteAccessError;
 use serde_with::SerializeDisplay;
@@ -48,9 +44,7 @@ pub enum ApplicationDownloadError {
 impl Display for ApplicationDownloadError {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
-            ApplicationDownloadError::NotInitialized => {
-                write!(f, "Download not initalized, did something go wrong?")
-            }
+            ApplicationDownloadError::NotInitialized => write!(f, "Download not initalized, did something go wrong?"),
             ApplicationDownloadError::DiskFull(required, available) => write!(
                 f,
                 "Game requires {}, {} remaining left on disk.",
@@ -66,9 +60,10 @@ impl Display for ApplicationDownloadError {
                 write!(f, "checksum failed to validate for download")
             }
             ApplicationDownloadError::IoError(error) => write!(f, "io error: {error}"),
-            ApplicationDownloadError::DownloadError(error) => {
-                write!(f, "Download failed with error {error:?}")
-            }
+            ApplicationDownloadError::DownloadError(error) => write!(
+                f,
+                "Download failed with error {error:?}"
+            ),
         }
     }
 }
@@ -77,4 +72,4 @@ impl From<io::Error> for ApplicationDownloadError {
     fn from(value: io::Error) -> Self {
         ApplicationDownloadError::IoError(Arc::new(value))
     }
-}
+}

download_manager/src/lib.rs

@@ -0,0 +1,16 @@
+#![feature(duration_millis_float)]
+#![feature(nonpoison_mutex)]
+#![feature(sync_nonpoison)]
+
+use std::sync::{nonpoison::Mutex, LazyLock};
+
+use crate::{download_manager_builder::DownloadManagerBuilder, download_manager_frontend::DownloadManager};
+
+pub mod download_manager_builder;
+pub mod download_manager_frontend;
+pub mod downloadable;
+pub mod util;
+pub mod error;
+pub mod frontend_updates;
+
+pub static DOWNLOAD_MANAGER: LazyLock<Mutex<DownloadManager>> = LazyLock::new(|| todo!());

download_manager/src/util/download_thread_control_flag.rs

@@ -1,6 +1,6 @@
 use std::sync::{
-    Arc,
     atomic::{AtomicBool, Ordering},
+    Arc,
 };
 
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
@@ -22,11 +22,7 @@ impl From<DownloadThreadControlFlag> for bool {
 /// false => Stop
 impl From<bool> for DownloadThreadControlFlag {
     fn from(value: bool) -> Self {
-        if value {
-            DownloadThreadControlFlag::Go
-        } else {
-            DownloadThreadControlFlag::Stop
-        }
+        if value { DownloadThreadControlFlag::Go } else { DownloadThreadControlFlag::Stop }
     }
 }
 

download_manager/src/util/progress_object.rs

@@ -15,7 +15,7 @@ use crate::download_manager_frontend::DownloadManagerSignal;
 
 use super::rolling_progress_updates::RollingProgressWindow;
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct ProgressObject {
     max: Arc<Mutex<usize>>,
     progress_instances: Arc<Mutex<Vec<Arc<AtomicUsize>>>>,
@@ -117,9 +117,7 @@ pub fn calculate_update(progress: &ProgressObject) {
     let last_update_time = progress
         .last_update_time
         .swap(Instant::now(), Ordering::SeqCst);
-    let time_since_last_update = Instant::now()
-        .duration_since(last_update_time)
-        .as_millis_f64();
+    let time_since_last_update = Instant::now().duration_since(last_update_time).as_millis_f64();
 
     let current_bytes_downloaded = progress.sum();
     let max = progress.get_max();
@@ -127,8 +125,7 @@ pub fn calculate_update(progress: &ProgressObject) {
         .bytes_last_update
         .swap(current_bytes_downloaded, Ordering::Acquire);
 
-    let bytes_since_last_update =
-        current_bytes_downloaded.saturating_sub(bytes_at_last_update) as f64;
+    let bytes_since_last_update = current_bytes_downloaded.saturating_sub(bytes_at_last_update) as f64;
 
     let kilobytes_per_second = bytes_since_last_update / time_since_last_update;
 

download_manager/src/util/queue.rs

@@ -6,7 +6,7 @@ use std::{
 use database::DownloadableMetadata;
 use utils::lock;
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct Queue {
     inner: Arc<Mutex<VecDeque<DownloadableMetadata>>>,
 }

download_manager/src/util/rolling_progress_updates.rs

@@ -3,17 +3,11 @@ use std::sync::{
     atomic::{AtomicUsize, Ordering},
 };
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct RollingProgressWindow<const S: usize> {
     window: Arc<[AtomicUsize; S]>,
     current: Arc<AtomicUsize>,
 }
-impl<const S: usize> Default for RollingProgressWindow<S> {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 impl<const S: usize> RollingProgressWindow<S> {
     pub fn new() -> Self {
         Self {
@@ -37,7 +31,7 @@ impl<const S: usize> RollingProgressWindow<S> {
             .collect::<Vec<usize>>();
         let amount = valid.len();
         let sum = valid.into_iter().sum::<usize>();
-
+        
         sum / amount
     }
     pub fn reset(&self) {

games/Cargo.toml

@@ -22,8 +22,5 @@ sysinfo = "0.37.2"
 tauri = "2.8.5"
 throttle_my_fn = "0.2.6"
 utils = { version = "0.1.0", path = "../utils" }
-native_model = { version = "0.6.4", features = [
-    "rmp_serde_1_3",
-], git = "https://github.com/Drop-OSS/native_model.git" }
+native_model = { version = "0.6.4", features = ["rmp_serde_1_3"], git = "https://github.com/Drop-OSS/native_model.git"}
 serde_json = "1.0.145"
-drop-consts = { version = "0.1.0", path = "../drop-consts" }

games/src/collections/collection.rs

@@ -1,7 +1,8 @@
 use bitcode::{Decode, Encode};
-use database::models::Game;
 use serde::{Deserialize, Serialize};
 
+use crate::library::Game;
+
 pub type Collections = Vec<Collection>;
 
 #[derive(Serialize, Deserialize, Debug, Clone, Default, Encode, Decode)]
@@ -14,7 +15,7 @@ pub struct Collection {
     entries: Vec<CollectionObject>,
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, Encode, Decode)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, Encode, Decode)]
 #[serde(rename_all = "camelCase")]
 pub struct CollectionObject {
     collection_id: String,

games/src/downloads/download_agent.rs

@@ -1,21 +1,16 @@
-use database::{
-    ApplicationTransientStatus, DownloadType, DownloadableMetadata, borrow_db_checked,
-    borrow_db_mut_checked,
-};
+use database::{borrow_db_checked, borrow_db_mut_checked, ApplicationTransientStatus, DownloadType, DownloadableMetadata};
 use download_manager::download_manager_frontend::{DownloadManagerSignal, DownloadStatus};
 use download_manager::downloadable::Downloadable;
 use download_manager::error::ApplicationDownloadError;
-use download_manager::util::download_thread_control_flag::{
-    DownloadThreadControl, DownloadThreadControlFlag,
-};
+use download_manager::util::download_thread_control_flag::{DownloadThreadControl, DownloadThreadControlFlag};
 use download_manager::util::progress_object::{ProgressHandle, ProgressObject};
-use drop_consts::{MAX_FILES_PER_BUCKET, RETRY_COUNT, TARGET_BUCKET_SIZE};
 use log::{debug, error, info, warn};
 use rayon::ThreadPoolBuilder;
 use remote::auth::generate_authorization_header;
 use remote::error::RemoteAccessError;
 use remote::requests::generate_url;
 use remote::utils::{DROP_CLIENT_ASYNC, DROP_CLIENT_SYNC};
+use utils::{app_emit, lock, send};
 use std::collections::{HashMap, HashSet};
 use std::fs::{OpenOptions, create_dir_all};
 use std::io;
@@ -23,15 +18,12 @@ use std::path::{Path, PathBuf};
 use std::sync::mpsc::Sender;
 use std::sync::{Arc, Mutex};
 use std::time::Instant;
-use tauri::AppHandle;
-use utils::{app_emit, lock, send};
+use tauri::{AppHandle, Emitter};
 
 #[cfg(target_os = "linux")]
 use rustix::fs::{FallocateFlags, fallocate};
 
-use crate::downloads::manifest::{
-    DownloadBucket, DownloadContext, DownloadDrop, DropManifest, DropValidateContext, ManifestBody,
-};
+use crate::downloads::manifest::{DownloadBucket, DownloadContext, DownloadDrop, DropManifest, DropValidateContext, ManifestBody};
 use crate::downloads::utils::get_disk_available;
 use crate::downloads::validate::validate_game_chunk;
 use crate::library::{on_game_complete, push_game_update, set_partially_installed};
@@ -40,6 +32,11 @@ use crate::state::GameStatusManager;
 use super::download_logic::download_game_bucket;
 use super::drop_data::DropData;
 
+static RETRY_COUNT: usize = 3;
+
+const TARGET_BUCKET_SIZE: usize = 63 * 1000 * 1000;
+const MAX_FILES_PER_BUCKET: usize = (1024 / 4) - 1;
+
 pub struct GameDownloadAgent {
     pub id: String,
     pub version: String,
@@ -100,7 +97,8 @@ impl GameDownloadAgent {
 
         result.ensure_manifest_exists().await?;
 
-        let required_space = lock!(result.manifest)
+        let required_space = lock!(result
+            .manifest)
             .as_ref()
             .unwrap()
             .values()
@@ -449,13 +447,9 @@ impl GameDownloadAgent {
 
                 let sender = self.sender.clone();
 
-                let download_context =
-                    download_contexts.get(&bucket.version).unwrap_or_else(|| {
-                        panic!(
-                            "Could not get bucket version {}. Corrupted state.",
-                            bucket.version
-                        )
-                    });
+                let download_context = download_contexts
+                    .get(&bucket.version)
+                    .unwrap_or_else(|| panic!("Could not get bucket version {}. Corrupted state.", bucket.version));
 
                 scope.spawn(move |_| {
                     // 3 attempts
@@ -693,10 +687,7 @@ impl Downloadable for GameDownloadAgent {
             Ok(_) => {}
             Err(e) => {
                 error!("could not mark game as complete: {e}");
-                send!(
-                    self.sender,
-                    DownloadManagerSignal::Error(ApplicationDownloadError::DownloadError(e))
-                );
+                send!(self.sender, DownloadManagerSignal::Error(ApplicationDownloadError::DownloadError(e)));
             }
         }
     }

games/src/downloads/download_logic.rs

@@ -11,9 +11,7 @@ use std::{
 };
 
 use download_manager::error::ApplicationDownloadError;
-use download_manager::util::download_thread_control_flag::{
-    DownloadThreadControl, DownloadThreadControlFlag,
-};
+use download_manager::util::download_thread_control_flag::{DownloadThreadControl, DownloadThreadControlFlag};
 use download_manager::util::progress_object::ProgressHandle;
 use log::{debug, info, warn};
 use md5::{Context, Digest};
@@ -49,7 +47,7 @@ impl DropWriter<File> {
 
     fn finish(mut self) -> io::Result<Digest> {
         self.flush()?;
-        Ok(self.hasher.finalize())
+        Ok(self.hasher.compute())
     }
 }
 // Write automatically pushes to file and hasher
@@ -118,12 +116,9 @@ impl<'a> DropDownloadPipeline<'a, Response, File> {
             let mut last_bump = 0;
             loop {
                 let size = MAX_PACKET_LENGTH.min(remaining);
-                let size = self
-                    .source
-                    .read(&mut copy_buffer[0..size])
-                    .inspect_err(|_| {
-                        info!("got error from {}", drop.filename);
-                    })?;
+                let size = self.source.read(&mut copy_buffer[0..size]).inspect_err(|_| {
+                    info!("got error from {}", drop.filename);
+                })?;
                 remaining -= size;
                 last_bump += size;
 

games/src/downloads/drop_data.rs

@@ -1,17 +1,15 @@
 use std::{
-    collections::HashMap,
-    fs::File,
-    io::{self, Read, Write},
-    path::{Path, PathBuf},
+    collections::HashMap, fs::File, io::{self, Read, Write}, path::{Path, PathBuf}
 };
 
-use drop_consts::DROP_DATA_PATH;
 use log::error;
 use native_model::{Decode, Encode};
 use utils::lock;
 
 pub type DropData = v1::DropData;
 
+pub static DROP_DATA_PATH: &str = ".dropdata";
+
 pub mod v1 {
     use std::{collections::HashMap, path::PathBuf, sync::Mutex};
 
@@ -79,10 +77,7 @@ impl DropData {
         }
     }
     pub fn set_contexts(&self, completed_contexts: &[(String, bool)]) {
-        *lock!(self.contexts) = completed_contexts
-            .iter()
-            .map(|s| (s.0.clone(), s.1))
-            .collect();
+        *lock!(self.contexts) = completed_contexts.iter().map(|s| (s.0.clone(), s.1)).collect();
     }
     pub fn set_context(&self, context: String, state: bool) {
         lock!(self.contexts).entry(context).insert_entry(state);

games/src/downloads/error.rs

@@ -0,0 +1,21 @@
+use std::fmt::{Display};
+
+use serde_with::SerializeDisplay;
+
+#[derive(SerializeDisplay)]
+pub enum LibraryError {
+    MetaNotFound(String),
+    VersionNotFound(String),
+}
+impl Display for LibraryError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", match self {
+            LibraryError::MetaNotFound(id) => {
+                format!("Could not locate any installed version of game ID {id} in the database")
+            }
+            LibraryError::VersionNotFound(game_id) => {
+                format!("Could not locate any installed version  for game id {game_id} in the database")
+            }
+        })
+    }
+}

games/src/downloads/mod.rs

@@ -3,5 +3,5 @@ mod download_logic;
 pub mod drop_data;
 pub mod error;
 mod manifest;
-pub mod utils;
 pub mod validate;
+pub mod utils;

games/src/downloads/utils.rs

@@ -19,7 +19,7 @@ pub fn get_disk_available(mount_point: PathBuf) -> Result<u64, ApplicationDownlo
             return Ok(disk.available_space());
         }
     }
-    Err(ApplicationDownloadError::IoError(Arc::new(
-        io::Error::other("could not find disk of path"),
-    )))
+    Err(ApplicationDownloadError::IoError(Arc::new(io::Error::other(
+        "could not find disk of path",
+    ))))
 }

games/src/downloads/validate.rs

@@ -3,13 +3,7 @@ use std::{
     io::{self, BufWriter, Read, Seek, SeekFrom, Write},
 };
 
-use download_manager::{
-    error::ApplicationDownloadError,
-    util::{
-        download_thread_control_flag::{DownloadThreadControl, DownloadThreadControlFlag},
-        progress_object::ProgressHandle,
-    },
-};
+use download_manager::{error::ApplicationDownloadError, util::{download_thread_control_flag::{DownloadThreadControl, DownloadThreadControlFlag}, progress_object::ProgressHandle}};
 use log::debug;
 use md5::Context;
 
@@ -22,10 +16,7 @@ pub fn validate_game_chunk(
 ) -> Result<bool, ApplicationDownloadError> {
     debug!(
         "Starting chunk validation {}, {}, {} #{}",
-        ctx.path.display(),
-        ctx.index,
-        ctx.offset,
-        ctx.checksum
+        ctx.path.display(), ctx.index, ctx.offset, ctx.checksum
     );
     // If we're paused
     if control_flag.get() == DownloadThreadControlFlag::Stop {
@@ -45,12 +36,13 @@ pub fn validate_game_chunk(
 
     let mut hasher = md5::Context::new();
 
-    let completed = validate_copy(&mut source, &mut hasher, ctx.length, control_flag, progress)?;
+    let completed =
+        validate_copy(&mut source, &mut hasher, ctx.length, control_flag, progress)?;
     if !completed {
         return Ok(false);
     }
 
-    let res = hex::encode(hasher.finalize().0);
+    let res = hex::encode(hasher.compute().0);
     if res != ctx.checksum {
         return Ok(false);
     }

games/src/lib.rs

@@ -3,5 +3,4 @@
 pub mod collections;
 pub mod downloads;
 pub mod library;
-pub mod scan;
 pub mod state;

games/src/library.rs

@@ -1,18 +1,15 @@
-use database::{
-    borrow_db_checked, borrow_db_mut_checked, models::Game, ApplicationTransientStatus, Database, DownloadableMetadata, GameDownloadStatus, GameVersion
-};
-use log::{debug, error, warn};
-use remote::{
-    auth::generate_authorization_header, error::RemoteAccessError, requests::generate_url,
-    utils::DROP_CLIENT_SYNC,
-};
-use serde::{Deserialize, Serialize};
 use std::fs::remove_dir_all;
+use std::sync::Mutex;
 use std::thread::spawn;
-use tauri::AppHandle;
+use bitcode::{Decode, Encode};
+use database::{borrow_db_checked, borrow_db_mut_checked, ApplicationTransientStatus, Database, DownloadableMetadata, GameDownloadStatus, GameVersion};
+use log::{debug, error, warn};
+use remote::{auth::generate_authorization_header, error::RemoteAccessError, requests::generate_url, utils::DROP_CLIENT_SYNC};
+use serde::{Deserialize, Serialize};
+use tauri::{AppHandle, Emitter};
 use utils::app_emit;
 
-use crate::state::{GameStatusManager, GameStatusWithTransient};
+use crate::{downloads::error::LibraryError, state::{GameStatusManager, GameStatusWithTransient}};
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct FetchGameStruct {
@@ -23,14 +20,30 @@ pub struct FetchGameStruct {
 
 impl FetchGameStruct {
     pub fn new(game: Game, status: GameStatusWithTransient, version: Option<GameVersion>) -> Self {
-        Self {
-            game,
-            status,
-            version,
-        }
+        Self { game, status, version }
     }
 }
 
+#[derive(Serialize, Deserialize, Clone, Debug, Default, Encode, Decode)]
+#[serde(rename_all = "camelCase")]
+pub struct Game {
+    id: String,
+    m_name: String,
+    m_short_description: String,
+    m_description: String,
+    // mDevelopers
+    // mPublishers
+    m_icon_object_id: String,
+    m_banner_object_id: String,
+    m_cover_object_id: String,
+    m_image_library_object_ids: Vec<String>,
+    m_image_carousel_object_ids: Vec<String>,
+}
+impl Game {
+    pub fn id(&self) -> &String {
+        &self.id
+    }
+}
 #[derive(serde::Serialize, Clone)]
 pub struct GameUpdateEvent {
     pub game_id: String,
@@ -155,7 +168,7 @@ pub fn uninstall_game_logic(meta: DownloadableMetadata, app_handle: &AppHandle)
                 );
 
                 debug!("uninstalled game id {}", &meta.id);
-                app_emit!(&app_handle, "update_library", ());
+                app_emit!(app_handle, "update_library", ());
             }
         });
     } else {
@@ -271,8 +284,41 @@ pub struct FrontendGameOptions {
     launch_string: String,
 }
 
-impl FrontendGameOptions {
-    pub fn launch_string(&self) -> &String {
-        &self.launch_string
-    }
+#[tauri::command]
+pub fn update_game_configuration(
+    game_id: String,
+    options: FrontendGameOptions,
+) -> Result<(), LibraryError> {
+    let mut handle = borrow_db_mut_checked();
+    let installed_version = handle
+        .applications
+        .installed_game_version
+        .get(&game_id)
+        .ok_or(LibraryError::MetaNotFound(game_id))?;
+
+    let id = installed_version.id.clone();
+    let version = installed_version.version.clone().ok_or(LibraryError::VersionNotFound(id.clone()))?;
+
+    let mut existing_configuration = handle
+        .applications
+        .game_versions
+        .get(&id)
+        .unwrap()
+        .get(&version)
+        .unwrap()
+        .clone();
+
+    // Add more options in here
+    existing_configuration.launch_command_template = options.launch_string;
+
+    // Add no more options past here
+
+    handle
+        .applications
+        .game_versions
+        .get_mut(&id)
+        .unwrap()
+        .insert(version.to_string(), existing_configuration);
+
+    Ok(())
 }

games/src/scan.rs

@@ -1,12 +1,16 @@
 use std::fs;
 
-use database::{DownloadType, DownloadableMetadata, borrow_db_mut_checked};
-use drop_consts::DROP_DATA_PATH;
 use log::warn;
 
 use crate::{
-    downloads::drop_data::DropData,
-    library::set_partially_installed_db,
+    database::{
+        db::borrow_db_mut_checked,
+        models::data::{DownloadType, DownloadableMetadata},
+    },
+    games::{
+        downloads::drop_data::{DropData, DROP_DATA_PATH},
+        library::set_partially_installed_db,
+    },
 };
 
 pub fn scan_install_dirs() {

games/src/state.rs

@@ -1,4 +1,4 @@
-use database::{
+use database::models::data::{
     ApplicationTransientStatus, Database, DownloadType, DownloadableMetadata, GameDownloadStatus,
 };
 
@@ -19,7 +19,7 @@ impl GameStatusManager {
                 version: None,
             })
             .cloned();
-
+        
         let offline_state = database.applications.game_statuses.get(game_id).cloned();
 
         if online_state.is_some() {

main/pages/settings/debug.vue

@@ -116,7 +116,7 @@ platformInfo.value = currentPlatform;
 async function openDataDir() {
   if (!dataDir.value) return;
   try {
-    await invoke("open_fs", { path: dataDir.value });
+    await open(dataDir.value);
   } catch (error) {
     console.error("Failed to open data dir:", error);
   }
@@ -126,7 +126,7 @@ async function openLogFile() {
   if (!dataDir.value) return;
   try {
     const logPath = `${dataDir.value}/drop.log`;
-    await invoke("open_fs", { path: logPath });
+    await open(logPath);
   } catch (error) {
     console.error("Failed to open log file:", error);
   }

package.json

@@ -9,8 +9,8 @@
   "dependencies": {
     "@tauri-apps/api": "^2.7.0",
     "@tauri-apps/plugin-deep-link": "^2.4.1",
-    "@tauri-apps/plugin-dialog": "^2.4.0",
-    "@tauri-apps/plugin-opener": "^2.5.0",
+    "@tauri-apps/plugin-dialog": "^2.3.2",
+    "@tauri-apps/plugin-opener": "^2.4.0",
     "@tauri-apps/plugin-os": "^2.3.0",
     "@tauri-apps/plugin-shell": "^2.3.0",
     "pino": "^9.7.0",

process/Cargo.toml

@@ -14,6 +14,5 @@ page_size = "0.6.0"
 serde = "1.0.228"
 serde_with = "3.15.0"
 shared_child = "1.1.1"
-tauri = "2.8.5"
 tauri-plugin-opener = "2.5.0"
 utils = { version = "0.1.0", path = "../utils" }

process/src/format.rs

@@ -8,12 +8,7 @@ pub struct DropFormatArgs {
 }
 
 impl DropFormatArgs {
-    pub fn new(
-        launch_string: String,
-        working_dir: &String,
-        executable_name: &String,
-        absolute_executable_name: String,
-    ) -> Self {
+    pub fn new(launch_string: String, working_dir: &String, executable_name: &String, absolute_executable_name: String) -> Self {
         let mut positional = Vec::new();
         let mut map: HashMap<&'static str, String> = HashMap::new();
 

process/src/lib.rs

@@ -0,0 +1,14 @@
+#![feature(nonpoison_mutex)]
+#![feature(sync_nonpoison)]
+
+use std::sync::{LazyLock, nonpoison::Mutex};
+
+use crate::process_manager::ProcessManager;
+
+pub static PROCESS_MANAGER: LazyLock<Mutex<ProcessManager>> =
+    LazyLock::new(|| Mutex::new(ProcessManager::new()));
+
+pub mod error;
+pub mod format;
+pub mod process_handlers;
+pub mod process_manager;

process/src/process_handlers.rs

@@ -1,7 +1,8 @@
 use client::compat::{COMPAT_INFO, UMU_LAUNCHER_EXECUTABLE};
-use database::{Database, DownloadableMetadata, GameVersion, platform::Platform};
+use database::{platform::Platform, Database, DownloadableMetadata, GameVersion};
 use log::debug;
 
+
 use crate::{error::ProcessError, process_manager::ProcessHandler};
 
 pub struct NativeGameLauncher;
@@ -45,9 +46,7 @@ impl ProcessHandler for UMULauncher {
         };
         Ok(format!(
             "GAMEID={game_id} {umu:?} \"{launch}\" {args}",
-            umu = UMU_LAUNCHER_EXECUTABLE
-                .as_ref()
-                .expect("Failed to get UMU_LAUNCHER_EXECUTABLE as ref"),
+            umu = UMU_LAUNCHER_EXECUTABLE.as_ref().expect("Failed to get UMU_LAUNCHER_EXECUTABLE as ref"),
             launch = launch_command,
             args = args.join(" ")
         ))
@@ -87,12 +86,7 @@ impl ProcessHandler for AsahiMuvmLauncher {
             .next()
             .ok_or(ProcessError::InvalidArguments(umu_string.clone()))?
             .trim();
-        let cmd = format!(
-            "umu-run{}",
-            args_cmd
-                .next()
-                .ok_or(ProcessError::InvalidArguments(umu_string.clone()))?
-        );
+        let cmd = format!("umu-run{}", args_cmd.next().ok_or(ProcessError::InvalidArguments(umu_string.clone()))?);
 
         Ok(format!("{args} muvm -- {cmd}"))
     }

process/src/process_manager.rs

@@ -6,7 +6,6 @@ use std::{
     process::{Command, ExitStatus},
     str::FromStr,
     sync::Arc,
-    thread::spawn,
     time::{Duration, SystemTime},
 };
 
@@ -16,10 +15,10 @@ use database::{
 };
 use dynfmt::Format;
 use dynfmt::SimpleCurlyFormat;
-use games::{library::push_game_update, state::GameStatusManager};
+use games::state::GameStatusManager;
 use log::{debug, info, warn};
+use serde::{Deserialize, Serialize};
 use shared_child::SharedChild;
-use tauri::AppHandle;
 
 use crate::{
     PROCESS_MANAGER,
@@ -42,11 +41,10 @@ pub struct ProcessManager<'a> {
         (Platform, Platform),
         &'a (dyn ProcessHandler + Sync + Send + 'static),
     )>,
-    app_handle: AppHandle,
 }
 
 impl ProcessManager<'_> {
-    pub fn new(app_handle: AppHandle) -> Self {
+    pub fn new() -> Self {
         let log_output_dir = DATA_ROOT_DIR.join("logs");
 
         ProcessManager {
@@ -54,7 +52,7 @@ impl ProcessManager<'_> {
             current_platform: Platform::Windows,
 
             #[cfg(target_os = "macos")]
-            current_platform: Platform::macOS,
+            current_platform: Platform::MacOs,
 
             #[cfg(target_os = "linux")]
             current_platform: Platform::Linux,
@@ -72,7 +70,7 @@ impl ProcessManager<'_> {
                     &NativeGameLauncher {} as &(dyn ProcessHandler + Sync + Send + 'static),
                 ),
                 (
-                    (Platform::macOS, Platform::macOS),
+                    (Platform::MacOs, Platform::MacOs),
                     &NativeGameLauncher {} as &(dyn ProcessHandler + Sync + Send + 'static),
                 ),
                 (
@@ -84,7 +82,6 @@ impl ProcessManager<'_> {
                     &UMULauncher {} as &(dyn ProcessHandler + Sync + Send + 'static),
                 ),
             ],
-            app_handle,
         }
     }
 
@@ -175,12 +172,13 @@ impl ProcessManager<'_> {
 
         let status = GameStatusManager::fetch_state(&game_id, &db_handle);
 
-        push_game_update(
-            &self.app_handle,
-            &game_id,
-            Some(version_data.clone()),
-            status,
-        );
+        // TODO
+        // push_game_update(
+        //     &self.app_handle,
+        //     &game_id,
+        //     Some(version_data.clone()),
+        //     status,
+        // );
         Ok(())
     }
 
@@ -365,12 +363,13 @@ impl ProcessManager<'_> {
             .transient_statuses
             .insert(meta.clone(), ApplicationTransientStatus::Running {});
 
-        push_game_update(
-            &self.app_handle,
-            &meta.id,
-            None,
-            (None, Some(ApplicationTransientStatus::Running {})),
-        );
+        // TODO
+        // push_game_update(
+        //     &self.app_handle,
+        //     &meta.id,
+        //     None,
+        //     (None, Some(ApplicationTransientStatus::Running {})),
+        // );
 
         let wait_thread_handle = launch_process_handle.clone();
         let wait_thread_game_id = meta.clone();
@@ -383,14 +382,12 @@ impl ProcessManager<'_> {
                 manually_killed: false,
             },
         );
-        spawn(move || {
-            let result: Result<ExitStatus, std::io::Error> = launch_process_handle.wait();
 
-            PROCESS_MANAGER
-                .lock()
-                .on_process_finish(wait_thread_game_id.id, result)
-        });
-        Ok(())
+        let result: Result<ExitStatus, std::io::Error> = launch_process_handle.wait();
+
+        PROCESS_MANAGER
+            .lock()
+            .on_process_finish(wait_thread_game_id.id, result)
     }
 }
 

remote/src/auth.rs

@@ -2,18 +2,14 @@ use std::{collections::HashMap, env};
 
 use chrono::Utc;
 use client::{app_status::AppStatus, user::User};
-use database::{DatabaseAuth, interface::borrow_db_checked};
+use database::interface::borrow_db_checked;
 use droplet_rs::ssl::sign_nonce;
 use gethostname::gethostname;
 use log::{error, warn};
 use serde::{Deserialize, Serialize};
 use url::Url;
 
-use crate::{
-    error::{DropServerError, RemoteAccessError},
-    requests::make_authenticated_get,
-    utils::DROP_CLIENT_SYNC,
-};
+use crate::{error::{DropServerError, RemoteAccessError}, requests::make_authenticated_get, utils::DROP_CLIENT_SYNC};
 
 use super::{
     cache::{cache_object, get_cached_object},
@@ -35,42 +31,35 @@ struct InitiateRequestBody {
 
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HandshakeRequestBody {
+struct HandshakeRequestBody {
     client_id: String,
     token: String,
 }
 
-impl HandshakeRequestBody {
-    pub fn new(client_id: String, token: String) -> Self {
-        Self { client_id, token }
-    }
-}
-
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HandshakeResponse {
+struct HandshakeResponse {
     private: String,
     certificate: String,
     id: String,
 }
 
-impl From<HandshakeResponse> for DatabaseAuth {
-    fn from(value: HandshakeResponse) -> Self {
-        DatabaseAuth::new(value.private, value.certificate, value.id, None)
-    }
-}
+pub fn generate_authorization_header() -> String {
+    let certs = {
+        let db = borrow_db_checked();
+        db.auth.clone().expect("Authorisation not initialised")
+    };
 
-pub fn generate_authorization_header(auth: DatabaseAuth) -> String {
     let nonce = Utc::now().timestamp_millis().to_string();
 
     let signature =
-        sign_nonce(auth.private, nonce.clone()).expect("Failed to generate authorisation header");
+        sign_nonce(certs.private, nonce.clone()).expect("Failed to generate authorisation header");
 
-    format!("Nonce {} {} {}", auth.client_id, nonce, signature)
+    format!("Nonce {} {} {}", certs.client_id, nonce, signature)
 }
 
-pub async fn fetch_user(auth: DatabaseAuth, base_url: Url) -> Result<User, RemoteAccessError> {
-    let response = make_authenticated_get(generate_url(&["/api/v1/client/user"], &[], base_url)?, auth).await?;
+pub async fn fetch_user() -> Result<User, RemoteAccessError> {
+    let response = make_authenticated_get(generate_url(&["/api/v1/client/user"], &[])?).await?;
     if response.status() != 200 {
         let err: DropServerError = response.json().await?;
         warn!("{err:?}");
@@ -88,7 +77,12 @@ pub async fn fetch_user(auth: DatabaseAuth, base_url: Url) -> Result<User, Remot
         .map_err(std::convert::Into::into)
 }
 
-pub fn auth_initiate_logic(mode: String, base_url: Url) -> Result<String, RemoteAccessError> {
+pub fn auth_initiate_logic(mode: String) -> Result<String, RemoteAccessError> {
+    let base_url = {
+        let db_lock = borrow_db_checked();
+        Url::parse(&db_lock.base_url.clone())?
+    };
+
     let hostname = gethostname();
 
     let endpoint = base_url.join("/api/v1/client/auth/initiate")?;
@@ -117,17 +111,26 @@ pub fn auth_initiate_logic(mode: String, base_url: Url) -> Result<String, Remote
     Ok(response)
 }
 
-pub async fn setup(auth: DatabaseAuth, base_url: Url) -> (AppStatus, Option<User>) {
-    let user_result = match fetch_user(auth, base_url).await {
-        Ok(data) => data,
-        Err(RemoteAccessError::FetchError(_)) => {
-            let user = get_cached_object::<User>("user").ok();
-            return (AppStatus::Offline, user);
-        }
-        Err(_) => return (AppStatus::SignedInNeedsReauth, None),
+pub async fn setup() -> (AppStatus, Option<User>) {
+    let auth = {
+        let data = borrow_db_checked();
+        data.auth.clone()
     };
-    if let Err(e) = cache_object("user", &user_result) {
-        warn!("Could not cache user object with error {e}");
+
+    if auth.is_some() {
+        let user_result = match fetch_user().await {
+            Ok(data) => data,
+            Err(RemoteAccessError::FetchError(_)) => {
+                let user = get_cached_object::<User>("user").ok();
+                return (AppStatus::Offline, user);
+            }
+            Err(_) => return (AppStatus::SignedInNeedsReauth, None),
+        };
+        if let Err(e) = cache_object("user", &user_result) {
+            warn!("Could not cache user object with error {e}");
+        }
+        return (AppStatus::SignedIn, Some(user_result));
     }
-    return (AppStatus::SignedIn, Some(user_result));
+
+    (AppStatus::SignedOut, None)
 }

remote/src/cache.rs

@@ -15,9 +15,9 @@ use crate::error::{CacheError, RemoteAccessError};
 macro_rules! offline {
     ($var:expr, $func1:expr, $func2:expr, $( $arg:expr ),* ) => {
 
-        async move {
-            if ::database::borrow_db_checked().settings.force_offline
-            || *$var.lock().status() == ::client::app_status::AppStatus::Offline {
+        async move { 
+            if ::database::borrow_db_checked().settings.force_offline 
+            || ::utils::lock!($var).status == ::client::app_status::AppStatus::Offline {
             $func2( $( $arg ), *).await
         } else {
             $func1( $( $arg ), *).await

remote/src/error.rs

@@ -4,7 +4,7 @@ use std::{
     sync::Arc,
 };
 
-use http::{HeaderName, StatusCode, header::ToStrError};
+use http::{header::ToStrError, HeaderName, StatusCode};
 use serde_with::SerializeDisplay;
 use url::ParseError;
 
@@ -19,6 +19,7 @@ pub struct DropServerError {
     // pub url: String,
 }
 
+
 #[derive(Debug, SerializeDisplay)]
 pub enum RemoteAccessError {
     FetchError(Arc<reqwest::Error>),
@@ -119,25 +120,17 @@ pub enum CacheError {
     HeaderNotFound(HeaderName),
     ParseError(ToStrError),
     Remote(RemoteAccessError),
-    ConstructionError(http::Error),
+    ConstructionError(http::Error)
 }
 
 impl Display for CacheError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let s = match self {
-            CacheError::HeaderNotFound(header_name) => {
-                format!("Could not find header {header_name} in cache")
-            }
-            CacheError::ParseError(to_str_error) => {
-                format!("Could not parse cache with error {to_str_error}")
-            }
-            CacheError::Remote(remote_access_error) => {
-                format!("Cache got remote access error: {remote_access_error}")
-            }
-            CacheError::ConstructionError(error) => {
-                format!("Could not construct cache body with error {error}")
-            }
+            CacheError::HeaderNotFound(header_name) => format!("Could not find header {header_name} in cache"),
+            CacheError::ParseError(to_str_error) => format!("Could not parse cache with error {to_str_error}"),
+            CacheError::Remote(remote_access_error) => format!("Cache got remote access error: {remote_access_error}"),
+            CacheError::ConstructionError(error) => format!("Could not construct cache body with error {error}"),
         };
         write!(f, "{s}")
     }
-}
+}

remote/src/fetch_object.rs

@@ -1,8 +1,7 @@
-use database::{DB, DatabaseAuth, interface::DatabaseImpls};
-use http::{Response, header::CONTENT_TYPE, response::Builder as ResponseBuilder};
+use database::{interface::DatabaseImpls, DB};
+use http::{header::CONTENT_TYPE, response::Builder as ResponseBuilder, Response};
 use log::{debug, warn};
 use tauri::UriSchemeResponder;
-use url::Url;
 
 use crate::{error::CacheError, utils::DROP_CLIENT_ASYNC};
 
@@ -11,26 +10,18 @@ use super::{
     cache::{ObjectCache, cache_object, get_cached_object},
 };
 
-pub async fn fetch_object_wrapper(request: http::Request<Vec<u8>>, responder: UriSchemeResponder, auth: DatabaseAuth, base_url: Url) {
-    match fetch_object(request, auth, base_url).await {
+pub async fn fetch_object_wrapper(request: http::Request<Vec<u8>>, responder: UriSchemeResponder) {
+    match fetch_object(request).await {
         Ok(r) => responder.respond(r),
         Err(e) => {
             warn!("Cache error: {e}");
-            responder.respond(
-                Response::builder()
-                    .status(500)
-                    .body(Vec::new())
-                    .expect("Failed to build error response"),
-            );
+            responder.respond(Response::builder().status(500).body(Vec::new()).expect("Failed to build error response"));
         }
     };
 }
 
-pub async fn fetch_object(
-    request: http::Request<Vec<u8>>,
-    auth: DatabaseAuth,
-    base_url: Url
-) -> Result<Response<Vec<u8>>, CacheError> {
+pub async fn fetch_object(request: http::Request<Vec<u8>>) -> Result<Response<Vec<u8>>, CacheError>
+{
     // Drop leading /
     let object_id = &request.uri().path()[1..];
 
@@ -41,9 +32,9 @@ pub async fn fetch_object(
         return cache_result.try_into();
     }
 
-    let header = generate_authorization_header(auth);
+    let header = generate_authorization_header();
     let client = DROP_CLIENT_ASYNC.clone();
-    let url = format!("{}api/v1/client/object/{object_id}", base_url);
+    let url = format!("{}api/v1/client/object/{object_id}", DB.fetch_base_url());
     let response = client.get(url).header("Authorization", header).send().await;
 
     match response {
@@ -57,13 +48,13 @@ pub async fn fetch_object(
             let data = match r.bytes().await {
                 Ok(data) => Vec::from(data),
                 Err(e) => {
-                    warn!("Could not get data from cache object {object_id} with error {e}",);
+                    warn!(
+                        "Could not get data from cache object {object_id} with error {e}",
+                    );
                     Vec::new()
                 }
             };
-            let resp = resp_builder
-                .body(data)
-                .expect("Failed to build object cache response body");
+            let resp = resp_builder.body(data).expect("Failed to build object cache response body");
             if cache_result.map_or(true, |x| x.has_expired()) {
                 cache_object::<ObjectCache>(object_id, &resp.clone().try_into()?)
                     .expect("Failed to create cached object");

remote/src/lib.rs

@@ -1,10 +1,10 @@
 pub mod auth;
 #[macro_use]
 pub mod cache;
-pub mod error;
 pub mod fetch_object;
 pub mod requests;
 pub mod server_proto;
 pub mod utils;
+pub mod error;
 
-pub use auth::setup;
+pub use auth::setup;

remote/src/requests.rs

@@ -1,4 +1,4 @@
-use database::{DB, DatabaseAuth, interface::DatabaseImpls};
+use database::{interface::DatabaseImpls, DB};
 use url::Url;
 
 use crate::{
@@ -8,9 +8,8 @@ use crate::{
 pub fn generate_url<T: AsRef<str>>(
     path_components: &[T],
     query: &[(T, T)],
-    base_url: Url
 ) -> Result<Url, RemoteAccessError> {
-    let mut base_url = base_url.clone();
+    let mut base_url = DB.fetch_base_url();
     for endpoint in path_components {
         base_url = base_url.join(endpoint.as_ref())?;
     }
@@ -23,10 +22,10 @@ pub fn generate_url<T: AsRef<str>>(
     Ok(base_url)
 }
 
-pub async fn make_authenticated_get(url: Url, auth: DatabaseAuth) -> Result<reqwest::Response, reqwest::Error> {
+pub async fn make_authenticated_get(url: Url) -> Result<reqwest::Response, reqwest::Error> {
     DROP_CLIENT_ASYNC
         .get(url)
-        .header("Authorization", generate_authorization_header(auth))
+        .header("Authorization", generate_authorization_header())
         .send()
         .await
 }

remote/src/server_proto.rs

@@ -1,66 +1,58 @@
 use std::str::FromStr;
 
-use database::{DatabaseAuth, borrow_db_checked};
-use http::{Request, Response, StatusCode, Uri, uri::PathAndQuery};
-use log::warn;
+use database::borrow_db_checked;
+use http::{uri::PathAndQuery, Request, Response, StatusCode, Uri};
+use log::{error, warn};
 use tauri::UriSchemeResponder;
-use url::Url;
 use utils::webbrowser_open::webbrowser_open;
 
 use crate::utils::DROP_CLIENT_SYNC;
 
-pub async fn handle_server_proto_offline_wrapper(
-    request: Request<Vec<u8>>,
-    responder: UriSchemeResponder,
-) {
+pub async fn handle_server_proto_offline_wrapper(request: Request<Vec<u8>>, responder: UriSchemeResponder) {
     responder.respond(match handle_server_proto_offline(request).await {
         Ok(res) => res,
-        Err(_) => unreachable!(),
+        Err(_) => unreachable!()
     });
 }
 
-pub async fn handle_server_proto_offline(
-    _request: Request<Vec<u8>>,
-) -> Result<Response<Vec<u8>>, StatusCode> {
+pub async fn handle_server_proto_offline(_request: Request<Vec<u8>>) -> Result<Response<Vec<u8>>, StatusCode>{
     Ok(Response::builder()
         .status(StatusCode::NOT_FOUND)
         .body(Vec::new())
         .expect("Failed to build error response for proto offline"))
+        
 }
 
-pub async fn handle_server_proto_wrapper(request: Request<Vec<u8>>, responder: UriSchemeResponder, auth: DatabaseAuth, base_url: Url) {
-    match handle_server_proto(request, auth, base_url).await {
+pub async fn handle_server_proto_wrapper(request: Request<Vec<u8>>, responder: UriSchemeResponder) {
+    match handle_server_proto(request).await {
         Ok(r) => responder.respond(r),
         Err(e) => {
             warn!("Cache error: {e}");
-            responder.respond(
-                Response::builder()
-                    .status(e)
-                    .body(Vec::new())
-                    .expect("Failed to build error response"),
-            );
+            responder.respond(Response::builder().status(e).body(Vec::new()).expect("Failed to build error response"));
         }
     }
 }
 
-async fn handle_server_proto(
-    request: Request<Vec<u8>>,
-    auth: DatabaseAuth,
-    base_url: Url,
-) -> Result<Response<Vec<u8>>, StatusCode> {
+async fn handle_server_proto(request: Request<Vec<u8>>) -> Result<Response<Vec<u8>>, StatusCode> {
+    let db_handle = borrow_db_checked();
+    let auth = match db_handle.auth.as_ref() {
+        Some(auth) => auth,
+        None => {
+            error!("Could not find auth in database");
+            return Err(StatusCode::UNAUTHORIZED)
+        }
+    };
     let web_token = match &auth.web_token {
         Some(token) => token,
         None => return Err(StatusCode::UNAUTHORIZED),
     };
-    let remote_uri = base_url.as_str().parse::<Uri>().expect("Failed to parse base url");
+    let remote_uri = db_handle.base_url.parse::<Uri>().expect("Failed to parse base url");
 
     let path = request.uri().path();
 
     let mut new_uri = request.uri().clone().into_parts();
-    new_uri.path_and_query = Some(
-        PathAndQuery::from_str(&format!("{path}?noWrapper=true"))
-            .expect("Failed to parse request path in proto"),
-    );
+    new_uri.path_and_query =
+        Some(PathAndQuery::from_str(&format!("{path}?noWrapper=true")).expect("Failed to parse request path in proto"));
     new_uri.authority = remote_uri.authority().cloned();
     new_uri.scheme = remote_uri.scheme().cloned();
     let err_msg = &format!("Failed to build new uri from parts {new_uri:?}");
@@ -70,7 +62,7 @@ async fn handle_server_proto(
 
     if whitelist_prefix.iter().all(|f| !path.starts_with(f)) {
         webbrowser_open(new_uri.to_string());
-        return Ok(Response::new(Vec::new()));
+        return Ok(Response::new(Vec::new()))
     }
 
     let client = DROP_CLIENT_SYNC.clone();
@@ -78,14 +70,13 @@ async fn handle_server_proto(
         .request(request.method().clone(), new_uri.to_string())
         .header("Authorization", format!("Bearer {web_token}"))
         .headers(request.headers().clone())
-        .send()
-    {
-        Ok(response) => response,
-        Err(e) => {
-            warn!("Could not send response. Got {e} when sending");
-            return Err(e.status().unwrap_or(StatusCode::BAD_REQUEST));
-        }
-    };
+        .send() {
+            Ok(response) => response,
+            Err(e) => {
+                warn!("Could not send response. Got {e} when sending");
+                return Err(e.status().unwrap_or(StatusCode::BAD_REQUEST))
+            },
+        };
 
     let response_status = response.status();
     let response_body = match response.bytes() {

remote/src/utils.rs

@@ -15,7 +15,7 @@ pub struct DropHealthcheck {
     app_name: String,
 }
 impl DropHealthcheck {
-    pub fn app_name(&self) -> &String {
+    pub fn app_name(&self) -> &String{
         &self.app_name
     }
 }
@@ -46,13 +46,11 @@ fn fetch_certificates() -> Vec<Certificate> {
                             }
                         }
                         .read_to_end(&mut buf)
-                        .unwrap_or_else(|e| {
-                            panic!(
-                                "Failed to read to end of certificate file {} with error {}",
-                                c.path().display(),
-                                e
-                            )
-                        });
+                        .unwrap_or_else(|e| panic!(
+                            "Failed to read to end of certificate file {} with error {}",
+                            c.path().display(),
+                            e
+                        ));
 
                         match Certificate::from_pem_bundle(&buf) {
                             Ok(certificates) => {
@@ -89,10 +87,7 @@ pub fn get_client_sync() -> reqwest::blocking::Client {
     for cert in DROP_CERT_BUNDLE.iter() {
         client = client.add_root_certificate(cert.clone());
     }
-    client
-        .use_rustls_tls()
-        .build()
-        .expect("Failed to build synchronous client")
+    client.use_rustls_tls().build().expect("Failed to build synchronous client")
 }
 pub fn get_client_async() -> reqwest::Client {
     let mut client = reqwest::ClientBuilder::new();
@@ -100,10 +95,7 @@ pub fn get_client_async() -> reqwest::Client {
     for cert in DROP_CERT_BUNDLE.iter() {
         client = client.add_root_certificate(cert.clone());
     }
-    client
-        .use_rustls_tls()
-        .build()
-        .expect("Failed to build asynchronous client")
+    client.use_rustls_tls().build().expect("Failed to build asynchronous client")
 }
 pub fn get_client_ws() -> reqwest::Client {
     let mut client = reqwest::ClientBuilder::new();
@@ -116,4 +108,4 @@ pub fn get_client_ws() -> reqwest::Client {
         .http1_only()
         .build()
         .expect("Failed to build websocket client")
-}
+}

src-tauri/Cargo.toml

@@ -65,9 +65,7 @@ whoami = "1.6.0"
 filetime = "0.2.25"
 walkdir = "2.5.0"
 known-folders = "1.2.0"
-native_model = { version = "0.6.4", features = [
-    "rmp_serde_1_3",
-], git = "https://github.com/Drop-OSS/native_model.git" }
+native_model = { version = "0.6.4", features = ["rmp_serde_1_3"], git = "https://github.com/Drop-OSS/native_model.git"}
 tauri-plugin-opener = "2.4.0"
 bitcode = "0.6.6"
 reqwest-websocket = "0.5.0"
@@ -82,13 +80,12 @@ bytes = "1.10.1"
 
 
 # Workspaces
-client = { version = "0.1.0", path = "./client" }
-database = { path = "./database" }
-process = { path = "./process" }
-remote = { version = "0.1.0", path = "./remote" }
-utils = { path = "./utils" }
-games = { version = "0.1.0", path = "./games" }
-download_manager = { version = "0.1.0", path = "./download_manager" }
+client = { version = "0.1.0", path = "../client" }
+database = { path = "../database" }
+process = { path = "../process" }
+remote = { version = "0.1.0", path = "../remote" }
+utils = { path = "../utils" }
+games = { version = "0.1.0", path = "../games" }
 
 [dependencies.dynfmt]
 version = "0.1.5"
@@ -139,20 +136,3 @@ features = ["derive", "rc"]
 lto = true
 codegen-units = 1
 panic = 'abort'
-
-
-[workspace]
-members = [
-    "client",
-    "database",
-    "process",
-    "remote",
-    "utils",
-    "cloud_saves",
-    "download_manager",
-    "games",
-    "library",
-    "drop-consts",
-]
-
-resolver = "3"

src-tauri/client/src/app_state.rs

@@ -1,42 +0,0 @@
-use std::collections::HashMap;
-
-use database::models::Game;
-use serde::Serialize;
-
-use crate::{app_status::AppStatus, user::User};
-
-#[derive(Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct AppState {
-    status: AppStatus,
-    user: Option<User>,
-    games: HashMap<String, Game>,
-}
-impl AppState {
-    pub fn new(status: AppStatus, user: Option<User>, games: HashMap<String, Game>) -> Self {
-        Self {
-            status,
-            user,
-            games,
-        }
-    }
-
-    pub fn status(&self) -> &AppStatus {
-        &self.status
-    }
-    pub fn status_mut(&mut self) -> &mut AppStatus {
-        &mut self.status
-    }
-    pub fn games(&self) -> &HashMap<String, Game> {
-        &self.games
-    }
-    pub fn games_mut(&mut self) -> &mut HashMap<String, Game> {
-        &mut self.games
-    }
-    pub fn user(&self) -> &Option<User> {
-        &self.user
-    }
-    pub fn user_mut(&mut self) -> &mut Option<User> {
-        &mut self.user
-    }
-}

src-tauri/client/src/lib.rs

@@ -1,5 +0,0 @@
-pub mod app_state;
-pub mod app_status;
-pub mod autostart;
-pub mod compat;
-pub mod user;

src-tauri/cloud_saves/src/backup_manager.rs

@@ -1,234 +0,0 @@
-use std::{collections::HashMap, path::PathBuf, str::FromStr};
-
-#[cfg(target_os = "linux")]
-use database::platform::Platform;
-use database::{db::DATA_ROOT_DIR, GameVersion};
-use log::warn;
-
-use crate::error::BackupError;
-
-use super::path::CommonPath;
-
-pub struct BackupManager<'a> {
-    pub current_platform: Platform,
-    pub sources: HashMap<(Platform, Platform), &'a (dyn BackupHandler + Sync + Send)>,
-}
-
-impl Default for BackupManager<'_> {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl BackupManager<'_> {
-    pub fn new() -> Self {
-        BackupManager {
-            #[cfg(target_os = "windows")]
-            current_platform: Platform::Windows,
-
-            #[cfg(target_os = "macos")]
-            current_platform: Platform::macOS,
-
-            #[cfg(target_os = "linux")]
-            current_platform: Platform::Linux,
-
-            sources: HashMap::from([
-                // Current platform to target platform
-                (
-                    (Platform::Windows, Platform::Windows),
-                    &WindowsBackupManager {} as &(dyn BackupHandler + Sync + Send),
-                ),
-                (
-                    (Platform::Linux, Platform::Linux),
-                    &LinuxBackupManager {} as &(dyn BackupHandler + Sync + Send),
-                ),
-                (
-                    (Platform::macOS, Platform::macOS),
-                    &MacBackupManager {} as &(dyn BackupHandler + Sync + Send),
-                ),
-            ]),
-        }
-    }
-}
-
-pub trait BackupHandler: Send + Sync {
-    fn root_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> {
-        Ok(DATA_ROOT_DIR.join("games"))
-    }
-    fn game_translate(&self, _path: &PathBuf, game: &GameVersion) -> Result<PathBuf, BackupError> {
-        Ok(PathBuf::from_str(&game.game_id).unwrap())
-    }
-    fn base_translate(&self, path: &PathBuf, game: &GameVersion) -> Result<PathBuf, BackupError> {
-        Ok(self
-            .root_translate(path, game)?
-            .join(self.game_translate(path, game)?))
-    }
-    fn home_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> {
-        let c = CommonPath::Home.get().ok_or(BackupError::NotFound);
-        println!("{:?}", c);
-        c
-    }
-    fn store_user_id_translate(
-        &self,
-        _path: &PathBuf,
-        game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        PathBuf::from_str(&game.game_id).map_err(|_| BackupError::ParseError)
-    }
-    fn os_user_name_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        Ok(PathBuf::from_str(&whoami::username()).unwrap())
-    }
-    fn win_app_data_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected Windows Reference in Backup <winAppData>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn win_local_app_data_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected Windows Reference in Backup <winLocalAppData>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn win_local_app_data_low_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected Windows Reference in Backup <winLocalAppDataLow>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn win_documents_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected Windows Reference in Backup <winDocuments>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn win_public_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected Windows Reference in Backup <winPublic>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn win_program_data_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected Windows Reference in Backup <winProgramData>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn win_dir_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected Windows Reference in Backup <winDir>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn xdg_data_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected XDG Reference in Backup <xdgData>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn xdg_config_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected XDG Reference in Backup <xdgConfig>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn skip_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> {
-        Ok(PathBuf::new())
-    }
-}
-
-pub struct LinuxBackupManager {}
-impl BackupHandler for LinuxBackupManager {
-    fn xdg_config_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        CommonPath::Data.get().ok_or(BackupError::NotFound)
-    }
-    fn xdg_data_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        CommonPath::Config.get().ok_or(BackupError::NotFound)
-    }
-}
-pub struct WindowsBackupManager {}
-impl BackupHandler for WindowsBackupManager {
-    fn win_app_data_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        CommonPath::Config.get().ok_or(BackupError::NotFound)
-    }
-    fn win_local_app_data_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        CommonPath::DataLocal.get().ok_or(BackupError::NotFound)
-    }
-    fn win_local_app_data_low_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        CommonPath::DataLocalLow
-            .get()
-            .ok_or(BackupError::NotFound)
-    }
-    fn win_dir_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        Ok(PathBuf::from_str("C:/Windows").unwrap())
-    }
-    fn win_documents_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        CommonPath::Document.get().ok_or(BackupError::NotFound)
-    }
-    fn win_program_data_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        Ok(PathBuf::from_str("C:/ProgramData").unwrap())
-    }
-    fn win_public_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        CommonPath::Public.get().ok_or(BackupError::NotFound)
-    }
-}
-pub struct MacBackupManager {}
-impl BackupHandler for MacBackupManager {}

src-tauri/database/src/lib.rs

@@ -1,14 +0,0 @@
-#![feature(nonpoison_rwlock)]
-
-pub mod db;
-pub mod debug;
-pub mod interface;
-pub mod models;
-pub mod platform;
-
-pub use db::DB;
-pub use interface::{borrow_db_checked, borrow_db_mut_checked};
-pub use models::{
-    ApplicationTransientStatus, Database, DatabaseApplications, DatabaseAuth, DownloadType,
-    DownloadableMetadata, GameDownloadStatus, GameVersion, Settings,
-};

src-tauri/database/src/models/mod.rs

@@ -1,110 +0,0 @@
-mod v1;
-mod v2;
-mod v3;
-mod v4;
-
-use std::{hash::Hash, path::PathBuf};
-
-use native_model::native_model;
-use serde::{Deserialize, Serialize};
-
-use std::collections::HashMap;
-
-use crate::db::DropDatabaseSerializer;
-
-
-// NOTE: Within each version, you should NEVER use these types.
-// Declare it using the actual version that it is from, i.e. v1::Settings rather than just Settings from here
-
-pub type GameVersion = v1::GameVersion;
-pub type Database = v4::Database;
-pub type Settings = v1::Settings;
-pub type DatabaseAuth = v1::DatabaseAuth;
-
-pub type GameDownloadStatus = v2::GameDownloadStatus;
-pub type ApplicationTransientStatus = v1::ApplicationTransientStatus;
-/**
- * Need to be universally accessible by the ID, and the version is just a couple sprinkles on top
- */
-pub type DownloadableMetadata = v1::DownloadableMetadata;
-pub type DownloadType = v1::DownloadType;
-pub type DatabaseApplications = v2::DatabaseApplications;
-// pub type DatabaseCompatInfo = v2::DatabaseCompatInfo;
-
-pub type Game = v1::Game;
-
-impl Game {
-    pub fn id(&self) -> &String {
-        &self.id
-    }
-}
-
-pub type DatabaseInterface =
-    rustbreak::Database<Database, rustbreak::backend::PathBackend, DropDatabaseSerializer>;
-
-pub type LibraryMetadata = v1::LibraryMetadata;
-pub type LibraryProviderMetadata = v1::LibraryProviderMetadata;
-pub type ProviderType = v1::ProviderType;
-
-pub type Collection = v1::Collection;
-pub type CollectionObject = v1::CollectionObject;
-
-impl PartialEq for DownloadableMetadata {
-    fn eq(&self, other: &Self) -> bool {
-        self.id == other.id && self.download_type == other.download_type
-    }
-}
-impl Hash for DownloadableMetadata {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.id.hash(state);
-        self.download_type.hash(state);
-    }
-}
-impl LibraryProviderMetadata {
-    pub fn provider(&self) -> &ProviderType {
-        &self.provider
-    }
-    pub fn id(&self) -> usize {
-        self.id
-    }
-    pub fn name(&self) -> &String {
-        &self.name
-    }
-}
-
-impl Database {
-    pub fn new<T: Into<PathBuf>>(
-        games_base_dir: T,
-        prev_database: Option<PathBuf>,
-        cache_dir: PathBuf,
-    ) -> Self {
-        Self {
-            prev_database,
-            settings: Settings::default(),
-            cache_dir,
-            compat_info: None,
-            library: v1::LibraryMetadata { providers: vec![] },
-        }
-    }
-}
-impl DatabaseAuth {
-    pub fn new(
-        private: String,
-        cert: String,
-        client_id: String,
-        web_token: Option<String>,
-    ) -> Self {
-        Self {
-            private,
-            cert,
-            client_id,
-            web_token,
-        }
-    }
-}
-
-impl LibraryMetadata {
-    pub fn providers(&self) -> &Vec<LibraryProviderMetadata> {
-        &self.providers
-    }
-}

src-tauri/database/src/models/v1.rs

@@ -1,201 +0,0 @@
-use bitcode::{Decode, Encode};
-use serde_with::serde_as;
-use std::{collections::HashMap, path::PathBuf};
-
-use crate::{models::v1, platform::Platform};
-
-use super::{Deserialize, Serialize, native_model};
-
-fn default_template() -> String {
-    "{}".to_owned()
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
-#[serde(rename_all = "camelCase")]
-#[native_model(id = 2, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
-pub struct GameVersion {
-    pub game_id: String,
-    pub version_name: String,
-
-    pub platform: Platform,
-
-    pub launch_command: String,
-    pub launch_args: Vec<String>,
-    #[serde(default = "default_template")]
-    pub launch_command_template: String,
-
-    pub setup_command: String,
-    pub setup_args: Vec<String>,
-    #[serde(default = "default_template")]
-    pub setup_command_template: String,
-
-    pub only_setup: bool,
-
-    pub version_index: usize,
-    pub delta: bool,
-
-    pub umu_id_override: Option<String>,
-}
-
-#[serde_as]
-#[derive(Serialize, Clone, Deserialize, Default)]
-#[serde(rename_all = "camelCase")]
-#[native_model(id = 3, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
-pub struct DatabaseApplications {
-    pub install_dirs: Vec<PathBuf>,
-    // Guaranteed to exist if the game also exists in the app state map
-    pub game_statuses: HashMap<String, v1::GameDownloadStatus>,
-    pub game_versions: HashMap<String, HashMap<String, v1::GameVersion>>,
-    pub installed_game_version: HashMap<String, v1::DownloadableMetadata>,
-
-    #[serde(skip)]
-    pub transient_statuses: HashMap<v1::DownloadableMetadata, v1::ApplicationTransientStatus>,
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug)]
-#[serde(rename_all = "camelCase")]
-#[native_model(id = 4, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
-pub struct Settings {
-    pub autostart: bool,
-    pub max_download_threads: usize,
-    pub force_offline: bool, // ... other settings ...
-}
-impl Default for Settings {
-    fn default() -> Self {
-        Self {
-            autostart: false,
-            max_download_threads: 4,
-            force_offline: false,
-        }
-    }
-}
-
-// Strings are version names for a particular game
-#[derive(Serialize, Clone, Deserialize, Debug)]
-#[serde(tag = "type")]
-#[native_model(id = 5, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
-pub enum GameDownloadStatus {
-    Remote {},
-    SetupRequired {
-        version_name: String,
-        install_dir: String,
-    },
-    Installed {
-        version_name: String,
-        install_dir: String,
-    },
-}
-
-// Stuff that shouldn't be synced to disk
-#[derive(Clone, Serialize, Deserialize, Debug)]
-pub enum ApplicationTransientStatus {
-    Queued { version_name: String },
-    Downloading { version_name: String },
-    Uninstalling {},
-    Updating { version_name: String },
-    Validating { version_name: String },
-    Running {},
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, Default, Encode, Decode)]
-#[native_model(id = 6, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
-pub struct DatabaseAuth {
-    pub private: String,
-    pub cert: String,
-    pub client_id: String,
-    pub web_token: Option<String>,
-}
-
-#[native_model(id = 8, version = 1)]
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, Clone, Copy)]
-pub enum DownloadType {
-    Game,
-    Tool,
-    Dlc,
-    Mod,
-}
-
-#[native_model(id = 7, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
-#[derive(Debug, Eq, PartialOrd, Ord, Serialize, Deserialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct DownloadableMetadata {
-    pub id: String,
-    pub version: Option<String>,
-    pub download_type: v1::DownloadType,
-}
-impl DownloadableMetadata {
-    pub fn new(id: String, version: Option<String>, download_type: v1::DownloadType) -> Self {
-        Self {
-            id,
-            version,
-            download_type,
-        }
-    }
-}
-
-#[native_model(id = 1, version = 1)]
-#[derive(Serialize, Deserialize, Clone, Default)]
-pub struct Database {
-    #[serde(default)]
-    pub settings: Settings,
-    pub auth: Option<v1::DatabaseAuth>,
-    pub base_url: String,
-    pub applications: v1::DatabaseApplications,
-    pub prev_database: Option<PathBuf>,
-    pub cache_dir: PathBuf,
-}
-#[native_model(id = 15, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
-#[derive(Serialize, Deserialize, Debug, Clone, Encode, Decode, Default)]
-pub struct LibraryMetadata {
-    pub(crate) providers: Vec<v1::LibraryProviderMetadata>
-}
-
-
-#[native_model(id = 11, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
-#[derive(Serialize, Deserialize, Debug, Clone, Encode, Decode)]
-pub struct LibraryProviderMetadata {
-    pub(crate) id: usize,
-    pub(crate) name: String,
-    pub(crate) provider: v1::ProviderType
-}
-#[native_model(id = 10, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
-#[derive(Serialize, Deserialize, Debug, Clone, Encode, Decode)]
-pub enum ProviderType {
-    Drop(v1::DatabaseAuth),
-}
-#[native_model(id = 12, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
-#[derive(Serialize, Deserialize, Debug, Clone, Encode, Decode)]
-pub struct Game {
-    pub library_id: LibraryProviderMetadata,
-    pub(crate) id: String,
-    m_name: String,
-    m_short_description: String,
-    m_description: String,
-    // mDevelopers
-    // mPublishers
-    m_icon_object_id: String,
-    m_banner_object_id: String,
-    m_cover_object_id: String,
-    m_image_library_object_ids: Vec<String>,
-    m_image_carousel_object_ids: Vec<String>,
-}
-
-#[native_model(id = 13, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[serde(rename_all = "camelCase")]
-pub struct Collection {
-    id: String,
-    name: String,
-    is_default: bool,
-    user_id: String,
-    entries: Vec<CollectionObject>,
-}
-
-#[native_model(id = 14, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct CollectionObject {
-    collection_id: String,
-    game_id: String,
-    game: Game,
-}

src-tauri/database/src/models/v2.rs

@@ -1,111 +0,0 @@
-        use std::{collections::HashMap, path::PathBuf};
-
-        use serde_with::serde_as;
-
-        use super::{Deserialize, Serialize, native_model, v1};
-
-        #[native_model(id = 1, version = 2, with = native_model::rmp_serde_1_3::RmpSerde, from = v1::Database)]
-        #[derive(Serialize, Deserialize, Clone, Default)]
-        pub struct Database {
-            #[serde(default)]
-            pub settings: v1::Settings,
-            pub auth: Option<v1::DatabaseAuth>,
-            pub base_url: String,
-            pub applications: v1::DatabaseApplications,
-            #[serde(skip)]
-            pub prev_database: Option<PathBuf>,
-            pub cache_dir: PathBuf,
-            pub compat_info: Option<DatabaseCompatInfo>,
-        }
-
-        #[native_model(id = 9, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
-        #[derive(Serialize, Deserialize, Clone, Default)]
-
-        pub struct DatabaseCompatInfo {
-            pub umu_installed: bool,
-        }
-
-        impl From<v1::Database> for Database {
-            fn from(value: v1::Database) -> Self {
-                Self {
-                    settings: value.settings,
-                    auth: value.auth,
-                    base_url: value.base_url,
-                    applications: value.applications,
-                    prev_database: value.prev_database,
-                    cache_dir: value.cache_dir,
-                    compat_info: None,
-                }
-            }
-        }
-        // Strings are version names for a particular game
-        #[derive(Serialize, Clone, Deserialize, Debug)]
-        #[serde(tag = "type")]
-        #[native_model(id = 5, version = 2, with = native_model::rmp_serde_1_3::RmpSerde, from = v1::GameDownloadStatus)]
-        pub enum GameDownloadStatus {
-            Remote {},
-            SetupRequired {
-                version_name: String,
-                install_dir: String,
-            },
-            Installed {
-                version_name: String,
-                install_dir: String,
-            },
-            PartiallyInstalled {
-                version_name: String,
-                install_dir: String,
-            },
-        }
-        impl From<v1::GameDownloadStatus> for GameDownloadStatus {
-            fn from(value: v1::GameDownloadStatus) -> Self {
-                match value {
-                    v1::GameDownloadStatus::Remote {} => Self::Remote {},
-                    v1::GameDownloadStatus::SetupRequired {
-                        version_name,
-                        install_dir,
-                    } => Self::SetupRequired {
-                        version_name,
-                        install_dir,
-                    },
-                    v1::GameDownloadStatus::Installed {
-                        version_name,
-                        install_dir,
-                    } => Self::Installed {
-                        version_name,
-                        install_dir,
-                    },
-                }
-            }
-        }
-        #[serde_as]
-        #[derive(Serialize, Clone, Deserialize, Default)]
-        #[serde(rename_all = "camelCase")]
-        #[native_model(id = 3, version = 2, with = native_model::rmp_serde_1_3::RmpSerde, from=v1::DatabaseApplications)]
-        pub struct DatabaseApplications {
-            pub install_dirs: Vec<PathBuf>,
-            // Guaranteed to exist if the game also exists in the app state map
-            pub game_statuses: HashMap<String, GameDownloadStatus>,
-
-            pub game_versions: HashMap<String, HashMap<String, v1::GameVersion>>,
-            pub installed_game_version: HashMap<String, v1::DownloadableMetadata>,
-
-            #[serde(skip)]
-            pub transient_statuses:
-                HashMap<v1::DownloadableMetadata, v1::ApplicationTransientStatus>,
-        }
-        impl From<v1::DatabaseApplications> for DatabaseApplications {
-            fn from(value: v1::DatabaseApplications) -> Self {
-                Self {
-                    game_statuses: value
-                        .game_statuses
-                        .into_iter()
-                        .map(|x| (x.0, x.1.into()))
-                        .collect::<HashMap<String, GameDownloadStatus>>(),
-                    install_dirs: value.install_dirs,
-                    game_versions: value.game_versions,
-                    installed_game_version: value.installed_game_version,
-                    transient_statuses: value.transient_statuses,
-                }
-            }
-        }

src-tauri/database/src/models/v3.rs

@@ -1,32 +0,0 @@
-use std::{collections::HashMap, path::PathBuf};
-
-use serde_with::serde_as;
-
-use super::{Deserialize, Serialize, native_model, v1, v2};
-#[native_model(id = 1, version = 3, with = native_model::rmp_serde_1_3::RmpSerde, from = v2::Database)]
-#[derive(Serialize, Deserialize, Clone, Default)]
-pub struct Database {
-    #[serde(default)]
-    pub settings: v1::Settings,
-    pub auth: Option<v1::DatabaseAuth>,
-    pub base_url: String,
-    pub applications: v2::DatabaseApplications,
-    #[serde(skip)]
-    pub prev_database: Option<PathBuf>,
-    pub cache_dir: PathBuf,
-    pub compat_info: Option<v2::DatabaseCompatInfo>,
-}
-
-impl From<v2::Database> for Database {
-    fn from(value: v2::Database) -> Self {
-        Self {
-            settings: value.settings,
-            auth: value.auth,
-            base_url: value.base_url,
-            applications: value.applications.into(),
-            prev_database: value.prev_database,
-            cache_dir: value.cache_dir,
-            compat_info: None,
-        }
-    }
-}

src-tauri/database/src/models/v4.rs

@@ -1,43 +0,0 @@
-use std::path::PathBuf;
-
-use native_model::native_model;
-use serde::{Deserialize, Serialize};
-
-use crate::models::{
-    v1::{self, LibraryMetadata},
-    v2, v3,
-};
-
-#[native_model(id = 1, version = 4, with = native_model::rmp_serde_1_3::RmpSerde, from = v3::Database)]
-#[derive(Serialize, Deserialize, Clone, Default)]
-pub struct Database {
-    #[serde(default)]
-    pub settings: v1::Settings,
-    #[serde(skip)]
-    pub prev_database: Option<PathBuf>,
-    pub cache_dir: PathBuf,
-    pub compat_info: Option<v2::DatabaseCompatInfo>,
-    pub library: v1::LibraryMetadata,
-}
-
-impl From<v3::Database> for Database {
-    fn from(value: v3::Database) -> Self {
-        Self {
-            settings: value.settings,
-            prev_database: value.prev_database,
-            cache_dir: value.cache_dir,
-            compat_info: value.compat_info,
-            library: v1::LibraryMetadata {
-                providers: if let Some(auth) = value.auth {
-                    vec![v1::LibraryProviderMetadata {
-                        id: 0,
-                        name: String::from("Default"),
-                        provider: v1::ProviderType::Drop(auth),
-                    }]
-                } else {
-                    vec![]
-                },
-            },
-        }
-    }
-}

src-tauri/download_manager/src/lib.rs

@@ -1,44 +0,0 @@
-#![feature(duration_millis_float)]
-#![feature(nonpoison_mutex)]
-#![feature(sync_nonpoison)]
-
-use std::{ops::Deref, sync::OnceLock};
-
-use tauri::AppHandle;
-
-use crate::{
-    download_manager_builder::DownloadManagerBuilder, download_manager_frontend::DownloadManager,
-};
-
-pub mod download_manager_builder;
-pub mod download_manager_frontend;
-pub mod downloadable;
-pub mod error;
-pub mod frontend_updates;
-pub mod util;
-
-pub static DOWNLOAD_MANAGER: DownloadManagerWrapper = DownloadManagerWrapper::new();
-
-pub struct DownloadManagerWrapper(OnceLock<DownloadManager>);
-impl DownloadManagerWrapper {
-    const fn new() -> Self {
-        DownloadManagerWrapper(OnceLock::new())
-    }
-    pub fn init(app_handle: AppHandle) {
-        DOWNLOAD_MANAGER
-            .0
-            .set(DownloadManagerBuilder::build(app_handle))
-            .expect("Failed to initialise download manager");
-    }
-}
-
-impl Deref for DownloadManagerWrapper {
-    type Target = DownloadManager;
-
-    fn deref(&self) -> &Self::Target {
-        match self.0.get() {
-            Some(download_manager) => download_manager,
-            None => unreachable!("Download manager should always be initialised"),
-        }
-    }
-}

src-tauri/drop-consts/Cargo.toml

@@ -1,7 +0,0 @@
-[package]
-name = "drop-consts"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-dirs = "6.0.0"

src-tauri/drop-consts/src/lib.rs

@@ -1,16 +0,0 @@
-use std::{path::PathBuf, sync::LazyLock};
-
-#[cfg(not(debug_assertions))]
-pub const DATA_ROOT_PREFIX: &str = "drop";
-#[cfg(debug_assertions)]
-pub const DATA_ROOT_PREFIX: &str = "drop-debug";
-
-pub const DROP_DATA_PATH: &str = ".dropdata";
-
-pub const RETRY_COUNT: usize = 3;
-
-pub const TARGET_BUCKET_SIZE: usize = 63 * 1000 * 1000;
-pub const MAX_FILES_PER_BUCKET: usize = (1024 / 4) - 1;
-
-pub const UMU_BASE_LAUNCHER_EXECUTABLE: &str = "umu-run";
-pub const UMU_INSTALL_DIRS: [&str; 4] = ["/app/share", "/use/local/share", "/usr/share", "/opt"];

src-tauri/games/src/downloads/error.rs

@@ -1,29 +0,0 @@
-use std::fmt::Display;
-
-use serde_with::SerializeDisplay;
-
-#[derive(SerializeDisplay)]
-pub enum LibraryError {
-    MetaNotFound(String),
-    VersionNotFound(String),
-}
-impl Display for LibraryError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                LibraryError::MetaNotFound(id) => {
-                    format!(
-                        "Could not locate any installed version of game ID {id} in the database"
-                    )
-                }
-                LibraryError::VersionNotFound(game_id) => {
-                    format!(
-                        "Could not locate any installed version  for game id {game_id} in the database"
-                    )
-                }
-            }
-        )
-    }
-}

src-tauri/library/Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-name = "library"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-async-trait = "0.1.89"
-client = { version = "0.1.0", path = "../client" }
-database = { version = "0.1.0", path = "../database" }
-futures = "0.3.31"
-itertools = "0.14.0"
-log = "0.4.28"
-remote = { version = "0.1.0", path = "../remote" }
-serde = { version = "1.0.228", features = ["derive"] }
-serde_with = "3.15.0"
-tauri = "2.8.5"
-url = "2.5.7"

src-tauri/library/src/drop/drop.rs

@@ -1,134 +0,0 @@
-use std::sync::nonpoison::Mutex;
-
-use async_trait::async_trait;
-use client::app_state::AppState;
-use database::{
-    DatabaseAuth, GameDownloadStatus, borrow_db_mut_checked,
-    models::{Collection, Game, LibraryProviderMetadata},
-};
-use log::warn;
-use remote::{
-    auth::generate_authorization_header,
-    cache::{cache_object, get_cached_object, get_cached_object_db},
-    error::{DropServerError, RemoteAccessError},
-    requests::generate_url,
-    utils::DROP_CLIENT_ASYNC,
-};
-use url::Url;
-
-use crate::{error::LibraryError, provider::LibraryProvider};
-
-pub struct DropLibraryProvider {
-    metadata: LibraryProviderMetadata,
-    auth: DatabaseAuth,
-    base_url: Url,
-}
-
-impl DropLibraryProvider {
-    pub fn new(metadata: LibraryProviderMetadata, auth: DatabaseAuth, base_url: Url) -> Self {
-        Self {
-            metadata,
-            auth,
-            base_url,
-        }
-    }
-}
-#[async_trait]
-impl LibraryProvider for DropLibraryProvider {
-    async fn get_library(
-        &self,
-        state: &tauri::State<'_, Mutex<AppState>>,
-    ) -> Result<Vec<Game>, LibraryError> {
-        // let do_hard_refresh = hard_fresh.unwrap_or(false);
-        if
-        /* !do_hard_refresh &&*/
-        let Ok(library) = get_cached_object("library") {
-            return Ok(library);
-        }
-
-        let client = DROP_CLIENT_ASYNC.clone();
-        let response = generate_url(&["/api/v1/client/user/library"], &[], self.base_url)?;
-        let response = client
-            .get(response)
-            .header("Authorization", generate_authorization_header(self.auth))
-            .send()
-            .await
-            .map_err(|e| LibraryError::FetchError(RemoteAccessError::FetchError(e.into())))?;
-
-        if response.status() != 200 {
-            let err = response.json().await.unwrap_or(DropServerError {
-                status_code: 500,
-                status_message: "Invalid response from server.".to_owned(),
-            });
-            warn!("{err:?}");
-            return Err(LibraryError::FetchError(
-                RemoteAccessError::InvalidResponse(err),
-            ));
-        }
-
-        let mut games: Vec<Game> = response
-            .json()
-            .await
-            .map_err(|e| RemoteAccessError::FetchError(e.into()))?;
-
-        let mut handle = state.lock();
-
-        let mut db_handle = borrow_db_mut_checked();
-
-        for game in &games {
-            handle.games_mut().insert(game.id().clone(), game.clone());
-            if !db_handle.applications.game_statuses.contains_key(game.id()) {
-                db_handle
-                    .applications
-                    .game_statuses
-                    .insert(game.id().clone(), GameDownloadStatus::Remote {});
-            }
-        }
-
-        // Add games that are installed but no longer in library
-        for meta in db_handle.applications.installed_game_version.values() {
-            if games.iter().any(|e| *e.id() == meta.id) {
-                continue;
-            }
-            // We should always have a cache of the object
-            // Pass db_handle because otherwise we get a gridlock
-            let game = match get_cached_object_db::<Game>(&meta.id.clone(), &db_handle) {
-                Ok(game) => game,
-                Err(err) => {
-                    warn!(
-                        "{} is installed, but encountered error fetching its error: {}.",
-                        meta.id, err
-                    );
-                    continue;
-                }
-            };
-            games.push(game);
-        }
-
-        drop(handle);
-        drop(db_handle);
-        cache_object("library", &games)?;
-
-        Ok(games)
-    }
-    async fn get_collections(&self) -> Result<Vec<Collection>, LibraryError> {
-        todo!()
-    }
-
-    fn install(&mut self, game_id: String) {
-        todo!()
-    }
-
-    fn uninstall(&mut self, game_id: String) {
-        todo!()
-    }
-
-    fn metadata(&self) -> LibraryProviderMetadata {
-        todo!()
-    }
-}
-
-async fn fetch_library_logic(state: &Mutex<AppState>) -> Result<Vec<Game>, RemoteAccessError> {}
-async fn fetch_library_logic_offline() -> Result<Vec<Game>, RemoteAccessError> {
-    todo!()
-}

src-tauri/library/src/drop/mod.rs

@@ -1 +0,0 @@
-pub mod drop;

src-tauri/library/src/error.rs

@@ -1,31 +0,0 @@
-use std::fmt::Display;
-
-use database::models::LibraryProviderMetadata;
-use remote::error::RemoteAccessError;
-use serde_with::SerializeDisplay;
-
-#[derive(Debug, SerializeDisplay)]
-pub enum LibraryError {
-    ProviderConnection(ProviderError),
-    FetchError(RemoteAccessError)
-}
-#[derive(Debug, SerializeDisplay)]
-pub struct ProviderError {
-    provider: LibraryProviderMetadata
-}
-
-impl Display for LibraryError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        todo!()
-    }
-}
-impl Display for ProviderError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        todo!()
-    }
-}
-impl From<RemoteAccessError> for LibraryError {
-    fn from(value: RemoteAccessError) -> Self {
-        LibraryError::FetchError(value)
-    }
-}

src-tauri/library/src/lib.rs

@@ -1,69 +0,0 @@
-#![feature(nonpoison_mutex)]
-#![feature(sync_nonpoison)]
-
-use std::sync::{LazyLock, nonpoison::Mutex};
-
-use client::app_state::AppState;
-use database::{borrow_db_checked, models::{Game, LibraryProviderMetadata, ProviderType}};
-use futures::{StreamExt, future::join_all};
-use itertools::Itertools;
-
-use crate::{drop::drop::DropLibraryProvider, error::LibraryError, provider::LibraryProvider};
-
-pub mod drop;
-pub mod error;
-pub mod provider;
-
-pub static LIBRARY: LazyLock<Library> = LazyLock::new(Library::init);
-
-pub struct Library {
-    providers: Vec<Box<dyn LibraryProvider>>,
-}
-
-impl Library {
-    pub fn init() -> Self {
-        let metadata = borrow_db_checked();
-        let library = &metadata.library;
-        let providers = library.providers().iter().map(|provider| {
-            Library::construct(provider)
-        }).collect();
-        Self {
-            providers
-        }
-    }
-    fn construct(provider: &LibraryProviderMetadata) -> Box<dyn LibraryProvider> {
-        todo!()
-    }
-    pub async fn get_library(
-        &self,
-        state: &tauri::State<'_, Mutex<AppState>>,
-    ) -> (Vec<Game>, Vec<LibraryError>) {
-        let res = join_all(
-            self.providers
-                .iter()
-                .map(|provider| provider.get_library(state)),
-        )
-        .await
-        .into_iter()
-        .fold(
-            (Vec::new(), Vec::new()),
-            |(mut acc_ok, mut acc_err), res| {
-                match res {
-                    Ok(games) => acc_ok.extend(games),
-                    Err(e) => acc_err.push(e),
-                };
-                (acc_ok, acc_err)
-            },
-        );
-        res
-    }
-    pub fn add(&mut self, provider: LibraryProviderMetadata) {
-        let new_provider = Box::new(match provider.provider() {
-            ProviderType::Drop(_) => DropLibraryProvider::new(provider),
-        });
-        self.providers.push(new_provider);
-    }
-    pub fn remove(&mut self, id: usize) {
-        self.providers.retain(|v| v.metadata().id() != id);
-    }
-}

src-tauri/library/src/provider.rs

@@ -1,16 +0,0 @@
-use std::sync::nonpoison::Mutex;
-
-use async_trait::async_trait;
-use client::app_state::AppState;
-use database::models::{Collection, Game, LibraryProviderMetadata};
-
-use crate::error::LibraryError;
-
-#[async_trait]
-pub trait LibraryProvider: Sync + Send {
-    async fn get_library(&self, state: &tauri::State<'_, Mutex<AppState>>) -> Result<Vec<Game>, LibraryError>;
-    async fn get_collections(&self) -> Result<Vec<Collection>, LibraryError>;
-    fn install(&mut self, game_id: String);
-    fn uninstall(&mut self, game_id: String);
-    fn metadata(&self) -> LibraryProviderMetadata;
-}

src-tauri/process/src/lib.rs

@@ -1,41 +0,0 @@
-#![feature(nonpoison_mutex)]
-#![feature(sync_nonpoison)]
-
-use std::{
-    ops::Deref,
-    sync::{OnceLock, nonpoison::Mutex},
-};
-
-use tauri::AppHandle;
-
-use crate::process_manager::ProcessManager;
-
-pub static PROCESS_MANAGER: ProcessManagerWrapper = ProcessManagerWrapper::new();
-
-pub mod error;
-pub mod format;
-pub mod process_handlers;
-pub mod process_manager;
-
-pub struct ProcessManagerWrapper(OnceLock<Mutex<ProcessManager<'static>>>);
-impl ProcessManagerWrapper {
-    const fn new() -> Self {
-        ProcessManagerWrapper(OnceLock::new())
-    }
-    pub fn init(app_handle: AppHandle) {
-        PROCESS_MANAGER
-            .0
-            .set(Mutex::new(ProcessManager::new(app_handle)))
-            .unwrap_or_else(|_| panic!("Failed to initialise Process Manager")); // Using panic! here because we can't implement Debug
-    }
-}
-impl Deref for ProcessManagerWrapper {
-    type Target = Mutex<ProcessManager<'static>>;
-
-    fn deref(&self) -> &Self::Target {
-        match self.0.get() {
-            Some(process_manager) => process_manager,
-            None => unreachable!("Download manager should always be initialised"),
-        }
-    }
-}

src-tauri/src/client.rs

@@ -1,29 +1,30 @@
-use std::sync::nonpoison::Mutex;
-
-use client::app_state::AppState;
 use database::{borrow_db_checked, borrow_db_mut_checked};
-use download_manager::DOWNLOAD_MANAGER;
 use log::{debug, error};
 use tauri::AppHandle;
 use tauri_plugin_autostart::ManagerExt;
-use tauri_plugin_opener::OpenerExt;
+use utils::lock;
+
+use crate::{AppState};
 
 #[tauri::command]
-pub fn fetch_state(state: tauri::State<'_, Mutex<AppState>>) -> Result<String, String> {
-    let guard = state.lock();
+pub fn fetch_state(
+    state: tauri::State<'_, std::sync::Mutex<AppState<'_>>>,
+) -> Result<String, String> {
+    let guard = lock!(state);
     let cloned_state = serde_json::to_string(&guard.clone()).map_err(|e| e.to_string())?;
     drop(guard);
     Ok(cloned_state)
 }
 
 #[tauri::command]
-pub fn quit(app: tauri::AppHandle) {
-    cleanup_and_exit(&app);
+pub fn quit(app: tauri::AppHandle, state: tauri::State<'_, std::sync::Mutex<AppState<'_>>>) {
+    cleanup_and_exit(&app, &state);
 }
 
-pub fn cleanup_and_exit(app: &AppHandle) {
+pub fn cleanup_and_exit(app: &AppHandle, state: &tauri::State<'_, std::sync::Mutex<AppState<'_>>>) {
     debug!("cleaning up and exiting application");
-    match DOWNLOAD_MANAGER.ensure_terminated() {
+    let download_manager = lock!(state).download_manager.clone();
+    match download_manager.ensure_terminated() {
         Ok(res) => match res {
             Ok(()) => debug!("download manager terminated correctly"),
             Err(()) => error!("download manager failed to terminate correctly"),
@@ -72,10 +73,3 @@ pub fn get_autostart_enabled(app: AppHandle) -> Result<bool, tauri_plugin_autost
 
     Ok(db_state)
 }
-
-#[tauri::command]
-pub fn open_fs(path: String, app_handle: AppHandle) -> Result<(), tauri_plugin_opener::Error> {
-    app_handle
-        .opener()
-        .open_path(path, None::<&str>)
-}

src-tauri/src/collections.rs

@@ -1,13 +1,17 @@
-use games::collections::collection::{Collection, Collections};
-use remote::{
-    auth::generate_authorization_header,
-    cache::{cache_object, get_cached_object},
-    error::RemoteAccessError,
-    requests::{generate_url, make_authenticated_get},
-    utils::DROP_CLIENT_ASYNC,
-};
 use serde_json::json;
 
+use crate::{
+    error::remote_access_error::RemoteAccessError,
+    remote::{
+        auth::generate_authorization_header,
+        cache::{cache_object, get_cached_object},
+        requests::{generate_url, make_authenticated_get},
+        utils::DROP_CLIENT_ASYNC,
+    },
+};
+
+use super::collection::{Collection, Collections};
+
 #[tauri::command]
 pub async fn fetch_collections(
     hard_refresh: Option<bool>,

src-tauri/src/download_manager.rs

@@ -1,22 +1,27 @@
-use database::DownloadableMetadata;
-use download_manager::DOWNLOAD_MANAGER;
+use std::sync::Mutex;
 
 #[tauri::command]
-pub fn pause_downloads() {
-    DOWNLOAD_MANAGER.pause_downloads();
+pub fn pause_downloads(state: tauri::State<'_, Mutex<AppState>>) {
+    lock!(state).download_manager.pause_downloads();
 }
 
 #[tauri::command]
-pub fn resume_downloads() {
-    DOWNLOAD_MANAGER.resume_downloads();
+pub fn resume_downloads(state: tauri::State<'_, Mutex<AppState>>) {
+    lock!(state).download_manager.resume_downloads();
 }
 
 #[tauri::command]
-pub fn move_download_in_queue(old_index: usize, new_index: usize) {
-    DOWNLOAD_MANAGER.rearrange(old_index, new_index);
+pub fn move_download_in_queue(
+    state: tauri::State<'_, Mutex<AppState>>,
+    old_index: usize,
+    new_index: usize,
+) {
+    lock!(state)
+        .download_manager
+        .rearrange(old_index, new_index);
 }
 
 #[tauri::command]
-pub fn cancel_game(meta: DownloadableMetadata) {
-    DOWNLOAD_MANAGER.cancel(meta);
+pub fn cancel_game(state: tauri::State<'_, Mutex<AppState>>, meta: DownloadableMetadata) {
+    lock!(state).download_manager.cancel(meta);
 }

src-tauri/src/downloads.rs

@@ -1,31 +1,34 @@
-use std::{path::PathBuf, sync::Arc};
-
-use database::{GameDownloadStatus, borrow_db_checked};
-use download_manager::{
-    DOWNLOAD_MANAGER, downloadable::Downloadable, error::ApplicationDownloadError,
+use std::{
+    path::PathBuf,
+    sync::{Arc, Mutex},
 };
-use games::downloads::download_agent::GameDownloadAgent;
+
+
+use crate::{
+    database::{
+        db::borrow_db_checked,
+        models::data::GameDownloadStatus,
+    }, download_manager::downloadable::Downloadable, error::application_download_error::ApplicationDownloadError, lock, AppState
+};
+
+use super::download_agent::GameDownloadAgent;
 
 #[tauri::command]
 pub async fn download_game(
     game_id: String,
     game_version: String,
     install_dir: usize,
+    state: tauri::State<'_, Mutex<AppState<'_>>>,
 ) -> Result<(), ApplicationDownloadError> {
-    let sender = { DOWNLOAD_MANAGER.get_sender().clone() };
+    let sender = { lock!(state).download_manager.get_sender().clone() };
 
-    let game_download_agent = GameDownloadAgent::new_from_index(
-        game_id.clone(),
-        game_version.clone(),
-        install_dir,
-        sender,
-    )
-    .await?;
+    let game_download_agent =
+        GameDownloadAgent::new_from_index(game_id.clone(), game_version.clone(), install_dir, sender).await?;
 
     let game_download_agent =
         Arc::new(Box::new(game_download_agent) as Box<dyn Downloadable + Send + Sync>);
-
-    DOWNLOAD_MANAGER
+    lock!(state)
+        .download_manager
         .queue_download(game_download_agent.clone())
         .unwrap();
 
@@ -33,7 +36,10 @@ pub async fn download_game(
 }
 
 #[tauri::command]
-pub async fn resume_download(game_id: String) -> Result<(), ApplicationDownloadError> {
+pub async fn resume_download(
+    game_id: String,
+    state: tauri::State<'_, Mutex<AppState<'_>>>,
+) -> Result<(), ApplicationDownloadError> {
     let s = borrow_db_checked()
         .applications
         .game_statuses
@@ -51,25 +57,21 @@ pub async fn resume_download(game_id: String) -> Result<(), ApplicationDownloadE
         } => (version_name, install_dir),
     };
 
-    let sender = DOWNLOAD_MANAGER.get_sender();
+    let sender = lock!(state).download_manager.get_sender();
     let parent_dir: PathBuf = install_dir.into();
 
     let game_download_agent = Arc::new(Box::new(
         GameDownloadAgent::new(
             game_id,
             version_name.clone(),
-            parent_dir
-                .parent()
-                .unwrap_or_else(|| {
-                    panic!("Failed to get parent directry of {}", parent_dir.display())
-                })
-                .to_path_buf(),
+            parent_dir.parent().unwrap_or_else(|| panic!("Failed to get parent directry of {}", parent_dir.display())).to_path_buf(),
             sender,
         )
         .await?,
     ) as Box<dyn Downloadable + Send + Sync>);
 
-    DOWNLOAD_MANAGER
+    lock!(state)
+        .download_manager
         .queue_download(game_download_agent)
         .unwrap();
     Ok(())

src-tauri/src/games.rs

@@ -1,28 +1,19 @@
-use std::sync::nonpoison::Mutex;
+use std::sync::Mutex;
 
-use database::{GameDownloadStatus, GameVersion, borrow_db_checked, borrow_db_mut_checked, models::Game};
-use games::{
-    downloads::error::LibraryError,
-    library::{FetchGameStruct, FrontendGameOptions, get_current_meta, uninstall_game_logic},
-    state::{GameStatusManager, GameStatusWithTransient},
-};
+use database::{borrow_db_checked, borrow_db_mut_checked, GameDownloadStatus, GameVersion};
+use games::{downloads::error::LibraryError, library::{get_current_meta, uninstall_game_logic, FetchGameStruct, Game}, state::{GameStatusManager, GameStatusWithTransient}};
 use log::warn;
 use process::PROCESS_MANAGER;
-use remote::{
-    auth::generate_authorization_header,
-    cache::{cache_object, cache_object_db, get_cached_object, get_cached_object_db},
-    error::{DropServerError, RemoteAccessError},
-    offline,
-    requests::generate_url,
-    utils::DROP_CLIENT_ASYNC,
-};
+use remote::{auth::generate_authorization_header, cache::{cache_object, cache_object_db, get_cached_object, get_cached_object_db}, error::{DropServerError, RemoteAccessError}, offline, requests::generate_url, utils::DROP_CLIENT_ASYNC};
 use tauri::AppHandle;
+use utils::lock;
+
+use crate::AppState;
 
-use client::app_state::AppState;
 
 #[tauri::command]
 pub async fn fetch_library(
-    state: tauri::State<'_, Mutex<AppState>>,
+    state: tauri::State<'_, Mutex<AppState<'_>>>,
     hard_refresh: Option<bool>,
 ) -> Result<Vec<Game>, RemoteAccessError> {
     offline!(
@@ -31,20 +22,82 @@ pub async fn fetch_library(
         fetch_library_logic_offline,
         state,
         hard_refresh
-    )
-    .await
+    ).await
 }
 
+
 pub async fn fetch_library_logic(
-    state: tauri::State<'_, Mutex<AppState>>,
+    state: tauri::State<'_, Mutex<AppState<'_>>>,
     hard_fresh: Option<bool>,
-) -> (Vec<Game>, Vec<LibraryError>) {
-    
+) -> Result<Vec<Game>, RemoteAccessError> {
+    let do_hard_refresh = hard_fresh.unwrap_or(false);
+    if !do_hard_refresh && let Ok(library) = get_cached_object("library") {
+        return Ok(library);
+    }
+
+    let client = DROP_CLIENT_ASYNC.clone();
+    let response = generate_url(&["/api/v1/client/user/library"], &[])?;
+    let response = client
+        .get(response)
+        .header("Authorization", generate_authorization_header())
+        .send()
+        .await?;
+
+    if response.status() != 200 {
+        let err = response.json().await.unwrap_or(DropServerError {
+            status_code: 500,
+            status_message: "Invalid response from server.".to_owned(),
+        });
+        warn!("{err:?}");
+        return Err(RemoteAccessError::InvalidResponse(err));
+    }
+
+    let mut games: Vec<Game> = response.json().await?;
+
+    let mut handle = lock!(state);
+
+    let mut db_handle = borrow_db_mut_checked();
+
+    for game in &games {
+        handle.games.insert(game.id().clone(), game.clone());
+        if !db_handle.applications.game_statuses.contains_key(game.id()) {
+            db_handle
+                .applications
+                .game_statuses
+                .insert(game.id().clone(), GameDownloadStatus::Remote {});
+        }
+    }
+
+    // Add games that are installed but no longer in library
+    for meta in db_handle.applications.installed_game_version.values() {
+        if games.iter().any(|e| *e.id() == meta.id) {
+            continue;
+        }
+        // We should always have a cache of the object
+        // Pass db_handle because otherwise we get a gridlock
+        let game = match get_cached_object_db::<Game>(&meta.id.clone(), &db_handle) {
+            Ok(game) => game,
+            Err(err) => {
+                warn!(
+                    "{} is installed, but encountered error fetching its error: {}.",
+                    meta.id, err
+                );
+                continue;
+            }
+        };
+        games.push(game);
+    }
+
+    drop(handle);
+    drop(db_handle);
+    cache_object("library", &games)?;
+
+    Ok(games)
 }
 pub async fn fetch_library_logic_offline(
-    _state: tauri::State<'_, Mutex<AppState>>,
+    _state: tauri::State<'_, Mutex<AppState<'_>>>,
     _hard_refresh: Option<bool>,
-) -> (Vec<Game>, Vec<LibraryError>) {
+) -> Result<Vec<Game>, RemoteAccessError> {
     let mut games: Vec<Game> = get_cached_object("library")?;
 
     let db_handle = borrow_db_checked();
@@ -64,10 +117,10 @@ pub async fn fetch_library_logic_offline(
 }
 pub async fn fetch_game_logic(
     id: String,
-    state: tauri::State<'_, Mutex<AppState>>,
+    state: tauri::State<'_, Mutex<AppState<'_>>>,
 ) -> Result<FetchGameStruct, RemoteAccessError> {
     let version = {
-        let state_handle = state.lock();
+        let state_handle = lock!(state);
 
         let db_lock = borrow_db_checked();
 
@@ -82,7 +135,7 @@ pub async fn fetch_game_logic(
                 .cloned(),
         };
 
-        let game = state_handle.games().get(&id);
+        let game = state_handle.games.get(&id);
         if let Some(game) = game {
             let status = GameStatusManager::fetch_state(&id, &db_lock);
 
@@ -120,8 +173,8 @@ pub async fn fetch_game_logic(
 
     let game: Game = response.json().await?;
 
-    let mut state_handle = state.lock();
-    state_handle.games_mut().insert(id.clone(), game.clone());
+    let mut state_handle = lock!(state);
+    state_handle.games.insert(id.clone(), game.clone());
 
     let mut db_handle = borrow_db_mut_checked();
 
@@ -144,7 +197,7 @@ pub async fn fetch_game_logic(
 
 pub async fn fetch_game_version_options_logic(
     game_id: String,
-    state: tauri::State<'_, Mutex<AppState>>,
+    state: tauri::State<'_, Mutex<AppState<'_>>>,
 ) -> Result<Vec<GameVersion>, RemoteAccessError> {
     let client = DROP_CLIENT_ASYNC.clone();
 
@@ -163,7 +216,7 @@ pub async fn fetch_game_version_options_logic(
 
     let data: Vec<GameVersion> = response.json().await?;
 
-    let state_lock = state.lock();
+    let state_lock = lock!(state);
     let process_manager_lock = PROCESS_MANAGER.lock();
     let data: Vec<GameVersion> = data
         .into_iter()
@@ -175,9 +228,10 @@ pub async fn fetch_game_version_options_logic(
     Ok(data)
 }
 
+
 pub async fn fetch_game_logic_offline(
     id: String,
-    _state: tauri::State<'_, Mutex<AppState>>,
+    _state: tauri::State<'_, Mutex<AppState<'_>>>,
 ) -> Result<FetchGameStruct, RemoteAccessError> {
     let db_handle = borrow_db_checked();
     let metadata_option = db_handle.applications.installed_game_version.get(&id);
@@ -202,7 +256,7 @@ pub async fn fetch_game_logic_offline(
 #[tauri::command]
 pub async fn fetch_game(
     game_id: String,
-    state: tauri::State<'_, Mutex<AppState>>,
+    state: tauri::State<'_, Mutex<AppState<'_>>>,
 ) -> Result<FetchGameStruct, RemoteAccessError> {
     offline!(
         state,
@@ -210,8 +264,7 @@ pub async fn fetch_game(
         fetch_game_logic_offline,
         game_id,
         state
-    )
-    .await
+    ).await
 }
 
 #[tauri::command]
@@ -234,49 +287,7 @@ pub fn uninstall_game(game_id: String, app_handle: AppHandle) -> Result<(), Libr
 #[tauri::command]
 pub async fn fetch_game_version_options(
     game_id: String,
-    state: tauri::State<'_, Mutex<AppState>>,
+    state: tauri::State<'_, Mutex<AppState<'_>>>,
 ) -> Result<Vec<GameVersion>, RemoteAccessError> {
     fetch_game_version_options_logic(game_id, state).await
 }
-
-#[tauri::command]
-pub fn update_game_configuration(
-    game_id: String,
-    options: FrontendGameOptions,
-) -> Result<(), LibraryError> {
-    let mut handle = borrow_db_mut_checked();
-    let installed_version = handle
-        .applications
-        .installed_game_version
-        .get(&game_id)
-        .ok_or(LibraryError::MetaNotFound(game_id))?;
-
-    let id = installed_version.id.clone();
-    let version = installed_version
-        .version
-        .clone()
-        .ok_or(LibraryError::VersionNotFound(id.clone()))?;
-
-    let mut existing_configuration = handle
-        .applications
-        .game_versions
-        .get(&id)
-        .unwrap()
-        .get(&version)
-        .unwrap()
-        .clone();
-
-    // Add more options in here
-    existing_configuration.launch_command_template = options.launch_string().clone();
-
-    // Add no more options past here
-
-    handle
-        .applications
-        .game_versions
-        .get_mut(&id)
-        .unwrap()
-        .insert(version.to_string(), existing_configuration);
-
-    Ok(())
-}