Skip to content

admin/render_readmes.rs to correctly identify the readme path #3967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2021
Merged

admin/render_readmes.rs to correctly identify the readme path #3967

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions src/admin/render_readmes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,31 +213,24 @@ fn get_readme(
};

let rendered = {
let path = format!(
"{}-{}/{}",
krate_name, version.num, manifest.package.readme?
);
let readme_path = manifest.package.readme.as_ref()?;
let path = format!("{}-{}/{}", krate_name, version.num, readme_path);
let contents = find_file_by_path(&mut entries, Path::new(&path), version, krate_name);
text_to_html(
&contents,
manifest
.package
.readme_file
.as_ref()
.map_or("README.md", |e| &**e),
readme_path,
manifest.package.repository.as_deref(),
)
};
return Some(rendered);

#[derive(Deserialize)]
#[derive(Debug, Deserialize)]
struct Package {
readme: Option<String>,
readme_file: Option<String>,
repository: Option<String>,
}

#[derive(Deserialize)]
#[derive(Debug, Deserialize)]
struct Manifest {
package: Package,
}
Expand Down