mirror of
https://github.com/Djeeberjr/fw-anwesenheit.git
synced 2025-07-03 01:24:17 +00:00
Switched to tokio and added webserver
This commit is contained in:
parent
9a26dad304
commit
eb39b09632
1475
Cargo.lock
generated
1475
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -6,3 +6,5 @@ edition = "2024"
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
chrono = { version = "0.4.40", features = ["serde"] }
|
chrono = { version = "0.4.40", features = ["serde"] }
|
||||||
regex = "1.11.1"
|
regex = "1.11.1"
|
||||||
|
rocket = "0.5.1"
|
||||||
|
tokio = { version = "1.44.2", features = ["full"] }
|
||||||
|
35
src/main.rs
35
src/main.rs
@ -1,18 +1,37 @@
|
|||||||
use pm3::{pm3_mock, run_pm3};
|
use pm3::{pm3_mock, run_pm3};
|
||||||
use std::{sync::mpsc::channel, thread};
|
use tokio::sync::mpsc;
|
||||||
|
use webserver::start_webserver;
|
||||||
|
|
||||||
mod id_store;
|
mod id_store;
|
||||||
mod parser;
|
mod parser;
|
||||||
mod pm3;
|
mod pm3;
|
||||||
|
mod webserver;
|
||||||
|
|
||||||
fn main() {
|
#[tokio::main]
|
||||||
let (sender, receiver) = channel();
|
async fn main() {
|
||||||
thread::spawn(move || {
|
let (tx, mut rx) = mpsc::channel::<String>(32);
|
||||||
// run_pm3(sender);
|
|
||||||
pm3_mock(sender);
|
tokio::spawn(async move {
|
||||||
|
match pm3_mock(tx).await {
|
||||||
|
Ok(()) => {
|
||||||
|
println!("PM3 exited with an zero error code");
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
println!("PM3 failed to run: {}", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
while true {
|
tokio::spawn(async move {
|
||||||
println!("{}", receiver.recv().unwrap());
|
while let Some(line) = rx.recv().await {
|
||||||
|
println!("Got from channel: {}", line);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
match start_webserver().await {
|
||||||
|
Ok(()) => {}
|
||||||
|
Err(e) => {
|
||||||
|
eprintln!("Failed to start webserver: {}", e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
17
src/pm3.rs
17
src/pm3.rs
@ -1,10 +1,11 @@
|
|||||||
use std::error::Error;
|
use std::error::Error;
|
||||||
use std::io::{self, BufRead};
|
use std::io::{self, BufRead};
|
||||||
use std::process::{Command, Stdio};
|
use std::process::{Command, Stdio};
|
||||||
use std::sync::mpsc::Sender;
|
use tokio::time::{Duration, sleep};
|
||||||
use std::{thread, time};
|
|
||||||
|
|
||||||
pub fn run_pm3(sender: Sender<String>) -> Result<(), Box<dyn Error>> {
|
use tokio::sync::mpsc;
|
||||||
|
|
||||||
|
pub async fn run_pm3(tx: mpsc::Sender<String>) -> Result<(), Box<dyn Error>> {
|
||||||
let mut cmd = Command::new("stdbuf")
|
let mut cmd = Command::new("stdbuf")
|
||||||
.arg("-oL")
|
.arg("-oL")
|
||||||
.arg("pm3")
|
.arg("pm3")
|
||||||
@ -21,8 +22,8 @@ pub fn run_pm3(sender: Sender<String>) -> Result<(), Box<dyn Error>> {
|
|||||||
Ok(line) => {
|
Ok(line) => {
|
||||||
let parse_result = super::parser::parse_line(&line);
|
let parse_result = super::parser::parse_line(&line);
|
||||||
if let Some(uid) = parse_result {
|
if let Some(uid) = parse_result {
|
||||||
match sender.send(uid) {
|
match tx.send(uid).await {
|
||||||
Ok(_) => {}
|
Ok(()) => {}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("Failed to send to channel: {}", e);
|
eprintln!("Failed to send to channel: {}", e);
|
||||||
}
|
}
|
||||||
@ -44,17 +45,17 @@ pub fn run_pm3(sender: Sender<String>) -> Result<(), Box<dyn Error>> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn pm3_mock(sender: Sender<String>) -> Result<(), Box<dyn Error>> {
|
pub async fn pm3_mock(tx: mpsc::Sender<String>) -> Result<(), Box<dyn Error>> {
|
||||||
#![allow(while_true)]
|
#![allow(while_true)]
|
||||||
while true {
|
while true {
|
||||||
match sender.send("F1409618".to_owned()) {
|
match tx.send("F1409618".to_owned()).await {
|
||||||
Ok(()) => {}
|
Ok(()) => {}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("Failed to send to channel: {}", e);
|
eprintln!("Failed to send to channel: {}", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
thread::sleep(time::Duration::from_secs(2));
|
sleep(Duration::from_millis(1000)).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
11
src/webserver.rs
Normal file
11
src/webserver.rs
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
use rocket::{get, routes};
|
||||||
|
|
||||||
|
pub async fn start_webserver() -> Result<(), rocket::Error> {
|
||||||
|
rocket::build().mount("/", routes![index]).launch().await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[get("/")]
|
||||||
|
fn index() -> &'static str {
|
||||||
|
"Hello, world!"
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user