Merge branch 'master' into gui_search

theseus/src/lib.rs

@@ -1,57 +1,21 @@
-//! # Theseus
-//!
-//! Theseus is a library which provides utilities for launching minecraft, creating Modrinth mod packs,
-//! and launching Modrinth mod packs
+/*!
+# Theseus
 
-#![warn(unused_import_braces, missing_debug_implementations)]
+Theseus is a library which provides utilities for launching minecraft, creating Modrinth mod packs,
+and launching Modrinth mod packs
+*/
+#![warn(unused_import_braces)]
+#![deny(unused_must_use)]
 
-// TODO: make non-hardcoded
-lazy_static::lazy_static! {
-    static ref LAUNCHER_WORK_DIR: std::path::PathBuf = dirs::config_dir().expect("Could not find config dir").join("theseus");
-}
-
-pub mod data;
-pub mod launcher;
-pub mod modpack;
+#[macro_use]
 mod util;
 
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    #[error("Launcher error: {0}")]
-    LauncherError(#[from] launcher::LauncherError),
+mod api;
+mod config;
+mod error;
+mod launcher;
+mod state;
 
-    #[error("Modpack error: {0}")]
-    ModpackError(#[from] modpack::ModpackError),
-
-    #[error("Data error: {0}")]
-    DaedalusError(#[from] data::DataError),
-}
-
-pub async fn init() -> Result<(), Error> {
-    tokio::fs::create_dir_all(LAUNCHER_WORK_DIR.as_path())
-        .await
-        .expect("Unable to create launcher root directory!");
-
-    use crate::data::*;
-    Metadata::init().await?;
-
-    Settings::init().await?;
-
-    tokio::try_join! {
-        launcher::init_download_semaphore(),
-        Profiles::init(),
-    }?;
-
-    Ok(())
-}
-
-pub async fn save() -> Result<(), Error> {
-    use crate::data::*;
-
-    tokio::try_join! {
-        Settings::save(),
-        Profiles::save(),
-    }?;
-
-    Ok(())
-}
+pub use api::*;
+pub use error::*;
+pub use state::State;