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

Refactor

Browse source
This commit is contained in:
ByteDream 2023-03-23 01:17:41 +01:00
parent 90212c4ec0
commit 0a40f3c40f
30 changed files with 3651 additions and 2982 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crunchy-cli-core/src/lib.rs
View file

@ -1,7 +1,6 @@
use crate::cli::log::CliLogger;
use crate::utils::context::Context;
use crate::utils::locale::system_locale;
use crate::utils::log::progress;
use crate::utils::log::{progress, CliLogger};
use anyhow::bail;
use anyhow::Result;
use clap::{Parser, Subcommand};
@ -9,10 +8,14 @@ use crunchyroll_rs::{Crunchyroll, Locale};
use log::{debug, error, warn, LevelFilter};
use std::{env, fs};
mod cli;
mod archive;
mod download;
mod login;
mod utils;
pub use cli::{archive::Archive, download::Download, login::Login};
pub use archive::Archive;
pub use download::Download;
pub use login::Login;
#[async_trait::async_trait(?Send)]
trait Execute {
@ -222,9 +225,14 @@ async fn crunchyroll_session(cli: &Cli) -> Result<Crunchyroll> {
lang
};
let builder = Crunchyroll::builder()
let mut builder = Crunchyroll::builder()
.locale(locale)
.stabilization_locales(true);
.stabilization_locales(true)
.stabilization_season_number(true);
if let Command::Download(download) = &cli.command {
builder = builder.preferred_audio_locale(download.audio.clone())
}
let login_methods_count = cli.login_method.credentials.is_some() as u8
+ cli.login_method.etp_rt.is_some() as u8
@ -232,7 +240,7 @@ async fn crunchyroll_session(cli: &Cli) -> Result<Crunchyroll> {
let progress_handler = progress!("Logging in");
if login_methods_count == 0 {
if let Some(login_file_path) = cli::login::login_file_path() {
if let Some(login_file_path) = login::login_file_path() {
if login_file_path.exists() {
let session = fs::read_to_string(login_file_path)?;
if let Some((token_type, token)) = session.split_once(':') {