start using a hash for the preview so you can return all multiple sets

Author: knzai

Cargo.toml

@@ -36,7 +36,7 @@ gui = ["dep:sdl2"]
 #Web usage, may want to build with no-default-features to skip irrelevant terminal stuff
 wasm = ["png", "dep:base64", "dep:gloo", "dep:js-sys", "dep:web-sys", "dep:yew"]
 #Web component, may want to build with no-default-features to skip irrelevant terminal stuff
-webc = ["png", "dep:base64", "dep:gloo", "dep:js-sys", "dep:wasm-bindgen", "dep:web-sys"]
+webc = ["png", "dep:base64", "dep:gloo", "gloo-utils", "dep:js-sys", "dep:wasm-bindgen", "dep:web-sys"]
 
 
 [dev-dependencies]
@@ -56,6 +56,7 @@ sdl2 = { optional = true, version = "0.37.0", features = ["gfx"], default-featur
 #wasm
 base64  = { optional = true, version = "0.21.5"}
 gloo    = { optional = true, version = "0.10" }
+gloo-utils = { optional = true, version = "0.1", features = ["serde"] }
 js-sys  = { optional = true, version = "0.3"}
 wasm-bindgen  = { optional = true, version = "0.2" }
 web-sys = { optional = true, version = "0.3", features = ["File", "DragEvent", "DataTransfer"] }

src/file_data.rs

@@ -35,13 +35,10 @@ impl Raw {
     pub fn previews(&self) -> Vec<Image> {
         // if let Some(width) = width {
         // }else {
-        let mut images: Vec<Image> = self
-            .widths(ImageType::CGA)
+        self.widths(ImageType::CGA)
             .iter()
-            .map(|w| self.parse(ParserType::CGA, *w as usize))
-            .collect();
+            .map(|w| Image(ParserType::CGA.process_input(&self.0, *w as usize)))
+            .collect()
         // }
-        images.push(self.parse(ParserType::CGA, 320));
-        images
     }
 }

src/webc/index.html

@@ -14,12 +14,12 @@
       let $ = (query) => document.querySelector(query);
 
       function fileLoaded(array) {
-         const container = document.createElement("preview-area");
-         let images = window.wasmBindings.previews(array);
-         images.forEach(function(src) {
-            container.appendChild(new PreviewItem(src));
-         });
-         $('preview-wrapper').appendChild(container);
+         let hash = new Map(Object.entries(window.wasmBindings.previews(array)));
+         hash.forEach((images, key) => {
+            const container = document.createElement("preview-area");
+            images.forEach(src => container.appendChild(new PreviewItem(src)));
+            $('preview-wrapper').appendChild(container);
+         })
       }
 
       document.addEventListener("DOMContentLoaded", () => {

src/webc/main.rs

@@ -1,7 +1,10 @@
 #![cfg(feature = "webc")]
 
+use std::collections::HashMap;
+
 use base64::engine::general_purpose::STANDARD;
 use base64::Engine;
+use gloo_utils::format::JsValueSerdeExt;
 use wasm_bindgen::prelude::*;
 
 use cega::color::palette::palette_from_abbr;
@@ -20,19 +23,21 @@ pub fn png(data: &[u8]) -> String {
 }
 
 #[wasm_bindgen]
-pub fn previews(data: &[u8]) -> Vec<String> {
+pub fn previews(data: &[u8]) -> JsValue {
     let file_data = Raw::new(data);
     let palette = palette_from_abbr("cga0");
-    file_data
+    let mut hm = HashMap::new();
+    let images: Vec<String> = file_data
         .previews()
         .iter()
         .map(|p| {
             format!(
                 "data:application/png;base64,{}",
                 STANDARD.encode(png::write2(p.data(), palette.clone()))
             )
-        })
-        .collect()
+        }).collect();
+    hm.insert("CGA".to_string(), images);
+    JsValue::from_serde(&hm).unwrap()
 }
 
 fn main() {}