config works

2 files changed, 31 insertions, 43 deletions

diff --git a/tool/src/add.rs b/tool/src/add.rs
index 2179a40..04328b2 100644
--- a/tool/src/add.rs
+++ b/tool/src/add.rs
@@ -4,11 +4,9 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 use crate::cli::Action;
-use anyhow::anyhow;
 use dialoguer::{theme::ColorfulTheme, Confirm, FuzzySelect, Input};
-use jellybase::SECRETS;
 use jellycommon::TraktKind;
-use jellyimport::trakt::Trakt;
+use jellyimport::get_trakt;
 use log::warn;
 use std::{
     fmt::Display,
@@ -37,13 +35,7 @@ pub async fn add(action: Action) -> anyhow::Result<()> {
                     .interact_text()
                     .unwrap();
 
-                let trakt = Trakt::new(
-                    SECRETS
-                        .api
-                        .trakt
-                        .as_ref()
-                        .ok_or(anyhow!("no trakt api key configured"))?,
-                );
+                let trakt = get_trakt()?;
 
                 let results = trakt.search(search_kinds, &name).await?;
 
diff --git a/tool/src/main.rs b/tool/src/main.rs
index 9ce7cf1..adf0a35 100644
--- a/tool/src/main.rs
+++ b/tool/src/main.rs
@@ -4,17 +4,12 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 
-use anyhow::anyhow;
 use clap::Parser;
-use jellybase::{CONF, SECRETS};
-use jellyclient::Instance;
-use jellycommon::user::CreateSessionParams;
 use jellytool::{
     add::add,
     cli::{Action, Args},
     migrate::migrate,
 };
-use log::info;
 
 fn main() -> anyhow::Result<()> {
     env_logger::builder()
@@ -30,34 +25,35 @@ fn main() -> anyhow::Result<()> {
             .unwrap()
             .block_on(add(a)),
         a @ Action::Migrate { .. } => migrate(a),
-        Action::Reimport {
-            hostname,
-            no_tls,
-            no_incremental,
-        } => tokio::runtime::Builder::new_multi_thread()
-            .enable_all()
-            .build()
-            .unwrap()
-            .block_on(async move {
-                let inst = Instance::new(hostname.unwrap_or(CONF.hostname.clone()), !no_tls);
-                info!("login");
-                let session = inst
-                    .login(CreateSessionParams {
-                        drop_permissions: None,
-                        expire: None,
-                        password: SECRETS
-                            .admin_password
-                            .clone()
-                            .ok_or(anyhow!("admin account required"))?,
-                        username: CONF
-                            .admin_username
-                            .clone()
-                            .ok_or(anyhow!("admin account required"))?,
-                    })
-                    .await?;
+        _ => Ok(()),
+        // Action::Reimport {
+        //     hostname,
+        //     no_tls,
+        //     no_incremental,
+        // } => tokio::runtime::Builder::new_multi_thread()
+        //     .enable_all()
+        //     .build()
+        //     .unwrap()
+        //     .block_on(async move {
+        //         let inst = Instance::new(hostname.unwrap_or(CONF.hostname.clone()), !no_tls);
+        //         info!("login");
+        //         let session = inst
+        //             .login(CreateSessionParams {
+        //                 drop_permissions: None,
+        //                 expire: None,
+        //                 password: SECRETS
+        //                     .admin_password
+        //                     .clone()
+        //                     .ok_or(anyhow!("admin account required"))?,
+        //                 username: CONF
+        //                     .admin_username
+        //                     .clone()
+        //                     .ok_or(anyhow!("admin account required"))?,
+        //             })
+        //             .await?;
 
-                session.reimport(!no_incremental).await?;
-                Ok(())
-            }),
+        //         session.reimport(!no_incremental).await?;
+        //         Ok(())
+        //     }),
     }
 }