diff --git a/src/builders/build_basalt.rs b/src/builders/build_basalt.rs index e053fea..e67e081 100644 --- a/src/builders/build_basalt.rs +++ b/src/builders/build_basalt.rs @@ -1,9 +1,9 @@ use crate::{ build_tools::{cmake::Cmake, git::Git}, - file_utils::rm_rf, profile::Profile, termcolor::TermColor, ui::job_worker::job::WorkerJob, + util::file_utils::rm_rf, }; use std::collections::{HashMap, VecDeque}; diff --git a/src/builders/build_libsurvive.rs b/src/builders/build_libsurvive.rs index 1373828..b4b0dc3 100644 --- a/src/builders/build_libsurvive.rs +++ b/src/builders/build_libsurvive.rs @@ -1,9 +1,9 @@ use crate::{ build_tools::{cmake::Cmake, git::Git}, - file_utils::rm_rf, profile::Profile, termcolor::TermColor, ui::job_worker::job::WorkerJob, + util::file_utils::rm_rf, }; use std::{ collections::{HashMap, VecDeque}, diff --git a/src/builders/build_monado.rs b/src/builders/build_monado.rs index 19fa3ba..f379d6f 100644 --- a/src/builders/build_monado.rs +++ b/src/builders/build_monado.rs @@ -1,9 +1,9 @@ use crate::{ build_tools::{cmake::Cmake, git::Git}, - file_utils::rm_rf, profile::Profile, termcolor::TermColor, ui::job_worker::job::WorkerJob, + util::file_utils::rm_rf, }; use std::{ collections::{HashMap, VecDeque}, diff --git a/src/builders/build_opencomposite.rs b/src/builders/build_opencomposite.rs index 6e11175..631b69f 100644 --- a/src/builders/build_opencomposite.rs +++ b/src/builders/build_opencomposite.rs @@ -1,9 +1,9 @@ use crate::{ build_tools::{cmake::Cmake, git::Git}, - file_utils::rm_rf, profile::Profile, termcolor::TermColor, ui::job_worker::job::WorkerJob, + util::file_utils::rm_rf, }; use std::{ collections::{HashMap, VecDeque}, diff --git a/src/builders/build_openhmd.rs b/src/builders/build_openhmd.rs index 5d272f3..46f12b1 100644 --- a/src/builders/build_openhmd.rs +++ b/src/builders/build_openhmd.rs @@ -1,9 +1,9 @@ use crate::{ build_tools::{cmake::Cmake, git::Git}, - file_utils::rm_rf, profile::Profile, termcolor::TermColor, ui::job_worker::job::WorkerJob, + util::file_utils::rm_rf, }; use std::{ collections::{HashMap, VecDeque}, diff --git a/src/builders/build_wivrn.rs b/src/builders/build_wivrn.rs index 65c0f72..f2a415d 100644 --- a/src/builders/build_wivrn.rs +++ b/src/builders/build_wivrn.rs @@ -1,9 +1,9 @@ use crate::{ build_tools::{cmake::Cmake, git::Git}, - file_utils::rm_rf, profile::Profile, termcolor::TermColor, ui::job_worker::job::WorkerJob, + util::file_utils::rm_rf, }; use std::{ collections::{HashMap, VecDeque}, diff --git a/src/cmd_runner.rs b/src/cmd_runner.rs index 2b720ba..1b94c6a 100644 --- a/src/cmd_runner.rs +++ b/src/cmd_runner.rs @@ -1,7 +1,7 @@ use crate::{ - file_utils::get_writer, profile::{Profile, XRServiceType}, runner::{Runner, RunnerStatus}, + util::file_utils::get_writer, }; use nix::{ sys::signal::{ diff --git a/src/config.rs b/src/config.rs index 252f8ad..e401565 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,13 +1,13 @@ use crate::{ constants::CMD_NAME, device_prober::PhysicalXRDevice, - file_utils::get_writer, paths::get_config_dir, profile::Profile, profiles::{ lighthouse::lighthouse_profile, openhmd::openhmd_profile, simulated::simulated_profile, survive::survive_profile, wivrn::wivrn_profile, wmr::wmr_profile, }, + util::file_utils::get_writer, }; use serde::{de::Error, Deserialize, Serialize}; use std::{ diff --git a/src/downloader.rs b/src/downloader.rs index d1495c6..bb9a4b7 100644 --- a/src/downloader.rs +++ b/src/downloader.rs @@ -1,4 +1,6 @@ -use crate::{constants::APP_ID, file_utils::get_writer, hash::sha256, paths::get_cache_dir}; +use crate::{ + constants::APP_ID, paths::get_cache_dir, util::file_utils::get_writer, util::hash::sha256, +}; use reqwest::{ header::{HeaderMap, USER_AGENT}, Method, diff --git a/src/file_builders/active_runtime_json.rs b/src/file_builders/active_runtime_json.rs index 62e9142..0cb7133 100644 --- a/src/file_builders/active_runtime_json.rs +++ b/src/file_builders/active_runtime_json.rs @@ -1,7 +1,7 @@ use crate::{ - file_utils::{copy_file, deserialize_file, get_writer, set_file_readonly}, paths::{get_backup_dir, SYSTEM_PREFIX}, profile::Profile, + util::file_utils::{copy_file, deserialize_file, get_writer, set_file_readonly}, xdg::XDG, }; use serde::{ser::Error, Deserialize, Serialize}; diff --git a/src/file_builders/monado_autorun.rs b/src/file_builders/monado_autorun.rs index f7ffdf7..87a85aa 100644 --- a/src/file_builders/monado_autorun.rs +++ b/src/file_builders/monado_autorun.rs @@ -1,7 +1,7 @@ use std::path::{Path, PathBuf}; use crate::{ - file_utils::{deserialize_file, get_writer}, + util::file_utils::{deserialize_file, get_writer}, xdg::XDG, }; use serde::{Deserialize, Serialize}; diff --git a/src/file_builders/openvrpaths_vrpath.rs b/src/file_builders/openvrpaths_vrpath.rs index 884a767..1108717 100644 --- a/src/file_builders/openvrpaths_vrpath.rs +++ b/src/file_builders/openvrpaths_vrpath.rs @@ -1,9 +1,9 @@ use std::path::{Path, PathBuf}; use crate::{ - file_utils::{copy_file, deserialize_file, get_writer, set_file_readonly}, paths::get_backup_dir, profile::Profile, + util::file_utils::{copy_file, deserialize_file, get_writer, set_file_readonly}, xdg::XDG, }; use serde::{ser::Error, Deserialize, Serialize}; diff --git a/src/file_builders/wivrn_config.rs b/src/file_builders/wivrn_config.rs index 3c4c557..b8e4705 100644 --- a/src/file_builders/wivrn_config.rs +++ b/src/file_builders/wivrn_config.rs @@ -1,5 +1,5 @@ use crate::{ - file_utils::{deserialize_file, get_writer}, + util::file_utils::{deserialize_file, get_writer}, xdg::XDG, }; use serde::{Deserialize, Serialize}; diff --git a/src/gpu_profile.rs b/src/gpu_profile.rs index 997d0ec..5a57c22 100644 --- a/src/gpu_profile.rs +++ b/src/gpu_profile.rs @@ -1,4 +1,4 @@ -use crate::file_utils::get_reader; +use crate::util::file_utils::get_reader; use std::{ error::Error, fmt::Display, diff --git a/src/linux_distro.rs b/src/linux_distro.rs index 2f0079d..994d4b8 100644 --- a/src/linux_distro.rs +++ b/src/linux_distro.rs @@ -1,4 +1,4 @@ -use crate::file_utils::get_reader; +use crate::util::file_utils::get_reader; use std::{ fmt::Display, io::{BufRead, Read}, diff --git a/src/main.rs b/src/main.rs index 35881ac..6d09e3a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -29,9 +29,7 @@ pub mod device_prober; pub mod downloader; pub mod env_var_descriptions; pub mod file_builders; -pub mod file_utils; pub mod gpu_profile; -pub mod hash; pub mod is_appimage; pub mod linux_distro; pub mod log_level; @@ -45,6 +43,7 @@ pub mod steam_linux_runtime_injector; pub mod steamvr_utils; pub mod termcolor; pub mod ui; +pub mod util; pub mod vulkaninfo; pub mod xdg; pub mod xr_devices; diff --git a/src/profile.rs b/src/profile.rs index 127549d..711b2fb 100644 --- a/src/profile.rs +++ b/src/profile.rs @@ -1,6 +1,6 @@ use crate::{ - file_utils::get_writer, paths::{get_data_dir, BWRAP_SYSTEM_PREFIX, SYSTEM_PREFIX}, + util::file_utils::get_writer, xdg::XDG, }; use nix::NixPath; diff --git a/src/steam_linux_runtime_injector.rs b/src/steam_linux_runtime_injector.rs index 50b814c..d8e4aa6 100644 --- a/src/steam_linux_runtime_injector.rs +++ b/src/steam_linux_runtime_injector.rs @@ -1,7 +1,7 @@ use crate::{ - file_utils::{copy_file, get_writer}, paths::{get_backup_dir, get_home_dir}, profile::Profile, + util::file_utils::{copy_file, get_writer}, }; use anyhow::bail; use std::{ diff --git a/src/ui/app.rs b/src/ui/app.rs index 46e77b4..937b951 100644 --- a/src/ui/app.rs +++ b/src/ui/app.rs @@ -37,7 +37,6 @@ use crate::{ set_current_openvrpaths_to_profile, set_current_openvrpaths_to_steam, }, }, - file_utils::{setcap_cap_sys_nice_eip, setcap_cap_sys_nice_eip_cmd}, is_appimage::IS_APPIMAGE, linux_distro::LinuxDistro, openxr_prober::is_openxr_ready, @@ -47,6 +46,7 @@ use crate::{ steam_linux_runtime_injector::{ restore_runtime_entrypoint, set_runtime_entrypoint_launch_opts_from_profile, }, + util::file_utils::{setcap_cap_sys_nice_eip, setcap_cap_sys_nice_eip_cmd}, xr_devices::XRDevice, }; use adw::{prelude::*, ResponseAppearance}; diff --git a/src/ui/main_view.rs b/src/ui/main_view.rs index 86035da..9a5a4d6 100644 --- a/src/ui/main_view.rs +++ b/src/ui/main_view.rs @@ -14,12 +14,12 @@ use super::{ use crate::{ config::Config, dependencies::common::dep_pkexec, - file_utils::{get_writer, mount_has_nosuid}, gpu_profile::{get_amd_gpu_power_profile, GpuPowerProfile}, paths::{get_data_dir, get_home_dir}, profile::{LighthouseDriver, Profile, XRServiceType}, stateless_action, steamvr_utils::chaperone_info_exists, + util::file_utils::{get_writer, mount_has_nosuid}, xr_devices::XRDevice, }; use adw::{prelude::*, ResponseAppearance}; diff --git a/src/file_utils.rs b/src/util/file_utils.rs similarity index 98% rename from src/file_utils.rs rename to src/util/file_utils.rs index e650aca..7812ef1 100644 --- a/src/file_utils.rs +++ b/src/util/file_utils.rs @@ -114,7 +114,7 @@ pub fn mount_has_nosuid(path: &Path) -> Result { #[cfg(test)] mod tests { - use crate::file_utils::mount_has_nosuid; + use super::mount_has_nosuid; use std::path::Path; #[test] diff --git a/src/hash.rs b/src/util/hash.rs similarity index 100% rename from src/hash.rs rename to src/util/hash.rs diff --git a/src/util/mod.rs b/src/util/mod.rs new file mode 100644 index 0000000..f2d0f0e --- /dev/null +++ b/src/util/mod.rs @@ -0,0 +1,2 @@ +pub mod file_utils; +pub mod hash;