Merge pull request #16 from calcit-lang/glob

add glob! function

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "calcit_std"
-version = "0.0.18"
+version = "0.0.19"
 authors = ["jiyinyiyong <[email protected]>"]
 edition = "2021"
 
@@ -24,6 +24,7 @@ rand = "0.8.5"
 ctrlc = "3.2.4"
 md5 = "0.7.0"
 walkdir = "2"
+glob = "0.3.0"
 
 # [profile.release]
 # lto = true

README.md

@@ -20,6 +20,7 @@ calcit.std.fs/check-write-file! a b
 calcit.std.fs/path-exists? a
 calcit.std.fs/read-dir! a
 calcit.std.fs/walk-dir! a
+calcit.std.fs/glob! |src/*.rs
 
 calcit.std.fs/create-dir! path
 calcit.std.fs/create-dir-all! path

compact.cirru

@@ -1,6 +1,6 @@
 
 {} (:package |calcit.std)
-  :configs $ {} (:init-fn |calcit.std.test/main!) (:reload-fn |calcit.std.test/reload!) (:version |0.0.18)
+  :configs $ {} (:init-fn |calcit.std.test/main!) (:reload-fn |calcit.std.test/reload!) (:version |0.0.19)
     :modules $ []
   :entries $ {}
   :files $ {}
@@ -59,6 +59,9 @@
         |create-dir-all! $ quote
           defn create-dir-all! (name)
             &call-dylib-edn (get-dylib-path "\"/dylibs/libcalcit_std") "\"create_dir_all" name
+        |glob! $ quote
+          defn glob! (name)
+            &call-dylib-edn (get-dylib-path "\"/dylibs/libcalcit_std") "\"glob_call" name
         |path-exists? $ quote
           defn path-exists? (name)
             &call-dylib-edn (get-dylib-path "\"/dylibs/libcalcit_std") "\"path_exists" name
@@ -230,14 +233,15 @@
             println $ read-dir! "\"./"
             println "\"dirs:" $ execute! ([] "\"ls")
             println "\"all paths size:" $ count (walk-dir! "\"target")
+            println "\"rs files:" $ glob! "\"src/*.rs"
             create-dir! "\"target/dir1"
             rename! "\"target/dir1" "\"target/dir4"
             create-dir-all! "\"target/dir2/dir3"
             check-write-file! "\"target/dir8/dir9/file.text" "\"TODO"
       :ns $ quote
         ns calcit.std.test.fs $ :require
           calcit.std.$meta :refer $ calcit-filename calcit-dirname
-          calcit.std.fs :refer $ read-file! write-file! path-exists? read-dir! create-dir! create-dir-all! rename! check-write-file! walk-dir!
+          calcit.std.fs :refer $ read-file! write-file! path-exists? read-dir! create-dir! create-dir-all! rename! check-write-file! walk-dir! glob!
           calcit.std.process :refer $ execute!
     |calcit.std.test.json $ {}
       :defs $ {}

src/fs.rs

@@ -1,6 +1,7 @@
 //! wraped some functions from std::fs https://doc.rust-lang.org/std/fs/index.html
 
 use cirru_edn::Edn;
+use glob::glob;
 use std::fs;
 use std::path::Path;
 use walkdir::WalkDir;
@@ -189,3 +190,28 @@ pub fn walk_dir(args: Vec<Edn>) -> Result<Edn, String> {
     Err(format!("walk-dir expected 1 argument, got: {args:?}"))
   }
 }
+
+/// use glob to match paths recursively
+#[no_mangle]
+pub fn glob_call(args: Vec<Edn>) -> Result<Edn, String> {
+  if args.len() == 1 {
+    if let Edn::Str(name) = &args[0] {
+      let mut content: Vec<Edn> = vec![];
+      for entry in glob(name).expect("expand glob result") {
+        match entry {
+          Ok(entry) => {
+            if entry.is_file() {
+              content.push(Edn::Str(format!("{}", entry.display()).into_boxed_str()));
+            }
+          }
+          Err(e) => return Err(format!("Failed to read: {}", e)),
+        }
+      }
+      Ok(Edn::List(content))
+    } else {
+      Err(format!("glob expected a string, got: {}", &args[0]))
+    }
+  } else {
+    Err(format!("glob expected 1 argument, got: {args:?}"))
+  }
+}

src/lib.rs

@@ -11,7 +11,7 @@ mod random;
 mod time;
 
 pub use date::{add_duration, format_time, now_bang, parse_time};
-pub use fs::{path_exists, read_dir, read_file, write_file};
+pub use fs::{glob_call, path_exists, read_dir, read_file, walk_dir, write_file};
 pub use json::{parse_json, stringify_json};
 pub use path::join_path;
 pub use process::execute_command;