runner: Add a method to get underlying wine runner to the trait

Author: cyberphantom52

src/runner/mod.rs

@@ -96,6 +96,11 @@ impl RunnerInfo {
 }
 
 pub trait Runner {
+    /// Get the Wine runner associated with this runner
+    ///
+    /// This is possible because all runners are built on top of Wine
+    fn wine(&self) -> &Wine;
+
     /// Get the common runner information
     fn info(&self) -> &RunnerInfo;
 

src/runner/proton.rs

@@ -1,4 +1,4 @@
-use super::{Runner, RunnerInfo};
+use super::{Runner, RunnerInfo, Wine};
 use std::path::{Path, PathBuf};
 
 // TODO: These need to be set to use proton outside steam
@@ -7,6 +7,7 @@ use std::path::{Path, PathBuf};
 #[derive(Debug)]
 pub struct Proton {
     info: RunnerInfo,
+    wine: Wine,
 }
 
 impl TryFrom<&Path> for Proton {
@@ -15,11 +16,16 @@ impl TryFrom<&Path> for Proton {
     fn try_from(path: &Path) -> Result<Self, Self::Error> {
         let executable = PathBuf::from("./proton");
         let info = RunnerInfo::try_from(path, &executable)?;
-        Ok(Proton { info })
+        let mut wine = Wine::try_from(path.join("files").as_path())?;
+        Ok(Proton { wine, info })
     }
 }
 
 impl Runner for Proton {
+    fn wine(&self) -> &Wine {
+        &self.wine
+    }
+
     fn info(&self) -> &RunnerInfo {
         &self.info
     }

src/runner/umu.rs

@@ -1,16 +1,17 @@
-use super::{Runner, RunnerInfo};
+use super::{Proton, Runner, RunnerInfo, Wine};
 use std::path::{Path, PathBuf};
 
 #[derive(Debug)]
 pub struct UMU {
     info: RunnerInfo,
-    proton_path: Option<PathBuf>,
+    proton: Option<Proton>,
 }
 
-impl TryFrom<&Path> for UMU {
-    type Error = Box<dyn std::error::Error>;
-
-    fn try_from(path: &Path) -> Result<Self, Self::Error> {
+impl UMU {
+    pub fn try_from(
+        path: &Path,
+        proton: Option<Proton>,
+    ) -> Result<Self, Box<dyn std::error::Error>> {
         let executable = PathBuf::from("./umu-run");
         let mut info = RunnerInfo::try_from(path, &executable)?;
         let pretty_version = info
@@ -20,14 +21,16 @@ impl TryFrom<&Path> for UMU {
             .unwrap_or("unknown")
             .to_string();
         info.version = pretty_version;
-        Ok(UMU {
-            info,
-            proton_path: None,
-        })
+        Ok(UMU { info, proton })
     }
 }
 
 impl Runner for UMU {
+    fn wine(&self) -> &Wine {
+        // TODO: Make sure an unwrap is possible
+        self.proton.as_ref().unwrap().wine()
+    }
+
     fn info(&self) -> &RunnerInfo {
         &self.info
     }

src/runner/wine.rs

@@ -28,6 +28,10 @@ impl TryFrom<&Path> for Wine {
 }
 
 impl Runner for Wine {
+    fn wine(&self) -> &Wine {
+        self
+    }
+
     fn info(&self) -> &RunnerInfo {
         &self.info
     }