feat: support cbr reading

src/formats/cbz.rs

@@ -4,17 +4,16 @@ use std::io::{Read, Write};
 use std::path::Path;
 
 use anyhow::Result;
-use rayon::prelude::*;
 use zip::ZipArchive;
 
-use crate::model::{Document, ImagePage};
+use crate::model::Document;
 
-use super::{FormatReader, FormatWriter};
+use super::{CbxReader, FormatReader, FormatWriter};
 
 pub struct CbzReader;
 
-impl FormatReader for CbzReader {
-    fn read(&self, input: &Path) -> Result<Document> {
+impl CbxReader for CbzReader {
+    fn extract_images(&self, input: &Path) -> Result<Vec<(String, Vec<u8>)>> {
         let mut zip = ZipArchive::new(File::open(input)?)?;
         let mut files: Vec<(String, Vec<u8>)> = Vec::new();
         for i in 0..zip.len() {
@@ -35,20 +34,13 @@ impl FormatReader for CbzReader {
                 ));
             }
         }
+        Ok(files)
+    }
+}
 
-        let mut pages: Vec<ImagePage> = Vec::new();
-        files
-            .par_iter()
-            .map(|(name, data)| ImagePage {
-                name: name.clone(),
-                image: image::load_from_memory(data).expect("Failed to decode image"),
-                jpeg_dct: Some(data.clone()),
-            })
-            .collect_into_vec(&mut pages);
-
-        pages.par_sort_by_key(|p| p.name.clone());
-
-        Ok(Document::new(pages))
+impl FormatReader for CbzReader {
+    fn read(&self, input: &Path) -> Result<Document> {
+        self.read_cbx(input)
     }
 }