misc-mirrors/article_scraper
1
0
Fork 0
mirror of https://gitlab.com/news-flash/article_scraper.git synced 2025-07-07 16:15:32 +02:00
Code Releases Activity

Merge branch 'reqwest-0.12' into 'master'

Browse source 
Reqwest 0.12

See merge request news-flash/article_scraper!10
This commit is contained in:
Jan Lukas Gernert 2024-03-24 20:54:27 +00:00
commit e4140ff093
4 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -4,7 +4,7 @@ stages:
run-build: run-build:
stage: build stage: build
image: rust:latest image: rust:1.77
before_script: before_script:
- rustup component add rustfmt - rustup component add rustfmt
- rustup component add clippy - rustup component add clippy
@ -12,4 +12,4 @@ run-build:
- rustc --version && cargo --version - rustc --version && cargo --version
- cargo fmt -- --check - cargo fmt -- --check
- cargo clippy --all-targets --all-features -- -D warnings - cargo clippy --all-targets --all-features -- -D warnings
- cargo build --release --jobs 1 - cargo build --release

8
article_scraper/Cargo.toml
View file

@ -13,16 +13,16 @@ exclude = ["resources/tests"]
[dependencies] [dependencies]
thiserror = "1.0" thiserror = "1.0"
libxml = "0.3" libxml = "0.3"
reqwest = { version = "0.11", features = ["json", "native-tls", "gzip", "brotli", "stream"] } reqwest = { version = "0.12", features = ["json", "native-tls", "gzip", "brotli", "stream"] }
tokio = { version = "1", features = ["macros", "fs", "io-util"] } tokio = { version = "1", features = ["macros", "fs", "io-util"] }
url = "2.5" url = "2.5"
regex = "1.10" regex = "1.10"
encoding_rs = "0.8" encoding_rs = "0.8"
chrono = "0.4" chrono = "0.4"
base64 = "0.21" base64 = "0.22"
image = "0.24" image = "0.25"
log = "0.4" log = "0.4"
rust-embed="8.2" rust-embed="8.3"
once_cell = "1.19" once_cell = "1.19"
escaper = "0.1" escaper = "0.1"
futures = "0.3" futures = "0.3"

5
article_scraper/src/images/mod.rs
View file

@ -6,7 +6,7 @@ use crate::constants;
use crate::util::Util; use crate::util::Util;
use base64::Engine; use base64::Engine;
use futures::StreamExt; use futures::StreamExt;
use image::ImageOutputFormat; use image::ImageFormat;
use libxml::parser::Parser; use libxml::parser::Parser;
use libxml::tree::{Node, SaveOptions}; use libxml::tree::{Node, SaveOptions};
use libxml::xpath::Context; use libxml::xpath::Context;
@ -324,8 +324,7 @@ impl ImageDownloader {
image::imageops::FilterType::Lanczos3, image::imageops::FilterType::Lanczos3,
); );
let mut resized_buf: Vec<u8> = Vec::new(); let mut resized_buf: Vec<u8> = Vec::new();
if let Err(error) = if let Err(error) = image.write_to(&mut Cursor::new(&mut resized_buf), ImageFormat::Png)
image.write_to(&mut Cursor::new(&mut resized_buf), ImageOutputFormat::Png)
{ {
log::error!("Failed to save resized image to resize: {}", error); log::error!("Failed to save resized image to resize: {}", error);
return None; return None;

8
article_scraper_cli/Cargo.toml
View file

@ -9,10 +9,10 @@ repository = "https://gitlab.com/news-flash/article_scraper"
[dependencies] [dependencies]
article_scraper = { path = "../article_scraper/" } article_scraper = { path = "../article_scraper/" }
clap = { version = "4.2", features = [ "derive" ] } clap = { version = "4.5", features = [ "derive" ] }
simplelog = "0.12" simplelog = "0.12"
log = "0.4" log = "0.4"
url = "2.3" url = "2.5"
reqwest = { version = "0.11", features = ["json", "native-tls", "gzip", "brotli", "stream"] } reqwest = { version = "0.12", features = ["json", "native-tls", "gzip", "brotli", "stream"] }
tokio = { version = "1.27", features = ["macros", "fs", "io-util", "rt-multi-thread" ] } tokio = { version = "1", features = ["macros", "fs", "io-util", "rt-multi-thread" ] }
indicatif = "0.17" indicatif = "0.17"