Mirror/rayhunter
1
0
Fork 0
mirror of https://github.com/EFForg/rayhunter.git synced 2026-04-28 00:20:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

respect ctrl c in image display loop

Browse Source
This commit is contained in:
Cooper Quintin
2024-06-10 13:28:36 -07:00
parent 185f9a3a96
commit 81f545e90e
2 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
bin/src/daemon.rs
View File

@@ -24,6 +24,7 @@ use axum::routing::{get, post};
use axum::Router;
use stats::get_qmdl_manifest;
use tokio::sync::mpsc::{self, Sender};
use tokio::sync::oneshot::error::TryRecvError;
use tokio::task::JoinHandle;
use tokio_util::task::TaskTracker;
use std::net::SocketAddr;
@@ -90,6 +91,7 @@ fn run_ctrl_c_thread(
task_tracker: &TaskTracker,
diag_device_sender: Sender<DiagDeviceCtrlMessage>,
server_shutdown_tx: oneshot::Sender<()>,
ui_shutdown_tx: oneshot::Sender<()>,
qmdl_store_lock: Arc<RwLock<RecordingStore>>
) -> JoinHandle<Result<(), RayhunterError>> {
task_tracker.spawn(async move {
@@ -104,6 +106,9 @@ fn run_ctrl_c_thread(
server_shutdown_tx.send(())
.expect("couldn't send server shutdown signal");
info!("sending UI shutdown");
ui_shutdown_tx.send(())
.expect("couldn't send ui shutdown signal");
diag_device_sender.send(DiagDeviceCtrlMessage::Exit).await
.expect("couldn't send Exit message to diag thread");
},
@@ -115,11 +120,23 @@ fn run_ctrl_c_thread(
})
}
async fn update_ui(task_tracker: &TaskTracker){
task_tracker.spawn_blocking(|| {
async fn update_ui(task_tracker: &TaskTracker, mut ui_shutdown_rx: oneshot::Receiver<()>){
task_tracker.spawn_blocking(move || {
let mut fb: Framebuffer = Framebuffer::new();
fb.draw_img("/data/rayhunter/orca.gif");
loop {
match ui_shutdown_rx.try_recv() {
Ok(_) => {
info!("received UI shutdown");
break;
},
Err(TryRecvError::Empty) => {},
Err(e) => panic!("what the fuck {e}")
}
fb.draw_img("/data/rayhunter/orca.gif");
}
}).await.unwrap();
}
#[tokio::main]
@@ -143,11 +160,11 @@ async fn main() -> Result<(), RayhunterError> {
run_diag_read_thread(&task_tracker, dev, rx, qmdl_store_lock.clone());
}
let (ui_shutdown_tx, ui_shutdown_rx) = oneshot::channel();
let (server_shutdown_tx, server_shutdown_rx) = oneshot::channel::<()>();
run_ctrl_c_thread(&task_tracker, tx.clone(), server_shutdown_tx, qmdl_store_lock.clone());
run_ctrl_c_thread(&task_tracker, tx.clone(), server_shutdown_tx, ui_shutdown_tx, qmdl_store_lock.clone());
run_server(&task_tracker, &config, qmdl_store_lock.clone(), server_shutdown_rx, tx).await;
update_ui(&task_tracker).await;
update_ui(&task_tracker, ui_shutdown_rx).await;
task_tracker.close();
task_tracker.wait().await;

22
bin/src/framebuffer.rs
View File

@@ -1,7 +1,6 @@
use image::{io::Reader as ImageReader, AnimationDecoder, imageops::FilterType, codecs::gif::GifDecoder, DynamicImage};
use std::{io::BufReader, fs::File, time::Duration};
use include_dir::{include_dir, Dir};
use log::{info, error};
const FB_PATH:&str = "/dev/fb0";
static IMAGE_DIR: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/static/images/");
@@ -52,19 +51,16 @@ impl Framebuffer<'_>{
pub fn draw_img(&mut self, img_name: &str) {
//let img_path = IMAGE_DIR.get_file(img_name).unwrap().path();
let img_path = img_name;
info!("img_path: {:?}", img_path);
if img_path.ends_with(".gif") {
loop{
// this is dumb and i'm sure there's a better way to loop this
let stream = BufReader::new(File::open(&img_path).unwrap());
let decoder = GifDecoder::new(stream).unwrap();
for maybe_frame in decoder.into_frames() {
let frame = maybe_frame.unwrap();
let (numerator, _) = frame.delay().numer_denom_ms();
let img = DynamicImage::from(frame.into_buffer());
self.write(img);
std::thread::sleep(Duration::from_millis(numerator as u64));
}
// this is dumb and i'm sure there's a better way to loop this
let stream = BufReader::new(File::open(&img_path).unwrap());
let decoder = GifDecoder::new(stream).unwrap();
for maybe_frame in decoder.into_frames() {
let frame = maybe_frame.unwrap();
let (numerator, _) = frame.delay().numer_denom_ms();
let img = DynamicImage::from(frame.into_buffer());
self.write(img);
std::thread::sleep(Duration::from_millis(numerator as u64));
}
} else {
let img_reader = ImageReader::open(img_path).unwrap();