MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-24 13:54:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'webgen-panic' into 'master'

Browse Source 
Fix webgen panicking, improve repo web message

See merge request redox-os/redox!1981
This commit is contained in:
Jeremy Soller 2026-03-06 18:33:00 -07:00
commit a04222217e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bin/repo_builder.rs
View File

@ -283,6 +283,7 @@ fn publish_packages(config: &CliConfig) -> anyhow::Result<()> {
output_file.write_all(output.as_bytes())?;
if let Some(conf) = &config.web {
eprintln!("\x1b[01;38;5;155mrepo - generating web content\x1b[0m");
generate_web(&repository.packages.keys().cloned().collect(), conf);
}
Ok(())

11
src/web/html.rs
View File

@ -61,7 +61,7 @@ pub fn generate_html_pkg(
Some(SourceRecipe::Git { git, .. }) => {
let host = get_hostname(git);
let tree_link = get_tree_url(git, host, &package.source_identifier, None);
let short_commit = &package.source_identifier[0..7];
let short_commit = get_short_commit(&package.source_identifier);
format!(
r#"
<table>
@ -110,7 +110,7 @@ pub fn generate_html_pkg(
&package.commit_identifier,
Some(&format!("recipes/{category}/{name}/recipe.toml")),
);
let short_commit = &package.commit_identifier[0..7];
let short_commit = get_short_commit(&package.commit_identifier);
source_html += &format!(
r#"
<table>
@ -275,7 +275,7 @@ pub fn generate_html_index(
target = redoxer::target(),
category_sections = categories_html.join("\n\n"),
commit_time = &ident::get_ident().time,
commit_hash = &ident::get_ident().commit[0..7],
commit_hash = get_short_commit(&ident::get_ident().commit),
commit_tree = get_tree_url(
&config.this_repo,
get_hostname(&config.this_repo),
@ -284,7 +284,6 @@ pub fn generate_html_index(
),
);
println!("Generating web content to {}", index_path.display());
fs::write(index_path, html).expect("Failed to write index HTML file");
}
@ -324,3 +323,7 @@ pub fn get_tree_url(git_url: &str, host: &str, commit: &str, folder: Option<&str
None => base_url,
}
}
fn get_short_commit(commit: &str) -> &str {
commit.get(0..7).unwrap_or("?")
}