diff --git a/src/lib.rs b/src/lib.rs index e58ca49..2e8358a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -15,8 +15,8 @@ use std::{ use eyre::Context; use serde::Deserialize; -use serving::get_name; use url::Url; +use util::get_name; use walkdir::WalkDir; use builder::SiteBuilder; diff --git a/src/serving.rs b/src/serving.rs index 177da73..09a6f53 100644 --- a/src/serving.rs +++ b/src/serving.rs @@ -18,7 +18,7 @@ use warp::{ Filter, }; -use crate::{Site, SiteBuilder, PAGES_PATH, ROOT_PATH, SASS_PATH, TEMPLATES_PATH}; +use crate::{util::get_name, Site, SiteBuilder, PAGES_PATH, ROOT_PATH, SASS_PATH, TEMPLATES_PATH}; fn with_build_path( build_path: PathBuf, @@ -26,16 +26,6 @@ fn with_build_path( warp::any().map(move || build_path.clone()) } -/// Helper to get the "name" of a path. -pub fn get_name(path: &Path) -> (PathBuf, String) { - let name = path.with_extension(""); - let name_str = name - .display() - .to_string() - .replace(std::path::MAIN_SEPARATOR, "/"); - (name, name_str) -} - /// Helper to make a path relative. fn rel(path: &Path, prefix: &Path) -> Result { Ok(path.strip_prefix(prefix)?.to_owned()) diff --git a/src/util.rs b/src/util.rs index faa4770..ed212ad 100644 --- a/src/util.rs +++ b/src/util.rs @@ -1,6 +1,6 @@ //! Module containing various utilities. -use std::path::Path; +use std::path::{Path, PathBuf}; /// Simple helper to remove the contents of a directory without removing the directory itself. pub fn remove_dir_contents(path: &Path) -> eyre::Result<()> { @@ -16,3 +16,13 @@ pub fn remove_dir_contents(path: &Path) -> eyre::Result<()> { Ok(()) } + +/// Helper to get the "name" of a path. +pub fn get_name(path: &Path) -> (PathBuf, String) { + let name = path.with_extension(""); + let name_str = name + .display() + .to_string() + .replace(std::path::MAIN_SEPARATOR, "/"); + (name, name_str) +}