NyxErinys/crunchy-cli
1
0
Fork 0
mirror of https://github.com/crunchy-labs/crunchy-cli.git synced 2026-01-21 04:02:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update dependencies and version

Browse source
This commit is contained in:
bytedream 2023-11-20 22:05:06 +01:00
parent 2c37093959
commit 440ccd99b5
6 changed files with 54 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

82
Cargo.lock generated
View file

@ -238,9 +238,9 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.4.7" version = "4.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64"
dependencies = [ dependencies = [
"clap_builder", "clap_builder",
"clap_derive", "clap_derive",
@ -248,9 +248,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_builder" name = "clap_builder"
version = "4.4.7" version = "4.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc"
dependencies = [ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
@ -369,7 +369,7 @@ dependencies = [
[[package]] [[package]]
name = "crunchy-cli" name = "crunchy-cli"
version = "3.1.0" version = "3.1.1"
dependencies = [ dependencies = [
"chrono", "chrono",
"clap", "clap",
@ -382,7 +382,7 @@ dependencies = [
[[package]] [[package]]
name = "crunchy-cli-core" name = "crunchy-cli-core"
version = "3.1.0" version = "3.1.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -412,9 +412,9 @@ dependencies = [
[[package]] [[package]]
name = "crunchyroll-rs" name = "crunchyroll-rs"
version = "0.6.3" version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19bdd19b3f1b26e1a45ed32f7b2db68981111a9f5e9551b2d225bf470dca1e11" checksum = "cc4ce434784eee7892ad8c3d1ecaea0c0858db51bbb295b474db38c256e8d2fb"
dependencies = [ dependencies = [
"aes", "aes",
"async-trait", "async-trait",
@ -423,7 +423,6 @@ dependencies = [
"crunchyroll-rs-internal", "crunchyroll-rs-internal",
"dash-mpd", "dash-mpd",
"futures-util", "futures-util",
"http",
"lazy_static", "lazy_static",
"m3u8-rs", "m3u8-rs",
"regex", "regex",
@ -439,9 +438,9 @@ dependencies = [
[[package]] [[package]]
name = "crunchyroll-rs-internal" name = "crunchyroll-rs-internal"
version = "0.6.3" version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0a12fb14fd65dede6da7dad3e4c434f6aee9c18cf2bae0d2cc5021cd5a29fec" checksum = "be840f8cf2ce6afc9a9eae268d41423093141ec88f664a515d5ed2a85a66fb60"
dependencies = [ dependencies = [
"darling", "darling",
"quote", "quote",
@ -505,9 +504,9 @@ dependencies = [
[[package]] [[package]]
name = "dash-mpd" name = "dash-mpd"
version = "0.14.3" version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad33027a1ac2f37def4c33a5987a8e047fd34f77ff7cabc14bd437aa6d8d4dd2" checksum = "5471fc46c0b229c8f2308d83be857c745c9f06cc83a433d7047909722e0453b4"
dependencies = [ dependencies = [
"base64", "base64",
"base64-serde", "base64-serde",
@ -609,9 +608,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]] [[package]]
name = "errno" name = "errno"
version = "0.3.5" version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8"
dependencies = [ dependencies = [
"libc", "libc",
"windows-sys 0.48.0", "windows-sys 0.48.0",
@ -655,9 +654,12 @@ dependencies = [
[[package]] [[package]]
name = "fs-err" name = "fs-err"
version = "2.9.0" version = "2.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41"
dependencies = [
"autocfg",
]
[[package]] [[package]]
name = "fs2" name = "fs2"
@ -721,9 +723,9 @@ dependencies = [
[[package]] [[package]]
name = "getrandom" name = "getrandom"
version = "0.2.10" version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"libc", "libc",
@ -738,9 +740,9 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
[[package]] [[package]]
name = "h2" name = "h2"
version = "0.3.21" version = "0.3.22"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178"
dependencies = [ dependencies = [
"bytes", "bytes",
"fnv", "fnv",
@ -748,7 +750,7 @@ dependencies = [
"futures-sink", "futures-sink",
"futures-util", "futures-util",
"http", "http",
"indexmap 1.9.3", "indexmap 2.1.0",
"slab", "slab",
"tokio", "tokio",
"tokio-util", "tokio-util",
@ -787,9 +789,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]] [[package]]
name = "http" name = "http"
version = "0.2.9" version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
dependencies = [ dependencies = [
"bytes", "bytes",
"fnv", "fnv",
@ -1039,9 +1041,9 @@ dependencies = [
[[package]] [[package]]
name = "linux-raw-sys" name = "linux-raw-sys"
version = "0.4.10" version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
[[package]] [[package]]
name = "log" name = "log"
@ -1443,9 +1445,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
[[package]] [[package]]
name = "rustix" name = "rustix"
version = "0.38.21" version = "0.38.25"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e"
dependencies = [ dependencies = [
"bitflags 2.4.1", "bitflags 2.4.1",
"errno", "errno",
@ -1456,9 +1458,9 @@ dependencies = [
[[package]] [[package]]
name = "rustls" name = "rustls"
version = "0.21.8" version = "0.21.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9"
dependencies = [ dependencies = [
"log", "log",
"ring", "ring",
@ -1480,9 +1482,9 @@ dependencies = [
[[package]] [[package]]
name = "rustls-pemfile" name = "rustls-pemfile"
version = "1.0.3" version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
dependencies = [ dependencies = [
"base64", "base64",
] ]
@ -1547,18 +1549,18 @@ dependencies = [
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.191" version = "1.0.192"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a834c4821019838224821468552240d4d95d14e751986442c816572d39a080c9" checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.191" version = "1.0.192"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46fa52d5646bce91b680189fe5b1c049d2ea38dabb4e2e7c8d00ca12cfbfbcfd" checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1810,9 +1812,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.33.0" version = "1.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"bytes", "bytes",
@ -1827,9 +1829,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio-macros" name = "tokio-macros"
version = "2.1.0" version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

4
Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "crunchy-cli" name = "crunchy-cli"
authors = ["Crunchy Labs Maintainers"] authors = ["Crunchy Labs Maintainers"]
version = "3.1.0" version = "3.1.1"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
@ -18,7 +18,7 @@ openssl = ["openssl-tls"]
openssl-static = ["openssl-tls-static"] openssl-static = ["openssl-tls-static"]
[dependencies] [dependencies]
tokio = { version = "1.33", features = ["macros", "rt-multi-thread", "time"], default-features = false } tokio = { version = "1.34", features = ["macros", "rt-multi-thread", "time"], default-features = false }
native-tls-crate = { package = "native-tls", version = "0.2.11", optional = true } native-tls-crate = { package = "native-tls", version = "0.2.11", optional = true }

6
crunchy-cli-core/Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "crunchy-cli-core" name = "crunchy-cli-core"
authors = ["Crunchy Labs Maintainers"] authors = ["Crunchy Labs Maintainers"]
version = "3.1.0" version = "3.1.1"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
@ -16,7 +16,7 @@ anyhow = "1.0"
async-trait = "0.1" async-trait = "0.1"
clap = { version = "4.4", features = ["derive", "string"] } clap = { version = "4.4", features = ["derive", "string"] }
chrono = "0.4" chrono = "0.4"
crunchyroll-rs = { version = "0.6.3", features = ["dash-stream"] } crunchyroll-rs = { version = "0.7.0", features = ["dash-stream"] }
ctrlc = "3.4" ctrlc = "3.4"
dialoguer = { version = "0.11", default-features = false } dialoguer = { version = "0.11", default-features = false }
dirs = "5.0" dirs = "5.0"
@ -34,7 +34,7 @@ serde_plain = "1.0"
shlex = "1.2" shlex = "1.2"
sys-locale = "0.3" sys-locale = "0.3"
tempfile = "3.8" tempfile = "3.8"
tokio = { version = "1.33", features = ["macros", "rt-multi-thread", "time"] } tokio = { version = "1.34", features = ["macros", "rt-multi-thread", "time"] }
rustls-native-certs = { version = "0.6", optional = true } rustls-native-certs = { version = "0.6", optional = true }
[build-dependencies] [build-dependencies]

8
crunchy-cli-core/src/archive/filter.rs
View file

@ -223,7 +223,7 @@ impl Filter for ArchiveFilter {
"Season {} is only available with {} audio until episode {} ({})", "Season {} is only available with {} audio until episode {} ({})",
season.season_number, season.season_number,
season_locale.unwrap_or(Locale::ja_JP), season_locale.unwrap_or(Locale::ja_JP),
last_episode.episode_number, last_episode.sequence_number,
last_episode.title last_episode.title
) )
} }
@ -278,7 +278,7 @@ impl Filter for ArchiveFilter {
if !missing_audio.is_empty() { if !missing_audio.is_empty() {
warn!( warn!(
"Episode {} is not available with {} audio", "Episode {} is not available with {} audio",
episode.episode_number, episode.sequence_number,
missing_audio missing_audio
.into_iter() .into_iter()
.map(|l| l.to_string()) .map(|l| l.to_string())
@ -298,7 +298,7 @@ impl Filter for ArchiveFilter {
{ {
warn!( warn!(
"Episode {} is not available with {} subtitles", "Episode {} is not available with {} subtitles",
episode.episode_number, episode.sequence_number,
missing_subtitles missing_subtitles
.into_iter() .into_iter()
.map(|l| l.to_string()) .map(|l| l.to_string())
@ -343,7 +343,7 @@ impl Filter for ArchiveFilter {
if relative_episode_number.is_none() || relative_sequence_number.is_none() { if relative_episode_number.is_none() || relative_sequence_number.is_none() {
warn!( warn!(
"Failed to get relative episode number for episode {} ({}) of {} season {}", "Failed to get relative episode number for episode {} ({}) of {} season {}",
episode.episode_number, episode.sequence_number,
episode.title, episode.title,
episode.series_title, episode.series_title,
episode.season_number, episode.season_number,

4
crunchy-cli-core/src/download/filter.rs
View file

@ -158,7 +158,7 @@ impl Filter for DownloadFilter {
{ {
let error_message = format!( let error_message = format!(
"Episode {} ({}) of {} season {} is not available with {} audio", "Episode {} ({}) of {} season {} is not available with {} audio",
episode.episode_number, episode.sequence_number,
episode.title, episode.title,
episode.series_title, episode.series_title,
episode.season_number, episode.season_number,
@ -234,7 +234,7 @@ impl Filter for DownloadFilter {
if relative_episode_number.is_none() || relative_sequence_number.is_none() { if relative_episode_number.is_none() || relative_sequence_number.is_none() {
warn!( warn!(
"Failed to get relative episode number for episode {} ({}) of {} season {}", "Failed to get relative episode number for episode {} ({}) of {} season {}",
episode.episode_number, episode.sequence_number,
episode.title, episode.title,
episode.series_title, episode.series_title,
episode.season_number, episode.season_number,

2
crunchy-cli-core/src/search/format.rs
View file

@ -70,7 +70,7 @@ impl From<&Episode> for FormatEpisode {
title: value.title.clone(), title: value.title.clone(),
description: value.description.clone(), description: value.description.clone(),
locale: value.audio_locale.clone(), locale: value.audio_locale.clone(),
number: value.episode_number, number: value.episode_number.unwrap_or_default(),
sequence_number: value.sequence_number, sequence_number: value.sequence_number,
duration: value.duration.num_milliseconds(), duration: value.duration.num_milliseconds(),
air_date: value.episode_air_date.timestamp(), air_date: value.episode_air_date.timestamp(),