Temp removal of method code.

YM162 · Dec 28, 2023 · b3033d1 · b3033d1
1 parent 37b711f
commit b3033d1
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 31 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/gulagcleaner_python/Cargo.toml b/gulagcleaner_python/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gulagcleaner_python"
-version = "0.11.0"
+version = "0.11.1"
 edition = "2021"
 authors = ["YM162 <[email protected]>"]
 description = "Ad removal tool for PDFs."

diff --git a/gulagcleaner_python/pyproject.toml b/gulagcleaner_python/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gulagcleaner"
-version = "0.11.0"
+version = "0.11.1"
 description = "Ad removal tool for PDFs."
 authors = [
   {name = "YM162", email = "[email protected]"}]

diff --git a/gulagcleaner_python/python/gulagcleaner/command_line.py b/gulagcleaner_python/python/gulagcleaner/command_line.py
@@ -61,7 +61,7 @@ def main():
 
     # Check for the -v argument
     if arguments["version"]:
-        print("Current version: 0.11.0")
+        print("Current version: 0.11.1")
         return
 
     # Get the pdf_path argument

diff --git a/gulagcleaner_rs/Cargo.toml b/gulagcleaner_rs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gulagcleaner_rs"
-version = "0.11.0"
+version = "0.11.1"
 edition = "2021"
 authors = ["YM162 <[email protected]>"]
 description = "Ad removal tool for PDFs."

diff --git a/gulagcleaner_rs/src/lib.rs b/gulagcleaner_rs/src/lib.rs
@@ -339,6 +339,7 @@ mod tests {
         //Load some pdf bytes and clean it
         let data = std::fs::read("../test.pdf").unwrap();
         let (clean_pdf,_) = clean_pdf(data,0);
+        //Print the length of the pdf
         std::fs::write("../test_clean.pdf", clean_pdf).unwrap();
     }
 }
diff --git a/gulagcleaner_wasm/Cargo.toml b/gulagcleaner_wasm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gulagcleaner_wasm"
-version = "0.11.0"
+version = "0.11.1"
 edition = "2021"
 authors = ["YM162 <[email protected]>"]
 description = "Ad removal tool for PDFs."
@@ -15,5 +15,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
-wasm-bindgen = { version = "0.2", features = ["serde-serialize"] }
+serde-wasm-bindgen = "0.6.3"
+wasm-bindgen = "0.2"
+
 gulagcleaner_rs = { path = "../gulagcleaner_rs" }
diff --git a/gulagcleaner_wasm/src/lib.rs b/gulagcleaner_wasm/src/lib.rs
@@ -10,11 +10,13 @@ pub struct CleaningResult {
 }
 
 #[wasm_bindgen]
-pub fn clean_pdf(data: Vec<u8>,force_naive: u8) -> JsValue {
+pub fn clean_pdf(data: Vec<u8>,force_naive: u8) -> Vec<u8> {
     let (clean_pdf,method_code) = gulagcleaner_rs::clean_pdf(data, force_naive);
-    let example = CleaningResult {
-        result: clean_pdf,
-        method: method_code,
-    };
-    JsValue::from_serde(&example).unwrap()
+    // For some reason, the serde serialization messes up our data, so we just return the raw bytes until we find a fix
+    // let example = CleaningResult {
+    //     result: clean_pdf,
+    //     method: method_code,
+    // };
+    // Ok(serde_wasm_bindgen::to_value(&example)?)
+    return clean_pdf;
 }