Implemented QWK command & QWK settings.

Author: mkrueger

crates/icbsetup/src/import/mod.rs

@@ -17,7 +17,7 @@ use icy_board_engine::{
         group_list::GroupList,
         icb_config::{
             BoardInformation, BoardOptions, ColorConfiguration, ConfigPaths, DEFAULT_PCBOARD_DATE_FORMAT, DisplayNewsBehavior, IcbColor, IcbConfig,
-            NewUserSettings, SubscriptionMode, SysopCommandLevels, SysopInformation,
+            NewUserSettings, QwkSettings, SubscriptionMode, SysopCommandLevels, SysopInformation,
         },
         icb_text::IcbTextFile,
         language::SupportedLanguages,
@@ -508,6 +508,7 @@ impl PCBoardImporter {
                 logoff_file: accounting_logoff_file,
                 accounting_config: None,
             },
+            qwk_settings: QwkSettings::default(),
         };
         icb_cfg.board.allow_iemsi = false;
         icb_cfg.login_server.telnet.port = 1337;

crates/icbsetup/src/tabs/general/mod.rs

@@ -26,6 +26,7 @@ mod configuration_options;
 mod connection_info;
 mod event_setup;
 mod file_locations;
+mod msg_networking;
 mod new_user_options;
 mod security_levels;
 mod subscription_information;
@@ -55,7 +56,7 @@ impl GeneralTab {
                 MenuItem::new(7, 'H', get_text("icb_setup_main_sec_levels")).with_help(get_text("icb_setup_main_sec_levels-help")),
                 MenuItem::new(8, 'I', get_text("icb_setup_main_acc_cfg")).with_help(get_text("icb_setup_main_acc_cfg-help")),
                 MenuItem::new(9, 'J', get_text("icb_setup_main_new_user")).with_help(get_text("icb_setup_main_new_user-help")),
-                MenuItem::new(10, 'K', "TODO: Mailer/Tosser".to_string()),
+                MenuItem::new(10, 'K', get_text("icb_setup_msg_networking")).with_help(get_text("icb_setup_msg_networking-help")),
                 MenuItem::new(11, 'L', get_text("icb_setup_mb_conf")).with_help(get_text("icb_setup_mb_conf-help")),
                 MenuItem::new(12, 'M', get_text("icb_setup_conferences")).with_help(get_text("icb_setup_conferences-help")),
             ]))
@@ -137,6 +138,11 @@ impl TabPage for GeneralTab {
                     return self.page.open_sup_page(Box::new(page));
                 }
 
+                10 => {
+                    let page = msg_networking::MsgNetworking::new(self.icy_board.clone());
+                    return self.page.open_sup_page(Box::new(page));
+                }
+
                 11 => {
                     // Main Board Configuration
                     let page = conferences::ConferenceEditor::new(self.icy_board.clone(), 0);

crates/icbsetup/src/tabs/general/msg_networking/mod.rs

@@ -0,0 +1,61 @@
+use std::sync::{Arc, Mutex};
+
+use crossterm::event::KeyEvent;
+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::{Frame, layout::Rect};
+
+mod qwk;
+
+pub struct MsgNetworking {
+    pub page: IcbSetupMenuUI,
+    icy_board: Arc<Mutex<IcyBoard>>,
+}
+
+impl MsgNetworking {
+    pub fn new(icy_board: Arc<Mutex<IcyBoard>>) -> Self {
+        Self {
+            page: IcbSetupMenuUI::new(SelectMenu::new(vec![
+                MenuItem::new(0, 'A', get_text("msg_networking_qwk")),
+                MenuItem::new(1, 'B', "FTN TODO".to_string()),
+                MenuItem::new(2, 'C', "UUCP TODO".to_string()),
+            ]))
+            .with_center_title(get_text("msg_networking_title")),
+            icy_board,
+        }
+    }
+}
+
+impl Page for MsgNetworking {
+    fn render(&mut self, frame: &mut Frame, area: Rect) {
+        self.page.render(frame, area);
+    }
+
+    fn request_status(&self) -> ResultState {
+        self.page.request_status()
+    }
+
+    fn handle_key_press(&mut self, key: KeyEvent) -> PageMessage {
+        if key.code == crossterm::event::KeyCode::Esc {
+            return PageMessage::Close;
+        }
+        let (_state, opt) = self.page.handle_key_press(key);
+
+        if let Some(selected) = opt {
+            return match selected {
+                0 => PageMessage::OpenSubPage(Box::new(qwk::QwkSettings::new(self.icy_board.clone()))),
+                //                1 => PageMessage::OpenSubPage(Box::new(ssh::SSH::new(self.icy_board.clone()))),
+                //2 => PageMessage::OpenSubPage(Box::new(Websockets::new(self.icy_board.clone()))),
+                //                2 => PageMessage::OpenSubPage(Box::new(SecureWebsockets::new(self.icy_board.clone()))),
+                _ => PageMessage::None,
+            };
+        }
+        PageMessage::None
+    }
+}

crates/icbsetup/src/tabs/general/msg_networking/qwk.rs

@@ -0,0 +1,57 @@
+use std::sync::{Arc, Mutex};
+
+use crossterm::event::KeyEvent;
+use icy_board_engine::icy_board::IcyBoard;
+use icy_board_tui::{
+    cfg_entry_path, cfg_entry_text,
+    config_menu::{ConfigEntry, ConfigMenu, ResultState},
+    get_text,
+    icbconfigmenu::ICBConfigMenuUI,
+    tab_page::{Page, PageMessage},
+};
+
+pub struct QwkSettings {
+    menu: ICBConfigMenuUI,
+}
+
+impl QwkSettings {
+    pub fn new(icy_board: Arc<Mutex<IcyBoard>>) -> Self {
+        let menu = {
+            let lock = icy_board.lock().unwrap();
+            let label_width = 14;
+            let sysop_info: Vec<icy_board_tui::config_menu::ConfigEntry<Arc<Mutex<IcyBoard>>>> = vec![
+                ConfigEntry::Separator,
+                ConfigEntry::Label(get_text("qwk_bbs_label")),
+                cfg_entry_text!("qwk_bbs_name", label_width, 25, qwk_settings, bbs_name, lock),
+                cfg_entry_text!("qwk_bbs_city_and_state", label_width, 25, qwk_settings, bbs_city_and_state, lock),
+                cfg_entry_text!("qwk_bbs_phone_number", label_width, 25, qwk_settings, bbs_phone_number, lock),
+                cfg_entry_text!("qwk_bbs_sysop_name", label_width, 25, qwk_settings, bbs_sysop_name, lock),
+                cfg_entry_text!("qwk_bbs_id", label_width, 25, qwk_settings, bbs_id, lock),
+                ConfigEntry::Separator,
+                ConfigEntry::Label(get_text("qwk_files_label")),
+                cfg_entry_path!("qwk_welcome_screen", label_width, qwk_settings, welcome_screen, lock),
+                cfg_entry_path!("qwk_goodbye_screen", label_width, qwk_settings, goodbye_screen, lock),
+                cfg_entry_path!("qwk_news_sceen", label_width, qwk_settings, news_sceen, lock),
+            ];
+            ConfigMenu {
+                obj: icy_board.clone(),
+                entry: sysop_info,
+            }
+        };
+        Self {
+            menu: ICBConfigMenuUI::new(get_text("qwk_settings_title"), menu),
+        }
+    }
+}
+
+impl Page for QwkSettings {
+    fn render(&mut self, frame: &mut ratatui::Frame, disp_area: ratatui::prelude::Rect) {
+        self.menu.render(frame, disp_area)
+    }
+    fn request_status(&self) -> ResultState {
+        self.menu.request_status()
+    }
+    fn handle_key_press(&mut self, key: KeyEvent) -> PageMessage {
+        self.menu.handle_key_press(key)
+    }
+}

crates/icy_board_engine/Cargo.toml

@@ -24,6 +24,7 @@ semver = { workspace = true }
 regex = { workspace = true }
 walkdir = { workspace = true }
 bitflag = { workspace = true }
+tempfile = { workspace = true }
 
 unicase = { workspace = true }
 rand = { workspace = true }
@@ -48,6 +49,7 @@ temp-file = "0.1.9"
 glob = "0.3.2"
 chumsky = "0.9.3"
 creditcard = "0.1.0"
+zip = "2.2.3"
 
 # interpreter deps
 [dev-dependencies]

crates/icy_board_engine/src/data/ICBTEXT.toml

@@ -2233,11 +2233,11 @@ text = "(H)elp, (1-@NUMDIR@), File List Command"
 style = "Yellow"
 
 [ConferenceHeader1]
-text = "Conference                                                   Last   High"
+text = "Conference"
 style = "White"
 
 [ConferenceHeader2]
-text = "  #   Name                                                   Read   Num. Flags"
+text = "#   Name                                                   Flags"
 style = "White"
 
 [CTTYOn]
@@ -2595,7 +2595,7 @@ text = "Error compressing file."
 style = "Red"
 
 [QWKCommands]
-text = "QWK Commands: (D)ownload, (U)pload"
+text = "QWK Commands: (D)ownload, (U)pload, (S)canned bases"
 style = "Green"
 
 [ExtractingMessages]
@@ -2959,3 +2959,23 @@ style = "Yellow"
 [ScanningArea]
 text = "Scanning Area"
 style = "White"
+
+[QWKListCommands]
+text = "Enter Area Numbers, (S)elect All, (D)eselect All, (Enter)=none"
+style = "Yellow"
+
+[QWKListCommandsExpertmode]
+text = "(S), (D), (Enter)"
+style = "Yellow"
+
+[MessageAreaListHeader1]
+text = "Message Area                                                 Last   High"
+style = "White"
+
+[MessageAreaListHeader2]
+text = "  #   Name                                                   Read   Num."
+style = "White"
+
+[SelectArea]
+text = "@OPTEXT@ Select Area"
+style = "Yellow"

crates/icy_board_engine/src/icy_board/commands.rs

@@ -613,7 +613,7 @@ impl CommandType {
             CommandType::RunPPE => "hlpppe",
             CommandType::TextSearch => "hlpts",
             CommandType::ChangeMessageArea => "hlparea",
-
+            CommandType::QWK => "hlpqwk",
             _ => "",
         }
     }

crates/icy_board_engine/src/icy_board/icb_config.rs

@@ -691,6 +691,8 @@ pub struct IcbConfig {
     pub options: BoardOptions,
     pub event: EventOptions,
     pub accounting: AccountingOptions,
+    #[serde(default)]
+    pub qwk_settings: QwkSettings,
 
     pub login_server: LoginServer,
 
@@ -962,6 +964,7 @@ impl IcbConfig {
                 logoff_file: PathBuf::new(),
                 accounting_config: None,
             },
+            qwk_settings: QwkSettings::default(),
         }
     }
 }
@@ -975,3 +978,16 @@ impl Default for IcbConfig {
         Self::new()
     }
 }
+
+#[derive(Default, Clone, Serialize, Deserialize, PartialEq)]
+pub struct QwkSettings {
+    pub bbs_name: String,
+    pub bbs_city_and_state: String,
+    pub bbs_phone_number: String,
+    pub bbs_sysop_name: String,
+    pub bbs_id: String,
+
+    pub welcome_screen: PathBuf,
+    pub goodbye_screen: PathBuf,
+    pub news_sceen: PathBuf,
+}

crates/icy_board_engine/src/icy_board/icb_text.rs

@@ -1374,7 +1374,7 @@ pub enum IceText {
     CreatingQWK = 676,
     /// `Error compressing file.`
     ErrorCompressing = 677,
-    /// `QWK Commands: (D)ownload, (U)pload`
+    /// `QWK Commands: (D)ownload, (U)pload, (S)canned bases`
     QWKCommands = 678,
     /// `Extracting messages, please wait...`
     ExtractingMessages = 679,
@@ -1587,9 +1587,24 @@ pub enum IceText {
 
     /// `Scanning Area`
     ScanningArea = 773,
+
+    /// `Enter Area Numbers, (S)elect All, (D)eselect All, (L)ast Read, (Enter)=none`
+    QWKListCommands = 774,
+
+    /// `(S), (D), (L), (Enter)`
+    QWKListCommandsExpertmode = 775,
+
+    /// `Message Area                                                 Last   High`
+    MessageAreaListHeader1 = 776,
+
+    /// `    # Name                                                   Read   Num.  Include`
+    MessageAreaListHeader2 = 777,
+
+    /// `@OPTEXT@ Select Area`
+    SelectArea = 778,
 }
 
-const LAST_ENTRY: usize = 773;
+const LAST_ENTRY: usize = 778;
 
 impl IceText {
     pub fn from(i: usize) -> Self {

crates/icy_board_engine/src/icy_board/message_area.rs

@@ -4,6 +4,7 @@ use std::{
 };
 
 use async_trait::async_trait;
+use jamjam::jam::JamMessageBase;
 use serde::{Deserialize, Serialize};
 use serde_with::{DisplayFromStr, serde_as};
 
@@ -38,6 +39,14 @@ pub struct MessageArea {
     pub req_level_to_save_attach: SecurityExpression,
 }
 
+impl MessageArea {
+    pub fn get_high_msg(&self) -> u32 {
+        JamMessageBase::open(&self.path)
+            .map(|jam| jam.base_messagenumber() + jam.active_messages())
+            .unwrap_or(0)
+    }
+}
+
 #[derive(Serialize, Deserialize, Default, Clone, PartialEq)]
 pub struct AreaList {
     #[serde(rename = "area")]