diff --git a/src/dependencies/basalt_deps.rs b/src/depcheck/basalt_deps.rs similarity index 97% rename from src/dependencies/basalt_deps.rs rename to src/depcheck/basalt_deps.rs index 4a75589..099d34d 100644 --- a/src/dependencies/basalt_deps.rs +++ b/src/depcheck/basalt_deps.rs @@ -1,8 +1,8 @@ -use crate::{ - depcheck::{DepType, Dependency, DependencyCheckResult}, - dependencies::common::{dep_cmake, dep_eigen, dep_gpp, dep_libglvnd, dep_ninja, dep_opencv}, - linux_distro::LinuxDistro, +use super::{ + common::{dep_cmake, dep_eigen, dep_gpp, dep_libglvnd, dep_ninja, dep_opencv}, + DepType, Dependency, DependencyCheckResult, }; +use crate::linux_distro::LinuxDistro; use std::collections::HashMap; fn basalt_deps() -> Vec { diff --git a/src/dependencies/common.rs b/src/depcheck/common.rs similarity index 94% rename from src/dependencies/common.rs rename to src/depcheck/common.rs index f03b9b2..c1ff762 100644 --- a/src/dependencies/common.rs +++ b/src/depcheck/common.rs @@ -254,3 +254,18 @@ pub fn dep_libx11() -> Dependency { ]), } } + +pub fn dep_adb() -> Dependency { + Dependency { + name: "adb".into(), + dep_type: DepType::Executable, + filename: "adb".into(), + packages: HashMap::from([ + (LinuxDistro::Arch, "android-tools".into()), + (LinuxDistro::Debian, "adb".into()), + (LinuxDistro::Fedora, "android-tools".into()), + (LinuxDistro::Alpine, "android-tools".into()), + (LinuxDistro::Gentoo, "dev-util/android-tools".into()), + ]), + } +} diff --git a/src/dependencies/libsurvive_deps.rs b/src/depcheck/libsurvive_deps.rs similarity index 76% rename from src/dependencies/libsurvive_deps.rs rename to src/depcheck/libsurvive_deps.rs index 58460a5..c9e8d9c 100644 --- a/src/dependencies/libsurvive_deps.rs +++ b/src/depcheck/libsurvive_deps.rs @@ -1,6 +1,6 @@ -use crate::{ - depcheck::{Dependency, DependencyCheckResult}, - dependencies::common::{dep_cmake, dep_eigen, dep_gcc, dep_git, dep_gpp, dep_ninja}, +use super::{ + common::{dep_cmake, dep_eigen, dep_gcc, dep_git, dep_gpp, dep_ninja}, + Dependency, DependencyCheckResult, }; fn libsurvive_deps() -> Vec { diff --git a/src/dependencies/mercury_deps.rs b/src/depcheck/mercury_deps.rs similarity index 90% rename from src/dependencies/mercury_deps.rs rename to src/depcheck/mercury_deps.rs index bdced55..e4cc7c9 100644 --- a/src/dependencies/mercury_deps.rs +++ b/src/depcheck/mercury_deps.rs @@ -1,8 +1,5 @@ -use crate::{ - depcheck::{DepType, Dependency, DependencyCheckResult}, - dependencies::common::dep_opencv, - linux_distro::LinuxDistro, -}; +use super::{common::dep_opencv, DepType, Dependency, DependencyCheckResult}; +use crate::linux_distro::LinuxDistro; use std::collections::HashMap; fn mercury_deps() -> Vec { diff --git a/src/depcheck.rs b/src/depcheck/mod.rs similarity index 96% rename from src/depcheck.rs rename to src/depcheck/mod.rs index e8da974..a94b85f 100644 --- a/src/depcheck.rs +++ b/src/depcheck/mod.rs @@ -1,3 +1,11 @@ +pub mod basalt_deps; +pub mod common; +pub mod libsurvive_deps; +pub mod mercury_deps; +pub mod monado_deps; +pub mod openhmd_deps; +pub mod wivrn_deps; + use crate::linux_distro::LinuxDistro; use std::{collections::HashMap, env, fmt::Display, path::Path}; diff --git a/src/dependencies/monado_deps.rs b/src/depcheck/monado_deps.rs similarity index 95% rename from src/dependencies/monado_deps.rs rename to src/depcheck/monado_deps.rs index 5d096d4..597da53 100644 --- a/src/dependencies/monado_deps.rs +++ b/src/depcheck/monado_deps.rs @@ -1,12 +1,12 @@ -use crate::{ - depcheck::{DepType, Dependency, DependencyCheckResult}, - dependencies::common::{ +use super::{ + common::{ dep_cmake, dep_eigen, dep_gcc, dep_git, dep_glslang_validator, dep_gpp, dep_libdrm, dep_libglvnd, dep_libudev, dep_libx11, dep_libxcb, dep_ninja, dep_openxr, dep_vulkan_headers, dep_vulkan_icd_loader, }, - linux_distro::LinuxDistro, + DepType, Dependency, DependencyCheckResult, }; +use crate::linux_distro::LinuxDistro; use std::collections::HashMap; fn monado_deps() -> Vec { diff --git a/src/dependencies/openhmd_deps.rs b/src/depcheck/openhmd_deps.rs similarity index 74% rename from src/dependencies/openhmd_deps.rs rename to src/depcheck/openhmd_deps.rs index 462ce78..9d9171c 100644 --- a/src/dependencies/openhmd_deps.rs +++ b/src/depcheck/openhmd_deps.rs @@ -1,6 +1,6 @@ -use crate::{ - depcheck::{Dependency, DependencyCheckResult}, - dependencies::common::{dep_cmake, dep_gcc, dep_git, dep_gpp, dep_ninja}, +use super::{ + common::{dep_cmake, dep_gcc, dep_git, dep_gpp, dep_ninja}, + Dependency, DependencyCheckResult, }; fn openhmd_deps() -> Vec { diff --git a/src/dependencies/wivrn_deps.rs b/src/depcheck/wivrn_deps.rs similarity index 98% rename from src/dependencies/wivrn_deps.rs rename to src/depcheck/wivrn_deps.rs index 321a1fb..7310a58 100644 --- a/src/dependencies/wivrn_deps.rs +++ b/src/depcheck/wivrn_deps.rs @@ -1,12 +1,12 @@ -use crate::{ - depcheck::{DepType, Dependency, DependencyCheckResult}, - dependencies::common::{ +use super::{ + common::{ dep_cmake, dep_eigen, dep_gcc, dep_git, dep_glslang_validator, dep_gpp, dep_libdrm, dep_libudev, dep_libx11, dep_libxcb, dep_ninja, dep_openxr, dep_vulkan_headers, dep_vulkan_icd_loader, }, - linux_distro::LinuxDistro, + DepType, Dependency, DependencyCheckResult, }; +use crate::linux_distro::LinuxDistro; use std::collections::HashMap; fn wivrn_deps() -> Vec { diff --git a/src/dependencies/adb_dep.rs b/src/dependencies/adb_dep.rs deleted file mode 100644 index af242d2..0000000 --- a/src/dependencies/adb_dep.rs +++ /dev/null @@ -1,20 +0,0 @@ -use crate::{ - depcheck::{DepType, Dependency}, - linux_distro::LinuxDistro, -}; -use std::collections::HashMap; - -pub fn adb_dep() -> Dependency { - Dependency { - name: "adb".into(), - dep_type: DepType::Executable, - filename: "adb".into(), - packages: HashMap::from([ - (LinuxDistro::Arch, "android-tools".into()), - (LinuxDistro::Debian, "adb".into()), - (LinuxDistro::Fedora, "android-tools".into()), - (LinuxDistro::Alpine, "android-tools".into()), - (LinuxDistro::Gentoo, "dev-util/android-tools".into()), - ]), - } -} diff --git a/src/dependencies/mod.rs b/src/dependencies/mod.rs deleted file mode 100644 index 6cc2364..0000000 --- a/src/dependencies/mod.rs +++ /dev/null @@ -1,8 +0,0 @@ -pub mod adb_dep; -pub mod basalt_deps; -pub mod common; -pub mod libsurvive_deps; -pub mod mercury_deps; -pub mod monado_deps; -pub mod openhmd_deps; -pub mod wivrn_deps; diff --git a/src/main.rs b/src/main.rs index 6d09e3a..34763de 100644 --- a/src/main.rs +++ b/src/main.rs @@ -24,7 +24,6 @@ pub mod cmd_runner; pub mod config; pub mod constants; pub mod depcheck; -pub mod dependencies; pub mod device_prober; pub mod downloader; pub mod env_var_descriptions; diff --git a/src/ui/app.rs b/src/ui/app.rs index 937b951..0643583 100644 --- a/src/ui/app.rs +++ b/src/ui/app.rs @@ -23,7 +23,7 @@ use crate::{ }, config::Config, constants::APP_NAME, - dependencies::{ + depcheck::{ basalt_deps::get_missing_basalt_deps, common::dep_pkexec, libsurvive_deps::get_missing_libsurvive_deps, mercury_deps::get_missing_mercury_deps, monado_deps::get_missing_monado_deps, openhmd_deps::get_missing_openhmd_deps, diff --git a/src/ui/install_wivrn_box.rs b/src/ui/install_wivrn_box.rs index 0f34613..aee2e27 100644 --- a/src/ui/install_wivrn_box.rs +++ b/src/ui/install_wivrn_box.rs @@ -1,7 +1,7 @@ use super::alert::alert; use crate::{ async_process::async_process, - dependencies::adb_dep::adb_dep, + depcheck::common::dep_adb, downloader::{cache_file, cache_file_path}, profile::{Profile, XRServiceType}, }; @@ -166,7 +166,7 @@ impl AsyncComponent for InstallWivrnBox { match message { Self::Input::InstallWivrnApk => { - if !adb_dep().check() { + if !dep_adb().check() { alert("ADB is not installed", Some("Please install ADB on your computer to install WiVRn on your Android headset"), Some(&self.root_win)); return; } diff --git a/src/ui/main_view.rs b/src/ui/main_view.rs index 9a5a4d6..dd1e414 100644 --- a/src/ui/main_view.rs +++ b/src/ui/main_view.rs @@ -13,7 +13,7 @@ use super::{ }; use crate::{ config::Config, - dependencies::common::dep_pkexec, + depcheck::common::dep_pkexec, gpu_profile::{get_amd_gpu_power_profile, GpuPowerProfile}, paths::{get_data_dir, get_home_dir}, profile::{LighthouseDriver, Profile, XRServiceType},