Skip to content

Commit 239237a

Browse files
committed
Auto merge of #3235 - plaets:issue-3194, r=Turbo87
Fix crates-admin render-readmes for local installations Fixes #3194
2 parents e47f017 + 79f5b13 commit 239237a

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

src/admin/render_readmes.rs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use crate::{
33
models::Version,
44
render::readme_to_html,
55
schema::{crates, readme_renderings, versions},
6+
uploaders::Uploader,
67
Config,
78
};
89
use std::{io::Read, path::Path, sync::Arc, thread};
@@ -15,6 +16,7 @@ use reqwest::{blocking::Client, header};
1516
use tar::{self, Archive};
1617

1718
const CACHE_CONTROL_README: &str = "public,max-age=604800";
19+
const USER_AGENT: &str = "crates-admin";
1820

1921
#[derive(Clap, Debug)]
2022
#[clap(
@@ -160,7 +162,14 @@ fn get_readme(
160162
.uploader
161163
.crate_location(krate_name, &version.num.to_string());
162164

163-
let response = match client.get(&location).send() {
165+
let location = match config.uploader {
166+
Uploader::S3 { .. } => location,
167+
Uploader::Local => format!("http://localhost:8888/{}", location),
168+
};
169+
170+
let mut extra_headers = header::HeaderMap::new();
171+
extra_headers.insert(header::USER_AGENT, USER_AGENT.parse().unwrap());
172+
let response = match client.get(&location).headers(extra_headers).send() {
164173
Ok(r) => r,
165174
Err(err) => {
166175
println!(

0 commit comments

Comments
 (0)