vw_small

commit bcd750695ff064633684c9ba1877c5780aeeabac
parent 19b6bb0fd65e1e2cd0f50cbcbbad56492e067df2
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Sun, 13 Jan 2019 01:57:03 +0100

Default to $data_folder/templates and remove dev option (use `TEMPLATES_FOLDER=src/static/templates` instead)

Diffstat:
M
src/main.rs
 | 
20
+++++++++-----------

1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/main.rs b/src/main.rs
@@ -328,21 +328,19 @@ pub struct Config {
     templates: Handlebars,
 }
 
-fn load_templates(path: Option<String>) -> Handlebars {
+fn load_templates(path: String) -> Handlebars {
     let mut hb = Handlebars::new();
 
     // First register default templates here (use include_str?)
-    hb.register_template_string("tpl_1", "Good afternoon, {{name}}").unwrap();
+    hb.register_template_string("tpl_1", "Good afternoon, {{name}}")
+        .unwrap();
 
-    // TODO: Development-only. Remove this before release
-    hb.register_templates_directory(".hbs", "src/static/templates").unwrap();
-    
     // And then load user templates to overwrite the defaults
-    if let Some(path) = path {
-        // Use .hbs extension for the files
-        // Templates get registered with their relative name
-        hb.register_templates_directory(".hbs", path).unwrap();
-    }
+    // Use .hbs extension for the files
+    // Templates get registered with their relative name
+    hb.register_templates_directory(".hbs", path).unwrap();
+
+    // println!("{}", hb.render("tpl_1", &json!({"name": "Dani"})).unwrap());
 
     hb
 }
@@ -364,6 +362,7 @@ impl Config {
             database_url: get_env_or("DATABASE_URL", format!("{}/{}", &df, "db.sqlite3")),
             icon_cache_folder: get_env_or("ICON_CACHE_FOLDER", format!("{}/{}", &df, "icon_cache")),
             attachments_folder: get_env_or("ATTACHMENTS_FOLDER", format!("{}/{}", &df, "attachments")),
+            templates: load_templates(get_env_or("TEMPLATES_FOLDER", format!("{}/{}", &df, "templates"))),
 
             // icon_cache_ttl defaults to 30 days (30 * 24 * 60 * 60 seconds)
             icon_cache_ttl: get_env_or("ICON_CACHE_TTL", 2_592_000),
@@ -403,7 +402,6 @@ impl Config {
             yubico_server: get_env("YUBICO_SERVER"),
 
             mail: MailConfig::load(),
-            templates: load_templates(get_env("TEMPLATES_FOLDER")),
         }
     }
 }