From c8393e29b93a0d36b35134cfa12b9e4cbd41a62a Mon Sep 17 00:00:00 2001 From: WriterV2 Date: Sat, 3 Jun 2023 15:05:57 +0200 Subject: Refactor standard library paths to mod tops + Add missing json extension to file path --- src/works/mod.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/works/mod.rs') diff --git a/src/works/mod.rs b/src/works/mod.rs index a588ae8..8cda299 100644 --- a/src/works/mod.rs +++ b/src/works/mod.rs @@ -1,4 +1,5 @@ -use std::fs::File; +use std::fs::{write, File}; +use std::io::BufReader; use std::path::PathBuf; use anyhow::{Context, Ok, Result}; @@ -11,8 +12,8 @@ pub trait Works: for<'a> Deserialize<'a> + Serialize { // create works from the corresponding JSON file, // e.g. stories from stories.json fn new_from_file(workname: &str) -> Result { - let work = serde_json::from_reader(std::io::BufReader::new( - &File::open(PathBuf::from(workname)) + let work = serde_json::from_reader(BufReader::new( + &File::open(PathBuf::from(format!("{}.json", workname))) .with_context(|| format!("Failed to open {}.json", workname))?, )) .with_context(|| format!("Failed to create works from {}.json", workname))?; @@ -37,7 +38,7 @@ pub trait Works: for<'a> Deserialize<'a> + Serialize { tera_instance: &tera::Tera, filename_without_extension: &str, ) -> Result { - std::fs::write( + write( format!("docs/{}.html", filename_without_extension).as_str(), tera_instance .render( -- cgit v1.2.3