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

Browse source
This commit is contained in:
ByteDream 2022-12-08 00:12:25 +01:00
parent ce5672588e
commit a32d3aef87
5 changed files with 124 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

67
Cargo.lock generated
View file

@ -86,6 +86,18 @@ dependencies = [
"generic-array", "generic-array",
] ]
[[package]]
name = "bstr"
version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
dependencies = [
"lazy_static",
"memchr",
"regex-automata",
"serde",
]
[[package]] [[package]]
name = "bumpalo" name = "bumpalo"
version = "3.11.1" version = "3.11.1"
@ -285,6 +297,7 @@ dependencies = [
"chrono", "chrono",
"clap", "clap",
"crunchyroll-rs", "crunchyroll-rs",
"csv",
"ctrlc", "ctrlc",
"dirs", "dirs",
"isahc", "isahc",
@ -293,6 +306,8 @@ dependencies = [
"regex", "regex",
"rustls-native-certs", "rustls-native-certs",
"sanitize-filename", "sanitize-filename",
"serde",
"serde_json",
"signal-hook", "signal-hook",
"sys-locale", "sys-locale",
"tempfile", "tempfile",
@ -303,7 +318,7 @@ dependencies = [
[[package]] [[package]]
name = "crunchyroll-rs" name = "crunchyroll-rs"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/crunchy-labs/crunchyroll-rs#50f9ad65f65affcc5839af565d425b9cd678b73a" source = "git+https://github.com/crunchy-labs/crunchyroll-rs#86fb8307a531aedec708dd1c8c88b76bcf2a8c38"
dependencies = [ dependencies = [
"aes", "aes",
"cbc", "cbc",
@ -326,7 +341,7 @@ dependencies = [
[[package]] [[package]]
name = "crunchyroll-rs-internal" name = "crunchyroll-rs-internal"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/crunchy-labs/crunchyroll-rs#50f9ad65f65affcc5839af565d425b9cd678b73a" source = "git+https://github.com/crunchy-labs/crunchyroll-rs#86fb8307a531aedec708dd1c8c88b76bcf2a8c38"
dependencies = [ dependencies = [
"darling", "darling",
"quote", "quote",
@ -343,6 +358,28 @@ dependencies = [
"typenum", "typenum",
] ]
[[package]]
name = "csv"
version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
dependencies = [
"bstr",
"csv-core",
"itoa 0.4.8",
"ryu",
"serde",
]
[[package]]
name = "csv-core"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
dependencies = [
"memchr",
]
[[package]] [[package]]
name = "ctrlc" name = "ctrlc"
version = "3.2.3" version = "3.2.3"
@ -722,7 +759,7 @@ checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
dependencies = [ dependencies = [
"bytes", "bytes",
"fnv", "fnv",
"itoa", "itoa 1.0.4",
] ]
[[package]] [[package]]
@ -763,7 +800,7 @@ dependencies = [
"http-body", "http-body",
"httparse", "httparse",
"httpdate", "httpdate",
"itoa", "itoa 1.0.4",
"pin-project-lite", "pin-project-lite",
"socket2", "socket2",
"tokio", "tokio",
@ -867,9 +904,9 @@ dependencies = [
[[package]] [[package]]
name = "ipnet" name = "ipnet"
version = "2.5.1" version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" checksum = "ec947b7a4ce12e3b87e353abae7ce124d025b6c7d6c5aea5cc0bcf92e9510ded"
[[package]] [[package]]
name = "is-terminal" name = "is-terminal"
@ -911,6 +948,12 @@ dependencies = [
"waker-fn", "waker-fn",
] ]
[[package]]
name = "itoa"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
[[package]] [[package]]
name = "itoa" name = "itoa"
version = "1.0.4" version = "1.0.4"
@ -1301,6 +1344,12 @@ dependencies = [
"regex-syntax", "regex-syntax",
] ]
[[package]]
name = "regex-automata"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
[[package]] [[package]]
name = "regex-syntax" name = "regex-syntax"
version = "0.6.28" version = "0.6.28"
@ -1481,7 +1530,7 @@ version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
dependencies = [ dependencies = [
"itoa", "itoa 1.0.4",
"ryu", "ryu",
"serde", "serde",
] ]
@ -1493,7 +1542,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
dependencies = [ dependencies = [
"form_urlencoded", "form_urlencoded",
"itoa", "itoa 1.0.4",
"ryu", "ryu",
"serde", "serde",
] ]
@ -1692,7 +1741,7 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
dependencies = [ dependencies = [
"itoa", "itoa 1.0.4",
"serde", "serde",
"time-core", "time-core",
"time-macros", "time-macros",

67
crunchy-cli-core/Cargo.lock generated
View file

@ -86,6 +86,18 @@ dependencies = [
"generic-array", "generic-array",
] ]
[[package]]
name = "bstr"
version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
dependencies = [
"lazy_static",
"memchr",
"regex-automata",
"serde",
]
[[package]] [[package]]
name = "bumpalo" name = "bumpalo"
version = "3.11.1" version = "3.11.1"
@ -253,6 +265,7 @@ dependencies = [
"chrono", "chrono",
"clap", "clap",
"crunchyroll-rs", "crunchyroll-rs",
"csv",
"ctrlc", "ctrlc",
"dirs", "dirs",
"isahc", "isahc",
@ -261,6 +274,8 @@ dependencies = [
"regex", "regex",
"rustls-native-certs", "rustls-native-certs",
"sanitize-filename", "sanitize-filename",
"serde",
"serde_json",
"signal-hook", "signal-hook",
"sys-locale", "sys-locale",
"tempfile", "tempfile",
@ -271,7 +286,7 @@ dependencies = [
[[package]] [[package]]
name = "crunchyroll-rs" name = "crunchyroll-rs"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/crunchy-labs/crunchyroll-rs#50f9ad65f65affcc5839af565d425b9cd678b73a" source = "git+https://github.com/crunchy-labs/crunchyroll-rs#86fb8307a531aedec708dd1c8c88b76bcf2a8c38"
dependencies = [ dependencies = [
"aes", "aes",
"cbc", "cbc",
@ -294,7 +309,7 @@ dependencies = [
[[package]] [[package]]
name = "crunchyroll-rs-internal" name = "crunchyroll-rs-internal"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/crunchy-labs/crunchyroll-rs#50f9ad65f65affcc5839af565d425b9cd678b73a" source = "git+https://github.com/crunchy-labs/crunchyroll-rs#86fb8307a531aedec708dd1c8c88b76bcf2a8c38"
dependencies = [ dependencies = [
"darling", "darling",
"quote", "quote",
@ -311,6 +326,28 @@ dependencies = [
"typenum", "typenum",
] ]
[[package]]
name = "csv"
version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
dependencies = [
"bstr",
"csv-core",
"itoa 0.4.8",
"ryu",
"serde",
]
[[package]]
name = "csv-core"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
dependencies = [
"memchr",
]
[[package]] [[package]]
name = "ctrlc" name = "ctrlc"
version = "3.2.3" version = "3.2.3"
@ -690,7 +727,7 @@ checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
dependencies = [ dependencies = [
"bytes", "bytes",
"fnv", "fnv",
"itoa", "itoa 1.0.4",
] ]
[[package]] [[package]]
@ -731,7 +768,7 @@ dependencies = [
"http-body", "http-body",
"httparse", "httparse",
"httpdate", "httpdate",
"itoa", "itoa 1.0.4",
"pin-project-lite", "pin-project-lite",
"socket2", "socket2",
"tokio", "tokio",
@ -835,9 +872,9 @@ dependencies = [
[[package]] [[package]]
name = "ipnet" name = "ipnet"
version = "2.5.1" version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" checksum = "ec947b7a4ce12e3b87e353abae7ce124d025b6c7d6c5aea5cc0bcf92e9510ded"
[[package]] [[package]]
name = "is-terminal" name = "is-terminal"
@ -879,6 +916,12 @@ dependencies = [
"waker-fn", "waker-fn",
] ]
[[package]]
name = "itoa"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
[[package]] [[package]]
name = "itoa" name = "itoa"
version = "1.0.4" version = "1.0.4"
@ -1269,6 +1312,12 @@ dependencies = [
"regex-syntax", "regex-syntax",
] ]
[[package]]
name = "regex-automata"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
[[package]] [[package]]
name = "regex-syntax" name = "regex-syntax"
version = "0.6.28" version = "0.6.28"
@ -1443,7 +1492,7 @@ version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
dependencies = [ dependencies = [
"itoa", "itoa 1.0.4",
"ryu", "ryu",
"serde", "serde",
] ]
@ -1455,7 +1504,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
dependencies = [ dependencies = [
"form_urlencoded", "form_urlencoded",
"itoa", "itoa 1.0.4",
"ryu", "ryu",
"serde", "serde",
] ]
@ -1648,7 +1697,7 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
dependencies = [ dependencies = [
"itoa", "itoa 1.0.4",
"serde", "serde",
"time-core", "time-core",
"time-macros", "time-macros",

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

@ -14,6 +14,7 @@ async-trait = "0.1"
clap = { version = "4.0", features = ["derive", "string"] } clap = { version = "4.0", features = ["derive", "string"] }
chrono = "0.4" chrono = "0.4"
crunchyroll-rs = { git = "https://github.com/crunchy-labs/crunchyroll-rs", default-features = false, features = ["parse", "hls-stream", "dash-stream"] } crunchyroll-rs = { git = "https://github.com/crunchy-labs/crunchyroll-rs", default-features = false, features = ["parse", "hls-stream", "dash-stream"] }
csv = "1.1"
ctrlc = "3.2" ctrlc = "3.2"
dirs = "4.0" dirs = "4.0"
isahc = { git = "https://github.com/sagebind/isahc", rev = "c39f6f8" } isahc = { git = "https://github.com/sagebind/isahc", rev = "c39f6f8" }
@ -21,6 +22,8 @@ log = { version = "0.4", features = ["std"] }
num_cpus = "1.13" num_cpus = "1.13"
regex = "1.6" regex = "1.6"
sanitize-filename = "0.4" sanitize-filename = "0.4"
serde = "1.0"
serde_json = "1.0"
signal-hook = "0.3" signal-hook = "0.3"
tempfile = "3.3" tempfile = "3.3"
terminal_size = "0.2" terminal_size = "0.2"

2
crunchy-cli-core/src/cli/archive.rs
View file

@ -341,7 +341,7 @@ async fn formats_from_series(
} }
let streams = episode.streams().await?; let streams = episode.streams().await?;
let streaming_data = streams.streaming_data(None).await?; let streaming_data = streams.hls_streaming_data(None).await?;
let Some(stream) = find_resolution(streaming_data, &archive.resolution) else { let Some(stream) = find_resolution(streaming_data, &archive.resolution) else {
bail!( bail!(
"Resolution ({}x{}) is not available for episode {} ({}) of season {} ({}) of {}", "Resolution ({}x{}) is not available for episode {} ({}) of season {} ({}) of {}",

8
crunchy-cli-core/src/cli/download.rs
View file

@ -352,9 +352,9 @@ async fn format_from_episode(
); );
return Ok(None); return Ok(None);
} }
streams.streaming_data(Some(subtitle.clone())).await? streams.hls_streaming_data(Some(subtitle.clone())).await?
} else { } else {
streams.streaming_data(None).await? streams.hls_streaming_data(None).await?
}; };
let Some(stream) = find_resolution(streaming_data, &download.resolution) else { let Some(stream) = find_resolution(streaming_data, &download.resolution) else {
@ -400,9 +400,9 @@ async fn format_from_movie(
error!("Movie {} has no {} subtitles", movie.title, subtitle); error!("Movie {} has no {} subtitles", movie.title, subtitle);
return Ok(None); return Ok(None);
} }
streams.streaming_data(Some(subtitle.clone())).await? streams.hls_streaming_data(Some(subtitle.clone())).await?
} else { } else {
streams.streaming_data(None).await? streams.hls_streaming_data(None).await?
}; };
streaming_data.sort_by(|a, b| a.resolution.width.cmp(&b.resolution.width).reverse()); streaming_data.sort_by(|a, b| a.resolution.width.cmp(&b.resolution.width).reverse());