add the buf option

Author: doubleailes

benches/big.rs

@@ -3,7 +3,7 @@ use framels::{basic_listing, parse_dir};
 
 fn parse_and_run() {
     let paths: Vec<String> = parse_dir("./samples/big".to_string());
-    let _results: Vec<String> = basic_listing(paths);
+    let _results: Vec<String> = basic_listing(paths, false);
 }
 
 fn criterion_benchmark(c: &mut Criterion) {

benches/mega.rs

@@ -14,7 +14,7 @@ fn get_data_set() -> Vec<String> {
 }
 
 fn parse_and_run() {
-    let _results: Vec<String> = basic_listing(get_data_set());
+    let _results: Vec<String> = basic_listing(get_data_set(), false);
 }
 
 fn criterion_benchmark(c: &mut Criterion) {

benches/small.rs

@@ -3,7 +3,7 @@ use framels::{basic_listing, parse_dir};
 
 fn parse_and_run() {
     let paths: Vec<String> = parse_dir("./samples/small/".to_string());
-    let _results: Vec<String> = basic_listing(paths);
+    let _results: Vec<String> = basic_listing(paths, false);
 }
 
 fn criterion_benchmark(c: &mut Criterion) {

src/lib.rs

@@ -207,10 +207,11 @@ fn test_create_frame_string() {
     assert_eq!(expected, create_frame_string(source));
 }
 #[allow(dead_code)]
-fn concat_line(main_string: String, frame_string: String) -> String {
-    let buf: bool = false;
+/// This function is intend to keep padding in the string lile:
+/// aa.[0035-0036].exr
+fn concat_line(main_string: String, frame_string: String, padding: String, buf:bool) -> String {
     if buf {
-        let from: String = String::from("#####");
+        let from: String = String::from(padding);
         main_string.replace(&from, &frame_string)
     } else {
         format!("{}@{}", main_string, frame_string)
@@ -221,8 +222,16 @@ fn test_concat_line() {
     let main_string: String = String::from("toto");
     let frame_string: String = String::from("bar");
     let expected: String = String::from("toto@bar");
-    assert_eq!(expected, concat_line(main_string, frame_string));
+    assert_eq!(expected, concat_line(main_string, frame_string,"#####".to_string(), false));
 }
+#[test]
+fn test_buf_concat_line() {
+    let main_string: String = String::from("toto.#####.exr");
+    let frame_string: String = String::from("bar");
+    let expected: String = String::from("toto.bar.exr");
+    assert_eq!(expected, concat_line(main_string, frame_string,"#####".to_string(), true));
+}
+
 /// ## Basic listing of the library
 /// ### Description
 ///
@@ -232,14 +241,16 @@ fn test_concat_line() {
 ///
 /// It take a `Vec<String>` of entries as an input
 ///  - Pack the frames
-pub fn basic_listing(frames: Vec<String>) -> Vec<String> {
+pub fn basic_listing(frames: Vec<String>, buf:bool) -> Vec<String> {
     let frames_dict: HashMap<String, Vec<String>> = parse_result(frames);
     let mut out_frames: Vec<String> = Vec::new();
     for (key, value) in frames_dict {
         if value[0] == "None" && value.len() == 1 {
             out_frames.push(key);
         } else {
-            out_frames.push(format!("{}@{}", key, create_frame_string(value)));
+            let to =value.first().unwrap();
+            let from = String::from_utf8(vec![b'#'; to.len()]).unwrap();
+            out_frames.push(concat_line(key, create_frame_string(value),from,buf ));
         }
     }
     out_frames
@@ -264,7 +275,7 @@ fn get_exr_metada(re: &Regex, root_path: &String, path: &String) -> String {
 ///  - Pack the frames
 ///  - Print the metada if the sequence is an exr sequence
 ///  - Return a Vector of path packed
-pub fn extended_listing(root_path: String, frames: Vec<String>) -> Vec<String> {
+pub fn extended_listing(root_path: String, frames: Vec<String>, buf:bool) -> Vec<String> {
     let re: Regex = Regex::new(r".*.exr$").unwrap();
     let frames_dict: HashMap<String, Vec<String>> = parse_result(frames);
     let mut out_frames: Vec<String> = Vec::new();
@@ -278,7 +289,7 @@ pub fn extended_listing(root_path: String, frames: Vec<String>) -> Vec<String> {
             let from = String::from_utf8(vec![b'#'; to.len()]).unwrap();
             let new_path = &key.replace(&from, to);
             medata.push(get_exr_metada(&re, &root_path, &new_path));
-            out_frames.push(format!("{}@{}", key, create_frame_string(value)));
+            out_frames.push(concat_line(key, create_frame_string(value),from,buf ));
         }
     }
     out_frames.append(&mut medata);

src/main.rs

@@ -22,10 +22,10 @@ fn main() {
     let args = Args::parse();
     let results = if args.list {
         let paths: Vec<String> = parse_dir(args.path.clone());
-        extended_listing(args.path, paths)
+        extended_listing(args.path, paths, args.buf)
     } else {
         let paths: Vec<String> = parse_dir(args.path);
-        basic_listing(paths)
+        basic_listing(paths, args.buf)
     };
 
     println!("{}", results.join("\n"))