Simplify drawing logic

Now that only typst is left, things become a lot simpler.

showbits-thermal-printer/src/documents/calendar/mod.rs

@@ -2,10 +2,7 @@ use axum::{Form, extract::State};
 use jiff::Zoned;
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use crate::server::{Server, somehow};
-    drawer::{Command, NewTypstDrawing},
-    server::{Server, somehow},
-};
 
 #[derive(Serialize)]
 struct Data {
@@ -34,10 +31,6 @@ pub async fn post(server: State<Server>, Form(form): Form<FormData>) -> somehow:
         .with_json("/data.json", &data)
         .with_main_file(include_str!("main.typ"));
 
-    let _ = server
+    server.print_typst(typst).await;
-        .tx
-        .send(Command::draw(NewTypstDrawing::new(typst)))
-        .await;
-
     Ok(())
 }

showbits-thermal-printer/src/documents/cells/mod.rs

@@ -6,7 +6,6 @@ use image::{ImageFormat, Rgba, RgbaImage, imageops};
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    drawer::{Command, NewTypstDrawing},
     printer::Printer,
     server::{Server, somehow},
 };
@@ -101,10 +100,6 @@ pub async fn post(server: State<Server>, Form(form): Form<FormData>) -> somehow:
         .with_file("/image.png", bytes)
         .with_main_file(include_str!("main.typ"));
 
-    let _ = server
+    server.print_typst(typst).await;
-        .tx
-        .send(Command::draw(NewTypstDrawing::new(typst)))
-        .await;
-
     Ok(())
 }

showbits-thermal-printer/src/documents/chat/mod.rs

@@ -1,10 +1,7 @@
 use axum::{Form, extract::State};
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use crate::server::Server;
-    drawer::{Command, NewTypstDrawing},
-    server::Server,
-};
 
 #[derive(Serialize)]
 struct Data {
@@ -31,8 +28,5 @@ pub async fn post(server: State<Server>, Form(form): Form<FormData>) {
         .with_json("/data.json", &data)
         .with_main_file(include_str!("main.typ"));
 
-    let _ = server
+    server.print_typst(typst).await;
-        .tx
-        .send(Command::draw(NewTypstDrawing::new(typst)))
-        .await;
 }

showbits-thermal-printer/src/documents/egg/mod.rs

@@ -1,10 +1,7 @@
 use axum::{Form, extract::State};
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use crate::server::Server;
-    drawer::{Command, NewTypstDrawing},
-    server::Server,
-};
 
 #[derive(Serialize)]
 struct Data {
@@ -57,8 +54,5 @@ pub async fn post(server: State<Server>, Form(form): Form<FormData>) {
         typst.add_file(format!("/egg_bad/pattern_{i:02}.png"), *pattern);
     }
 
-    let _ = server
+    server.print_typst(typst).await;
-        .tx
-        .send(Command::draw(NewTypstDrawing::new(typst)))
-        .await;
 }

showbits-thermal-printer/src/documents/image/mod.rs

@@ -9,10 +9,7 @@ use axum::{
 use image::ImageFormat;
 use serde::Serialize;
 
-use crate::{
+use crate::server::{Server, somehow, statuscode::status_code};
-    drawer::{Command, NewTypstDrawing},
-    server::{Server, somehow, statuscode::status_code},
-};
 
 #[derive(Serialize)]
 struct Data {
@@ -79,10 +76,6 @@ pub async fn post(server: State<Server>, mut multipart: Multipart) -> somehow::R
         .with_file("/image.png", bytes)
         .with_main_file(include_str!("main.typ"));
 
-    let _ = server
+    server.print_typst(typst).await;
-        .tx
-        .send(Command::draw(NewTypstDrawing::new(typst)))
-        .await;
-
     Ok(Redirect::to("image").into_response())
 }

showbits-thermal-printer/src/documents/text/mod.rs

@@ -1,10 +1,7 @@
 use axum::{Form, extract::State};
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use crate::server::Server;
-    drawer::{Command, NewTypstDrawing},
-    server::Server,
-};
 
 #[derive(Serialize)]
 struct Data {
@@ -31,8 +28,5 @@ pub async fn post(server: State<Server>, Form(form): Form<FormData>) {
         .with_json("/data.json", &data)
         .with_main_file(include_str!("main.typ"));
 
-    let _ = server
+    server.print_typst(typst).await;
-        .tx
-        .send(Command::draw(NewTypstDrawing::new(typst)))
-        .await;
 }

showbits-thermal-printer/src/documents/tictactoe/mod.rs

@@ -1,10 +1,7 @@
 use axum::{Form, extract::State};
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use crate::server::{Server, somehow};
-    drawer::{Command, NewTypstDrawing},
-    server::{Server, somehow},
-};
 
 #[derive(Serialize)]
 struct Data {
@@ -25,10 +22,6 @@ pub async fn post(server: State<Server>, Form(form): Form<FormData>) -> somehow:
         .with_json("/data.json", &data)
         .with_main_file(include_str!("main.typ"));
 
-    let _ = server
+    server.print_typst(typst).await;
-        .tx
-        .send(Command::draw(NewTypstDrawing::new(typst)))
-        .await;
-
     Ok(())
 }

showbits-thermal-printer/src/drawer.rs

@@ -1,22 +1,11 @@
-mod backlog;
+use showbits_typst::Typst;
-mod new_typst;
-
 use tokio::sync::mpsc;
 
 use crate::persistent_printer::PersistentPrinter;
 
-pub use self::{backlog::BacklogDrawing, new_typst::NewTypstDrawing};
+pub enum Command {
-
+    Backlog,
-pub trait Drawing {
+    Typst(Typst),
-    fn draw(&self, printer: &mut PersistentPrinter) -> anyhow::Result<()>;
-}
-
-pub struct Command(Box<dyn Drawing + Send>);
-
-impl Command {
-    pub fn draw<D: Drawing + Send + 'static>(drawing: D) -> Self {
-        Self(Box::new(drawing))
-    }
 }
 
 pub struct Drawer {
@@ -31,7 +20,20 @@ impl Drawer {
 
     pub fn run(&mut self) -> anyhow::Result<()> {
         while let Some(command) = self.rx.blocking_recv() {
-            command.0.draw(&mut self.printer)?;
+            self.run_cmd(command)?;
+        }
+        Ok(())
+    }
+
+    fn run_cmd(&mut self, command: Command) -> anyhow::Result<()> {
+        match command {
+            Command::Backlog => {
+                self.printer.print_backlog()?;
+            }
+            Command::Typst(typst) => {
+                let image = typst.render()?;
+                self.printer.print_image(&image)?;
+            }
         }
         Ok(())
     }

showbits-thermal-printer/src/drawer/backlog.rs

@@ -1,12 +0,0 @@
-use crate::persistent_printer::PersistentPrinter;
-
-use super::Drawing;
-
-pub struct BacklogDrawing;
-
-impl Drawing for BacklogDrawing {
-    fn draw(&self, printer: &mut PersistentPrinter) -> anyhow::Result<()> {
-        printer.print_backlog()?;
-        Ok(())
-    }
-}

showbits-thermal-printer/src/drawer/new_typst.rs

@@ -1,21 +0,0 @@
-use showbits_typst::Typst;
-
-use crate::persistent_printer::PersistentPrinter;
-
-use super::Drawing;
-
-pub struct NewTypstDrawing(pub Typst);
-
-impl NewTypstDrawing {
-    pub fn new(typst: impl Into<Typst>) -> Self {
-        Self(typst.into())
-    }
-}
-
-impl Drawing for NewTypstDrawing {
-    fn draw(&self, printer: &mut PersistentPrinter) -> anyhow::Result<()> {
-        let image = self.0.render()?;
-        printer.print_image(&image)?;
-        Ok(())
-    }
-}

showbits-thermal-printer/src/main.rs

@@ -8,7 +8,7 @@ mod server;
 use std::{path::PathBuf, time::Duration};
 
 use clap::Parser;
-use drawer::{BacklogDrawing, Command};
+use drawer::Command;
 use tokio::{runtime::Runtime, sync::mpsc};
 
 use self::{drawer::Drawer, persistent_printer::PersistentPrinter};
@@ -44,7 +44,7 @@ fn main() -> anyhow::Result<()> {
     runtime.spawn(server::run(tx.clone(), args.addr));
     runtime.spawn(async move {
         loop {
-            let _ = tx.send(Command::draw(BacklogDrawing)).await;
+            let _ = tx.send(Command::Backlog).await;
             tokio::time::sleep(Duration::from_secs(1)).await;
         }
     });

showbits-thermal-printer/src/server.rs

@@ -7,6 +7,7 @@ use axum::{
     extract::DefaultBodyLimit,
     routing::{get, post},
 };
+use showbits_typst::Typst;
 use tokio::{net::TcpListener, sync::mpsc};
 
 use crate::{documents, drawer::Command};
@@ -15,7 +16,13 @@ use self::r#static::get_static_file;
 
 #[derive(Clone)]
 pub struct Server {
-    pub tx: mpsc::Sender<Command>,
+    tx: mpsc::Sender<Command>,
+}
+
+impl Server {
+    pub async fn print_typst(&self, typst: Typst) {
+        let _ = self.tx.send(Command::Typst(typst)).await;
+    }
 }
 
 pub async fn run(tx: mpsc::Sender<Command>, addr: String) -> anyhow::Result<()> {