Add serialization and deserialization methods

2 files changed, 78 insertions, 3 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 334176d..c245655 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,8 +7,9 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+adblock = "0.2.6"
 pyo3 = "0.9"
-adblock = "0.2"
+failure = "0.1"
 
 [lib]
 name="adblock"
diff --git a/src/lib.rs b/src/lib.rs
index 86512f7..5ba8d8a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -10,11 +10,17 @@
     unused_qualifications
 )]
 
+use adblock::blocker::BlockerError as RustBlockerError;
+use adblock::blocker::BlockerResult as RustBlockerResult;
+use adblock::engine::Engine as RustEngine;
+use failure::Fail;
 use pyo3::class::PyObjectProtocol;
+use pyo3::exceptions::ValueError as PyValueError;
 use pyo3::prelude::*;
+use pyo3::PyErr;
 
-use adblock::blocker::BlockerResult as RustBlockerResult;
-use adblock::engine::Engine as RustEngine;
+use std::fs;
+use std::io::{Read, Write};
 
 /// Brave's adblocking library in Python!
 #[pymodule]
@@ -72,6 +78,38 @@ impl PyObjectProtocol for BlockerResult {
     }
 }
 
+#[derive(Fail, Debug, PartialEq, Copy, Clone)]
+pub enum BlockerError {
+    #[fail(display = "Serialization error")]
+    SerializationError,
+    #[fail(display = "Deserialization error")]
+    DeserializationError,
+    #[fail(display = "Optimized filter exists")]
+    OptimizedFilterExistence,
+    #[fail(display = "Bad filter add unsupported")]
+    BadFilterAddUnsupported,
+    #[fail(display = "Filter exists")]
+    FilterExists,
+}
+
+impl Into<PyErr> for BlockerError {
+    fn into(self) -> PyErr {
+        PyErr::new::<PyValueError, _>(format!("{:?}", self))
+    }
+}
+
+impl Into<BlockerError> for RustBlockerError {
+    fn into(self) -> BlockerError {
+        match self {
+            Self::SerializationError => BlockerError::SerializationError,
+            Self::DeserializationError => BlockerError::DeserializationError,
+            Self::OptimizedFilterExistence => BlockerError::OptimizedFilterExistence,
+            Self::BadFilterAddUnsupported => BlockerError::BadFilterAddUnsupported,
+            Self::FilterExists => BlockerError::FilterExists,
+        }
+    }
+}
+
 #[pyclass]
 pub struct Engine {
     engine: RustEngine,
@@ -148,6 +186,42 @@ impl Engine {
         blocker_result.into()
     }
 
+    pub fn serialize(&mut self) -> PyResult<Vec<u8>> {
+        let result = self.engine.serialize();
+        match result {
+            Ok(x) => Ok(x),
+            Err(error) => {
+                let my_blocker_error: BlockerError = error.into();
+                Err(my_blocker_error.into())
+            }
+        }
+    }
+
+    pub fn serialize_to_file(&mut self, file: &str) -> PyResult<()> {
+        let mut fd = fs::File::open(file)?;
+        let data = self.serialize()?;
+        fd.write_all(&data)?;
+        Ok(())
+    }
+
+    pub fn deserialize(&mut self, serialized: &[u8]) -> PyResult<()> {
+        let result = self.engine.deserialize(serialized);
+        match result {
+            Ok(x) => Ok(x),
+            Err(error) => {
+                let my_blocker_error: BlockerError = error.into();
+                Err(my_blocker_error.into())
+            }
+        }
+    }
+
+    pub fn deserialize_from_file(&mut self, file: &str) -> PyResult<()> {
+        let mut fd = fs::File::open(file)?;
+        let mut data: Vec<u8> = Vec::new();
+        fd.read_to_end(&mut data)?;
+        self.deserialize(&data)
+    }
+
     pub fn filter_exists(&self, filter: &str) -> bool {
         self.engine.filter_exists(filter)
     }