chore: move depcheck and dependencies modules together as depcheck

src/depcheck/basalt_deps.rs

@@ -1,8 +1,8 @@
-use crate::{
+use super::{
-    depcheck::{DepType, Dependency, DependencyCheckResult},
+    common::{dep_cmake, dep_eigen, dep_gpp, dep_libglvnd, dep_ninja, dep_opencv},
-    dependencies::common::{dep_cmake, dep_eigen, dep_gpp, dep_libglvnd, dep_ninja, dep_opencv},
+    DepType, Dependency, DependencyCheckResult,
-    linux_distro::LinuxDistro,
 };
+use crate::linux_distro::LinuxDistro;
 use std::collections::HashMap;
 
 fn basalt_deps() -> Vec<Dependency> {

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()),
+        ]),
+    }
+}

src/depcheck/libsurvive_deps.rs

@@ -1,6 +1,6 @@
-use crate::{
+use super::{
-    depcheck::{Dependency, DependencyCheckResult},
+    common::{dep_cmake, dep_eigen, dep_gcc, dep_git, dep_gpp, dep_ninja},
-    dependencies::common::{dep_cmake, dep_eigen, dep_gcc, dep_git, dep_gpp, dep_ninja},
+    Dependency, DependencyCheckResult,
 };
 
 fn libsurvive_deps() -> Vec<Dependency> {

src/depcheck/mercury_deps.rs

@@ -1,8 +1,5 @@
-use crate::{
+use super::{common::dep_opencv, DepType, Dependency, DependencyCheckResult};
-    depcheck::{DepType, Dependency, DependencyCheckResult},
+use crate::linux_distro::LinuxDistro;
-    dependencies::common::dep_opencv,
-    linux_distro::LinuxDistro,
-};
 use std::collections::HashMap;
 
 fn mercury_deps() -> Vec<Dependency> {

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};
 

src/depcheck/monado_deps.rs

@@ -1,12 +1,12 @@
-use crate::{
+use super::{
-    depcheck::{DepType, Dependency, DependencyCheckResult},
+    common::{
-    dependencies::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<Dependency> {

src/depcheck/openhmd_deps.rs

@@ -1,6 +1,6 @@
-use crate::{
+use super::{
-    depcheck::{Dependency, DependencyCheckResult},
+    common::{dep_cmake, dep_gcc, dep_git, dep_gpp, dep_ninja},
-    dependencies::common::{dep_cmake, dep_gcc, dep_git, dep_gpp, dep_ninja},
+    Dependency, DependencyCheckResult,
 };
 
 fn openhmd_deps() -> Vec<Dependency> {

src/depcheck/wivrn_deps.rs

@@ -1,12 +1,12 @@
-use crate::{
+use super::{
-    depcheck::{DepType, Dependency, DependencyCheckResult},
+    common::{
-    dependencies::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<Dependency> {

src/dependencies/adb_dep.rs

@@ -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()),
-        ]),
-    }
-}

src/dependencies/mod.rs

@@ -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;

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;

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,

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;
                 }

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},