strawberries/wiki-maker
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eliminated unneeded panics

Browse Source
This commit is contained in:
eiiko6
2026-02-26 14:42:24 +01:00
parent bc6ee96a47
commit 2973430c00
3 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/analysis.rs
View File

@@ -25,11 +25,11 @@ impl WikiGraph {
let config: WikiConfig = toml::from_str(&content) let config: WikiConfig = toml::from_str(&content)
.with_context(|| format!("Failed to parse {:?}", path))?; .with_context(|| format!("Failed to parse {:?}", path))?;
let slug = path let slug: String = if let Some(file_stem) = path.file_stem() {
.file_stem() file_stem.to_string_lossy().into_owned()
.and_then(|s| s.to_str()) } else {
.unwrap() continue;
.to_string(); };
nodes.insert(slug.clone(), config.clone()); nodes.insert(slug.clone(), config.clone());
raw_files.insert(slug, config); raw_files.insert(slug, config);

6
src/entry.rs
View File

@@ -23,7 +23,11 @@ async fn list_entries(root: &PathBuf) -> Result<()> {
while let Some(entry) = entries.next_entry().await? { while let Some(entry) = entries.next_entry().await? {
let path = entry.path(); let path = entry.path();
if path.extension().and_then(|s| s.to_str()) == Some("toml") { if path.extension().and_then(|s| s.to_str()) == Some("toml") {
let name = path.file_stem().unwrap().to_string_lossy().to_string(); let name = if let Some(file_stem) = path.file_stem() {
file_stem.to_string_lossy().to_string()
} else {
continue;
};
// Read configuration to check for linked files // Read configuration to check for linked files
let content = fs::read_to_string(&path).await.unwrap_or_default(); let content = fs::read_to_string(&path).await.unwrap_or_default();

43
src/main.rs
View File

@@ -182,7 +182,7 @@ async fn get_summary_data(docs_dir: &PathBuf, is_static: bool) -> Vec<Page> {
} }
async fn run_build(docs_dir: PathBuf, out_dir: PathBuf, no_navigation: bool) -> anyhow::Result<()> { async fn run_build(docs_dir: PathBuf, out_dir: PathBuf, no_navigation: bool) -> anyhow::Result<()> {
tracing::info!("Building static site to: {:?}", out_dir); tracing::info!("Building static site to: {}", out_dir.display());
if !no_navigation { if !no_navigation {
let pages = get_summary_data(&docs_dir, true).await; let pages = get_summary_data(&docs_dir, true).await;
@@ -209,10 +209,20 @@ async fn run_build(docs_dir: PathBuf, out_dir: PathBuf, no_navigation: bool) ->
let mut entries = tokio::fs::read_dir(&docs_dir).await?; let mut entries = tokio::fs::read_dir(&docs_dir).await?;
while let Some(entry) = entries.next_entry().await? { while let Some(entry) = entries.next_entry().await? {
let path = entry.path(); let path = entry.path();
if let Some(ext) = path.extension().and_then(|s| s.to_str()) { if path.extension().and_then(|s| s.to_str()) == Some("toml") {
if ["png", "jpg", "jpeg", "gif", "webp"].contains(&ext) { let filename = if let Some(file_name) = entry.file_name().to_str() {
let dest = out_dir.join(path.file_name().unwrap()); file_name.to_string()
tokio::fs::copy(path, dest).await?; } else {
continue;
};
match render_wiki_page(&filename, &docs_dir, no_navigation, true).await {
Ok(rendered) => {
let out_file = out_dir.join(filename.replace(".toml", ".html"));
tokio::fs::write(&out_file, rendered).await?;
tracing::info!("Generated {}", out_file.display());
}
Err(e) => tracing::error!("Failed to generate {}: {}", filename, e),
} }
} }
} }
@@ -227,29 +237,16 @@ async fn run_build(docs_dir: PathBuf, out_dir: PathBuf, no_navigation: bool) ->
tracing::info!("Copied {}", entry.file_name().display(),); tracing::info!("Copied {}", entry.file_name().display(),);
let path = entry.path(); let path = entry.path();
if path.is_file() { if path.is_file() {
let dest = out_images.join(path.file_name().unwrap()); let dest = out_images.join(if let Some(file_name) = path.file_name() {
file_name
} else {
continue;
});
tokio::fs::copy(path, dest).await?; tokio::fs::copy(path, dest).await?;
} }
} }
} }
let mut entries = tokio::fs::read_dir(&docs_dir).await?;
while let Some(entry) = entries.next_entry().await? {
let path = entry.path();
if path.extension().and_then(|s| s.to_str()) == Some("toml") {
let filename = entry.file_name().to_str().unwrap().to_string();
match render_wiki_page(&filename, &docs_dir, no_navigation, true).await {
Ok(rendered) => {
let out_file = out_dir.join(filename.replace(".toml", ".html"));
tokio::fs::write(out_file, rendered).await?;
tracing::info!("Generated {}", filename);
}
Err(e) => tracing::error!("Failed to generate {}: {}", filename, e),
}
}
}
tracing::info!("Build complete!"); tracing::info!("Build complete!");
Ok(()) Ok(())
} }