toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed minor bug where a double '/' would be inserted into the path.

Browse Source
This commit is contained in:
Jordan Petridis 2017-10-14 20:46:08 +03:00
parent dcc6c0202b
commit 910896cc08
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hammond-downloader/src/downloader.rs
View File

@ -20,6 +20,7 @@ use hammond_data::{DL_DIR, HAMMOND_CACHE};
pub fn download_to(target: &str, url: &str) -> Result<()> { pub fn download_to(target: &str, url: &str) -> Result<()> {
info!("GET request to: {}", url); info!("GET request to: {}", url);
let mut resp = reqwest::get(url)?; let mut resp = reqwest::get(url)?;
info!("Status Resp: {}", resp.status());
if resp.status().is_success() { if resp.status().is_success() {
let headers = resp.headers().clone(); let headers = resp.headers().clone();
@ -123,7 +124,6 @@ fn get_episode(connection: &SqliteConnection, ep: &mut Episode, dl_folder: &str)
// pub fn cache_image(pd: &Podcast) -> Option<String> { // pub fn cache_image(pd: &Podcast) -> Option<String> {
// TODO: Refactor // TODO: Refactor
pub fn cache_image(title: &str, image_uri: Option<&str>) -> Option<String> { pub fn cache_image(title: &str, image_uri: Option<&str>) -> Option<String> {
info!("{:?}", image_uri);
if let Some(url) = image_uri { if let Some(url) = image_uri {
if url == "" { if url == "" {
return None; return None;
@ -131,18 +131,17 @@ pub fn cache_image(title: &str, image_uri: Option<&str>) -> Option<String> {
let ext = url.split('.').last().unwrap(); let ext = url.split('.').last().unwrap();
let dl_fold = format!("{}/{}", HAMMOND_CACHE.to_str().unwrap(), title); let dl_fold = format!("{}{}", HAMMOND_CACHE.to_str().unwrap(), title);
info!("Img Dl path: {}", dl_fold);
DirBuilder::new().recursive(true).create(&dl_fold).unwrap(); DirBuilder::new().recursive(true).create(&dl_fold).unwrap();
let dlpath = format!("{}/{}.{}", dl_fold, title, ext); let dlpath = format!("{}/{}.{}", dl_fold, title, ext);
info!("Cached img path: {}", dlpath);
if Path::new(&dlpath).exists() { if Path::new(&dlpath).exists() {
return Some(dlpath); return Some(dlpath);
} }
download_to(&dlpath, url).unwrap(); download_to(&dlpath, url).unwrap();
info!("Cached img into: {}", dlpath);
return Some(dlpath); return Some(dlpath);
} }
None None