Fix parsing of or chains from string

Signed-off-by: trivernis <trivernis@protonmail.com>

Cargo.toml

@@ -16,11 +16,12 @@ reqwest = {version = "0.11.4", features = ["json"]}
 log = "0.4.14"
 mime = "0.3.16"
 chrono = "0.4.19"
+regex = "1.5.4"
+lazy_static = "1.4.0"
 
 [dev-dependencies]
 env_logger = "0.8.4"
 maplit = "1.0.2"
-lazy_static = "1.4.0"
 
 [dev-dependencies.tokio]
 version = "1.8.0"

src/wrapper/or_chain.rs

@@ -1,11 +1,15 @@
 use crate::utils::tag_list_to_string_list;
 use crate::wrapper::tag::Tag;
+use lazy_static::lazy_static;
+use regex::Regex;
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialOrd, PartialEq)]
 pub struct OrChain {
     tags: Vec<Tag>,
 }
 
+impl Eq for OrChain {}
+
 impl OrChain {
     /// Creates a new or chain directly from a list of tags
     pub fn new(tags: Vec<Tag>) -> Self {
@@ -27,9 +31,12 @@ where
     S: AsRef<str>,
 {
     fn from(s: S) -> Self {
+        lazy_static! {
+            static ref CHAIN_REGEX: Regex = Regex::new(r#"(\s|'|")or(\s|'|")"#).unwrap();
+        }
         let s = s.as_ref().to_ascii_lowercase();
-        let tags = s
-            .split("or")
+        let tags = CHAIN_REGEX
+            .split(&s)
             .map(|mut t| {
                 t = t
                     .trim_start()
@@ -40,6 +47,7 @@ where
             })
             .map(Tag::from)
             .collect();
+        log::debug!("String parsed to or-chain {:?}", tags);
 
         Self { tags }
     }

src/wrapper/tag.rs

@@ -1,17 +1,20 @@
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialOrd, PartialEq)]
 pub struct Tag {
     pub negated: bool,
     pub name: String,
     pub namespace: Option<String>,
 }
 
+impl Eq for Tag {}
+
 impl<S> From<S> for Tag
 where
     S: AsRef<str>,
 {
     fn from(value: S) -> Self {
-        let value = value.as_ref().trim();
-        let negated = value.strip_prefix("-").is_some();
+        let mut value = value.as_ref().trim();
+        let negated = value.starts_with("-");
+        value = value.trim_start_matches("-");
         if let Some((namespace, tag)) = value.split_once(":") {
             Self {
                 negated,

tests/wrapper/mod.rs

@@ -2,6 +2,7 @@ mod test_address;
 mod test_files;
 mod test_hydrus;
 mod test_import;
+mod test_or_chain;
 mod test_page;
 mod test_service;
 mod test_tags;

tests/wrapper/test_or_chain.rs

@@ -0,0 +1,26 @@
+use super::super::common;
+use hydrus_api::wrapper::builders::or_chain_builder::OrChainBuilder;
+use hydrus_api::wrapper::builders::tag_builder::TagBuilder;
+use hydrus_api::wrapper::or_chain::OrChain;
+
+#[test]
+fn it_parses_from_string() {
+    common::setup();
+    let chain_string =
+        "'character:megumin' or 'character:aqua' OR '-character:hatsune miku'or 'terminator'";
+    let chain = OrChain::from(chain_string);
+    assert_eq!(
+        chain,
+        OrChainBuilder::new()
+            .add_tag("character:megumin".into())
+            .add_tag("character:aqua".into())
+            .add_tag(
+                TagBuilder::new("hatsune miku")
+                    .namespace("character")
+                    .negate()
+                    .build()
+            )
+            .add_tag("terminator".into())
+            .build()
+    );
+}