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

refactor display code

Browse Source
This commit is contained in:
Cooper Quintin
2024-06-14 14:00:46 -07:00
parent e31bccb229
commit 54dd952ebd
3 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
bin/src/daemon.rs
View File

@@ -125,17 +125,20 @@ fn run_ctrl_c_thread(
async fn update_ui(task_tracker: &TaskTracker, config: &config::Config, mut ui_shutdown_rx: oneshot::Receiver<()>){
static IMAGE_DIR: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/static/images/");
let img_name = match config.ui_level {
0 => {info!("silent UI!"); return},
1 => "subtle.png",
2 => "orca.gif",
_ => "orca.gif"
};
let img = IMAGE_DIR.get_file(img_name).unwrap();
let display_level = config.ui_level;
if display_level == 0 {
info!("Invisible mode, not spawning UI.");
}
info!("spawning UI with {:?}", img.path());
task_tracker.spawn_blocking(move || {
let mut fb: Framebuffer = Framebuffer::new();
// this feels wrong, is there a more rusty way to do this?
let img;
if display_level == 2 {
img = IMAGE_DIR.get_file("orca.gif").unwrap().contents();
} else {
img = &[];
}
loop {
match ui_shutdown_rx.try_recv() {
Ok(_) => {
@@ -146,13 +149,24 @@ async fn update_ui(task_tracker: &TaskTracker, config: &config::Config, mut ui_
Err(e) => panic!("error receiving shutdown message: {e}")
}
if img_name == "subtle.png" {
fb.draw_line(framebuffer::Color565::Green, 2);
} else if img_name.ends_with(".gif"){
fb.draw_gif(img.contents());
} else {
fb.draw_img(img.contents());
}
match display_level {
1 => {
fb.draw_line(framebuffer::Color565::Green, 2);
},
2 => {
fb.draw_gif(img);
},
128 => {
fb.draw_line(framebuffer::Color565::Cyan, 128);
fb.draw_line(framebuffer::Color565::Pink, 102);
fb.draw_line(framebuffer::Color565::White, 76);
fb.draw_line(framebuffer::Color565::Pink, 50);
fb.draw_line(framebuffer::Color565::Cyan, 25);
},
_ => {
fb.draw_line(framebuffer::Color565::Green, 2);
}
};
sleep(Duration::from_millis(100));
}
}).await.unwrap();

1
bin/src/framebuffer.rs
View File

@@ -20,6 +20,7 @@ pub enum Color565 {
Black = 0b0000000000000000,
Cyan = 0b0000011111111111,
Yellow = 0b1111111111100000,
Pink = 0b1111010010011111,
}
#[derive(Copy, Clone)]