summaryrefslogtreecommitdiff
path: root/crates/renderer/src
diff options
context:
space:
mode:
Diffstat (limited to 'crates/renderer/src')
-rw-r--r--crates/renderer/src/main.rs26
-rw-r--r--crates/renderer/src/overlay/tcg.rs14
-rw-r--r--crates/renderer/src/texture_server.rs2
3 files changed, 6 insertions, 36 deletions
diff --git a/crates/renderer/src/main.rs b/crates/renderer/src/main.rs
index b71a836..6f951ac 100644
--- a/crates/renderer/src/main.rs
+++ b/crates/renderer/src/main.rs
@@ -29,11 +29,6 @@ pub fn main() -> Erm<()> {
.about("Run the LCOLONQ model renderer in a terminal")
)
.subcommand(
- Command::new("validate-card")
- .arg(Arg::new("path"))
- .about("Validate the TCG card at the given path.")
- )
- .subcommand(
Command::new("repair-card")
.arg(Arg::new("path"))
.about("Repair the TCG card at the given path.")
@@ -57,27 +52,6 @@ pub fn main() -> Erm<()> {
Some(("model-terminal", _cm)) => {
teleia::run("LCOLONQ", 1920, 1080, teleia::Options::HIDDEN, overlay::model::Terminal::new)?;
},
- Some(("validate-card", cm)) => {
- if let Some(path) = cm.get_one::<String>("path") {
- if overlay::tcg::validate_card(&std::fs::read(path)?)? {
- println!("signatures match!");
- std::process::exit(0);
- } else {
- println!("signatures do not match");
- std::process::exit(1);
- }
- } else {
- eprintln!("no path specified");
- }
- },
- Some(("repair-card", cm)) => {
- if let Some(path) = cm.get_one::<String>("path") {
- let res = overlay::tcg::repair_card(&std::fs::read(path)?)?;
- std::io::stdout().write_all(&res)?;
- } else {
- eprintln!("no path specified");
- }
- },
_ => unreachable!("no subcommand"),
}
Ok(())
diff --git a/crates/renderer/src/overlay/tcg.rs b/crates/renderer/src/overlay/tcg.rs
index c3e6a38..acc9915 100644
--- a/crates/renderer/src/overlay/tcg.rs
+++ b/crates/renderer/src/overlay/tcg.rs
@@ -1,4 +1,3 @@
-use sha2::Digest;
use teleia::*;
use std::{cell::RefCell, rc::Rc};
@@ -140,7 +139,6 @@ impl std::io::Write for ImageWrite {
struct ImageEncoder {
frames: u32,
frames_left: u32,
- frame_hashes: Vec<u8>,
buf: Rc<RefCell<Vec<u8>>>,
writer: png::Writer<ImageWrite>,
}
@@ -167,14 +165,12 @@ impl ImageEncoder {
Some(Self {
frames,
frames_left: frames,
- frame_hashes: Vec::new(),
buf,
writer,
})
}
fn write_frame(&mut self, pixels: &[u8]) {
if self.frames_left > 0 {
- self.frame_hashes.extend_from_slice(sha2::Sha256::digest(pixels).as_slice());
let _ = self.writer.write_image_data(&pixels);
self.frames_left -= 1;
}
@@ -182,10 +178,10 @@ impl ImageEncoder {
fn is_finished(&self) -> bool {
self.frames_left == 0
}
- fn finish(self) -> Option<(Vec<u8>, Vec<u8>)> {
+ fn finish(self) -> Option<Vec<u8>> {
if self.is_finished() {
self.writer.finish().expect("failed to finish");
- Some((self.buf.replace(Vec::new()), self.frame_hashes))
+ Some(self.buf.replace(Vec::new()))
} else { None }
}
}
@@ -288,7 +284,7 @@ impl Marquee {
}
}
fn upload_card(ctx: &context::Context, st: &mut state::State, ost: &mut overlay::State,
- c: &Card, buf: &[u8], hashes: &[u8],
+ c: &Card, buf: &[u8],
) -> Erm<()> {
let with_meta = web_image_meta::png::add_text_chunk(
buf, "lcolonqtcg", &c.encoded,
@@ -304,9 +300,9 @@ impl Marquee {
renderer: &CardRenderer,
) {
for s in self.slots.iter_mut() {
- if let Some((b, h)) = s.encoder.take_if(|e| e.is_finished()).and_then(|enc| enc.finish()) {
+ if let Some(b) = s.encoder.take_if(|e| e.is_finished()).and_then(|enc| enc.finish()) {
if let Some(c) = &s.card.card {
- let _ = Self::upload_card(ctx, st, ost, &c, &b, &h).expect("failed to upload");
+ let _ = Self::upload_card(ctx, st, ost, &c, &b).expect("failed to upload");
}
}
}
diff --git a/crates/renderer/src/texture_server.rs b/crates/renderer/src/texture_server.rs
index 5afad70..ce14262 100644
--- a/crates/renderer/src/texture_server.rs
+++ b/crates/renderer/src/texture_server.rs
@@ -21,7 +21,7 @@ pub struct Server {
}
impl Server {
pub fn new(ctx: &context::Context) -> Self {
- std::fs::remove_file(SOCK_PATH).expect("failed to remove socket");
+ let _ = std::fs::remove_file(SOCK_PATH);
let sock = UnixDatagram::bind(SOCK_PATH).expect("failed to bind texture server socket");
let (sender, receiver) = channel::<i32>();