Deleted Handlebars and renamed tera-templates to templates

Author: Kixiron

Cargo.lock

@@ -54,7 +54,6 @@ serde_json = "1.0"
 # iron dependencies
 iron = "0.5"
 router = "0.5"
-handlebars-iron = "0.25"
 params = "0.8"
 staticfile = { version = "0.4", features = [ "cache" ] }
 tempfile = "3.1.0"

Cargo.toml

@@ -74,7 +74,6 @@ RUN mkdir -p /opt/docsrs/prefix
 COPY --from=build /build/target/release/cratesfyi /usr/local/bin
 COPY static /opt/docsrs/prefix/public_html
 COPY templates /opt/docsrs/templates
-COPY tera-templates /opt/docsrs/tera-templates
 COPY dockerfiles/entrypoint.sh /opt/docsrs/
 
 WORKDIR /opt/docsrs

dockerfiles/Dockerfile

@@ -78,7 +78,6 @@ use crate::{config::Config, db::Pool, impl_webpage, BuildQueue};
 use chrono::{DateTime, Utc};
 use extensions::InjectExtensions;
 use failure::Error;
-use handlebars_iron::{DirectorySource, HandlebarsEngine, SourceError};
 use iron::{
     self,
     headers::{CacheControl, CacheDirective, ContentType, Expires, HttpDate},
@@ -104,17 +103,6 @@ const OPENSEARCH_XML: &[u8] = include_bytes!("opensearch.xml");
 
 const DEFAULT_BIND: &str = "0.0.0.0:3000";
 
-fn handlebars_engine() -> Result<HandlebarsEngine, SourceError> {
-    // TODO: Use DocBuilderOptions for paths
-    let mut hbse = HandlebarsEngine::new();
-    hbse.add(Box::new(DirectorySource::new("./templates", ".hbs")));
-
-    // load templates
-    hbse.reload()?;
-
-    Ok(hbse)
-}
-
 struct CratesfyiHandler {
     shared_resource_handler: Box<dyn Handler>,
     router_handler: Box<dyn Handler>,
@@ -125,11 +113,9 @@ struct CratesfyiHandler {
 
 impl CratesfyiHandler {
     fn chain<H: Handler>(inject_extensions: InjectExtensions, base: H) -> Chain {
-        let hbse = handlebars_engine().expect("Failed to load handlebar templates");
-
         let mut chain = Chain::new(base);
         chain.link_before(inject_extensions);
-        chain.link_after(hbse);
+
         chain
     }
 
@@ -584,7 +570,7 @@ fn ico_handler(req: &mut Request) -> IronResult<Response> {
 }
 
 /// MetaData used in header
-#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
 pub(crate) struct MetaData {
     pub(crate) name: String,
     pub(crate) version: String,
@@ -652,10 +638,7 @@ impl_webpage! {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::{
-        test::*,
-        web::{handlebars_engine, match_version},
-    };
+    use crate::{test::*, web::match_version};
     use kuchiki::traits::TendrilSink;
     use serde_json::json;
 
@@ -864,11 +847,6 @@ mod test {
         });
     }
 
-    #[test]
-    fn test_templates_are_valid() {
-        handlebars_engine().expect("Failed to load handlebar templates");
-    }
-
     #[test]
     fn serialize_metadata() {
         let mut metadata = MetaData {

src/web/mod.rs

@@ -1,8 +1,6 @@
-mod handlebars;
 mod templates;
 mod web_page;
 
-pub use handlebars::*;
 pub(crate) use templates::TemplateData;
 pub(crate) use web_page::WebPage;
 

src/web/page/handlebars.rs

@@ -16,7 +16,7 @@ use std::{
 use tera::{Result as TeraResult, Tera};
 use walkdir::WalkDir;
 
-const TEMPLATES_DIRECTORY: &str = "tera-templates";
+const TEMPLATES_DIRECTORY: &str = "templates";
 
 /// Holds all data relevant to templating
 #[derive(Debug)]
@@ -45,7 +45,7 @@ impl TemplateData {
         let mut watcher = watcher(tx, Duration::from_secs(2)).unwrap();
 
         watcher
-            .watch("tera-templates", RecursiveMode::Recursive)
+            .watch(TEMPLATES_DIRECTORY, RecursiveMode::Recursive)
             .unwrap();
 
         thread::spawn(move || {