summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2023-04-21 15:07:27 +0000
committerLars Wirzenius <liw@liw.fi>2023-04-21 15:07:27 +0000
commitd13479dd8aac43e9c5b7f447c2d4bc710c2b9bee (patch)
treea1687c405d8809c9472d962446a3c155ccd012e5
parent4a5f847d87f6e625b61672c572c06aa002ef85e2 (diff)
parent29f2b07c85ca1bbb025019760d07d95a58aa5bfe (diff)
downloadjt2-d13479dd8aac43e9c5b7f447c2d4bc710c2b9bee.tar.gz
Merge branch 'tera-fix' into 'main'
fix: tera creation See merge request larswirzenius/jt!37
-rw-r--r--src/template.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/template.rs b/src/template.rs
index cf05ab5..4f9b0b6 100644
--- a/src/template.rs
+++ b/src/template.rs
@@ -26,7 +26,11 @@ pub struct Templates {
impl Templates {
pub fn new(dirname: &Path) -> Result<Self, JournalError> {
let glob = format!("{}/.config/templates/*", dirname.display());
- let mut tera = Tera::new(&glob).expect("Tera::new");
+ let mut tera = if let Ok(tera) = Tera::new(&glob) {
+ tera
+ } else {
+ Tera::default()
+ };
add_default_template(&mut tera, "new_entry", NEW_ENTRY);
add_default_template(&mut tera, "new_topic", NEW_TOPIC);
Ok(Self { tera })