runner: Remove const from the Runner trait

Makes it possible to have Box<dyn Runner>

Author: cyberphantom52

src/runner/mod.rs

@@ -18,6 +18,7 @@ pub struct RunnerInfo {
     name: String,
     version: String,
     directory: PathBuf,
+    executable: PathBuf,
 }
 
 impl RunnerInfo {
@@ -66,9 +67,15 @@ impl RunnerInfo {
         Ok(RunnerInfo {
             name,
             directory: directory.to_path_buf(),
+            executable: executable.to_path_buf(),
             version,
         })
     }
+
+    /// Get the full path to the executable for the runner
+    pub fn executable_path(&self) -> PathBuf {
+        self.directory.join(&self.executable)
+    }
 }
 
 impl RunnerInfo {
@@ -89,13 +96,12 @@ impl RunnerInfo {
 }
 
 pub trait Runner {
-    const EXECUTABLE: &'static str;
     /// Get the common runner information
     fn info(&self) -> &RunnerInfo;
 
     /// Check if the runner executable is available and functional
     fn is_available(&self) -> bool {
-        let executable_path = self.info().directory().join(Self::EXECUTABLE);
+        let executable_path = self.info().executable_path();
         executable_path.exists() && executable_path.is_file()
     }
 }

src/runner/proton.rs

@@ -13,14 +13,13 @@ impl TryFrom<&Path> for Proton {
     type Error = Box<dyn std::error::Error>;
 
     fn try_from(path: &Path) -> Result<Self, Self::Error> {
-        let executable = PathBuf::from(Self::EXECUTABLE);
+        let executable = PathBuf::from("./proton");
         let info = RunnerInfo::try_from(path, &executable)?;
         Ok(Proton { info })
     }
 }
 
 impl Runner for Proton {
-    const EXECUTABLE: &'static str = "proton";
     fn info(&self) -> &RunnerInfo {
         &self.info
     }

src/runner/umu.rs

@@ -11,7 +11,7 @@ impl TryFrom<&Path> for UMU {
     type Error = Box<dyn std::error::Error>;
 
     fn try_from(path: &Path) -> Result<Self, Self::Error> {
-        let executable = PathBuf::from(Self::EXECUTABLE);
+        let executable = PathBuf::from("./umu-run");
         let mut info = RunnerInfo::try_from(path, &executable)?;
         let pretty_version = info
             .version
@@ -28,7 +28,6 @@ impl TryFrom<&Path> for UMU {
 }
 
 impl Runner for UMU {
-    const EXECUTABLE: &'static str = "umu-run";
     fn info(&self) -> &RunnerInfo {
         &self.info
     }

src/runner/wine.rs

@@ -21,14 +21,13 @@ impl TryFrom<&Path> for Wine {
     type Error = Box<dyn std::error::Error>;
 
     fn try_from(path: &Path) -> Result<Self, Self::Error> {
-        let executable = PathBuf::from(Self::EXECUTABLE);
+        let executable = PathBuf::from("./bin/wine");
         let info = RunnerInfo::try_from(path, &executable)?;
         Ok(Wine { info })
     }
 }
 
 impl Runner for Wine {
-    const EXECUTABLE: &'static str = "bin/wine";
     fn info(&self) -> &RunnerInfo {
         &self.info
     }