fix site_assets to be a relative path
This commit is contained in:
+2
-2
@@ -334,7 +334,7 @@ impl GitsyGenerator {
|
|||||||
local_ctx.insert("site_description", site_description);
|
local_ctx.insert("site_description", site_description);
|
||||||
}
|
}
|
||||||
local_ctx.insert("site_dir", &self.settings.outputs.output_dir());
|
local_ctx.insert("site_dir", &self.settings.outputs.output_dir());
|
||||||
local_ctx.insert("site_assets", &self.settings.outputs.global_assets(None, None));
|
local_ctx.insert("site_assets", &self.settings.outputs.to_relative(&self.settings.outputs.global_assets(None, None)));
|
||||||
local_ctx.insert("site_generated_ts", &generated_dt.timestamp());
|
local_ctx.insert("site_generated_ts", &generated_dt.timestamp());
|
||||||
local_ctx.insert("site_generated_offset", &generated_dt.offset().local_minus_utc());
|
local_ctx.insert("site_generated_offset", &generated_dt.offset().local_minus_utc());
|
||||||
|
|
||||||
@@ -645,7 +645,7 @@ impl GitsyGenerator {
|
|||||||
global_ctx.insert("site_description", site_description);
|
global_ctx.insert("site_description", site_description);
|
||||||
}
|
}
|
||||||
global_ctx.insert("site_dir", &self.settings.outputs.output_dir());
|
global_ctx.insert("site_dir", &self.settings.outputs.output_dir());
|
||||||
global_ctx.insert("site_assets", &self.settings.outputs.global_assets(None, None));
|
global_ctx.insert("site_assets", &self.settings.outputs.to_relative(&self.settings.outputs.global_assets(None, None)));
|
||||||
global_ctx.insert("site_generated_ts", &generated_dt.timestamp());
|
global_ctx.insert("site_generated_ts", &generated_dt.timestamp());
|
||||||
global_ctx.insert("site_generated_offset", &generated_dt.offset().local_minus_utc());
|
global_ctx.insert("site_generated_offset", &generated_dt.offset().local_minus_utc());
|
||||||
|
|
||||||
|
|||||||
@@ -175,6 +175,15 @@ impl GitsySettingsOutputs {
|
|||||||
.to_str().expect(&format!("ERROR: unable to parse output path: {}", self.path.display()))
|
.to_str().expect(&format!("ERROR: unable to parse output path: {}", self.path.display()))
|
||||||
.to_string()
|
.to_string()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn to_relative(&self, path: &str) -> String {
|
||||||
|
let path_buf = PathBuf::from(path);
|
||||||
|
path_buf.strip_prefix(self.output_dir())
|
||||||
|
.expect(&format!("ERROR: Unable to make path relative: {}", path))
|
||||||
|
.to_str()
|
||||||
|
.expect(&format!("ERROR: Unable to make path relative: {}", path))
|
||||||
|
.to_string()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Deserialize, Default, Debug)]
|
#[derive(Clone, Deserialize, Default, Debug)]
|
||||||
|
|||||||
Reference in New Issue
Block a user