mirror of
https://github.com/crunchy-labs/crunchy-cli.git
synced 2026-01-21 12:12:00 -06:00
Update dependencies and version
This commit is contained in:
parent
172e3612d0
commit
283a3802b2
11 changed files with 273 additions and 203 deletions
451
Cargo.lock
generated
451
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,7 +1,7 @@
|
||||||
[package]
|
[package]
|
||||||
name = "crunchy-cli"
|
name = "crunchy-cli"
|
||||||
authors = ["Crunchy Labs Maintainers"]
|
authors = ["Crunchy Labs Maintainers"]
|
||||||
version = "3.1.1"
|
version = "3.2.0"
|
||||||
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.34", features = ["macros", "rt-multi-thread", "time"], default-features = false }
|
tokio = { version = "1.35", 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 }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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.1"
|
version = "3.2.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
|
||||||
|
|
@ -14,10 +14,9 @@ openssl-tls-static = ["reqwest/native-tls", "reqwest/native-tls-alpn", "reqwest/
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow = "1.0"
|
anyhow = "1.0"
|
||||||
async-speed-limit = "0.4"
|
async-speed-limit = "0.4"
|
||||||
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.8.0", features = ["dash-stream", "experimental-stabilizations", "tower"] }
|
crunchyroll-rs = { version = "0.8.1", features = ["dash-stream", "experimental-stabilizations", "tower"] }
|
||||||
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"
|
||||||
|
|
@ -36,8 +35,8 @@ serde_json = "1.0"
|
||||||
serde_plain = "1.0"
|
serde_plain = "1.0"
|
||||||
shlex = "1.2"
|
shlex = "1.2"
|
||||||
sys-locale = "0.3"
|
sys-locale = "0.3"
|
||||||
tempfile = "3.8"
|
tempfile = "3.9"
|
||||||
tokio = { version = "1.34", features = ["io-util", "macros", "net", "rt-multi-thread", "time"] }
|
tokio = { version = "1.35", features = ["io-util", "macros", "net", "rt-multi-thread", "time"] }
|
||||||
tokio-util = "0.7"
|
tokio-util = "0.7"
|
||||||
tower-service = "0.3"
|
tower-service = "0.3"
|
||||||
rustls-native-certs = { version = "0.6", optional = true }
|
rustls-native-certs = { version = "0.6", optional = true }
|
||||||
|
|
|
||||||
|
|
@ -134,7 +134,6 @@ pub struct Archive {
|
||||||
pub(crate) urls: Vec<String>,
|
pub(crate) urls: Vec<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait::async_trait(?Send)]
|
|
||||||
impl Execute for Archive {
|
impl Execute for Archive {
|
||||||
fn pre_check(&mut self) -> Result<()> {
|
fn pre_check(&mut self) -> Result<()> {
|
||||||
if !has_ffmpeg() {
|
if !has_ffmpeg() {
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,6 @@ impl ArchiveFilter {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait::async_trait]
|
|
||||||
impl Filter for ArchiveFilter {
|
impl Filter for ArchiveFilter {
|
||||||
type T = Vec<SingleFormat>;
|
type T = Vec<SingleFormat>;
|
||||||
type Output = SingleFormatCollection;
|
type Output = SingleFormatCollection;
|
||||||
|
|
|
||||||
|
|
@ -113,7 +113,6 @@ pub struct Download {
|
||||||
pub(crate) urls: Vec<String>,
|
pub(crate) urls: Vec<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait::async_trait(?Send)]
|
|
||||||
impl Execute for Download {
|
impl Execute for Download {
|
||||||
fn pre_check(&mut self) -> Result<()> {
|
fn pre_check(&mut self) -> Result<()> {
|
||||||
if !has_ffmpeg() {
|
if !has_ffmpeg() {
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,6 @@ impl DownloadFilter {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait::async_trait]
|
|
||||||
impl Filter for DownloadFilter {
|
impl Filter for DownloadFilter {
|
||||||
type T = SingleFormat;
|
type T = SingleFormat;
|
||||||
type Output = SingleFormatCollection;
|
type Output = SingleFormatCollection;
|
||||||
|
|
|
||||||
|
|
@ -24,12 +24,11 @@ pub use download::Download;
|
||||||
pub use login::Login;
|
pub use login::Login;
|
||||||
pub use search::Search;
|
pub use search::Search;
|
||||||
|
|
||||||
#[async_trait::async_trait(?Send)]
|
|
||||||
trait Execute {
|
trait Execute {
|
||||||
fn pre_check(&mut self) -> Result<()> {
|
fn pre_check(&mut self) -> Result<()> {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
async fn execute(mut self, ctx: Context) -> Result<()>;
|
async fn execute(self, ctx: Context) -> Result<()>;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Parser)]
|
#[derive(Debug, Parser)]
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@ pub struct Login {
|
||||||
pub remove: bool,
|
pub remove: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait::async_trait(?Send)]
|
|
||||||
impl Execute for Login {
|
impl Execute for Login {
|
||||||
async fn execute(self, ctx: Context) -> Result<()> {
|
async fn execute(self, ctx: Context) -> Result<()> {
|
||||||
if let Some(login_file_path) = session_file_path() {
|
if let Some(login_file_path) = session_file_path() {
|
||||||
|
|
|
||||||
|
|
@ -100,7 +100,6 @@ pub struct Search {
|
||||||
input: String,
|
input: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait::async_trait(?Send)]
|
|
||||||
impl Execute for Search {
|
impl Execute for Search {
|
||||||
async fn execute(self, ctx: Context) -> Result<()> {
|
async fn execute(self, ctx: Context) -> Result<()> {
|
||||||
let input = if crunchyroll_rs::parse::parse_url(&self.input).is_some() {
|
let input = if crunchyroll_rs::parse::parse_url(&self.input).is_some() {
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,6 @@ use crunchyroll_rs::{
|
||||||
Concert, Episode, MediaCollection, Movie, MovieListing, MusicVideo, Season, Series,
|
Concert, Episode, MediaCollection, Movie, MovieListing, MusicVideo, Season, Series,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Check when https://github.com/dtolnay/async-trait/issues/224 is resolved and update async-trait
|
|
||||||
// to the new fixed version (as this causes some issues)
|
|
||||||
#[async_trait::async_trait]
|
|
||||||
pub trait Filter {
|
pub trait Filter {
|
||||||
type T: Send + Sized;
|
type T: Send + Sized;
|
||||||
type Output: Send + Sized;
|
type Output: Send + Sized;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue