Create `mullvad-metadata` crate

2 files changed, 5 insertions, 11 deletions

diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index a4c2eb1466..12136d0f29 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -36,6 +36,7 @@ extern crate tokio_timer;
 extern crate uuid;
 
 extern crate mullvad_ipc_client;
+extern crate mullvad_metadata;
 extern crate mullvad_rpc;
 extern crate mullvad_types;
 extern crate talpid_core;
@@ -59,7 +60,6 @@ mod shutdown;
 mod system_service;
 mod version;
 
-use app_dirs::AppInfo;
 use error_chain::ChainedError;
 use futures::Future;
 use jsonrpc_core::futures::sync::oneshot::Sender as OneshotSender;
@@ -67,6 +67,7 @@ use jsonrpc_core::futures::sync::oneshot::Sender as OneshotSender;
 use management_interface::{BoxFuture, ManagementInterfaceServer, TunnelCommand};
 use mullvad_rpc::{AccountsProxy, AppVersionProxy, HttpHandle};
 
+use mullvad_metadata::APP_INFO;
 use mullvad_types::account::{AccountData, AccountToken};
 use mullvad_types::location::GeoIpLocation;
 use mullvad_types::relay_constraints::{RelaySettings, RelaySettingsUpdate};
@@ -134,14 +135,6 @@ lazy_static! {
     static ref RELAY_CACHE_UPDATE_TIMEOUT: Duration = Duration::from_millis(3000);
 }
 
-static APP_INFO: AppInfo = AppInfo {
-    name: crate_name!(),
-    author: "Mullvad",
-};
-
-#[cfg(windows)]
-static PRODUCT_NAME: &str = "Mullvad VPN";
-
 
 /// All events that can happen in the daemon. Sent from various threads and exposed interfaces.
 pub enum DaemonEvent {
@@ -940,7 +933,7 @@ fn get_resource_dir() -> PathBuf {
 }
 
 fn get_cache_dir() -> Result<PathBuf> {
-    app_dirs::app_root(app_dirs::AppDataType::UserCache, &::APP_INFO)
+    app_dirs::app_root(app_dirs::AppDataType::UserCache, &APP_INFO)
         .chain_err(|| ErrorKind::NoCacheDir)
 }
 
diff --git a/mullvad-daemon/src/system_service.rs b/mullvad-daemon/src/system_service.rs
index a141b2a191..28b8172203 100644
--- a/mullvad-daemon/src/system_service.rs
+++ b/mullvad-daemon/src/system_service.rs
@@ -10,6 +10,7 @@ use std::{env, io, thread};
 
 use cli;
 use error_chain::ChainedError;
+use mullvad_metadata::PRODUCT_NAME;
 use windows_service::service::{
     ServiceAccess, ServiceControl, ServiceControlAccept, ServiceErrorControl, ServiceExitCode,
     ServiceInfo, ServiceStartType, ServiceState, ServiceStatus, ServiceType,
@@ -226,7 +227,7 @@ fn get_service_info() -> Result<ServiceInfo> {
     let program_data_directory_string =
         ::std::env::var_os("ALLUSERSPROFILE").ok_or_else(|| ErrorKind::NoLogDir)?;
     let program_data_directory = Path::new(&program_data_directory_string);
-    let log_directory = program_data_directory.join(::PRODUCT_NAME);
+    let log_directory = program_data_directory.join(PRODUCT_NAME);
     let service_log_file = log_directory.join("backend.log");
     let tunnel_log_file = log_directory.join("openvpn.log");