From 8cd91f6df38dffb2d7f63bd29fcba8e98963e8ab Mon Sep 17 00:00:00 2001 From: veeso Date: Sun, 6 Jun 2021 14:19:20 +0200 Subject: [PATCH] tui-realm 0.3.2 --- CHANGELOG.md | 10 ++++++++++ Cargo.lock | 4 ++-- Cargo.toml | 17 ++++------------- src/ui/activities/auth/mod.rs | 2 +- src/ui/activities/auth/update.rs | 8 +++++--- src/ui/activities/filetransfer/misc.rs | 1 + src/ui/activities/filetransfer/update.rs | 8 +++++--- src/ui/activities/setup/mod.rs | 2 +- src/ui/activities/setup/update.rs | 6 +++--- 9 files changed, 32 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a80f0fb..ccf2d42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog - [Changelog](#changelog) + - [0.5.1](#051) - [0.5.0](#050) - [0.4.2](#042) - [0.4.1](#041) @@ -17,6 +18,15 @@ --- +## 0.5.1 + +Released on FIXME: ?? + +- Bugfix: + - Fixed broken input cursor when typing UTF8 characters (tui-realm 0.3.2) +- Dependencies: + - Updated `tui-realm` to `0.3.2` + ## 0.5.0 Released on 23/05/2021 diff --git a/Cargo.lock b/Cargo.lock index cd0480a..77df50e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1439,9 +1439,9 @@ dependencies = [ [[package]] name = "tuirealm" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aad880656efa943543c8048a28e1fa1d0ea6b5c4bf7f53636492ef8a49ec681f" +checksum = "a7c0026d8e0c649dbd9416466777a584d06ac569283683c396f08f8a69832559" dependencies = [ "crossterm", "textwrap", diff --git a/Cargo.toml b/Cargo.toml index a7d3c86..ed3f85c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,6 +34,7 @@ content_inspector = "0.2.4" crossterm = "0.19.0" dirs = "3.0.1" edit = "0.1.3" +ftp4 = { version = "4.0.2", features = [ "secure" ] } getopts = "0.2.21" hostname = "0.3.1" lazy_static = "1.4.0" @@ -42,31 +43,21 @@ magic-crypt = "3.1.7" rand = "0.8.3" regex = "1.5.4" rpassword = "5.0.1" +serde = { version = "^1.0.0", features = [ "derive" ] } simplelog = "0.10.0" ssh2 = "0.9.0" tempfile = "3.1.0" textwrap = "0.13.4" thiserror = "^1.0.0" toml = "0.5.8" -tuirealm = { version = "0.3.0", features = [ "with-components" ] } +tuirealm = { version = "0.3.2", features = [ "with-components" ] } +ureq = { version = "2.1.0", features = [ "json" ] } whoami = "1.1.1" wildmatch = "2.0.0" [dev-dependencies] pretty_assertions = "0.7.2" -[dependencies.ftp4] -features = ["secure"] -version = "^4.0.2" - -[dependencies.serde] -features = ["derive"] -version = "^1.0.0" - -[dependencies.ureq] -features = ["json"] -version = "2.1.0" - [features] githubActions = [] diff --git a/src/ui/activities/auth/mod.rs b/src/ui/activities/auth/mod.rs index 0cd7653..cf400af 100644 --- a/src/ui/activities/auth/mod.rs +++ b/src/ui/activities/auth/mod.rs @@ -44,7 +44,7 @@ use crate::utils::git; // Includes use crossterm::terminal::{disable_raw_mode, enable_raw_mode}; -use tuirealm::View; +use tuirealm::{Update, View}; // -- components const COMPONENT_TEXT_H1: &str = "TEXT_H1"; diff --git a/src/ui/activities/auth/update.rs b/src/ui/activities/auth/update.rs index ae9a153..dd8c1f2 100644 --- a/src/ui/activities/auth/update.rs +++ b/src/ui/activities/auth/update.rs @@ -36,16 +36,16 @@ use super::{ }; use crate::ui::keymap::*; use tuirealm::components::InputPropsBuilder; -use tuirealm::{Msg, Payload, PropsBuilder, Value}; +use tuirealm::{Msg, Payload, PropsBuilder, Update, Value}; // -- update -impl AuthActivity { +impl Update for AuthActivity { /// ### update /// /// Update auth activity model based on msg /// The function exits when returns None - pub(super) fn update(&mut self, msg: Option<(String, Msg)>) -> Option<(String, Msg)> { + fn update(&mut self, msg: Option<(String, Msg)>) -> Option<(String, Msg)> { let ref_msg: Option<(&str, &Msg)> = msg.as_ref().map(|(s, msg)| (s.as_str(), msg)); // Match msg match ref_msg { @@ -339,7 +339,9 @@ impl AuthActivity { }, } } +} +impl AuthActivity { fn update_input_port(&mut self, port: u16) -> Option<(String, Msg)> { match self.view.get_props(COMPONENT_INPUT_PORT) { None => None, diff --git a/src/ui/activities/filetransfer/misc.rs b/src/ui/activities/filetransfer/misc.rs index b13e47e..ca14fad 100644 --- a/src/ui/activities/filetransfer/misc.rs +++ b/src/ui/activities/filetransfer/misc.rs @@ -28,6 +28,7 @@ use crate::system::sshkey_storage::SshKeyStorage; // Ext use std::env; use std::path::{Path, PathBuf}; +use tuirealm::Update; const LOG_CAPACITY: usize = 256; diff --git a/src/ui/activities/filetransfer/update.rs b/src/ui/activities/filetransfer/update.rs index ecb9292..7f63f2d 100644 --- a/src/ui/activities/filetransfer/update.rs +++ b/src/ui/activities/filetransfer/update.rs @@ -48,17 +48,17 @@ use tuirealm::{ components::progress_bar::ProgressBarPropsBuilder, props::{PropsBuilder, TableBuilder, TextSpan, TextSpanBuilder}, tui::style::Color, - Msg, Payload, Value, + Msg, Payload, Update, Value, }; -impl FileTransferActivity { +impl Update for FileTransferActivity { // -- update /// ### update /// /// Update auth activity model based on msg /// The function exits when returns None - pub(super) fn update(&mut self, msg: Option<(String, Msg)>) -> Option<(String, Msg)> { + fn update(&mut self, msg: Option<(String, Msg)>) -> Option<(String, Msg)> { let ref_msg: Option<(&str, &Msg)> = msg.as_ref().map(|(s, msg)| (s.as_str(), msg)); // Match msg match ref_msg { @@ -652,7 +652,9 @@ impl FileTransferActivity { }, } } +} +impl FileTransferActivity { /// ### update_local_filelist /// /// Update local file list diff --git a/src/ui/activities/setup/mod.rs b/src/ui/activities/setup/mod.rs index 15966fa..1040914 100644 --- a/src/ui/activities/setup/mod.rs +++ b/src/ui/activities/setup/mod.rs @@ -40,7 +40,7 @@ extern crate tuirealm; use super::{Activity, Context, ExitReason}; // Ext use crossterm::terminal::{disable_raw_mode, enable_raw_mode}; -use tuirealm::View; +use tuirealm::{Update, View}; // -- components const COMPONENT_TEXT_HELP: &str = "TEXT_HELP"; diff --git a/src/ui/activities/setup/update.rs b/src/ui/activities/setup/update.rs index 053d7b5..ce4b4e2 100644 --- a/src/ui/activities/setup/update.rs +++ b/src/ui/activities/setup/update.rs @@ -37,14 +37,14 @@ use super::{ use crate::ui::keymap::*; // ext -use tuirealm::{Msg, Payload, Value}; +use tuirealm::{Msg, Payload, Update, Value}; -impl SetupActivity { +impl Update for SetupActivity { /// ### update /// /// Update auth activity model based on msg /// The function exits when returns None - pub(super) fn update(&mut self, msg: Option<(String, Msg)>) -> Option<(String, Msg)> { + fn update(&mut self, msg: Option<(String, Msg)>) -> Option<(String, Msg)> { let ref_msg: Option<(&str, &Msg)> = msg.as_ref().map(|(s, msg)| (s.as_str(), msg)); // Match msg match ref_msg {