diff --git a/src/dirs.rs b/src/config.rs similarity index 97% rename from src/dirs.rs rename to src/config.rs index 4d80e00..a44c634 100644 --- a/src/dirs.rs +++ b/src/config.rs @@ -10,7 +10,7 @@ const APPLICATION: &str = "AzireVPN"; static PROJECT_DIRS: OnceCell = OnceCell::new(); -pub(crate) fn get_data_dir() -> PathBuf { +fn get_data_dir() -> PathBuf { let project_dirs = PROJECT_DIRS.get_or_init(|| { ProjectDirs::from(QUALIFIER, ORGANIZATION, APPLICATION) .expect("cannot get project data dir") diff --git a/src/keys.rs b/src/keys.rs index 227495c..8e61062 100644 --- a/src/keys.rs +++ b/src/keys.rs @@ -4,7 +4,7 @@ use x25519_dalek::{PublicKey, StaticSecret}; use std::{io::Write, path::Path}; -use crate::dirs::MachineConfig; +use crate::config::MachineConfig; const KEY_SIZE: usize = 32; diff --git a/src/main.rs b/src/main.rs index 5d7ed12..1f3c03c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ mod api; -mod dirs; +mod config; mod keys; use std::io::Write; @@ -9,7 +9,7 @@ use std::path::PathBuf; use clap::{Parser, Subcommand}; use log::debug; -use crate::{keys::{get_keys, WireguardKeyPair}, dirs::MachineConfig}; +use crate::{keys::{get_keys, WireguardKeyPair}, config::MachineConfig}; /// AzireVPN client #[derive(Parser, Debug)] @@ -75,14 +75,14 @@ fn main() -> Result<(), anyhow::Error> { } fn login(opts: &Opts, login_opts: &LoginOpts) -> Result<(), anyhow::Error> { - let machine_config = dirs::MachineConfig::new(opts.machine.as_ref())?; + let machine_config = config::MachineConfig::new(opts.machine.as_ref())?; std::fs::write(machine_config.username_path(), &login_opts.username)?; std::fs::write(machine_config.token_path(), &login_opts.token)?; Ok(()) } fn logout(opts: &Opts) -> Result<(), anyhow::Error> { - let machine_config = dirs::MachineConfig::new(opts.machine.as_ref())?; + let machine_config = config::MachineConfig::new(opts.machine.as_ref())?; machine_config.destroy()?; Ok(()) }