Browse Source

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

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).
index-subcmd
Thomas Hurst Vincent Prouillet 5 years ago
parent
commit
0cd9e58a86
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      components/library/src/content/file_info.rs

+ 2
- 2
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 name = path.file_stem().unwrap().to_string_lossy().to_string();
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() {
format!("{}/{}.md", components.join("/"), name)
@@ -92,7 +92,7 @@ impl FileInfo {
let parent = path.parent().expect("Get parent of section").to_path_buf();
let name = path.file_stem().unwrap().to_string_lossy().to_string();
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() {
format!("{}/{}.md", components.join("/"), name)


Loading…
Cancel
Save