From 8fb9e1c1f13766ac9b5b0dae2f4f79a63296423a Mon Sep 17 00:00:00 2001
From: Gabriele Musco <gabmus@disroot.org>
Date: Sun, 1 Sep 2024 20:02:49 +0200
Subject: [PATCH] feat: remove unnecessary runner trait

---
 src/cmd_runner.rs                 | 18 ++++++++++--------
 src/main.rs                       |  1 -
 src/runner.rs                     | 12 ------------
 src/ui/libsurvive_setup_window.rs |  1 -
 4 files changed, 10 insertions(+), 22 deletions(-)
 delete mode 100644 src/runner.rs

diff --git a/src/cmd_runner.rs b/src/cmd_runner.rs
index 1b94c6a..a3a8219 100644
--- a/src/cmd_runner.rs
+++ b/src/cmd_runner.rs
@@ -1,6 +1,5 @@
 use crate::{
     profile::{Profile, XRServiceType},
-    runner::{Runner, RunnerStatus},
     util::file_utils::get_writer,
 };
 use nix::{
@@ -23,6 +22,12 @@ use std::{
     time::Duration,
 };
 
+#[derive(PartialEq, Eq, Debug)]
+pub enum RunnerStatus {
+    Running,
+    Stopped(Option<i32>),
+}
+
 pub struct CmdRunner {
     pub environment: HashMap<String, String>,
     pub command: String,
@@ -182,24 +187,22 @@ impl CmdRunner {
     pub fn save_output(&mut self, path: &Path) -> Result<(), std::io::Error> {
         CmdRunner::save_log(path, &self.output)
     }
-}
 
-impl Runner for CmdRunner {
-    fn consume_output(&mut self) -> String {
+    pub fn consume_output(&mut self) -> String {
         self.receive_output();
         let res = self.output.concat();
         self.output.clear();
         res
     }
 
-    fn consume_rows(&mut self) -> Vec<String> {
+    pub fn consume_rows(&mut self) -> Vec<String> {
         self.receive_output();
         let res = self.output.clone();
         self.output.clear();
         res
     }
 
-    fn status(&mut self) -> RunnerStatus {
+    pub fn status(&mut self) -> RunnerStatus {
         match &mut self.process {
             None => RunnerStatus::Stopped(None),
             Some(proc) => match proc.try_wait() {
@@ -210,7 +213,7 @@ impl Runner for CmdRunner {
         }
     }
 
-    fn start(&mut self) {
+    pub fn start(&mut self) {
         self.try_start().expect("Failed to execute runner");
     }
 }
@@ -219,7 +222,6 @@ impl Runner for CmdRunner {
 mod tests {
     use super::{CmdRunner, RunnerStatus};
     use crate::profile::Profile;
-    use crate::runner::Runner;
     use core::time;
     use std::{path::Path, thread::sleep};
 
diff --git a/src/main.rs b/src/main.rs
index 34763de..0341b21 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -37,7 +37,6 @@ pub mod openxr_prober;
 pub mod paths;
 pub mod profile;
 pub mod profiles;
-pub mod runner;
 pub mod steam_linux_runtime_injector;
 pub mod steamvr_utils;
 pub mod termcolor;
diff --git a/src/runner.rs b/src/runner.rs
deleted file mode 100644
index 6daf84a..0000000
--- a/src/runner.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-#[derive(PartialEq, Eq, Debug)]
-pub enum RunnerStatus {
-    Running,
-    Stopped(Option<i32>),
-}
-
-pub trait Runner {
-    fn start(&mut self);
-    fn status(&mut self) -> RunnerStatus;
-    fn consume_output(&mut self) -> String;
-    fn consume_rows(&mut self) -> Vec<String>;
-}
diff --git a/src/ui/libsurvive_setup_window.rs b/src/ui/libsurvive_setup_window.rs
index 813e826..aaf0547 100644
--- a/src/ui/libsurvive_setup_window.rs
+++ b/src/ui/libsurvive_setup_window.rs
@@ -2,7 +2,6 @@ use super::alert::alert;
 use crate::{
     cmd_runner::CmdRunner,
     profile::{prepare_ld_library_path, Profile},
-    runner::Runner,
 };
 use adw::prelude::*;
 use gtk::glib;