Run HTTP server on a separate thread, all good

1 files changed, 25 insertions, 22 deletions

diff --git a/src/main.rs b/src/main.rs
index 398e76d..a56c7fd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -48,31 +48,34 @@ fn main() {
         process::exit(1);
     }
 
-    serve::run();
 
-    // let _udp = thread::spawn(move || {
-    //     upnp::discover();
-    // });
+    let _http = thread::spawn(move || {
+        serve::run();
+    });
 
-    // let (tx, rx) = mpsc::channel();
-    // let child = thread::spawn(move || {
-    //     let mut controller = cli::Controller::init();
-    //     loop {
-    //         let c = controller.read();
-    //         tx.send(c).unwrap();
-    //         if c == 113 {
-    //             break;
-    //         }
-    //     }
-    //     controller.destroy();
-    // });
+    let _udp = thread::spawn(move || {
+        upnp::discover();
+    });
 
-    // for received in rx {
-    //     println!("Got char: {}", received);
-    // }
+    let (tx, rx) = mpsc::channel();
+    let child = thread::spawn(move || {
+        let mut controller = cli::Controller::init();
+        loop {
+            let c = controller.read();
+            tx.send(c).unwrap();
+            if c == 113 {
+                break;
+            }
+        }
+        controller.destroy();
+    });
 
-    // println!("Waiting for all thread");
-    // let _res = child.join();
-    // println!("Done!");
+    for received in rx {
+        println!("Got char: {}", received);
+    }
+
+    println!("Waiting for all thread");
+    let _res = child.join();
+    println!("Done!");
 
 }