From a2ef3f6ec4c830611fde1a2e935588ccbbc61c03 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Wed, 30 Apr 2025 10:47:54 +0200 Subject: config works --- tool/src/main.rs | 62 ++++++++++++++++++++++++++------------------------------ 1 file changed, 29 insertions(+), 33 deletions(-) (limited to 'tool/src/main.rs') 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 */ -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(()) + // }), } } -- cgit v1.2.3-70-g09d2