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

Implemeted .part for the downloader.

Browse Source
This commit is contained in:
Jordan Petridis 2017-10-03 14:43:51 +03:00
parent 828a12054d
commit 1dddd237c8
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/downloader.rs
View File

@ -2,7 +2,7 @@ use reqwest;
use hyper::header::*; use hyper::header::*;
use diesel::prelude::*; use diesel::prelude::*;
use std::fs::{DirBuilder, File}; use std::fs::{rename, DirBuilder, File};
use std::io::{BufWriter, Read, Write}; use std::io::{BufWriter, Read, Write};
use std::path::Path; use std::path::Path;
@ -10,11 +10,11 @@ use errors::*;
use dbqueries; use dbqueries;
// Adapted from https://github.com/mattgathu/rget . // Adapted from https://github.com/mattgathu/rget .
/// I never wanted to write a custom downloader. // I never wanted to write a custom downloader.
/// Sorry to those who will have to work with that code. // Sorry to those who will have to work with that code.
/// Would much rather use a crate, // Would much rather use a crate,
/// or bindings for a lib like youtube-dl(python), // or bindings for a lib like youtube-dl(python),
/// But cant seem to find one. // But cant seem to find one.
pub fn download_to(target: &str, url: &str) -> Result<()> { pub fn download_to(target: &str, url: &str) -> Result<()> {
let mut resp = reqwest::get(url)?; let mut resp = reqwest::get(url)?;
info!("GET request to: {}", url); info!("GET request to: {}", url);
@ -27,8 +27,6 @@ pub fn download_to(target: &str, url: &str) -> Result<()> {
ct_len.map(|x| info!("File Lenght: {}", x)); ct_len.map(|x| info!("File Lenght: {}", x));
info!("Content Type: {:?}", ct_type); info!("Content Type: {:?}", ct_type);
// FIXME
// let out_file = target.to_owned() + "/bar.mp3";
info!("Save destination: {}", target); info!("Save destination: {}", target);
let chunk_size = match ct_len { let chunk_size = match ct_len {
@ -36,7 +34,8 @@ pub fn download_to(target: &str, url: &str) -> Result<()> {
None => 1024 as usize, // default chunk size None => 1024 as usize, // default chunk size
}; };
let mut writer = BufWriter::new(File::create(target)?); let out_file = format!("{}.part", target);
let mut writer = BufWriter::new(File::create(&out_file)?);
loop { loop {
let mut buffer = vec![0; chunk_size]; let mut buffer = vec![0; chunk_size];
@ -48,6 +47,7 @@ pub fn download_to(target: &str, url: &str) -> Result<()> {
break; break;
} }
} }
rename(out_file, target)?;
} }
Ok(()) Ok(())
} }
@ -79,10 +79,12 @@ pub fn latest_dl(connection: &SqliteConnection, limit: u32) -> Result<()> {
eps.iter_mut() eps.iter_mut()
.map(|y| -> Result<()> { .map(|y| -> Result<()> {
// Check if its alrdy downloaded // Check if its alrdy downloaded
if let Some(foo) = y.local_uri().clone(){ if let Some(_) = y.local_uri() {
if Path::new(foo).exists() { // Not idiomatic but I am still fighting the borrow-checker.
if Path::new(y.local_uri().unwrap().to_owned().as_str()).exists() {
return Ok(()); return Ok(());
} }
y.set_local_uri(None);
y.save_changes::<Episode>(connection)?; y.save_changes::<Episode>(connection)?;
() ()
}; };
@ -92,8 +94,7 @@ pub fn latest_dl(connection: &SqliteConnection, limit: u32) -> Result<()> {
// Construct the download path. // Construct the download path.
let dlpath = format!("{}/{}.{}", dl_fold, y.title().unwrap().to_owned(), ext); let dlpath = format!("{}/{}.{}", dl_fold, y.title().unwrap().to_owned(), ext);
info!("Downloading {:?} into: {}", y.title(), dlpath); // info!("Downloading {:?} into: {}", y.title(), dlpath);
// TODO: implement .part files
download_to(&dlpath, y.uri())?; download_to(&dlpath, y.uri())?;
// If download succedes set episode local_uri to dlpath. // If download succedes set episode local_uri to dlpath.