Move platform version os modules to their own files

6 files changed, 188 insertions, 172 deletions

diff --git a/mullvad-platform-metadata/src/android.rs b/mullvad-platform-metadata/src/android.rs
new file mode 100644
index 0000000000..5573586808
--- /dev/null
+++ b/mullvad-platform-metadata/src/android.rs
@@ -0,0 +1,35 @@
+use std::collections::HashMap;
+
+mod command;
+use command::command_stdout_lossy;
+
+pub fn version() -> String {
+    let version = get_prop("ro.build.version.release").unwrap_or_else(|| "N/A".to_owned());
+    let api_level = get_prop("ro.build.version.sdk").unwrap_or_else(|| "N/A".to_owned());
+
+    let manufacturer =
+        get_prop("ro.product.manufacturer").unwrap_or_else(|| "Unknown brand".to_owned());
+    let product = get_prop("ro.product.model").unwrap_or_else(|| "Unknown model".to_owned());
+
+    format!(
+        "Android {} (API: {}) - {} {}",
+        version, api_level, manufacturer, product
+    )
+}
+
+pub fn short_version() -> String {
+    version()
+}
+
+pub fn extra_metadata() -> HashMap<String, String> {
+    let mut metadata = HashMap::new();
+    metadata.insert(
+        "abi".to_owned(),
+        get_prop("ro.product.cpu.abilist").unwrap_or_else(|| "N/A".to_owned()),
+    );
+    metadata
+}
+
+fn get_prop(property: &str) -> Option<String> {
+    command_stdout_lossy("getprop", &[property])
+}
diff --git a/mullvad-platform-metadata/src/command.rs b/mullvad-platform-metadata/src/command.rs
new file mode 100644
index 0000000000..87ed6c40a0
--- /dev/null
+++ b/mullvad-platform-metadata/src/command.rs
@@ -0,0 +1,10 @@
+use std::process::Command;
+
+/// Helper for getting stdout of some command as a String. Ignores the exit code of the command.
+pub fn command_stdout_lossy(cmd: &str, args: &[&str]) -> Option<String> {
+    Command::new(cmd)
+        .args(args)
+        .output()
+        .map(|output| String::from_utf8_lossy(&output.stdout).trim().to_string())
+        .ok()
+}
diff --git a/mullvad-platform-metadata/src/lib.rs b/mullvad-platform-metadata/src/lib.rs
index c52d76bb4b..f4ba78eaeb 100644
--- a/mullvad-platform-metadata/src/lib.rs
+++ b/mullvad-platform-metadata/src/lib.rs
@@ -1,180 +1,17 @@
-use std::process::Command;
-
 #[cfg(target_os = "linux")]
-mod imp {
-    pub fn version() -> String {
-        // The OS version information is obtained first from the os-release file. If that
-        // information is incomplete or unavailable, an attempt is made to obtain the
-        // version information from the lsb_release command. If that fails, any partial
-        // information from os-release is used if available, or a fallback message if
-        // reading from the os-release file produced
-        // no version information.
-        let version = read_os_release_file().unwrap_or_else(|incomplete_info| {
-            parse_lsb_release().unwrap_or_else(|| {
-                incomplete_info.unwrap_or_else(|| String::from("[Failed to detect version]"))
-            })
-        });
-
-        format!("Linux {}", version)
-    }
-
-    pub fn short_version() -> String {
-        version()
-    }
-
-    fn read_os_release_file() -> Result<String, Option<String>> {
-        let mut os_release_info = rs_release::get_os_release().map_err(|_| None)?;
-        let os_name = os_release_info.remove("NAME");
-        let os_version = os_release_info.remove("VERSION");
-
-        if os_name.is_some() || os_version.is_some() {
-            let full_info_available = os_name.is_some() && os_version.is_some();
-
-            let gathered_info = format!(
-                "{} {}",
-                os_name.unwrap_or_else(|| "[unknown distribution]".to_owned()),
-                os_version.unwrap_or_else(|| "[unknown version]".to_owned())
-            );
-
-            if full_info_available {
-                Ok(gathered_info)
-            } else {
-                // Partial version information
-                Err(Some(gathered_info))
-            }
-        } else {
-            // No information was obtained
-            Err(None)
-        }
-    }
-
-    fn parse_lsb_release() -> Option<String> {
-        super::command_stdout_lossy("lsb_release", &["-ds"]).and_then(|output| {
-            if output.is_empty() {
-                None
-            } else {
-                Some(output)
-            }
-        })
-    }
-
-    pub fn extra_metadata() -> impl Iterator<Item = (String, String)> {
-        std::iter::empty()
-    }
-}
+#[path = "linux.rs"]
+mod imp;
 
 #[cfg(target_os = "macos")]
-mod imp {
-    pub fn version() -> String {
-        format!(
-            "macOS {}",
-            super::command_stdout_lossy("sw_vers", &["-productVersion"])
-                .unwrap_or(String::from("[Failed to detect version]"))
-        )
-    }
-
-    pub fn short_version() -> String {
-        version()
-    }
-
-    pub fn extra_metadata() -> impl Iterator<Item = (String, String)> {
-        std::iter::empty()
-    }
-}
+#[path = "macos.rs"]
+mod imp;
 
 #[cfg(windows)]
-mod imp {
-    use std::collections::HashMap;
-
-    pub fn version() -> String {
-        let system_info = system_info();
-        let os_name = system_info.get("OS Name");
-        let os_version = system_info.get("OS Version");
-        let version = os_name.map(parse_version).unwrap_or(String::from("N/A"));
-        let full_version = os_version.map(parse_full_version).unwrap_or(String::from("N/A"));
-        format!("Windows {} ({})", version, full_version)
-    }
-
-    pub fn short_version() -> String {
-        let system_info = system_info();
-        let os_name = system_info.get("OS Name");
-        let version = os_name.map(parse_version).unwrap_or(String::from("N/A"));
-        format!("Windows {}", version)
-    }
-
-    fn system_info() -> HashMap<String, String> {
-        let system_info =
-            super::command_stdout_lossy("systeminfo", &["/FO", "LIST"]).unwrap_or_else(String::new);
-
-        let mut info_map = HashMap::new();
-        system_info.lines().for_each(|line| {
-            let mut split = line.split(":");
-            if let Some(key) = split.next() {
-                if let Some(value) = split.next() {
-                    info_map.insert(key.to_owned(), value.to_owned());
-                }
-            }
-        });
-
-        info_map
-    }
-
-    fn parse_version(os_name: &String) -> String {
-        os_name.trim().trim_start_matches("Microsoft Windows ").to_owned()
-    }
-
-    fn parse_full_version(os_version: &String) -> String {
-        os_version.trim().to_owned()
-    }
-
-    pub fn extra_metadata() -> impl Iterator<Item = (String, String)> {
-        std::iter::empty()
-    }
-}
+#[path = "windows.rs"]
+mod imp;
 
 #[cfg(target_os = "android")]
-mod imp {
-    use std::collections::HashMap;
-
-    pub fn version() -> String {
-        let version = get_prop("ro.build.version.release").unwrap_or_else(|| "N/A".to_owned());
-        let api_level = get_prop("ro.build.version.sdk").unwrap_or_else(|| "N/A".to_owned());
-
-        let manufacturer =
-            get_prop("ro.product.manufacturer").unwrap_or_else(|| "Unknown brand".to_owned());
-        let product = get_prop("ro.product.model").unwrap_or_else(|| "Unknown model".to_owned());
-
-        format!(
-            "Android {} (API: {}) - {} {}",
-            version, api_level, manufacturer, product
-        )
-    }
-
-    pub fn short_version() -> String {
-        version()
-    }
-
-    pub fn extra_metadata() -> HashMap<String, String> {
-        let mut metadata = HashMap::new();
-        metadata.insert(
-            "abi".to_owned(),
-            get_prop("ro.product.cpu.abilist").unwrap_or_else(|| "N/A".to_owned()),
-        );
-        metadata
-    }
-
-    fn get_prop(property: &str) -> Option<String> {
-        super::command_stdout_lossy("getprop", &[property])
-    }
-}
-
-/// Helper for getting stdout of some command as a String. Ignores the exit code of the command.
-fn command_stdout_lossy(cmd: &str, args: &[&str]) -> Option<String> {
-    Command::new(cmd)
-        .args(args)
-        .output()
-        .map(|output| String::from_utf8_lossy(&output.stdout).trim().to_string())
-        .ok()
-}
+#[path = "android.rs"]
+mod imp;
 
-pub use imp::{extra_metadata, short_version, version};
+pub use self::imp::{extra_metadata, short_version, version};
diff --git a/mullvad-platform-metadata/src/linux.rs b/mullvad-platform-metadata/src/linux.rs
new file mode 100644
index 0000000000..484d2eaaf8
--- /dev/null
+++ b/mullvad-platform-metadata/src/linux.rs
@@ -0,0 +1,62 @@
+mod command;
+use command::command_stdout_lossy;
+
+pub fn version() -> String {
+    // The OS version information is obtained first from the os-release file. If that
+    // information is incomplete or unavailable, an attempt is made to obtain the
+    // version information from the lsb_release command. If that fails, any partial
+    // information from os-release is used if available, or a fallback message if
+    // reading from the os-release file produced
+    // no version information.
+    let version = read_os_release_file().unwrap_or_else(|incomplete_info| {
+        parse_lsb_release().unwrap_or_else(|| {
+            incomplete_info.unwrap_or_else(|| String::from("[Failed to detect version]"))
+        })
+    });
+
+    format!("Linux {}", version)
+}
+
+pub fn short_version() -> String {
+    version()
+}
+
+fn read_os_release_file() -> Result<String, Option<String>> {
+    let mut os_release_info = rs_release::get_os_release().map_err(|_| None)?;
+    let os_name = os_release_info.remove("NAME");
+    let os_version = os_release_info.remove("VERSION");
+
+    if os_name.is_some() || os_version.is_some() {
+        let full_info_available = os_name.is_some() && os_version.is_some();
+
+        let gathered_info = format!(
+            "{} {}",
+            os_name.unwrap_or_else(|| "[unknown distribution]".to_owned()),
+            os_version.unwrap_or_else(|| "[unknown version]".to_owned())
+        );
+
+        if full_info_available {
+            Ok(gathered_info)
+        } else {
+            // Partial version information
+            Err(Some(gathered_info))
+        }
+    } else {
+        // No information was obtained
+        Err(None)
+    }
+}
+
+fn parse_lsb_release() -> Option<String> {
+    command_stdout_lossy("lsb_release", &["-ds"]).and_then(|output| {
+        if output.is_empty() {
+            None
+        } else {
+            Some(output)
+        }
+    })
+}
+
+pub fn extra_metadata() -> impl Iterator<Item = (String, String)> {
+    std::iter::empty()
+}
diff --git a/mullvad-platform-metadata/src/macos.rs b/mullvad-platform-metadata/src/macos.rs
new file mode 100644
index 0000000000..9ee496adb1
--- /dev/null
+++ b/mullvad-platform-metadata/src/macos.rs
@@ -0,0 +1,18 @@
+mod command;
+use command::command_stdout_lossy;
+
+pub fn version() -> String {
+    format!(
+        "macOS {}",
+        command_stdout_lossy("sw_vers", &["-productVersion"])
+            .unwrap_or(String::from("[Failed to detect version]"))
+    )
+}
+
+pub fn short_version() -> String {
+    version()
+}
+
+pub fn extra_metadata() -> impl Iterator<Item = (String, String)> {
+    std::iter::empty()
+}
diff --git a/mullvad-platform-metadata/src/windows.rs b/mullvad-platform-metadata/src/windows.rs
new file mode 100644
index 0000000000..41faf0099b
--- /dev/null
+++ b/mullvad-platform-metadata/src/windows.rs
@@ -0,0 +1,54 @@
+use std::collections::HashMap;
+
+mod command;
+use command::command_stdout_lossy;
+
+pub fn version() -> String {
+    let system_info = system_info();
+    let os_name = system_info.get("OS Name");
+    let os_version = system_info.get("OS Version");
+    let version = os_name.map(parse_version).unwrap_or(String::from("N/A"));
+    let full_version = os_version
+        .map(parse_full_version)
+        .unwrap_or(String::from("N/A"));
+    format!("Windows {} ({})", version, full_version)
+}
+
+pub fn short_version() -> String {
+    let system_info = system_info();
+    let os_name = system_info.get("OS Name");
+    let version = os_name.map(parse_version).unwrap_or(String::from("N/A"));
+    format!("Windows {}", version)
+}
+
+fn system_info() -> HashMap<String, String> {
+    let system_info =
+        command_stdout_lossy("systeminfo", &["/FO", "LIST"]).unwrap_or_else(String::new);
+
+    let mut info_map = HashMap::new();
+    system_info.lines().for_each(|line| {
+        let mut split = line.split(":");
+        if let Some(key) = split.next() {
+            if let Some(value) = split.next() {
+                info_map.insert(key.to_owned(), value.to_owned());
+            }
+        }
+    });
+
+    info_map
+}
+
+fn parse_version(os_name: &String) -> String {
+    os_name
+        .trim()
+        .trim_start_matches("Microsoft Windows ")
+        .to_owned()
+}
+
+fn parse_full_version(os_version: &String) -> String {
+    os_version.trim().to_owned()
+}
+
+pub fn extra_metadata() -> impl Iterator<Item = (String, String)> {
+    std::iter::empty()
+}