From ea9dd03f55f2822e19bdc70d850eb477583d8a05 Mon Sep 17 00:00:00 2001 From: veeso Date: Fri, 6 Oct 2023 09:13:57 +0200 Subject: [PATCH] Revert "feat: tui-realm 1.9" This reverts commit cfbecc049ddf3b352f09b5e5d07cfef2df6ec245. --- Cargo.lock | 111 +++--------------- Cargo.toml | 8 +- .../components/transfer/file_list.rs | 4 +- 3 files changed, 20 insertions(+), 103 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 68a7cd1..5cbb602 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -552,38 +552,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "crossterm" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" -dependencies = [ - "bitflags 1.3.2", - "crossterm_winapi", - "libc", - "mio 0.8.8", - "parking_lot 0.12.1", - "signal-hook", - "signal-hook-mio", - "winapi 0.3.9", -] - -[[package]] -name = "crossterm" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" -dependencies = [ - "bitflags 2.3.3", - "crossterm_winapi", - "libc", - "mio 0.8.8", - "parking_lot 0.12.1", - "signal-hook", - "signal-hook-mio", - "winapi 0.3.9", -] - [[package]] name = "crossterm_winapi" version = "0.9.1" @@ -1316,12 +1284,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "indoc" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" - [[package]] name = "inotify" version = "0.7.1" @@ -1441,18 +1403,7 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff63c423c68ea6814b7da9e88ce585f793c87ddd9e78f646970891769c8235d4" dependencies = [ - "lazy-regex-proc_macros 2.4.1", - "once_cell", - "regex", -] - -[[package]] -name = "lazy-regex" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57451d19ad5e289ff6c3d69c2a2424652995c42b79dafa11e9c4d5508c913c01" -dependencies = [ - "lazy-regex-proc_macros 3.0.1", + "lazy-regex-proc_macros", "once_cell", "regex", ] @@ -1469,18 +1420,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "lazy-regex-proc_macros" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0a1d9139f0ee2e862e08a9c5d0ba0470f2aa21cd1e1aa1b1562f83116c725f" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "syn 2.0.23", -] - [[package]] name = "lazy_static" version = "1.4.0" @@ -2101,12 +2040,6 @@ dependencies = [ "windows-targets 0.48.1", ] -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - [[package]] name = "path-slash" version = "0.1.5" @@ -2270,21 +2203,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "ratatui" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8285baa38bdc9f879d92c0e37cb562ef38aa3aeefca22b3200186bc39242d3d5" -dependencies = [ - "bitflags 2.3.3", - "cassowary", - "crossterm 0.26.1", - "indoc", - "paste", - "unicode-segmentation", - "unicode-width", -] - [[package]] name = "redox_syscall" version = "0.2.16" @@ -2838,9 +2756,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.17" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" dependencies = [ "libc", "signal-hook-registry", @@ -2957,7 +2875,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c84c5cecf19018f5f85ca3f2c7e2c974dfe07e7e4a85cbea4330bb1e7c578df" dependencies = [ "chrono", - "lazy-regex 2.5.0", + "lazy-regex", "log", "native-tls", "thiserror", @@ -3044,7 +2962,7 @@ dependencies = [ "filetime", "hostname", "keyring", - "lazy-regex 3.0.1", + "lazy-regex", "lazy_static", "log", "magic-crypt", @@ -3078,9 +2996,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.16.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" dependencies = [ "smawk", "unicode-linebreak", @@ -3311,16 +3229,16 @@ checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" dependencies = [ "bitflags 1.3.2", "cassowary", - "crossterm 0.25.0", + "crossterm", "unicode-segmentation", "unicode-width", ] [[package]] name = "tui-realm-stdlib" -version = "1.3.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d8dc6284ce10a3a3e0a969f0f929f582db65f28573c670f4dfbfdfbaf75c34" +checksum = "66f252bf8b07c6fd708ddd6349b5f044ae5b488b26929c745728d9c7e2cebfa6" dependencies = [ "textwrap", "tuirealm", @@ -3329,14 +3247,13 @@ dependencies = [ [[package]] name = "tuirealm" -version = "1.9.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cf31de95c3b682bb40e1903c326892cf469ba9094eb2f6dbd93abdd6866802c" +checksum = "265411b5606f400459af94fbc5aae6a7bc0e98094d08cb5868390c932be88e26" dependencies = [ "bitflags 1.3.2", - "crossterm 0.27.0", - "lazy-regex 3.0.1", - "ratatui", + "crossterm", + "lazy-regex", "thiserror", "tui", "tuirealm_derive", diff --git a/Cargo.toml b/Cargo.toml index 9506b6b..c214a76 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Christian Visintin "] categories = ["command-line-utilities"] -description = "termscp is a feature rich terminal file transfer and explorer with support for SCP/SFTP/FTP/S3/SMB" +description = "termscp is a feature rich terminal file transfer and explorer with support for SCP/SFTP/FTP/S3" edition = "2021" homepage = "https://termscp.veeso.dev" include = ["src/**/*", "LICENSE", "README.md", "CHANGELOG.md"] @@ -47,7 +47,7 @@ edit = "^0.1" filetime = "^0.2" hostname = "^0.3" keyring = { version = "^2.0", optional = true } -lazy-regex = "^3" +lazy-regex = "^2.5" lazy_static = "^1.4" log = "^0.4" magic-crypt = "^3.1" @@ -74,8 +74,8 @@ ssh2-config = "^0.2" tempfile = "^3.4" thiserror = "^1" toml = "^0.7" -tui-realm-stdlib = "^1.3" -tuirealm = "^1.9" +tui-realm-stdlib = "^1.2" +tuirealm = "^1.8.0" unicode-width = "^0.1" version-compare = "^0.1" whoami = "^1.4" diff --git a/src/ui/activities/filetransfer/components/transfer/file_list.rs b/src/ui/activities/filetransfer/components/transfer/file_list.rs index 9ad6905..d17cc2d 100644 --- a/src/ui/activities/filetransfer/components/transfer/file_list.rs +++ b/src/ui/activities/filetransfer/components/transfer/file_list.rs @@ -7,7 +7,7 @@ use tuirealm::props::{ Alignment, AttrValue, Attribute, Borders, Color, Style, Table, TextModifiers, }; use tuirealm::tui::layout::Corner; -use tuirealm::tui::text::{Line, Span}; +use tuirealm::tui::text::{Span, Spans}; use tuirealm::tui::widgets::{List as TuiList, ListItem, ListState}; use tuirealm::{MockComponent, Props, State, StateValue}; @@ -211,7 +211,7 @@ impl MockComponent for FileList { ) }) .collect(); - ListItem::new(Line::from(columns)) + ListItem::new(Spans::from(columns)) }) .collect(), // Make List item from TextSpan _ => Vec::new(),