Skip to content

Commit 15f75ca

Browse files
nipunn1313Turbo87
authored andcommitted
admin::render_readmes: Extract pkg_name variable
1 parent 79d1a57 commit 15f75ca

File tree

1 file changed

+13
-21
lines changed

1 file changed

+13
-21
lines changed

src/admin/render_readmes.rs

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ fn get_readme(
160160
version: &Version,
161161
krate_name: &str,
162162
) -> Option<String> {
163+
let pkg_name = format!("{}-{}", krate_name, version.num);
164+
163165
let location = uploader.crate_location(krate_name, &version.num.to_string());
164166

165167
let location = match uploader {
@@ -175,46 +177,36 @@ fn get_readme(
175177
let response = match client.get(&location).headers(extra_headers).send() {
176178
Ok(r) => r,
177179
Err(err) => {
178-
println!(
179-
"[{}-{}] Unable to fetch crate: {}",
180-
krate_name, version.num, err
181-
);
180+
println!("[{}] Unable to fetch crate: {}", pkg_name, err);
182181
return None;
183182
}
184183
};
185184

186185
if !response.status().is_success() {
187186
println!(
188-
"[{}-{}] Failed to get a 200 response: {}",
189-
krate_name,
190-
version.num,
187+
"[{}] Failed to get a 200 response: {}",
188+
pkg_name,
191189
response.text().unwrap()
192190
);
193191
return None;
194192
}
195193

196194
let reader = GzDecoder::new(response);
197195
let mut archive = Archive::new(reader);
198-
let mut entries = archive.entries().unwrap_or_else(|_| {
199-
panic!(
200-
"[{}-{}] Invalid tar archive entries",
201-
krate_name, version.num
202-
)
203-
});
196+
let mut entries = archive
197+
.entries()
198+
.unwrap_or_else(|_| panic!("[{}] Invalid tar archive entries", pkg_name));
199+
204200
let manifest: Manifest = {
205-
let path = format!("{}-{}/Cargo.toml", krate_name, version.num);
201+
let path = format!("{}/Cargo.toml", pkg_name);
206202
let contents = find_file_by_path(&mut entries, Path::new(&path), version, krate_name);
207-
toml::from_str(&contents).unwrap_or_else(|_| {
208-
panic!(
209-
"[{}-{}] Syntax error in manifest file",
210-
krate_name, version.num
211-
)
212-
})
203+
toml::from_str(&contents)
204+
.unwrap_or_else(|_| panic!("[{}] Syntax error in manifest file", pkg_name))
213205
};
214206

215207
let rendered = {
216208
let readme_path = manifest.package.readme.as_ref()?;
217-
let path = format!("{}-{}/{}", krate_name, version.num, readme_path);
209+
let path = format!("{}/{}", pkg_name, readme_path);
218210
let contents = find_file_by_path(&mut entries, Path::new(&path), version, krate_name);
219211
text_to_html(
220212
&contents,

0 commit comments

Comments
 (0)