kemitix/paperoni
1
0
Fork 0
Code Issues 4 Pull requests 2 Projects Releases Packages Wiki Activity

Fixed img resolving bug

Browse source
This commit is contained in:
Kenneth Gitere 2020-05-16 10:22:49 +03:00
parent 9f56c58dd9
commit 6dab011cac
2 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
out.epub Normal file
View file

Binary file not shown.

46
src/extractor.rs
View file

@ -101,10 +101,10 @@ impl Extractor {
self.extract_img_urls(); self.extract_img_urls();
println!("Downloading images to res/"); println!("Downloading images to res/");
for img_url in &self.img_urls { for img_url in &self.img_urls {
let mut img_url = img_url.0.clone(); let img_url = img_url.0.clone();
get_absolute_url(&mut img_url, article_origin); let abs_url = get_absolute_url(&img_url, article_origin);
async_download_tasks.push(task::spawn(async { async_download_tasks.push(task::spawn(async move {
let mut img_response = surf::get(&img_url).await.expect("Unable to retrieve file"); let mut img_response = surf::get(&abs_url).await.expect("Unable to retrieve file");
let img_content: Vec<u8> = img_response.body_bytes().await.unwrap(); let img_content: Vec<u8> = img_response.body_bytes().await.unwrap();
let img_mime = img_response let img_mime = img_response
.header("Content-Type") .header("Content-Type")
@ -114,7 +114,7 @@ impl Extractor {
.and_then(map_mime_type_to_ext) .and_then(map_mime_type_to_ext)
.unwrap(); .unwrap();
let img_path = format!("res/{}{}", hash_url(&img_url), &img_ext); let img_path = format!("res/{}{}", hash_url(&abs_url), &img_ext);
let mut img_file = File::create(&img_path) let mut img_file = File::create(&img_path)
.await .await
.expect("Unable to create file"); .expect("Unable to create file");
@ -174,10 +174,11 @@ fn map_mime_type_to_ext(mime_type: &str) -> Option<String> {
.map(|format| String::from(".") + format) .map(|format| String::from(".") + format)
} }
fn get_absolute_url(url: &mut String, request_url: &Url) { fn get_absolute_url(url: &str, request_url: &Url) -> String {
if Url::parse(url).is_ok() { if Url::parse(url).is_ok() {
url.to_owned()
} else if url.starts_with("/") { } else if url.starts_with("/") {
*url = Url::parse(&format!( Url::parse(&format!(
"{}://{}", "{}://{}",
request_url.scheme(), request_url.scheme(),
request_url.host_str().unwrap() request_url.host_str().unwrap()
@ -185,9 +186,9 @@ fn get_absolute_url(url: &mut String, request_url: &Url) {
.unwrap() .unwrap()
.join(url) .join(url)
.unwrap() .unwrap()
.into_string(); .into_string()
} else { } else {
*url = request_url.join(url).unwrap().into_string(); request_url.join(url).unwrap().into_string()
} }
} }
@ -356,24 +357,21 @@ mod test {
#[test] #[test]
fn test_get_absolute_url() { fn test_get_absolute_url() {
let mut absolute_url = "https://example.image.com/images/1.jpg".to_owned(); let absolute_url = "https://example.image.com/images/1.jpg";
let mut relative_url = "../../images/2.jpg".to_owned(); let relative_url = "../../images/2.jpg";
let mut relative_from_host_url = "/images/3.jpg".to_owned(); let relative_from_host_url = "/images/3.jpg";
let host_url = Url::parse("https://example.image.com/blog/how-to-test-resolvers/").unwrap(); let host_url = Url::parse("https://example.image.com/blog/how-to-test-resolvers/").unwrap();
get_absolute_url(&mut absolute_url, &host_url); let abs_url = get_absolute_url(&absolute_url, &host_url);
assert_eq!("https://example.image.com/images/1.jpg", absolute_url); assert_eq!("https://example.image.com/images/1.jpg", abs_url);
get_absolute_url(&mut relative_url, &host_url); let abs_url = get_absolute_url(&relative_url, &host_url);
assert_eq!("https://example.image.com/images/2.jpg", relative_url); assert_eq!("https://example.image.com/images/2.jpg", abs_url);
relative_url = "2-1.jpg".to_owned(); let relative_url = "2-1.jpg";
get_absolute_url(&mut relative_url, &host_url); let abs_url = get_absolute_url(&relative_url, &host_url);
assert_eq!( assert_eq!(
"https://example.image.com/blog/how-to-test-resolvers/2-1.jpg", "https://example.image.com/blog/how-to-test-resolvers/2-1.jpg",
relative_url abs_url
);
get_absolute_url(&mut relative_from_host_url, &host_url);
assert_eq!(
"https://example.image.com/images/3.jpg",
relative_from_host_url
); );
let abs_url = get_absolute_url(&relative_from_host_url, &host_url);
assert_eq!("https://example.image.com/images/3.jpg", abs_url);
} }
} }