Merge pull request #4 from linw1995/fix/bearql_issue

Fix BearQL parsing error
linw1995 · Aug 7, 2024 · 97f138e · 97f138e
2 parents 2b9a75e + c0a1d7c
commit 97f138e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/db/search.rs b/src/db/search.rs
@@ -43,7 +43,7 @@ type BookmarkFilter = Box<
 fn join_folder_path(cwd: &str, p: &str) -> String {
     const PATH_SEP: char = '/';
     if p.starts_with(PATH_SEP) {
-        p.to_string()
+        p.trim_end_matches(PATH_SEP).to_string()
     } else {
         cwd.trim_end_matches(PATH_SEP)
             .split(PATH_SEP)
@@ -319,6 +319,7 @@ pub(crate) mod test {
             ("./langs/rust//", Path("./langs/rust//".into())),
             ("//", Path("//".into())),
             (".//", Path(".//".into())),
+            ("/blog/", Path("/blog/".into())),
             (
                 "rust | langs go",
                 Or(

diff --git a/src/lib.rs b/src/lib.rs
@@ -10,6 +10,7 @@ pub mod db;
 pub mod utils;
 
 #[cfg(test)]
+#[cfg(not(tarpaulin_include))]
 #[ctor::ctor]
 fn init() {
     crate::utils::logging::setup_console_log();

diff --git a/src/utils/search.rs b/src/utils/search.rs
@@ -40,6 +40,8 @@ pub enum Path<'a> {
 pub enum RelativePath<'a> {
     #[parse("{0}/{1}")]
     Join(Keyword<'a>, &'a Self),
+    #[parse("{0}/")]
+    NameEndSlash(Keyword<'a>),
     #[parse("{0}")]
     Name(Keyword<'a>),
     #[parse("/")] // for tailing "/", "//" ... syntax
@@ -145,6 +147,11 @@ fn _path_to_str_parts<'a>(p: Path<'a>, parts: &mut Vec<&'a str>) {
             parts.push(item.into());
             false
         }
+        RelativePath::NameEndSlash(item) => {
+            parts.push(item.into());
+            parts.push("");
+            false
+        }
         RelativePath::ExtraSlash() => {
             parts.push("");
             parts.push("");
@@ -187,6 +194,7 @@ mod test {
             r#"title | #rust #langs"#,
             r#"title ( #rust  #langs )"#,
             r#"title ( #rust | #langs )"#,
+            r#"/blog/"#,
         ] {
             let rv = parse_query(&src, &out_arena, &err_arena);
             info!(?rv, ?src, "parsed");