Turn stream into factory

Author: max-lt

.gitignore

@@ -1,4 +1,4 @@
 /target
 
 example.yml
-  
+example.sh

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "github-hook-rs"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Cargo.toml

@@ -1,18 +1,25 @@
 use std::io::Read;
-
+use std::io::BufRead;
+use std::thread::spawn;
+use std::thread::JoinHandle;
 use rand::RngCore;
 
-fn stream<R: Sized + Read>(id: &str, name: &str, reader: R) {
-    let mut reader = std::io::BufReader::new(reader);
-    let mut line = String::new();
-    while std::io::BufRead::read_line(&mut reader, &mut line).unwrap() > 0 {
-        log::info!("Job {id}:{name}: {}", line.trim());
-        line.clear();
-    }
+fn stream<R: Read + Send + 'static>(
+    id: String,
+    name: &'static str,
+    reader: R,
+) -> JoinHandle<()> {
+    spawn(move || {
+        let lines = std::io::BufReader::new(reader).lines();
+
+        for line in lines {
+            log::info!("Job {id}:{name}: {}", line.unwrap());
+        }
+    })
 }
 
-pub fn run_script(script: String) -> std::thread::JoinHandle<()> {
-    std::thread::spawn(move || {
+pub fn run_script(script: String) -> JoinHandle<()> {
+    spawn(move || {
         let job_id = {
             let mut data = [0u8; 4];
             rand::thread_rng().fill_bytes(&mut data);
@@ -29,17 +36,14 @@ pub fn run_script(script: String) -> std::thread::JoinHandle<()> {
             .spawn()
             .expect("Failed to start script");
 
-        
         let out_h = {
-          let job_id = job_id.clone();
-          let stdout = child.stdout.take().unwrap();
-          std::thread::spawn(move || stream(&job_id, "stdout", stdout))
+            let stdout = child.stdout.take().unwrap();
+            stream(job_id.to_string(), "stdout", stdout)
         };
 
         let err_h = {
-          let job_id = job_id.clone();
-          let stderr = child.stderr.take().unwrap();
-          std::thread::spawn(move || stream(&job_id, "stderr", stderr))
+            let stderr = child.stderr.take().unwrap();
+            stream(job_id.to_string(), "stderr", stderr)
         };
 
         // wait out_h and err_h to finish