diff options
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/Cargo.toml | 12 | ||||
| -rw-r--r-- | tool/src/add.rs | 14 | ||||
| -rw-r--r-- | tool/src/migrate.rs | 6 |
3 files changed, 20 insertions, 12 deletions
diff --git a/tool/Cargo.toml b/tool/Cargo.toml index ba74ee9..12b6895 100644 --- a/tool/Cargo.toml +++ b/tool/Cargo.toml @@ -11,18 +11,18 @@ jellyclient = { path = "../client" } log = { workspace = true } env_logger = "0.11.3" -anyhow = "1.0.82" +anyhow = "1.0.86" reqwest = { workspace = true } indicatif = "0.17.8" tokio = { workspace = true } -clap = { version = "4.5.4", features = ["derive"] } -clap_complete = "4.5.2" +clap = { version = "4.5.6", features = ["derive"] } +clap_complete = "4.5.5" -serde = { version = "1.0.197", features = ["derive"] } -serde_json = "1.0.115" +serde = { version = "1.0.203", features = ["derive"] } +serde_json = "1.0.117" serde_yaml = "0.9.34" bincode = { version = "2.0.0-rc.3", features = ["serde"] } -base64 = "0.22.0" +base64 = "0.22.1" rand = "0.8.5" dialoguer = { version = "0.11.0", features = ["fuzzy-select"] } diff --git a/tool/src/add.rs b/tool/src/add.rs index dfec40d..7b3861e 100644 --- a/tool/src/add.rs +++ b/tool/src/add.rs @@ -55,6 +55,14 @@ pub async fn add(action: Action) -> anyhow::Result<()> { default = i }; } + TraktKind::Show => { + if let Some(i) = directories + .iter() + .position(|d| d.0.to_str().unwrap().contains("shows")) + { + default = i + }; + } _ => (), } } @@ -71,7 +79,7 @@ pub async fn add(action: Action) -> anyhow::Result<()> { let (last_search, trakt_object, trakt_kind) = loop { let name: String = Input::with_theme(&theme) .with_prompt("Search by title") - .default(media.as_ref().map(path_to_query).unwrap_or_default()) + .default(media.as_ref().map(|p| path_to_query(p)).unwrap_or_default()) .interact_text() .unwrap(); @@ -155,7 +163,7 @@ pub async fn add(action: Action) -> anyhow::Result<()> { } fn validate_id(s: &String) -> anyhow::Result<()> { - if &make_id(&s) == s { + if &make_id(s) == s { Ok(()) } else { bail!("invalid id") @@ -174,7 +182,7 @@ fn make_id(s: &str) -> String { out } -fn path_to_query(path: &PathBuf) -> String { +fn path_to_query(path: &Path) -> String { path.file_stem() .unwrap() .to_str() diff --git a/tool/src/migrate.rs b/tool/src/migrate.rs index 0412430..fe369d4 100644 --- a/tool/src/migrate.rs +++ b/tool/src/migrate.rs @@ -112,7 +112,7 @@ pub fn migrate(action: Action) -> anyhow::Result<()> { let table = txn.open_table(T_USER)?; let len = table.len()?; - for r in table.iter()?.progress_count(len.try_into().unwrap()) { + for r in table.iter()?.progress_count(len) { let (k, v) = r?; serde_json::to_writer(&mut o, &(k.value(), v.value().0))?; writeln!(&mut o)?; @@ -161,7 +161,7 @@ pub fn migrate(action: Action) -> anyhow::Result<()> { let table = txn.open_table(T_USER_NODE)?; let len = table.len()?; - for r in table.iter()?.progress_count(len.try_into().unwrap()) { + for r in table.iter()?.progress_count(len) { let (k, v) = r?; serde_json::to_writer(&mut o, &(k.value(), v.value().0))?; writeln!(&mut o)?; @@ -213,7 +213,7 @@ pub fn migrate(action: Action) -> anyhow::Result<()> { let table = txn.open_table(T_INVITE)?; let len = table.len()?; - for r in table.iter()?.progress_count(len.try_into().unwrap()) { + for r in table.iter()?.progress_count(len) { let (k, v) = r?; serde_json::to_writer(&mut o, &(k.value(), v.value().0))?; writeln!(&mut o)?; |