Updated icbsysmngr.

mkrueger · Feb 9, 2025 · 9a1383f · 9a1383f
1 parent 8f9a8b4
commit 9a1383f
Show file tree

Hide file tree

Showing 58 changed files with 1,913 additions and 1,015 deletions.
diff --git a/crates/icboard/src/menu_runner/login.rs b/crates/icboard/src/menu_runner/login.rs
@@ -431,7 +431,7 @@ impl PcbBoardCommand {
                         display_flags::FIELDLEN | display_flags::NEWLINE | display_flags::LFBEFORE,
                     )
                     .await?;
-                new_user.birth_date = IcbDate::parse(&date).to_utc_date_time();
+                new_user.birth_date = IcbDate::parse(&date);
             }
 
             if settings.ask_email && self.state.display_text.has_text(IceText::EnterEmail) {
@@ -555,15 +555,15 @@ impl PcbBoardCommand {
 
         if self.state.get_board().await.config.subscription_info.is_enabled {
             if let Some(user) = &self.state.session.current_user {
-                if user.exp_date < Utc::now() {
+                if user.exp_date.to_utc_date_time() < Utc::now() {
                     log::warn!("Login from expired user {} at {}", self.state.session.user_name, Local::now().to_rfc2822());
                     let exp_file = self.state.get_board().await.config.paths.expired.clone();
                     self.state.display_file(&self.state.resolve_path(&exp_file)).await?;
                     self.state.hangup().await?;
                     return Ok(false);
                 }
                 let warn_days = self.state.get_board().await.config.subscription_info.warning_days as i64;
-                if user.exp_date + chrono::Duration::days(warn_days) < Utc::now() {
+                if user.exp_date.to_utc_date_time() + chrono::Duration::days(warn_days) < Utc::now() {
                     let exp_file = self.state.get_board().await.config.paths.expire_warning.clone();
                     self.state.display_file(&self.state.resolve_path(&exp_file)).await?;
                     self.state.press_enter().await?;

diff --git a/crates/icbsetup/src/tabs/general/accounting.rs b/crates/icbsetup/src/tabs/general/accounting.rs
@@ -1,16 +1,15 @@
 use std::sync::{Arc, Mutex};
 
-use crate::{cfg_entry_bool, cfg_entry_dow, cfg_entry_path, cfg_entry_time};
 use crossterm::event::KeyEvent;
 use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
+    cfg_entry_bool, cfg_entry_dow, cfg_entry_path, cfg_entry_time,
     config_menu::{ConfigEntry, ConfigMenu, ResultState},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::{Page, PageMessage},
 };
 
-use super::ICBConfigMenuUI;
-
 pub struct AccountingConfig {
     menu: ICBConfigMenuUI,
 }

diff --git a/crates/icbsetup/src/tabs/general/board_configuration.rs b/crates/icbsetup/src/tabs/general/board_configuration.rs
@@ -1,16 +1,15 @@
 use std::sync::{Arc, Mutex};
 
-use crate::{cfg_entry_bool, cfg_entry_text, cfg_entry_u16};
 use crossterm::event::KeyEvent;
 use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
+    cfg_entry_bool, cfg_entry_text, cfg_entry_u16,
     config_menu::{ConfigEntry, ConfigMenu, ListItem, ListValue, ResultState, Value},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::{Page, PageMessage},
 };
 
-use super::ICBConfigMenuUI;
-
 pub struct BoardConfiguration {
     menu: ICBConfigMenuUI,
 }

diff --git a/crates/icbsetup/src/tabs/general/configuration_options/colors.rs b/crates/icbsetup/src/tabs/general/configuration_options/colors.rs
@@ -1,10 +1,11 @@
 use std::sync::{Arc, Mutex};
 
-use crate::{cfg_entry_color, tabs::ICBConfigMenuUI};
 use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
+    cfg_entry_color,
     config_menu::{ConfigEntry, ConfigMenu, ResultState},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::Page,
 };
 

diff --git a/crates/icbsetup/src/tabs/general/configuration_options/config_switches.rs b/crates/icbsetup/src/tabs/general/configuration_options/config_switches.rs
@@ -1,10 +1,11 @@
 use std::sync::{Arc, Mutex};
 
-use crate::{cfg_entry_bool, tabs::ICBConfigMenuUI};
 use icy_board_engine::icy_board::{icb_config::DisplayNewsBehavior, IcyBoard};
 use icy_board_tui::{
+    cfg_entry_bool,
     config_menu::{ConfigEntry, ConfigMenu, ListItem, ListValue, ResultState},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::Page,
 };
 

diff --git a/crates/icbsetup/src/tabs/general/configuration_options/file_transfer.rs b/crates/icbsetup/src/tabs/general/configuration_options/file_transfer.rs
@@ -3,13 +3,13 @@ use std::sync::{Arc, Mutex};
 use crossterm::event::KeyEvent;
 use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
+    cfg_entry_bool, cfg_entry_u32,
     config_menu::{ConfigEntry, ConfigMenu, ResultState},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::{Page, PageMessage},
 };
 
-use crate::{cfg_entry_bool, cfg_entry_u32, tabs::ICBConfigMenuUI};
-
 pub struct FileTransfers {
     menu: ICBConfigMenuUI,
 }

diff --git a/crates/icbsetup/src/tabs/general/configuration_options/function_keys.rs b/crates/icbsetup/src/tabs/general/configuration_options/function_keys.rs
@@ -4,11 +4,10 @@ use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
     config_menu::{ConfigEntry, ConfigMenu, ListItem, ListValue, ResultState},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::Page,
 };
 
-use crate::tabs::ICBConfigMenuUI;
-
 pub struct FunctionKeys {
     menu: ICBConfigMenuUI,
 }

diff --git a/crates/icbsetup/src/tabs/general/configuration_options/limits.rs b/crates/icbsetup/src/tabs/general/configuration_options/limits.rs
@@ -1,14 +1,14 @@
 use std::sync::{Arc, Mutex};
 
-use crate::{cfg_entry_u16, cfg_entry_u8, tabs::ICBConfigMenuUI};
 use crossterm::event::KeyEvent;
 use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
+    cfg_entry_u16, cfg_entry_u8,
     config_menu::{ConfigEntry, ConfigMenu, ResultState},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::{Page, PageMessage},
 };
-
 pub struct Limits {
     menu: ICBConfigMenuUI,
 }

diff --git a/crates/icbsetup/src/tabs/general/configuration_options/messages.rs b/crates/icbsetup/src/tabs/general/configuration_options/messages.rs
@@ -1,11 +1,12 @@
 use std::sync::{Arc, Mutex};
 
-use crate::{cfg_entry_bool, cfg_entry_u16, tabs::ICBConfigMenuUI};
 use crossterm::event::KeyEvent;
 use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
+    cfg_entry_bool, cfg_entry_u16,
     config_menu::{ConfigEntry, ConfigMenu, ResultState},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::{Page, PageMessage},
 };
 

diff --git a/crates/icbsetup/src/tabs/general/configuration_options/mod.rs b/crates/icbsetup/src/tabs/general/configuration_options/mod.rs
@@ -6,12 +6,12 @@ use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
     config_menu::ResultState,
     get_text,
+    icbsetupmenu::IcbSetupMenuUI,
     select_menu::{MenuItem, SelectMenu},
     tab_page::{Page, PageMessage},
 };
 use ratatui::{layout::Rect, Frame};
 
-use super::IcbSetupMenuUI;
 mod colors;
 mod config_switches;
 mod file_transfer;

diff --git a/crates/icbsetup/src/tabs/general/configuration_options/system_control.rs b/crates/icbsetup/src/tabs/general/configuration_options/system_control.rs
@@ -1,11 +1,12 @@
 use std::sync::{Arc, Mutex};
 
-use crate::{cfg_entry_bool, tabs::ICBConfigMenuUI};
 use crossterm::event::KeyEvent;
 use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
+    cfg_entry_bool,
     config_menu::{ConfigEntry, ConfigMenu, ResultState},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::{Page, PageMessage},
 };
 

diff --git a/crates/icbsetup/src/tabs/general/connection_info/mod.rs b/crates/icbsetup/src/tabs/general/connection_info/mod.rs
@@ -5,15 +5,14 @@ use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
     config_menu::ResultState,
     get_text,
+    icbsetupmenu::IcbSetupMenuUI,
     select_menu::{MenuItem, SelectMenu},
     tab_page::{Page, PageMessage},
 };
 use ratatui::{layout::Rect, Frame};
 use secure_websockets::SecureWebsockets;
 use websockets::Websockets;
 
-use super::IcbSetupMenuUI;
-
 mod secure_websockets;
 mod ssh;
 mod telnet;

diff --git a/crates/icbsetup/src/tabs/general/connection_info/secure_websockets.rs b/crates/icbsetup/src/tabs/general/connection_info/secure_websockets.rs
@@ -3,12 +3,12 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-use crate::tabs::ICBConfigMenuUI;
 use crossterm::event::KeyEvent;
 use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
     config_menu::{ConfigEntry, ConfigMenu, ListItem, ListValue, ResultState},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::{Page, PageMessage},
 };
 

diff --git a/crates/icbsetup/src/tabs/general/connection_info/ssh.rs b/crates/icbsetup/src/tabs/general/connection_info/ssh.rs
@@ -3,12 +3,12 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-use crate::tabs::ICBConfigMenuUI;
 use crossterm::event::KeyEvent;
 use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
     config_menu::{ConfigEntry, ConfigMenu, ListItem, ListValue, ResultState},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::{Page, PageMessage},
 };
 

diff --git a/crates/icbsetup/src/tabs/general/connection_info/telnet.rs b/crates/icbsetup/src/tabs/general/connection_info/telnet.rs
@@ -3,12 +3,12 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-use crate::tabs::ICBConfigMenuUI;
 use crossterm::event::KeyEvent;
 use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
     config_menu::{ConfigEntry, ConfigMenu, ListItem, ListValue, ResultState},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::{Page, PageMessage},
 };
 

diff --git a/crates/icbsetup/src/tabs/general/connection_info/websockets.rs b/crates/icbsetup/src/tabs/general/connection_info/websockets.rs
@@ -3,12 +3,12 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-use crate::tabs::ICBConfigMenuUI;
 use crossterm::event::KeyEvent;
 use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
     config_menu::{ConfigEntry, ConfigMenu, ListItem, ListValue, ResultState},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::{Page, PageMessage},
 };
 

diff --git a/crates/icbsetup/src/tabs/general/event_setup.rs b/crates/icbsetup/src/tabs/general/event_setup.rs
@@ -1,16 +1,15 @@
 use std::sync::{Arc, Mutex};
 
-use crate::{cfg_entry_bool, cfg_entry_path, cfg_entry_u16};
 use crossterm::event::KeyEvent;
 use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
+    cfg_entry_bool, cfg_entry_path, cfg_entry_u16,
     config_menu::{ConfigEntry, ConfigMenu, ResultState},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::{Page, PageMessage},
 };
 
-use super::ICBConfigMenuUI;
-
 pub struct EventSetup {
     menu: ICBConfigMenuUI,
 }

diff --git a/crates/icbsetup/src/tabs/general/file_locations/configuration_files.rs b/crates/icbsetup/src/tabs/general/file_locations/configuration_files.rs
@@ -1,14 +1,17 @@
 use std::sync::{Arc, Mutex};
 
-use crate::{cfg_entry_path, editors::languages::edit_languages, tabs::ICBConfigMenuUI};
 use crossterm::event::KeyEvent;
 use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
+    cfg_entry_path,
     config_menu::{ConfigEntry, ConfigMenu, ResultState},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::{Page, PageMessage},
 };
 
+use crate::editors::languages::edit_languages;
+
 pub struct ConfigurationFiles {
     menu: ICBConfigMenuUI,
 }

diff --git a/crates/icbsetup/src/tabs/general/file_locations/display_files.rs b/crates/icbsetup/src/tabs/general/file_locations/display_files.rs
@@ -1,11 +1,12 @@
 use std::sync::{Arc, Mutex};
 
-use crate::{cfg_entry_path, tabs::ICBConfigMenuUI};
 use crossterm::event::KeyEvent;
 use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
+    cfg_entry_path,
     config_menu::{ConfigEntry, ConfigMenu, ResultState},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::{Page, PageMessage},
 };
 

diff --git a/crates/icbsetup/src/tabs/general/file_locations/mod.rs b/crates/icbsetup/src/tabs/general/file_locations/mod.rs
@@ -6,15 +6,14 @@ use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
     config_menu::ResultState,
     get_text,
+    icbsetupmenu::IcbSetupMenuUI,
     select_menu::{MenuItem, SelectMenu},
     tab_page::{Page, PageMessage},
 };
 use new_user_files::NewUserFiles;
 use ratatui::{layout::Rect, Frame};
 use system_files::SystemFiles;
 
-use super::IcbSetupMenuUI;
-
 mod configuration_files;
 mod display_files;
 mod new_user_files;

diff --git a/crates/icbsetup/src/tabs/general/file_locations/new_user_files.rs b/crates/icbsetup/src/tabs/general/file_locations/new_user_files.rs
@@ -1,11 +1,12 @@
 use std::sync::{Arc, Mutex};
 
-use crate::{cfg_entry_path, tabs::ICBConfigMenuUI};
 use crossterm::event::KeyEvent;
 use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
+    cfg_entry_path,
     config_menu::{ConfigEntry, ConfigMenu, ResultState},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::{Page, PageMessage},
 };
 

diff --git a/crates/icbsetup/src/tabs/general/file_locations/system_files.rs b/crates/icbsetup/src/tabs/general/file_locations/system_files.rs
@@ -6,13 +6,13 @@ use std::{
 use crossterm::event::KeyEvent;
 use icy_board_engine::icy_board::IcyBoard;
 use icy_board_tui::{
+    cfg_entry_path,
     config_menu::{ConfigEntry, ConfigMenu, ResultState},
     get_text,
+    icbconfigmenu::ICBConfigMenuUI,
     tab_page::{Page, PageMessage},
 };
 
-use crate::{cfg_entry_path, tabs::ICBConfigMenuUI};
-
 pub struct SystemFiles {
     menu: ICBConfigMenuUI,
 }