flibusta-apps/books_downloader
1
0
Fork 0
mirror of https://github.com/flibusta-apps/books_downloader.git synced 2025-12-06 15:05:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Bulat Kurbanov
2023-09-14 21:50:23 +02:00
parent efaf2e385a
commit cbab567692
6 changed files with 59 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build_docker_image.yml vendored
View File

@@ -13,12 +13,6 @@ jobs:
name: Checkout
uses: actions/checkout@v4
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
platforms: arm64
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

82
Cargo.lock generated
View File

@@ -154,9 +154,9 @@ dependencies = [
[[package]]
name = "base64"
version = "0.21.2"
version = "0.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
[[package]]
name = "base64ct"
@@ -223,9 +223,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
version = "1.4.0"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
[[package]]
name = "bzip2"
@@ -1293,9 +1293,9 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
[[package]]
name = "reqwest"
version = "0.11.18"
version = "0.11.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
dependencies = [
"base64",
"bytes",
@@ -1417,9 +1417,9 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
[[package]]
name = "sentry"
version = "0.31.5"
version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01b0ad16faa5d12372f914ed40d00bda21a6d1bdcc99264c5e5e1c9495cf3654"
checksum = "0097a48cd1999d983909f07cb03b15241c5af29e5e679379efac1c06296abecc"
dependencies = [
"httpdate",
"native-tls",
@@ -1436,9 +1436,9 @@ dependencies = [
[[package]]
name = "sentry-backtrace"
version = "0.31.5"
version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11f2ee8f147bb5f22ac59b5c35754a759b9a6f6722402e2a14750b2a63fc59bd"
checksum = "18a7b80fa1dd6830a348d38a8d3a9761179047757b7dca29aef82db0118b9670"
dependencies = [
"backtrace",
"once_cell",
@@ -1448,9 +1448,9 @@ dependencies = [
[[package]]
name = "sentry-contexts"
version = "0.31.5"
version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcd133362c745151eeba0ac61e3ba8350f034e9fe7509877d08059fe1d7720c6"
checksum = "7615dc588930f1fd2e721774f25844ae93add2dbe2d3c2f995ce5049af898147"
dependencies = [
"hostname",
"libc",
@@ -1462,9 +1462,9 @@ dependencies = [
[[package]]
name = "sentry-core"
version = "0.31.5"
version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7163491708804a74446642ff2c80b3acd668d4b9e9f497f85621f3d250fd012b"
checksum = "8f51264e4013ed9b16558cce43917b983fa38170de2ca480349ceb57d71d6053"
dependencies = [
"once_cell",
"rand",
@@ -1475,9 +1475,9 @@ dependencies = [
[[package]]
name = "sentry-debug-images"
version = "0.31.5"
version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a5003d7ff08aa3b2b76994080b183e8cfa06c083e280737c9cee02ca1c70f5e"
checksum = "2fe6180fa564d40bb942c9f0084ffb5de691c7357ead6a2b7a3154fae9e401dd"
dependencies = [
"findshlibs",
"once_cell",
@@ -1486,9 +1486,9 @@ dependencies = [
[[package]]
name = "sentry-panic"
version = "0.31.5"
version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4dfe8371c9b2e126a8b64f6fefa54cef716ff2a50e63b5558a48b899265bccd"
checksum = "323160213bba549f9737317b152af116af35c0410f4468772ee9b606d3d6e0fa"
dependencies = [
"sentry-backtrace",
"sentry-core",
@@ -1496,9 +1496,9 @@ dependencies = [
[[package]]
name = "sentry-tracing"
version = "0.31.5"
version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aca8b88978677a27ee1a91beafe4052306c474c06f582321fde72d2e2cc2f7f"
checksum = "38033822128e73f7b6ca74c1631cef8868890c6cb4008a291cf73530f87b4eac"
dependencies = [
"sentry-backtrace",
"sentry-core",
@@ -1508,13 +1508,13 @@ dependencies = [
[[package]]
name = "sentry-types"
version = "0.31.5"
version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e7a88e0c1922d19b3efee12a8215f6a8a806e442e665ada71cc222cab72985f"
checksum = "0e663b3eb62ddfc023c9cf5432daf5f1a4f6acb1df4d78dd80b740b32dd1a740"
dependencies = [
"debugid",
"getrandom",
"hex",
"rand",
"serde",
"serde_json",
"thiserror",
@@ -1525,18 +1525,18 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.183"
version = "1.0.188"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.183"
version = "1.0.188"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
dependencies = [
"proc-macro2",
"quote",
@@ -1545,9 +1545,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.105"
version = "1.0.107"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
dependencies = [
"itoa",
"ryu",
@@ -1682,9 +1682,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
[[package]]
name = "tempfile"
version = "3.7.1"
version = "3.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651"
checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
dependencies = [
"cfg-if",
"fastrand",
@@ -1768,9 +1768,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
version = "1.31.0"
version = "1.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920"
checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
dependencies = [
"backtrace",
"bytes",
@@ -1839,9 +1839,9 @@ dependencies = [
[[package]]
name = "tower-http"
version = "0.4.3"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82"
checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
dependencies = [
"bitflags 2.4.0",
"bytes",
@@ -2019,7 +2019,6 @@ version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
dependencies = [
"getrandom",
"serde",
]
@@ -2124,9 +2123,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
[[package]]
name = "wasm-streams"
version = "0.2.3"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078"
checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7"
dependencies = [
"futures-util",
"js-sys",
@@ -2235,11 +2234,12 @@ checksum = "d419259aba16b663966e29e6d7c6ecfa0bb8425818bb96f6f1f3c3eb71a6e7b9"
[[package]]
name = "winreg"
version = "0.10.1"
version = "0.50.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
dependencies = [
"winapi",
"cfg-if",
"windows-sys",
]
[[package]]

22
Cargo.toml
View File

@@ -6,25 +6,25 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
tokio = { version = "1.28.2", features = ["full"] }
tokio = { version = "1.32.0", features = ["full"] }
tokio-util = { version = "0.7.8", features = ["compat"] }
futures = "0.3.28"
reqwest = { version = "0.11.18", features = ["json", "stream", "multipart"] }
reqwest = { version = "0.11.20", features = ["json", "stream", "multipart"] }
tracing = "0.1.37"
tracing = "0.1.3"
tracing-subscriber = { version = "0.3.17", features = ["env-filter"]}
tower-http = { version = "0.4.3", features = ["trace"] }
tower-http = { version = "0.4.4", features = ["trace"] }
once_cell = "1.18.0"
serde = { version = "1.0.163", features = ["derive"] }
serde_json = "1.0.96"
axum = "0.6.18"
serde = { version = "1.0.188", features = ["derive"] }
serde_json = "1.0.107"
axum = "0.6.20"
translit = "0.5.0"
zip = "0.6.6"
tempfile = "3.7.0"
bytes = "1.4.0"
tempfile = "3.8.0"
bytes = "1.5.0"
axum-prometheus = "0.4.0"
base64 = "0.21.2"
base64 = "0.21.4"
sentry = { version = "0.31.5", features = ["debug-images"] }
sentry = { version = "0.31.7", features = ["debug-images"] }

4
src/services/book_library/mod.rs
View File

@@ -13,10 +13,10 @@ where
{
let client = reqwest::Client::new();
let formated_url = format!("{}{}", &config::CONFIG.book_library_url, url);
let formatted_url = format!("{}{}", &config::CONFIG.book_library_url, url);
let response = client
.get(formated_url)
.get(formatted_url)
.query(&params)
.header("Authorization", &config::CONFIG.book_library_api_key)
.send()

6
src/services/downloader/mod.rs
View File

@@ -122,7 +122,7 @@ pub async fn download_chain<'a>(
);
};
let (unziped_temp_file, data_size) = {
let (unzipped_temp_file, data_size) = {
let temp_file_to_unzip_result = response_to_tempfile(&mut response).await;
let temp_file_to_unzip = match temp_file_to_unzip_result {
Some(v) => v.0,
@@ -137,7 +137,7 @@ pub async fn download_chain<'a>(
let (mut clean_file, data_size) = if converting {
match convert_file(unziped_temp_file, file_type.to_string()).await {
match convert_file(unzipped_temp_file, file_type.to_string()).await {
Some(mut response) => {
match response_to_tempfile(&mut response).await {
Some(v) => v,
@@ -147,7 +147,7 @@ pub async fn download_chain<'a>(
None => return None,
}
} else {
(unziped_temp_file, data_size)
(unzipped_temp_file, data_size)
};
if !final_need_zip {

4
src/views.rs
View File

@@ -5,7 +5,7 @@ use axum::{
response::{AppendHeaders, IntoResponse},
};
use axum::{
http::{self, Request},
http::Request,
middleware::{self, Next},
response::Response,
routing::get,
@@ -92,7 +92,7 @@ pub async fn get_filename(Path((book_id, file_type)): Path<(u32, String)>) -> im
async fn auth<B>(req: Request<B>, next: Next<B>) -> Result<Response, StatusCode> {
let auth_header = req
.headers()
.get(http::header::AUTHORIZATION)
.get(header::AUTHORIZATION)
.and_then(|header| header.to_str().ok());
let auth_header = if let Some(auth_header) = auth_header {