From 5e3a8b31ab6911d332c757e5bc64dccb42c39104 Mon Sep 17 00:00:00 2001
From: Stephen D <webmaster@scd31.com>
Date: Sat, 22 Feb 2025 15:46:26 -0500
Subject: [PATCH] interactive mode
---
Cargo.lock | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++
Cargo.toml | 2 +
src/arg.rs | 15 ++++++
src/main.rs | 50 +++++++++++++++++++
4 files changed, 208 insertions(+)
create mode 100644 src/arg.rs
diff --git a/Cargo.lock b/Cargo.lock
index 4ba483e..f84b200 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,6 +14,56 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
+[[package]]
+name = "anstream"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+dependencies = [
+ "anstyle",
+ "once_cell",
+ "windows-sys",
+]
+
[[package]]
name = "anyhow"
version = "1.0.96"
@@ -159,12 +209,58 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+[[package]]
+name = "clap"
+version = "4.5.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+
[[package]]
name = "color_quant"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+[[package]]
+name = "colorchoice"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
[[package]]
name = "colored"
version = "3.0.0"
@@ -174,6 +270,19 @@ dependencies = [
"windows-sys",
]
+[[package]]
+name = "console"
+version = "0.15.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b"
+dependencies = [
+ "encode_unicode",
+ "libc",
+ "once_cell",
+ "unicode-width",
+ "windows-sys",
+]
+
[[package]]
name = "crc32fast"
version = "1.4.2"
@@ -220,6 +329,12 @@ version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+[[package]]
+name = "encode_unicode"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
+
[[package]]
name = "equivalent"
version = "1.0.2"
@@ -369,6 +484,12 @@ dependencies = [
"syn",
]
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
[[package]]
name = "itertools"
version = "0.12.1"
@@ -667,7 +788,9 @@ name = "rapidriter-cat"
version = "0.1.0"
dependencies = [
"bitvec",
+ "clap",
"colored",
+ "console",
"image",
]
@@ -809,6 +932,12 @@ version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
[[package]]
name = "syn"
version = "2.0.98"
@@ -916,6 +1045,18 @@ version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
[[package]]
name = "v_frame"
version = "0.3.8"
diff --git a/Cargo.toml b/Cargo.toml
index 7558fae..81bc4a9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,9 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
bitvec = "1.0.1"
+clap = { version = "4.5.30", features = ["derive"] }
colored = "3.0.0"
+console = "0.15.10"
[build-dependencies]
image = "0.25.5"
diff --git a/src/arg.rs b/src/arg.rs
new file mode 100644
index 0000000..bb5dc37
--- /dev/null
+++ b/src/arg.rs
@@ -0,0 +1,15 @@
+use std::path::PathBuf;
+
+use clap::Parser;
+
+#[derive(Parser)]
+#[command(version)]
+pub struct Args {
+ /// Interactive mode
+ #[arg(short, long, default_value = "false")]
+ pub interactive: bool,
+
+ /// Export a gif
+ #[arg(short, long)]
+ pub out: Option<PathBuf>,
+}
diff --git a/src/main.rs b/src/main.rs
index e050456..b9174f5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,19 +1,69 @@
use std::{
+ io::{self, Read},
thread,
time::{Duration, Instant},
};
+use arg::Args;
use bitvec::{order::Msb0, view::AsBits};
+use clap::Parser;
use colored::Colorize;
+use console::Term;
use rapidriter_cat::next_frame;
const WIDTH: usize = 96;
const HEIGHT: usize = 38;
+mod arg;
+
fn main() {
+ let args = Args::parse();
+
// clear screen
print!("\x1B[2J");
+ if args.interactive {
+ interactive_mode();
+ } else {
+ non_interactive_mode();
+ }
+}
+
+fn interactive_mode() {
+ let mut frame = [0; 456];
+
+ let mut i = 0;
+
+ let term = Term::stdout();
+
+ loop {
+ let has_next_frame = i < 99 && unsafe { next_frame(i, frame.as_mut_ptr()) } == 0;
+
+ draw_frame(&frame);
+ print!("Frame: {i} ");
+ if !has_next_frame {
+ print!(" (Last frame)");
+ }
+ println!("\np for previous frame, n for next frame, q to quit");
+
+ loop {
+ match term.read_char().expect("stdin error") {
+ 'n' if has_next_frame => {
+ i += 1;
+ break;
+ }
+ 'p' if i > 0 => {
+ i -= 1;
+ break;
+ }
+ 'q' => return,
+ _ => {}
+ }
+ }
+ }
+}
+
+fn non_interactive_mode() {
let mut frame = [0; 456];
let start = Instant::now();
--
GitLab