setting up for multiple previews

Author: knzai

src/file_data.rs

@@ -0,0 +1,37 @@
+use factor::factor::factor;
+
+use crate::image::Image;
+use crate::parser::ParserType;
+
+pub struct Raw(Vec<u8>);
+
+impl Raw {
+    pub fn new(data: &[u8]) -> Self {
+        Self(data.to_owned())
+    }
+    fn byte_count(&self) -> usize {
+        self.0.len()
+    }
+    fn cga_count(&self) -> usize {
+        self.byte_count() * 4
+    }
+    fn ega_count(&self) -> usize {
+        self.byte_count() * 2
+    }
+    pub fn cga_possible(&self) -> bool {
+        self.cga_count() <= 64_000
+    }
+    pub fn cga_fullscreen(&self) -> bool {
+        self.cga_count() == 64_000
+    }
+    pub fn cga_widths(&self) -> Vec<i64> {
+        factor(self.cga_count().try_into().unwrap())
+    }
+    pub fn ega_widths(&self) -> Vec<i64> {
+        factor(self.ega_count().try_into().unwrap())
+    }
+
+    pub fn parse(&self, parser: ParserType, width: usize) -> Image {
+        Image(parser.process_input(&self.0, width))
+    }
+}

src/terminal/main.rs

@@ -6,8 +6,8 @@ use std::path::Path;
 use clap::Parser;
 
 use cega::color::palette::palette_from_abbr;
-//use cega::file_data::Raw;
-use cega::image::{self, Image};
+use cega::file_data;
+use cega::image;
 use cega::parser::ParserType;
 #[cfg(feature = "png")]
 use cega::png;
@@ -19,9 +19,9 @@ use cega::ImageType;
 pub fn main() -> Result<(), Box<dyn std::error::Error>> {
     let args = args::Args::parse();
 
-    let file_data = &std::fs::read(Path::new(&args.image))?;
+    let file_data = file_data::Raw::new(&std::fs::read(Path::new(&args.image))?);
     let parser = ParserType::type_str(&args.image_parser);
-    let image = Image(parser.process_input(&file_data, args.width));
+    let image = file_data.parse(parser, args.width);
 
     let image_data = if args.tile_height.is_some() {
         image::tile(image.data(), args.tile_height.unwrap())

src/wasm/image.rs

@@ -4,8 +4,8 @@ use web_sys::HtmlInputElement;
 use yew::{html, Callback, Component, Context, Event, Html, Properties, SubmitEvent, TargetCast};
 
 use crate::color::palette::palette_from_abbr;
+use crate::file_data;
 use crate::image::tile;
-use crate::image::Image;
 use crate::parser::ParserType;
 use crate::png;
 
@@ -39,9 +39,9 @@ impl ImageFile<'_> {
         if self.file_input.mime_type.contains("image") {
             self.file_input.data.clone()
         } else {
+            let file_data = file_data::Raw::new(&self.file_input.data);
             let parser = ParserType::CGA;
-            let parsed = parser.process_input(&self.file_input.data, self.width);
-            let image = Image(parsed);
+            let image = file_data.parse(parser, self.width);
             let palette = palette_from_abbr("cga0");
             let mut bytes: Vec<u8> = Vec::new();