diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-06-13 16:34:10 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-06-13 16:34:57 +0200 |
| commit | 0f2236daa09c30cb2f30e9b1ee2033cba7e686a9 (patch) | |
| tree | 5a3f0589798bf83450582d6df1e92adc05f71c73 | |
| parent | 73e218d44401513963700a0915d557119e9a3d84 (diff) | |
| download | mullvadvpn-0f2236daa09c30cb2f30e9b1ee2033cba7e686a9.tar.xz mullvadvpn-0f2236daa09c30cb2f30e9b1ee2033cba7e686a9.zip | |
Introduce metadata module
| -rw-r--r-- | mullvad-paths/src/cache.rs | 2 | ||||
| -rw-r--r-- | mullvad-paths/src/lib.rs | 21 | ||||
| -rw-r--r-- | mullvad-paths/src/logs.rs | 2 | ||||
| -rw-r--r-- | mullvad-paths/src/rpc_address.rs | 2 | ||||
| -rw-r--r-- | mullvad-paths/src/settings.rs | 2 |
5 files changed, 17 insertions, 12 deletions
diff --git a/mullvad-paths/src/cache.rs b/mullvad-paths/src/cache.rs index aaf332040c..cb47d4eea7 100644 --- a/mullvad-paths/src/cache.rs +++ b/mullvad-paths/src/cache.rs @@ -30,6 +30,6 @@ fn get_default_cache_dir() -> Result<PathBuf> { #[cfg(any(target_os = "macos", windows))] fn get_default_cache_dir() -> Result<PathBuf> { - ::app_dirs::get_app_root(::app_dirs::AppDataType::UserCache, &::APP_INFO) + ::app_dirs::get_app_root(::app_dirs::AppDataType::UserCache, &::metadata::APP_INFO) .chain_err(|| ErrorKind::CreateDirFailed) } diff --git a/mullvad-paths/src/lib.rs b/mullvad-paths/src/lib.rs index 7a00b7b3fd..4235cb1824 100644 --- a/mullvad-paths/src/lib.rs +++ b/mullvad-paths/src/lib.rs @@ -6,19 +6,24 @@ extern crate error_chain; extern crate log; -#[cfg(windows)] -const PRODUCT_NAME: &str = "Mullvad VPN"; +#[cfg(any(windows, target_os = "macos"))] +mod metadata { + use app_dirs::AppInfo; + + pub const PRODUCT_NAME: &str = "Mullvad VPN"; + + pub const APP_INFO: AppInfo = AppInfo { + name: PRODUCT_NAME, + author: "Mullvad", + }; +} -#[cfg(windows)] -const APP_INFO: AppInfo = app_dirs::AppInfo { - name: PRODUCT_NAME, - author: "Mullvad", -}; error_chain! { errors { CreateDirFailed { description("Failed to create directory") } - #[cfg(windows)] NoProgramDataDir { description("Missing %ALLUSERSPROFILE% environment variable") } + #[cfg(windows)] + NoProgramDataDir { description("Missing %ALLUSERSPROFILE% environment variable") } } } diff --git a/mullvad-paths/src/logs.rs b/mullvad-paths/src/logs.rs index eb57da3f71..4f67753e5b 100644 --- a/mullvad-paths/src/logs.rs +++ b/mullvad-paths/src/logs.rs @@ -29,5 +29,5 @@ fn get_default_log_dir() -> Result<PathBuf> { fn get_default_log_dir() -> Result<PathBuf> { let program_data_dir = Path::new(env::var_os("ALLUSERSPROFILE").ok_or_else(|| ErrorKind::NoProgramDataDir)?); - Ok(program_data_dir.join(::PRODUCT_NAME)) + Ok(program_data_dir.join(::metadata::PRODUCT_NAME)) } diff --git a/mullvad-paths/src/rpc_address.rs b/mullvad-paths/src/rpc_address.rs index dd26c17c7d..781d1ab555 100644 --- a/mullvad-paths/src/rpc_address.rs +++ b/mullvad-paths/src/rpc_address.rs @@ -21,5 +21,5 @@ fn get_default_rpc_address_dir() -> Result<PathBuf> { fn get_default_rpc_address_dir() -> Result<PathBuf> { let program_data_dir = env::var_os("ALLUSERSPROFILE").ok_or_else(|| ::ErrorKind::NoProgramDataDir)?; - Ok(Path::new(program_data_dir).join(::PRODUCT_NAME)) + Ok(Path::new(program_data_dir).join(::metadata::PRODUCT_NAME)) } diff --git a/mullvad-paths/src/settings.rs b/mullvad-paths/src/settings.rs index ed9762409f..f45b110f06 100644 --- a/mullvad-paths/src/settings.rs +++ b/mullvad-paths/src/settings.rs @@ -26,6 +26,6 @@ fn get_default_settings_dir() -> Result<PathBuf> { #[cfg(windows)] fn get_default_settings_dir() -> Result<PathBuf> { - ::app_dirs::get_app_root(::app_dirs::AppDataType::UserConfig, &::APP_INFO) + ::app_dirs::get_app_root(::app_dirs::AppDataType::UserConfig, &::metadataAPP_INFO) .chain_err(|| ErrorKind::CreateDirFailed) } |