From 1fd7173eac3b0949637f5d9543947040e031ca62 Mon Sep 17 00:00:00 2001 From: Jan Lukas Gernert Date: Tue, 28 Apr 2020 02:51:30 +0200 Subject: [PATCH] update for newer deps --- Cargo.toml | 3 +++ src/images/mod.rs | 14 ++++++++------ src/lib.rs | 9 ++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7d1838e..abf9904 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,9 @@ name = "article_scraper" version = "1.0.0" authors = ["Jan Lukas Gernert "] edition = "2018" +license = "GPL-3.0-or-later" +description = "Scrap article contents from the web. Powered by fivefilters full text feed configurations." +repository = "https://gitlab.com/news-flash/article_scraper" [dependencies] failure = "0.1" diff --git a/src/images/mod.rs b/src/images/mod.rs index b60b1b0..e3f4de3 100644 --- a/src/images/mod.rs +++ b/src/images/mod.rs @@ -8,8 +8,6 @@ use libxml::tree::{Node, SaveOptions}; use libxml::xpath::Context; use log::{debug, error}; use reqwest::{Client, Response}; -use std; -use std::error::Error; use url; mod error; @@ -103,7 +101,7 @@ impl ImageDownloader { .send() .await .map_err(|err| { - error!("GET {} failed - {}", image_url.as_str(), err.description()); + error!("GET {} failed - {}", image_url.as_str(), err); err }) .context(ImageDownloadErrorKind::Http)?; @@ -218,7 +216,7 @@ impl ImageDownloader { .context(ImageDownloadErrorKind::ImageScale)?; image - .write_to(&mut original_image, image::ImageOutputFormat::PNG) + .write_to(&mut original_image, image::ImageOutputFormat::Png) .map_err(|err| { error!("Failed to save resized image to resize"); err @@ -230,11 +228,11 @@ impl ImageDownloader { image = image.resize( max_dimensions.0, max_dimensions.1, - image::FilterType::Lanczos3, + image::imageops::FilterType::Lanczos3, ); let mut resized_buf: Vec = Vec::new(); image - .write_to(&mut resized_buf, image::ImageOutputFormat::PNG) + .write_to(&mut resized_buf, image::ImageOutputFormat::Png) .map_err(|err| { error!("Failed to save resized image to resize"); err @@ -249,9 +247,13 @@ impl ImageDownloader { fn get_image_dimensions(image: &image::DynamicImage) -> (u32, u32) { match image { image::DynamicImage::ImageLuma8(image) => (image.width(), image.height()), + image::DynamicImage::ImageLuma16(image) => (image.width(), image.height()), image::DynamicImage::ImageLumaA8(image) => (image.width(), image.height()), + image::DynamicImage::ImageLumaA16(image) => (image.width(), image.height()), image::DynamicImage::ImageRgb8(image) => (image.width(), image.height()), image::DynamicImage::ImageRgba8(image) => (image.width(), image.height()), + image::DynamicImage::ImageRgb16(image) => (image.width(), image.height()), + image::DynamicImage::ImageRgba16(image) => (image.width(), image.height()), image::DynamicImage::ImageBgr8(image) => (image.width(), image.height()), image::DynamicImage::ImageBgra8(image) => (image.width(), image.height()), } diff --git a/src/lib.rs b/src/lib.rs index 9f4155a..86485ae 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -17,7 +17,6 @@ use log::{debug, error, info, warn}; use regex; use reqwest::{Client, Response}; use std::collections; -use std::error::Error; use std::path::PathBuf; use std::str::FromStr; use std::sync::{Arc, RwLock}; @@ -66,11 +65,7 @@ impl ArticleScraper { .send() .await .map_err(|err| { - error!( - "Failed head request to: '{}' - '{}'", - url.as_str(), - err.description() - ); + error!("Failed head request to: '{}' - '{}'", url.as_str(), err); err }) .context(ScraperErrorKind::Http)?; @@ -273,7 +268,7 @@ impl ArticleScraper { error!( "Downloading HTML failed: GET '{}' - '{}'", url.as_str(), - err.description() + err ); err })