app/Cargo.toml

@@ -14,7 +14,7 @@ name = "db_bench"
 harness = false
 
 [dependencies]
-chgk_ledb_lib = {path = "../lib", features = ["sync"]}
+chgk_ledb_lib = {path = "../lib", features = ["sync", "source"]}
 serde_json="1.0"
 zip="0.6"
 rand="0.8"

lib/Cargo.toml

@@ -13,13 +13,14 @@ description = "Библиотека для доступа к файлу базы
 default = ["async"]
 sync = ["zstd", "memmap"]
 async = ["futures", "futures-core", "futures-util", "fmmap", "tokio", "async-compression", "async-stream"]
+source = ["zip"]
 
 [dependencies]
 serde="1.0"
 serde_derive="1.0"
 serde_json="1.0"
 bincode = "^2.0.0-rc.2"
-zip="0.6"
+zip= {version = "0.6", optional = true}
 fmmap = { version = "0.3", features = ["tokio-async"] , optional = true}
 tokio = { version = "1", features = ["fs","io-util","rt", "macros"] , optional = true}
 futures-core  = {version = "0.3", optional = true}

lib/src/lib.rs

@@ -3,4 +3,5 @@ pub mod async_db;
 #[cfg(feature = "sync")]
 pub mod db;
 pub mod questions;
+#[cfg(feature = "source")]
 pub mod source;

lib/src/questions.rs

@@ -1,7 +1,5 @@
 use serde_derive::{Deserialize, Serialize};
 
-use crate::source::{SourceQuestion, SourceQuestionsBatch};
-
 macro_rules! make {
     ($Target:ident; by {$($field:ident),+}; from $src:expr) => {$Target {$(
         $field: $src.$field
@@ -80,25 +78,31 @@ pub struct Question {
     pub batch_info: BatchInfo,
 }
 
-impl From<SourceQuestion> for Question {
+#[cfg(feature = "source")]
+pub mod convert {
+    use crate::source::{SourceQuestion, SourceQuestionsBatch};
+
+    use super::{BatchInfo, Question};
+
+    impl From<SourceQuestion> for Question {
         fn from(src: SourceQuestion) -> Self {
             make! {Self; with defaults and by {
                 num, id, description, answer, author, comment, comment1, tour, url,
                 date, processed_by, redacted_by, copyright, theme, kind, source, rating
             }; from src}
         }
-}
+    }
 
-impl From<SourceQuestionsBatch> for BatchInfo {
+    impl From<SourceQuestionsBatch> for BatchInfo {
         fn from(src: SourceQuestionsBatch) -> Self {
             make! {Self; by {
                 filename, description, author, comment, url, date,
                 processed_by, redacted_by, copyright, theme, kind, source, rating
             }; from src}
         }
-}
+    }
 
-impl From<SourceQuestionsBatch> for Vec<Question> {
+    impl From<SourceQuestionsBatch> for Vec<Question> {
         fn from(src: SourceQuestionsBatch) -> Self {
             let mut result: Vec<Question> = src
                 .questions
@@ -112,16 +116,16 @@ impl From<SourceQuestionsBatch> for Vec<Question> {
 
             result
         }
-}
+    }
 
-pub trait QuestionsConverter {
+    pub trait QuestionsConverter {
         fn convert<'a>(&'a mut self) -> Box<dyn Iterator<Item = Question> + 'a>;
-}
+    }
 
-impl<T> QuestionsConverter for T
+    impl<T> QuestionsConverter for T
-where
+    where
         T: Iterator<Item = (String, Result<SourceQuestionsBatch, serde_json::Error>)>,
-{
+    {
         fn convert<'a>(&'a mut self) -> Box<dyn Iterator<Item = Question> + 'a> {
             let iter = self
                 .filter(|(_, data)| data.is_ok())
@@ -133,4 +137,8 @@ where
                 });
             Box::new(iter)
         }
+    }
 }
+
+#[cfg(feature = "source")]
+pub use convert::QuestionsConverter;