Add year function and fix bug where lang IDs wouldn't be found sometimes

Cargo.toml

@@ -5,6 +5,7 @@ description = "Quickly initialise files and folders with preconfigured boilerpla
 edition = "2018"
 
 [dependencies]
+chrono = "0.4.38"
 clap = { version = "4.4.18", features = ["derive"] }
 colored = "2.1.0"
 dirs = "5.0.1"

examples/templates/file/copyright

@@ -2,13 +2,13 @@
 {%- if lang != "unknown" -%}
 {%- set com = comment_by_lang(lang_id=lang) -%}
 {{ com.0 }}
-{{ com.1 }}   Copyright (c) {{ year }} {{ copyright_holders }}.
+{{ com.1 }}   Copyright (c) {{ year() }} {{ copyright_holders }}.
 {{ com.1 }}   All Rights Reserved.
 {{ com.1 }}
 {{ com.1 }}   See the LICENCE file for more information.
 {{ com.2 }}
 {%- else -%}
-Copyright (c) {{ year }} {{ copyright_holders }}.
+Copyright (c) {{ year() }} {{ copyright_holders }}.
 All Rights Reserved.
 
 See the LICENCE file for more information.

src/templater/context.rs

@@ -9,7 +9,7 @@ use std::sync::{Arc, Mutex};
 
 use tera::Tera;
 
-use super::fn_decls;
+use super::register_functions;
 
 pub type ContextArcMutex = Arc<Mutex<Context>>;
 
@@ -21,13 +21,7 @@ pub struct Context {
 impl Context {
     pub fn new() -> Self {
         let mut tera = Tera::default();
-
-        tera.register_function("licence", fn_decls::licence());
-        tera.register_function("lang_by_filename", fn_decls::lang_by_filename());
-        tera.register_function("comment_by_lang", fn_decls::comment_by_lang());
-
-        tera.register_filter("wrap", fn_decls::wrap());
-
+        register_functions(&mut tera);
         Self { tera }
     }
 

src/templater/fn_decls.rs → src/templater/functions/fn_decls.rs

@@ -5,12 +5,20 @@
  *   See the LICENCE file for more information.
  */
 
+use chrono::Datelike;
 use license::License;
 use std::collections::HashMap;
 use tera::{from_value, to_value, Filter, Function, Map, Result, Value};
 
 use super::language_specifics;
 
+function! {
+    /// Get the current year.
+    pub fn year() {
+        chrono::Utc::now().year()
+    }
+}
+
 function! {
     /// Expand the specified licence by its SPDX code to it full form.
     /// See https://spdx.org/licenses/ for more.
@@ -32,12 +40,14 @@ function! {
 }
 
 function! {
+    /// Get the associated language ID from the specified filename.
     pub fn lang_by_filename(filename: String,) {
         language_specifics::lang_id_from_filename(&filename).unwrap_or("unknown")
     }
 }
 
 function! {
+    /// Get the comment style associated with the specified language id.
     pub fn comment_by_lang(lang_id: String,) {
         to_value(language_specifics::comment_style_from_lang(&lang_id)).unwrap_or("unknown".into())
     }

src/templater/fn_utils.rs → src/templater/functions/fn_utils.rs

@@ -14,6 +14,7 @@ macro_rules! function {
     ) => {
         $(#[$($attrss)*])*
         pub fn $fname() -> impl Function {
+            #[allow(unused_variables)]
             Box::new(|argv: &HashMap<String, Value>| -> Result<Value> {
                 $(
                     let $arg = get_arg_helper!(argv, $arg: $typ);

src/templater/language_specifics.rs → src/templater/functions/language_specifics.rs

@@ -100,18 +100,15 @@ pub fn lang_id_from_filename<S: AsRef<str>>(filename: S) -> Option<&'static str>
 /// Get the associated language ID from the specified file extension.
 fn from_ext<S: AsRef<str>>(ext: S) -> Option<&'static str> {
     let ext = ext.as_ref().to_lowercase();
-    EXT_BY_LANG_ID
-        .binary_search_by_key(&ext.as_str(), |&(ext, _)| ext)
-        .ok()
-        .map(|i| EXT_BY_LANG_ID[i].1)
+    EXT_BY_LANG_ID.iter().find(|x| x.0 == ext).map(|x| x.1)
 }
 
 /// Get the associated language ID from the specified filename, if it is a standard recognised filename.
 fn from_standard_filename<S: AsRef<str>>(filename: S) -> Option<&'static str> {
     FILENAME_BY_LANG_ID
-        .binary_search_by_key(&filename.as_ref(), |&(fname, _)| fname)
-        .ok()
-        .map(|i| FILENAME_BY_LANG_ID[i].1)
+        .iter()
+        .find(|x| x.0 == filename.as_ref())
+        .map(|x| x.1)
 }
 
 /// A struct containing comment style information.

src/templater/functions/mod.rs

@@ -0,0 +1,24 @@
+/*
+ *   Copyright (c) 2024 Jack Bennett.
+ *   All Rights Reserved.
+ *
+ *   See the LICENCE file for more information.
+ */
+
+use tera::Tera;
+
+#[macro_use]
+pub mod fn_utils;
+pub mod fn_decls;
+
+mod language_specifics;
+
+/// Register all functions and filters onto the given Tera context
+pub fn register_functions(tera: &mut Tera) {
+    tera.register_function("year", fn_decls::year());
+    tera.register_function("licence", fn_decls::licence());
+    tera.register_function("lang_by_filename", fn_decls::lang_by_filename());
+    tera.register_function("comment_by_lang", fn_decls::comment_by_lang());
+
+    tera.register_filter("wrap", fn_decls::wrap());
+}

src/templater/mod.rs

@@ -14,11 +14,8 @@ pub use built_ins::*;
 mod context;
 pub use context::*;
 
-#[macro_use]
-pub mod fn_utils;
-pub mod fn_decls;
-
-mod language_specifics;
+mod functions;
+pub use functions::*;
 
 mod renderer;
 pub use renderer::*;