···

       
21
       
 
       
    env,

     

       
22
       
 
       
    fs::{self},

     

       
23
       
 
       
    path::PathBuf,

     

       
0
       
 
       

     

       
24
       
 
       
};

     

       
25
       
 
       
use stringtools::{collect_arguments, collect_block, split_to_tokens};

     

       
26
       
 
       
use types::Token;

     
···

       
74
       
 
       
    //         process_skid(infile, group.convert_html, &mut project.context);

     

       
75
       
 
       
    //     }

     

       
76
       
 
       
    // }

     

       
77
       
-
       


     

       
78
       
 
       
    for i in 0..project.filegroups.len() {

     

       
79
       
 
       
        if !project.filegroups[i].process {

     

       
80
       
 
       
            continue;

     

       
81
       
 
       
        }

     

       
82
       
 
       
        let convert_html = project.filegroups[i].convert_html;

     

       
83
       
 
       
        for k in 0..project.filegroups[i].files.len() {

     

       
0
       
 
       

     

       
84
       
 
       
            let file_input = project.filegroups[i].files[k].file_input.clone();

     

       
85
       
 
       
            let contents = fs::read_to_string(&project.filegroups[i].files[k].file_input)

     

       
86
       
 
       
                .expect("File unreadable or missing");

     
···

       
92
       
 
       
                &project.filegroups[i].files[k].file_out.clone(),

     

       
93
       
 
       
                convert_html,

     

       
94
       
 
       
                &process_skid(&tokens, &mut project, &mut skid_context),

     

       
0
       
 
       

     

       
95
       
 
       
            );

     

       
96
       
 
       
        }

     

       
97
       
 
       
    }

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
98
       
 
       
}

     

       
99
       
 
       


     

       
100
       
 
       
fn find_and_run_macro(

     
···

       
357
       
 
       
    return tokens;

     

       
358
       
 
       
}

     

       
359
       
 
       


     

       
360
       
-
       
fn write_file(file_skidout: &PathBuf, file_out: &PathBuf, convert_html: bool, tokens: &[Token]) {

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
361
       
 
       
    //println!("{:?}", tokens);

     

       
362
       
 
       
    let mut skid_output: String = if convert_html {

     

       
363
       
 
       
        "<!-- Generated by Skidmark, Do Not Edit! -->\n\n".into()

     
···

       
407
       
 
       
        fs::write(&file_out, &skid_output).expect("Couldn't write output to file");

     

       
408
       
 
       
    }

     

       
409
       
 
       
    ok_generic(&format!(

     

       
410
       
-
       
        "{} written",

     

       
411
       
-
       
        file_out.to_str().unwrap_or("Couldnt Unwrap file_out name")

     

       
0
       
 
       

     

       
412
       
 
       
    ));

     

       
413
       
 
       
}

     

···

       
21
       
 
       
    env,

     

       
22
       
 
       
    fs::{self},

     

       
23
       
 
       
    path::PathBuf,

     

       
24
       
+
       
    time::Instant,

     

       
25
       
 
       
};

     

       
26
       
 
       
use stringtools::{collect_arguments, collect_block, split_to_tokens};

     

       
27
       
 
       
use types::Token;

     
···

       
75
       
 
       
    //         process_skid(infile, group.convert_html, &mut project.context);

     

       
76
       
 
       
    //     }

     

       
77
       
 
       
    // }

     

       
78
       
+
       
    let project_start = Instant::now();

     

       
79
       
 
       
    for i in 0..project.filegroups.len() {

     

       
80
       
 
       
        if !project.filegroups[i].process {

     

       
81
       
 
       
            continue;

     

       
82
       
 
       
        }

     

       
83
       
 
       
        let convert_html = project.filegroups[i].convert_html;

     

       
84
       
 
       
        for k in 0..project.filegroups[i].files.len() {

     

       
85
       
+
       
            let file_start = Instant::now();

     

       
86
       
 
       
            let file_input = project.filegroups[i].files[k].file_input.clone();

     

       
87
       
 
       
            let contents = fs::read_to_string(&project.filegroups[i].files[k].file_input)

     

       
88
       
 
       
                .expect("File unreadable or missing");

     
···

       
94
       
 
       
                &project.filegroups[i].files[k].file_out.clone(),

     

       
95
       
 
       
                convert_html,

     

       
96
       
 
       
                &process_skid(&tokens, &mut project, &mut skid_context),

     

       
97
       
+
       
                file_start,

     

       
98
       
 
       
            );

     

       
99
       
 
       
        }

     

       
100
       
 
       
    }

     

       
101
       
+
       
    info_generic(&format!(

     

       
102
       
+
       
        "Finished in {:.3}ms",

     

       
103
       
+
       
        project_start.elapsed().as_secs_f64() * 1000.0

     

       
104
       
+
       
    ));

     

       
105
       
 
       
}

     

       
106
       
 
       


     

       
107
       
 
       
fn find_and_run_macro(

     
···

       
364
       
 
       
    return tokens;

     

       
365
       
 
       
}

     

       
366
       
 
       


     

       
367
       
+
       
fn write_file(

     

       
368
       
+
       
    file_skidout: &PathBuf,

     

       
369
       
+
       
    file_out: &PathBuf,

     

       
370
       
+
       
    convert_html: bool,

     

       
371
       
+
       
    tokens: &[Token],

     

       
372
       
+
       
    file_start: Instant,

     

       
373
       
+
       
) {

     

       
374
       
 
       
    //println!("{:?}", tokens);

     

       
375
       
 
       
    let mut skid_output: String = if convert_html {

     

       
376
       
 
       
        "<!-- Generated by Skidmark, Do Not Edit! -->\n\n".into()

     
···

       
420
       
 
       
        fs::write(&file_out, &skid_output).expect("Couldn't write output to file");

     

       
421
       
 
       
    }

     

       
422
       
 
       
    ok_generic(&format!(

     

       
423
       
+
       
        "{} written in {:.3}ms",

     

       
424
       
+
       
        file_out.to_str().unwrap_or("Couldnt Unwrap file_out name"),

     

       
425
       
+
       
        file_start.elapsed().as_secs_f64() * 1000.0

     

       
426
       
 
       
    ));

     

       
427
       
 
       
}