robin/bin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Templates: fix the content type of templates

Browse source 
Templating is weird af in Rocket. Look into 3a541ae for more.
The content-type of the rendering is determined by the extension of the
template name.

But renaming these templates would break building the project for
development because it finds a phony template there. So the trick is to
default the `template_dir` to `args.upload` because it should never
interfere and will be always present.
This also fixes the hax in Dockerfile by making it the default.

Signed-off-by: Gunwant Jain <mail@wantguns.dev>
This commit is contained in:
Gunwant Jain 2022-01-19 13:37:07 +05:30
commit edc247b558
8 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main.rs
View file

@ -22,10 +22,10 @@ fn setup_tera_engine(tera: &mut Tera) {
// and shove them in the tera instance
tera.add_raw_templates(vec![
("base", std::str::from_utf8(&base_html.data).unwrap()),
("index", std::str::from_utf8(&index_html.data).unwrap()),
("base.html", std::str::from_utf8(&base_html.data).unwrap()),
("index.html", std::str::from_utf8(&index_html.data).unwrap()),
(
"pretty",
"pretty.html",
std::str::from_utf8(&pretty_html.data).unwrap(),
),
])
@ -68,13 +68,13 @@ fn rocket() -> _ {
// Custom Fairings and Providers
let shield = Shield::default().disable::<NoSniff>();
let figment = Figment::from(rocket::Config::default())
.merge(("port", args.port))
.merge(("address", args.address))
.merge(("template_dir", ".")) // Required if embedding templates
.merge(("port", &args.port))
.merge(("address", &args.address))
.merge(("template_dir", &args.upload)) // Required if embedding templates
.merge(Env::prefixed("BIN_").global());
// create the upload directory, if not already created
fs::create_dir_all(args.upload)
fs::create_dir_all(&args.upload)
.expect("Could not create the upload directory");
rocket::custom(figment)