From 6c594bc4610bd266f58e501b7160194873de974b Mon Sep 17 00:00:00 2001 From: lychang <632945494@qq.com> Date: Fri, 12 Jan 2024 12:20:44 +0800 Subject: [PATCH] update get_response --- src/main.rs | 2 +- src/web_parser.rs | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main.rs b/src/main.rs index 19404fd..32168e5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -26,7 +26,7 @@ fn main() { web_parser::download_images(idx, &name); idx += 1; } + file::write_file("cache/index", Bytes::from(idx.to_string())).expect(&format!("Write index error: {}", idx)); thread::sleep(Duration::from_millis(300)); } - file::write_file("cache/index", Bytes::from(idx.to_string())).expect(&format!("Write index error: {}", idx)); } \ No newline at end of file diff --git a/src/web_parser.rs b/src/web_parser.rs index 8a8e9c6..6e2121c 100644 --- a/src/web_parser.rs +++ b/src/web_parser.rs @@ -3,14 +3,13 @@ use scraper::{Html, Selector}; use crate::file; -fn get_response(url: &str) -> Bytes { - let response = reqwest::blocking::get(url).expect("Could not load url."); +fn get_response(url: &str) -> Result { + let response = reqwest::blocking::get(url).expect("Server error"); + let mut body = Bytes::new(); if response.status() == 200 { - let body = response.bytes().unwrap(); - return body; - } else { - return Bytes::new(); + body = response.bytes().unwrap() } + Ok(body) } pub(crate) fn get_html_title(body: String) -> String { @@ -24,11 +23,13 @@ pub(crate) fn download_image(url_path: &str, file_path: &str) -> bool { let url = format!("https://i.tuiimg.net/{}", url_path); println!("{}", url); let response = get_response(&url); - if response.is_empty() { - return false; + let file_content; + match response { + Ok(value) => file_content = value, + Err(_e) => return false, } let file_path = format!("images/{}", file_path); - file::write_file(&file_path, response).expect("Write file error"); + file::write_file(&file_path, file_content).expect("Write file error"); return true; }