emelie/zola
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Allow relative paths in new_file()/new_section() (#763)

Browse source 
These functions expect that file_path can have base_path stripped from
it, but during reloading they can be given relative paths.  Maybe this
behaviour varies between the notify backends?

This fixes two zola serve panics on FreeBSD (poll backend).
This commit is contained in:
Thomas Hurst 2019-08-01 09:17:38 +01:00 committed by Vincent Prouillet
parent 7e618684da
commit 0cd9e58a86
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/library/src/content/file_info.rs
View file

@ -57,7 +57,7 @@ impl FileInfo {
let mut parent = file_path.parent().expect("Get parent of page").to_path_buf(); let mut parent = file_path.parent().expect("Get parent of page").to_path_buf();
let name = path.file_stem().unwrap().to_string_lossy().to_string(); let name = path.file_stem().unwrap().to_string_lossy().to_string();
let mut components = find_content_components( let mut components = find_content_components(
&file_path.strip_prefix(base_path).expect("Strip base path prefix for page"), &file_path.strip_prefix(base_path).unwrap_or(&file_path),
); );
let relative = if !components.is_empty() { let relative = if !components.is_empty() {
format!("{}/{}.md", components.join("/"), name) format!("{}/{}.md", components.join("/"), name)
@ -92,7 +92,7 @@ impl FileInfo {
let parent = path.parent().expect("Get parent of section").to_path_buf(); let parent = path.parent().expect("Get parent of section").to_path_buf();
let name = path.file_stem().unwrap().to_string_lossy().to_string(); let name = path.file_stem().unwrap().to_string_lossy().to_string();
let components = find_content_components( let components = find_content_components(
&file_path.strip_prefix(base_path).expect("Strip base path prefix for section"), &file_path.strip_prefix(base_path).unwrap_or(&file_path),
); );
let relative = if !components.is_empty() { let relative = if !components.is_empty() {
format!("{}/{}.md", components.join("/"), name) format!("{}/{}.md", components.join("/"), name)