From f31f58aa799770c8765e4d609f5b9f0b459549c4 Mon Sep 17 00:00:00 2001 From: veeso Date: Thu, 26 Aug 2021 10:42:46 +0200 Subject: [PATCH 01/40] working on 0.7.0 --- CHANGELOG.md | 7 +++++++ Cargo.lock | 2 +- Cargo.toml | 2 +- README.md | 4 ++-- dist/pkgs/freebsd/manifest | 2 +- install.sh | 2 +- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05f6c4a..f6ba442 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog - [Changelog](#changelog) + - [0.7.0](#070) - [0.6.1](#061) - [0.6.0](#060) - [0.5.1](#051) @@ -20,6 +21,12 @@ --- +## 0.7.0 + +Released on ?? + +> 🍁 Autumn update 🍇 + ## 0.6.1 Released on 31/08/2021 diff --git a/Cargo.lock b/Cargo.lock index 0684892..65f5fd9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1371,7 +1371,7 @@ dependencies = [ [[package]] name = "termscp" -version = "0.6.1" +version = "0.7.0" dependencies = [ "argh", "bitflags", diff --git a/Cargo.toml b/Cargo.toml index 7066e40..7c55e8f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ license = "MIT" name = "termscp" readme = "README.md" repository = "https://github.com/veeso/termscp" -version = "0.6.1" +version = "0.7.0" [package.metadata.rpm] package = "termscp" diff --git a/README.md b/README.md index bf29840..ba51645 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,9 @@

Developed by @veeso

-

Current version: 0.6.1 (31/08/2021)

+

Current version: 0.7.0 (FIXME: 31/08/2021)

-[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.6.1-orange.svg)](https://crates.io/crates/termscp) [![Docs](https://docs.rs/termscp/badge.svg)](https://docs.rs/termscp) +[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) [![Docs](https://docs.rs/termscp/badge.svg)](https://docs.rs/termscp) [![Linux](https://github.com/veeso/termscp/workflows/Linux/badge.svg)](https://github.com/veeso/termscp/actions) [![MacOs](https://github.com/veeso/termscp/workflows/MacOS/badge.svg)](https://github.com/veeso/termscp/actions) [![Windows](https://github.com/veeso/termscp/workflows/Windows/badge.svg)](https://github.com/veeso/termscp/actions) [![FreeBSD](https://github.com/veeso/termscp/workflows/FreeBSD/badge.svg)](https://github.com/veeso/termscp/actions) [![Coverage Status](https://coveralls.io/repos/github/veeso/termscp/badge.svg)](https://coveralls.io/github/veeso/termscp) diff --git a/dist/pkgs/freebsd/manifest b/dist/pkgs/freebsd/manifest index c4b0d18..9526e26 100644 --- a/dist/pkgs/freebsd/manifest +++ b/dist/pkgs/freebsd/manifest @@ -1,5 +1,5 @@ name: "termscp" -version: 0.6.1 +version: 0.7.0 origin: veeso/termscp comment: "A feature rich terminal UI file transfer and explorer with support for SCP/SFTP/FTP" desc: < Date: Thu, 26 Aug 2021 11:24:13 +0200 Subject: [PATCH 02/40] Aws s3 support --- .github/actions-rs/grcov.yml | 1 + CHANGELOG.md | 6 + Cargo.lock | 270 ++++++- Cargo.toml | 6 +- README.md | 4 +- docs/man.md | 40 + src/config/bookmarks.rs | 250 ++++++- src/config/serialization.rs | 113 ++- src/filetransfer/mod.rs | 127 +++- src/filetransfer/params.rs | 194 +++-- .../{ftp_transfer.rs => transfer/ftp.rs} | 113 +-- src/filetransfer/transfer/mod.rs | 18 + src/filetransfer/transfer/s3/mod.rs | 697 ++++++++++++++++++ src/filetransfer/transfer/s3/object.rs | 247 +++++++ .../{scp_transfer.rs => transfer/scp.rs} | 122 ++- .../{sftp_transfer.rs => transfer/sftp.rs} | 149 ++-- src/host/mod.rs | 4 +- src/lib.rs | 1 + src/main.rs | 48 +- src/system/bookmarks_client.rs | 373 ++++++---- src/ui/activities/auth/bookmarks.rs | 114 +-- src/ui/activities/auth/misc.rs | 74 +- src/ui/activities/auth/mod.rs | 22 + src/ui/activities/auth/update.rs | 67 +- src/ui/activities/auth/view.rs | 243 ++++-- .../activities/filetransfer/actions/copy.rs | 22 +- .../filetransfer/actions/newfile.rs | 34 +- .../activities/filetransfer/actions/rename.rs | 41 ++ .../activities/filetransfer/lib/transfer.rs | 9 + src/ui/activities/filetransfer/misc.rs | 12 + src/ui/activities/filetransfer/mod.rs | 38 +- src/ui/activities/filetransfer/session.rs | 549 ++++++++------ src/ui/activities/filetransfer/update.rs | 6 +- src/ui/activities/setup/view/setup.rs | 9 +- src/utils/parser.rs | 317 ++++++-- src/utils/path.rs | 82 ++- src/utils/test_helpers.rs | 9 +- 37 files changed, 3458 insertions(+), 973 deletions(-) rename src/filetransfer/{ftp_transfer.rs => transfer/ftp.rs} (92%) create mode 100644 src/filetransfer/transfer/mod.rs create mode 100644 src/filetransfer/transfer/s3/mod.rs create mode 100644 src/filetransfer/transfer/s3/object.rs rename src/filetransfer/{scp_transfer.rs => transfer/scp.rs} (95%) rename src/filetransfer/{sftp_transfer.rs => transfer/sftp.rs} (91%) diff --git a/.github/actions-rs/grcov.yml b/.github/actions-rs/grcov.yml index cf68823..be98493 100644 --- a/.github/actions-rs/grcov.yml +++ b/.github/actions-rs/grcov.yml @@ -9,6 +9,7 @@ ignore: - src/main.rs - src/lib.rs - src/activity_manager.rs + - src/filetransfer/transfer/s3/mod.rs - src/support.rs - "src/ui/activities/*" - src/ui/context.rs diff --git a/CHANGELOG.md b/CHANGELOG.md index f6ba442..674c6fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,12 @@ Released on ?? > 🍁 Autumn update 🍇 +- **Aws S3** + - Added support for the aws-s3 protocol + - Operate on your bucket directly from the file explorer + - You can also save your buckets as bookmarks + - Aws s3 reads credentials directly from your credentials file at `$HOME/.aws/credentials` or from environment. Read more in the user manual. + ## 0.6.1 Released on 31/08/2021 diff --git a/Cargo.lock b/Cargo.lock index 65f5fd9..08919a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,6 +33,12 @@ dependencies = [ "opaque-debug", ] +[[package]] +name = "ahash" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" + [[package]] name = "aho-corasick" version = "0.7.18" @@ -51,6 +57,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "anyhow" +version = "1.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" + [[package]] name = "argh" version = "0.1.5" @@ -80,12 +92,78 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a61eb019cb8f415d162cb9f12130ee6bbe9168b7d953c17f4ad049e4051ca00" +[[package]] +name = "async-trait" +version = "0.1.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "attohttpc" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb8867f378f33f78a811a8eb9bf108ad99430d7aad43315dd9319c827ef6247" +dependencies = [ + "http", + "log", + "native-tls", + "openssl", + "serde", + "serde_json", + "url", + "wildmatch 1.1.0", +] + +[[package]] +name = "attohttpc" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8bda305457262b339322106c776e3fd21df860018e566eb6a5b1aa4b6ae02d" +dependencies = [ + "http", + "log", + "native-tls", + "openssl", + "url", + "wildmatch 1.1.0", +] + [[package]] name = "autocfg" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +[[package]] +name = "aws-creds" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1331d069460a674d42bd27c12b47ce578f789954c7bd7f239fd030771eca6616" +dependencies = [ + "anyhow", + "attohttpc 0.16.3", + "dirs", + "rust-ini", + "serde", + "serde-xml-rs", + "serde_derive", + "url", +] + +[[package]] +name = "aws-region" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2884b8f2aaeb4a4bf80b219b4fe1d340139ca9331679c57e0fd4a24f571a78bd" +dependencies = [ + "anyhow", +] + [[package]] name = "base64" version = "0.13.0" @@ -136,6 +214,12 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +[[package]] +name = "bytes" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + [[package]] name = "bytesize" version = "1.1.0" @@ -368,6 +452,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "dlv-list" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68df3f2b690c1b86e65ef7830956aededf3cb0a16f898f79b9a6f421a7b6211b" +dependencies = [ + "rand 0.8.4", +] + [[package]] name = "edit" version = "0.1.3" @@ -384,6 +477,12 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + [[package]] name = "foreign-types" version = "0.3.2" @@ -409,6 +508,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "futures-core" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" + [[package]] name = "generic-array" version = "0.14.4" @@ -441,6 +546,15 @@ dependencies = [ "wasi 0.10.0+wasi-snapshot-preview1", ] +[[package]] +name = "hashbrown" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +dependencies = [ + "ahash", +] + [[package]] name = "heck" version = "0.3.3" @@ -450,6 +564,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + [[package]] name = "hkdf" version = "0.10.0" @@ -481,6 +601,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "http" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "idna" version = "0.2.3" @@ -622,6 +753,17 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +[[package]] +name = "maybe-async" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6007f9dad048e0a224f27ca599d669fca8cfa0dac804725aab542b2eb032bce6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "md-5" version = "0.9.1" @@ -633,12 +775,27 @@ dependencies = [ "opaque-debug", ] +[[package]] +name = "md5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + [[package]] name = "memchr" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +[[package]] +name = "minidom" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332592c2149fc7dd40a64fc9ef6f0d65607284b474cef9817d1fc8c7e7b3608e" +dependencies = [ + "quick-xml", +] + [[package]] name = "mio" version = "0.7.13" @@ -819,6 +976,16 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "ordered-multimap" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485" +dependencies = [ + "dlv-list", + "hashbrown", +] + [[package]] name = "output_vt100" version = "0.1.2" @@ -895,6 +1062,12 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +[[package]] +name = "pin-project-lite" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" + [[package]] name = "pkg-config" version = "0.3.19" @@ -928,6 +1101,15 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "quick-xml" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26aab6b48e2590e4a64d1ed808749ba06257882b461d01ca71baeb747074a6dd" +dependencies = [ + "memchr", +] + [[package]] name = "quote" version = "1.0.9" @@ -1094,6 +1276,46 @@ dependencies = [ "winapi", ] +[[package]] +name = "rust-ini" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55b134767a87e0b086f73a4ce569ac9ce7d202f39c8eab6caa266e2617e73ac6" +dependencies = [ + "cfg-if 0.1.10", + "ordered-multimap", +] + +[[package]] +name = "rust-s3" +version = "0.27.0-rc4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c93272c1d654d492f8ab30b94cd43d98f2700b1db55b2576aff7712ce40e3ef" +dependencies = [ + "anyhow", + "async-trait", + "attohttpc 0.17.0", + "aws-creds", + "aws-region", + "base64", + "cfg-if 1.0.0", + "chrono", + "hex", + "hmac", + "http", + "log", + "maybe-async", + "md5", + "minidom", + "percent-encoding", + "serde", + "serde-xml-rs", + "serde_derive", + "sha2", + "tokio-stream", + "url", +] + [[package]] name = "rustls" version = "0.19.1" @@ -1210,6 +1432,18 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-xml-rs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0bf1ba0696ccf0872866277143ff1fd14d22eec235d2b23702f95e6660f7dfa" +dependencies = [ + "log", + "serde", + "thiserror", + "xml-rs", +] + [[package]] name = "serde_derive" version = "1.0.127" @@ -1392,6 +1626,7 @@ dependencies = [ "rand 0.8.4", "regex", "rpassword", + "rust-s3", "serde", "simplelog", "ssh2", @@ -1405,7 +1640,7 @@ dependencies = [ "ureq", "users", "whoami", - "wildmatch", + "wildmatch 2.1.0", ] [[package]] @@ -1476,6 +1711,27 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +[[package]] +name = "tokio" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92036be488bb6594459f2e03b60e42df6f937fe6ca5c5ffdcb539c6b84dc40f5" +dependencies = [ + "autocfg", + "pin-project-lite", +] + +[[package]] +name = "tokio-stream" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + [[package]] name = "toml" version = "0.5.8" @@ -1741,6 +1997,12 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wildmatch" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f44b95f62d34113cf558c93511ac93027e03e9c29a60dd0fd70e6e025c7270a" + [[package]] name = "wildmatch" version = "2.1.0" @@ -1777,3 +2039,9 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "xml-rs" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" diff --git a/Cargo.toml b/Cargo.toml index 7c55e8f..0b88c4f 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" +description = "termscp is a feature rich terminal file transfer and explorer with support for SCP/SFTP/FTP/S3" documentation = "https://docs.rs/termscp" edition = "2018" homepage = "https://veeso.github.io/termscp/" @@ -44,6 +44,7 @@ open = "2.0.1" rand = "0.8.4" regex = "1.5.4" rpassword = "5.0.1" +rust-s3 = { version = "0.27.0-rc4", default-features = false, features = [ "sync-native-tls", "sync" ] } serde = { version = "^1.0.0", features = [ "derive" ] } simplelog = "0.10.0" ssh2 = "0.9.0" @@ -63,7 +64,8 @@ pretty_assertions = "0.7.2" [features] default = [ "with-keyring" ] -github-actions = [] +github-actions = [ ] +with-s3-ci = [] with-containers = [] with-keyring = [ "keyring" ] diff --git a/README.md b/README.md index ba51645..96a4b17 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ ## About termscp 🖥 -Termscp is a feature rich terminal file transfer and explorer, with support for SCP/SFTP/FTP. So basically is a terminal utility with an TUI to connect to a remote server to retrieve and upload files and to interact with the local file system. It is **Linux**, **MacOS**, **BSD** and **Windows** compatible and supports SFTP, SCP, FTP and FTPS. +Termscp is a feature rich terminal file transfer and explorer, with support for SCP/SFTP/FTP/S3. So basically is a terminal utility with an TUI to connect to a remote server to retrieve and upload files and to interact with the local file system. It is **Linux**, **MacOS**, **BSD** and **Windows** compatible and supports SFTP, SCP, FTP, FTPS and S3. ![Explorer](assets/images/explorer.gif) @@ -36,6 +36,7 @@ Termscp is a feature rich terminal file transfer and explorer, with support for - SFTP - SCP - FTP and FTPS + - Aws S3 - 🖥 Explore and operate on the remote and on the local machine file system with a handy UI - Create, remove, rename, search, view and edit files - ⭐ Connect to your favourite hosts through built-in bookmarks and recent connections @@ -160,6 +161,7 @@ termscp is powered by these aweseome projects: - [keyring-rs](https://github.com/hwchen/keyring-rs) - [open-rs](https://github.com/Byron/open-rs) - [rpassword](https://github.com/conradkleinespel/rpassword) +- [rust-s3](https://github.com/durch/rust-s3) - [ssh2-rs](https://github.com/alexcrichton/ssh2-rs) - [suppaftp](https://github.com/veeso/suppaftp) - [textwrap](https://github.com/mgeisler/textwrap) diff --git a/docs/man.md b/docs/man.md index 0b1df9d..d635fae 100644 --- a/docs/man.md +++ b/docs/man.md @@ -3,6 +3,7 @@ - [User manual 🎓](#user-manual-) - [Usage ❓](#usage-) - [Address argument 🌎](#address-argument-) + - [AWS S3 address argument](#aws-s3-address-argument) - [How Password can be provided 🔐](#how-password-can-be-provided-) - [File explorer 📂](#file-explorer-) - [Keybindings ⌨](#keybindings-) @@ -13,6 +14,7 @@ - [Are my passwords Safe 😈](#are-my-passwords-safe-) - [Linux Keyring](#linux-keyring) - [KeepassXC setup for termscp](#keepassxc-setup-for-termscp) + - [Aws S3 credentials 🦊](#aws-s3-credentials-) - [Configuration ⚙️](#configuration-️) - [SSH Key Storage 🔐](#ssh-key-storage-) - [File Explorer Format](#file-explorer-format) @@ -78,6 +80,20 @@ Let's see some example of this particular syntax, since it's very comfortable an termscp scp://omar@192.168.1.31:4022:/tmp ``` +#### AWS S3 address argument + +Aws S3 has a different syntax for CLI address argument, for obvious reasons, but I managed to keep it the more similiar as possible to the generic address argument: + +```txt +s3://@[:profile][:/wrkdir] +``` + +e.g. + +```txt +s3://buckethead@eu-central-1:default:/assets +``` + #### How Password can be provided 🔐 You have probably noticed, that, when providing the address as argument, there's no way to provide the password. @@ -246,6 +262,30 @@ Follow these steps in order to setup keepassXC for termscp: --- +## Aws S3 credentials 🦊 + +In order to connect to an Aws S3 bucket you must obviously provide some credentials. +There are basically two ways to achieve this, and as you've probably already noticed you **can't** do that via the authentication form. +So these are the ways you can provide the credentials for s3: + +1. Use your credentials file: just configure the AWS cli via `aws configure` and your credentials should already be located at `~/.aws/credentials`. In case you're using a profile different from `default`, just provide it in the profile field in the authentication form. +2. **Environment variables**: you can always provide your credentials as environment variables. Keep in mind that these credentials **will always override** the credentials located in the `credentials` file. See how to configure the environment below: + + These should always be mandatory: + + - `AWS_ACCESS_KEY_ID`: aws access key ID (usually starts with `AKIA...`) + - `AWS_SECRET_ACCESS_KEY`: the secret access key + + In case you've configured a stronger security, you *may* require these too: + + - `AWS_SECURITY_TOKEN`: security token + - `AWS_SESSION_TOKEN`: session token + +⚠️ Your credentials are safe: termscp won't manipulate these values directly! Your credentials are directly consumed by the **s3** crate. +In case you've got some concern regarding security, please contact the library author on [Github](https://github.com/durch/rust-s3) ⚠️ + +--- + ## Configuration ⚙️ termscp supports some user defined parameters, which can be defined in the configuration. diff --git a/src/config/bookmarks.rs b/src/config/bookmarks.rs index 0bb5265..dd7fcdf 100644 --- a/src/config/bookmarks.rs +++ b/src/config/bookmarks.rs @@ -25,31 +25,57 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -use serde::{Deserialize, Serialize}; -use std::collections::HashMap; +use crate::filetransfer::params::{AwsS3Params, GenericProtocolParams, ProtocolParams}; +use crate::filetransfer::{FileTransferParams, FileTransferProtocol}; + +use serde::{de::Error as DeError, Deserialize, Deserializer, Serialize, Serializer}; +use std::collections::HashMap; +use std::str::FromStr; -#[derive(Deserialize, Serialize, std::fmt::Debug)] /// ## UserHosts /// /// UserHosts contains all the hosts saved by the user in the data storage /// It contains both `Bookmark` +#[derive(Deserialize, Serialize, Debug)] pub struct UserHosts { pub bookmarks: HashMap, pub recents: HashMap, } -#[derive(Deserialize, Serialize, std::fmt::Debug, PartialEq)] /// ## Bookmark /// /// Bookmark describes a single bookmark entry in the user hosts storage +#[derive(Clone, Deserialize, Serialize, Debug, PartialEq)] pub struct Bookmark { - pub address: String, - pub port: u16, - pub protocol: String, - pub username: String, - pub password: Option, // Password is optional; base64, aes-128 encrypted password + #[serde( + deserialize_with = "deserialize_protocol", + serialize_with = "serialize_protocol" + )] + pub protocol: FileTransferProtocol, + /// Address for generic parameters + pub address: Option, + /// Port number for generic parameters + pub port: Option, + /// Username for generic parameters + pub username: Option, + /// Password is optional; base64, aes-128 encrypted password + pub password: Option, + /// S3 params; optional. When used other fields are empty for sure + pub s3: Option, } +/// ## S3Params +/// +/// Connection parameters for Aws s3 protocol +#[derive(Clone, Deserialize, Serialize, Debug, PartialEq, Default)] +pub struct S3Params { + pub bucket: String, + pub region: String, + pub profile: Option, +} + +// -- impls + impl Default for UserHosts { fn default() -> Self { Self { @@ -59,6 +85,87 @@ impl Default for UserHosts { } } +impl From for Bookmark { + fn from(params: FileTransferParams) -> Self { + let protocol: FileTransferProtocol = params.protocol; + // Create generic or others + match params.params { + ProtocolParams::Generic(params) => Self { + protocol, + address: Some(params.address), + port: Some(params.port), + username: params.username, + password: params.password, + s3: None, + }, + ProtocolParams::AwsS3(params) => Self { + protocol, + address: None, + port: None, + username: None, + password: None, + s3: Some(S3Params::from(params)), + }, + } + } +} + +impl From for FileTransferParams { + fn from(bookmark: Bookmark) -> Self { + // Create generic or others based on protocol + match bookmark.protocol { + FileTransferProtocol::AwsS3 => { + let params = bookmark.s3.unwrap_or_default(); + let params = AwsS3Params::from(params); + Self::new(FileTransferProtocol::AwsS3, ProtocolParams::AwsS3(params)) + } + protocol => { + let params = GenericProtocolParams::default() + .address(bookmark.address.unwrap_or_default()) + .port(bookmark.port.unwrap_or(22)) + .username(bookmark.username) + .password(bookmark.password); + Self::new(protocol, ProtocolParams::Generic(params)) + } + } + } +} + +impl From for S3Params { + fn from(params: AwsS3Params) -> Self { + S3Params { + bucket: params.bucket_name, + region: params.region, + profile: params.profile, + } + } +} + +impl From for AwsS3Params { + fn from(params: S3Params) -> Self { + AwsS3Params::new(params.bucket, params.region, params.profile) + } +} + +fn deserialize_protocol<'de, D>(deserializer: D) -> Result +where + D: Deserializer<'de>, +{ + let s: &str = Deserialize::deserialize(deserializer)?; + // Parse color + match FileTransferProtocol::from_str(s) { + Err(err) => Err(DeError::custom(err)), + Ok(protocol) => Ok(protocol), + } +} + +fn serialize_protocol(protocol: &FileTransferProtocol, serializer: S) -> Result +where + S: Serializer, +{ + serializer.serialize_str(protocol.to_string().as_str()) +} + // Tests #[cfg(test)] @@ -77,48 +184,117 @@ mod tests { #[test] fn test_bookmarks_bookmark_new() { let bookmark: Bookmark = Bookmark { - address: String::from("192.168.1.1"), - port: 22, - protocol: String::from("SFTP"), - username: String::from("root"), + address: Some(String::from("192.168.1.1")), + port: Some(22), + protocol: FileTransferProtocol::Sftp, + username: Some(String::from("root")), password: Some(String::from("password")), + s3: None, }; let recent: Bookmark = Bookmark { - address: String::from("192.168.1.2"), - port: 22, - protocol: String::from("SCP"), - username: String::from("admin"), + address: Some(String::from("192.168.1.2")), + port: Some(22), + protocol: FileTransferProtocol::Scp, + username: Some(String::from("admin")), password: Some(String::from("password")), + s3: None, }; let mut bookmarks: HashMap = HashMap::with_capacity(1); bookmarks.insert(String::from("test"), bookmark); let mut recents: HashMap = HashMap::with_capacity(1); recents.insert(String::from("ISO20201218T181432"), recent); - let hosts: UserHosts = UserHosts { - bookmarks: bookmarks, - recents: recents, - }; + let hosts: UserHosts = UserHosts { bookmarks, recents }; // Verify let bookmark: &Bookmark = hosts.bookmarks.get(&String::from("test")).unwrap(); - assert_eq!(bookmark.address, String::from("192.168.1.1")); - assert_eq!(bookmark.port, 22); - assert_eq!(bookmark.protocol, String::from("SFTP")); - assert_eq!(bookmark.username, String::from("root")); - assert_eq!( - *bookmark.password.as_ref().unwrap(), - String::from("password") - ); + assert_eq!(bookmark.address.as_deref().unwrap(), "192.168.1.1"); + assert_eq!(bookmark.port.unwrap(), 22); + assert_eq!(bookmark.protocol, FileTransferProtocol::Sftp); + assert_eq!(bookmark.username.as_deref().unwrap(), "root"); + assert_eq!(bookmark.password.as_deref().unwrap(), "password"); let bookmark: &Bookmark = hosts .recents .get(&String::from("ISO20201218T181432")) .unwrap(); - assert_eq!(bookmark.address, String::from("192.168.1.2")); - assert_eq!(bookmark.port, 22); - assert_eq!(bookmark.protocol, String::from("SCP")); - assert_eq!(bookmark.username, String::from("admin")); - assert_eq!( - *bookmark.password.as_ref().unwrap(), - String::from("password") - ); + assert_eq!(bookmark.address.as_deref().unwrap(), "192.168.1.2"); + assert_eq!(bookmark.port.unwrap(), 22); + assert_eq!(bookmark.protocol, FileTransferProtocol::Scp); + assert_eq!(bookmark.username.as_deref().unwrap(), "admin"); + assert_eq!(bookmark.password.as_deref().unwrap(), "password"); + } + + #[test] + fn bookmark_from_generic_ftparams() { + let params = ProtocolParams::Generic(GenericProtocolParams { + address: "127.0.0.1".to_string(), + port: 10222, + username: Some(String::from("root")), + password: Some(String::from("omar")), + }); + let params: FileTransferParams = FileTransferParams::new(FileTransferProtocol::Scp, params); + let bookmark = Bookmark::from(params); + assert_eq!(bookmark.protocol, FileTransferProtocol::Scp); + assert_eq!(bookmark.address.as_deref().unwrap(), "127.0.0.1"); + assert_eq!(bookmark.port.unwrap(), 10222); + assert_eq!(bookmark.username.as_deref().unwrap(), "root"); + assert_eq!(bookmark.password.as_deref().unwrap(), "omar"); + assert!(bookmark.s3.is_none()); + } + + #[test] + fn bookmark_from_s3_ftparams() { + let params = ProtocolParams::AwsS3(AwsS3Params::new("omar", "eu-west-1", Some("test"))); + let params: FileTransferParams = + FileTransferParams::new(FileTransferProtocol::AwsS3, params); + let bookmark = Bookmark::from(params); + assert_eq!(bookmark.protocol, FileTransferProtocol::AwsS3); + assert!(bookmark.address.is_none()); + assert!(bookmark.port.is_none()); + assert!(bookmark.username.is_none()); + assert!(bookmark.password.is_none()); + let s3: &S3Params = bookmark.s3.as_ref().unwrap(); + assert_eq!(s3.bucket.as_str(), "omar"); + assert_eq!(s3.region.as_str(), "eu-west-1"); + assert_eq!(s3.profile.as_deref().unwrap(), "test"); + } + + #[test] + fn ftparams_from_generic_bookmark() { + let bookmark: Bookmark = Bookmark { + address: Some(String::from("192.168.1.1")), + port: Some(22), + protocol: FileTransferProtocol::Sftp, + username: Some(String::from("root")), + password: Some(String::from("password")), + s3: None, + }; + let params = FileTransferParams::from(bookmark); + assert_eq!(params.protocol, FileTransferProtocol::Sftp); + let gparams = params.params.generic_params().unwrap(); + assert_eq!(gparams.address.as_str(), "192.168.1.1"); + assert_eq!(gparams.port, 22); + assert_eq!(gparams.username.as_deref().unwrap(), "root"); + assert_eq!(gparams.password.as_deref().unwrap(), "password"); + } + + #[test] + fn ftparams_from_s3_bookmark() { + let bookmark: Bookmark = Bookmark { + protocol: FileTransferProtocol::AwsS3, + address: None, + port: None, + username: None, + password: None, + s3: Some(S3Params { + bucket: String::from("veeso"), + region: String::from("eu-west-1"), + profile: None, + }), + }; + let params = FileTransferParams::from(bookmark); + assert_eq!(params.protocol, FileTransferProtocol::AwsS3); + let gparams = params.params.s3_params().unwrap(); + assert_eq!(gparams.bucket_name.as_str(), "veeso"); + assert_eq!(gparams.region.as_str(), "eu-west-1"); + assert_eq!(gparams.profile, None); } } diff --git a/src/config/serialization.rs b/src/config/serialization.rs index eacd88f..6505c3a 100644 --- a/src/config/serialization.rs +++ b/src/config/serialization.rs @@ -141,17 +141,19 @@ where mod tests { use super::*; + + use crate::config::bookmarks::{Bookmark, S3Params, UserHosts}; + use crate::config::params::UserConfig; + use crate::config::themes::Theme; + use crate::filetransfer::FileTransferProtocol; + use crate::utils::test_helpers::create_file_ioers; + use pretty_assertions::assert_eq; use std::collections::HashMap; use std::io::{Seek, SeekFrom}; use std::path::PathBuf; use tuirealm::tui::style::Color; - use crate::config::bookmarks::{Bookmark, UserHosts}; - use crate::config::params::UserConfig; - use crate::config::themes::Theme; - use crate::utils::test_helpers::create_file_ioers; - #[test] fn test_config_serialization_errors() { let error: SerializerError = SerializerError::new(SerializerErrorKind::Syntax); @@ -373,31 +375,42 @@ mod tests { // Verify recents assert_eq!(hosts.recents.len(), 1); let host: &Bookmark = hosts.recents.get("ISO20201215T094000Z").unwrap(); - assert_eq!(host.address, String::from("172.16.104.10")); - assert_eq!(host.port, 22); - assert_eq!(host.protocol, String::from("SCP")); - assert_eq!(host.username, String::from("root")); + assert_eq!(host.address.as_deref().unwrap(), "172.16.104.10"); + assert_eq!(host.port.unwrap(), 22); + assert_eq!(host.protocol, FileTransferProtocol::Scp); + assert_eq!(host.username.as_deref().unwrap(), "root"); assert_eq!(host.password, None); // Verify bookmarks - assert_eq!(hosts.bookmarks.len(), 3); + assert_eq!(hosts.bookmarks.len(), 4); let host: &Bookmark = hosts.bookmarks.get("raspberrypi2").unwrap(); - assert_eq!(host.address, String::from("192.168.1.31")); - assert_eq!(host.port, 22); - assert_eq!(host.protocol, String::from("SFTP")); - assert_eq!(host.username, String::from("root")); - assert_eq!(*host.password.as_ref().unwrap(), String::from("mypassword")); + assert_eq!(host.address.as_deref().unwrap(), "192.168.1.31"); + assert_eq!(host.port.unwrap(), 22); + assert_eq!(host.protocol, FileTransferProtocol::Sftp); + assert_eq!(host.username.as_deref().unwrap(), "root"); + assert_eq!(host.password.as_deref().unwrap(), "mypassword"); let host: &Bookmark = hosts.bookmarks.get("msi-estrem").unwrap(); - assert_eq!(host.address, String::from("192.168.1.30")); - assert_eq!(host.port, 22); - assert_eq!(host.protocol, String::from("SFTP")); - assert_eq!(host.username, String::from("cvisintin")); - assert_eq!(*host.password.as_ref().unwrap(), String::from("mysecret")); + assert_eq!(host.address.as_deref().unwrap(), "192.168.1.30"); + assert_eq!(host.port.unwrap(), 22); + assert_eq!(host.protocol, FileTransferProtocol::Sftp); + assert_eq!(host.username.as_deref().unwrap(), "cvisintin"); + assert_eq!(host.password.as_deref().unwrap(), "mysecret"); let host: &Bookmark = hosts.bookmarks.get("aws-server-prod1").unwrap(); - assert_eq!(host.address, String::from("51.23.67.12")); - assert_eq!(host.port, 21); - assert_eq!(host.protocol, String::from("FTPS")); - assert_eq!(host.username, String::from("aws001")); + assert_eq!(host.address.as_deref().unwrap(), "51.23.67.12"); + assert_eq!(host.port.unwrap(), 21); + assert_eq!(host.protocol, FileTransferProtocol::Ftp(true)); + assert_eq!(host.username.as_deref().unwrap(), "aws001"); assert_eq!(host.password, None); + // Aws s3 bucket + let host: &Bookmark = hosts.bookmarks.get("my-bucket").unwrap(); + assert_eq!(host.address, None); + assert_eq!(host.port, None); + assert_eq!(host.username, None); + assert_eq!(host.password, None); + assert_eq!(host.protocol, FileTransferProtocol::AwsS3); + let s3 = host.s3.as_ref().unwrap(); + assert_eq!(s3.bucket.as_str(), "veeso"); + assert_eq!(s3.region.as_str(), "eu-west-1"); + assert_eq!(s3.profile.as_deref().unwrap(), "default"); } #[test] @@ -416,32 +429,50 @@ mod tests { bookmarks.insert( String::from("raspberrypi2"), Bookmark { - address: String::from("192.168.1.31"), - port: 22, - protocol: String::from("SFTP"), - username: String::from("root"), + address: Some(String::from("192.168.1.31")), + port: Some(22), + protocol: FileTransferProtocol::Sftp, + username: Some(String::from("root")), password: None, + s3: None, }, ); bookmarks.insert( String::from("msi-estrem"), Bookmark { - address: String::from("192.168.1.30"), - port: 4022, - protocol: String::from("SFTP"), - username: String::from("cvisintin"), + address: Some(String::from("192.168.1.30")), + port: Some(4022), + protocol: FileTransferProtocol::Sftp, + username: Some(String::from("cvisintin")), password: Some(String::from("password")), + s3: None, + }, + ); + bookmarks.insert( + String::from("my-bucket"), + Bookmark { + address: None, + port: None, + protocol: FileTransferProtocol::AwsS3, + username: None, + password: None, + s3: Some(S3Params { + bucket: "veeso".to_string(), + region: "eu-west-1".to_string(), + profile: None, + }), }, ); let mut recents: HashMap = HashMap::with_capacity(1); recents.insert( String::from("ISO20201215T094000Z"), Bookmark { - address: String::from("192.168.1.254"), - port: 3022, - protocol: String::from("SCP"), - username: String::from("omar"), + address: Some(String::from("192.168.1.254")), + port: Some(3022), + protocol: FileTransferProtocol::Scp, + username: Some(String::from("omar")), password: Some(String::from("aaa")), + s3: None, }, ); let tmpfile: tempfile::NamedTempFile = tempfile::NamedTempFile::new().unwrap(); @@ -482,6 +513,14 @@ mod tests { raspberrypi2 = { address = "192.168.1.31", port = 22, protocol = "SFTP", username = "root", password = "mypassword" } msi-estrem = { address = "192.168.1.30", port = 22, protocol = "SFTP", username = "cvisintin", password = "mysecret" } aws-server-prod1 = { address = "51.23.67.12", port = 21, protocol = "FTPS", username = "aws001" } + + [bookmarks.my-bucket] + protocol = "S3" + + [bookmarks.my-bucket.s3] + bucket = "veeso" + region = "eu-west-1" + profile = "default" [recents] ISO20201215T094000Z = { address = "172.16.104.10", port = 22, protocol = "SCP", username = "root" } @@ -497,7 +536,7 @@ mod tests { let file_content: &str = r#" [bookmarks] raspberrypi2 = { address = "192.168.1.31", port = 22, protocol = "SFTP", username = "root"} - msi-estrem = { address = "192.168.1.30", port = 22, protocol = "SFTP" } + msi-estrem = { address = "192.168.1.30", port = 22 } aws-server-prod1 = { address = "51.23.67.12", port = 21, protocol = "FTPS", username = "aws001" } [recents] diff --git a/src/filetransfer/mod.rs b/src/filetransfer/mod.rs index 39d10c0..4208890 100644 --- a/src/filetransfer/mod.rs +++ b/src/filetransfer/mod.rs @@ -28,27 +28,29 @@ // locals use crate::fs::{FsEntry, FsFile}; // ext -use std::io::{Read, Write}; +use std::fs::File; +use std::io::{self, Read, Write}; use std::path::{Path, PathBuf}; use thiserror::Error; use wildmatch::WildMatch; // exports -pub mod ftp_transfer; pub mod params; -pub mod scp_transfer; -pub mod sftp_transfer; +mod transfer; -pub use params::FileTransferParams; +// -- export types +pub use params::{FileTransferParams, ProtocolParams}; +pub use transfer::{FtpFileTransfer, S3FileTransfer, ScpFileTransfer, SftpFileTransfer}; /// ## FileTransferProtocol /// /// This enum defines the different transfer protocol available in termscp -#[derive(PartialEq, Debug, std::clone::Clone, Copy)] +#[derive(PartialEq, Debug, Clone, Copy)] pub enum FileTransferProtocol { Sftp, Scp, Ftp(bool), // Bool is for secure (true => ftps) + AwsS3, } /// ## FileTransferError @@ -130,25 +132,16 @@ impl std::fmt::Display for FileTransferError { /// ## FileTransfer /// /// File transfer trait must be implemented by all the file transfers and defines the method used by a generic file transfer - pub trait FileTransfer { /// ### connect /// /// Connect to the remote server /// Can return banner / welcome message on success - - fn connect( - &mut self, - address: String, - port: u16, - username: Option, - password: Option, - ) -> Result, FileTransferError>; + fn connect(&mut self, params: &ProtocolParams) -> Result, FileTransferError>; /// ### disconnect /// /// Disconnect from the remote server - fn disconnect(&mut self) -> Result<(), FileTransferError>; /// ### is_connected @@ -210,18 +203,28 @@ pub trait FileTransfer { /// Send file to remote /// File name is referred to the name of the file as it will be saved /// Data contains the file data - /// Returns file and its size + /// Returns file and its size. + /// By default returns unsupported feature fn send_file( &mut self, - local: &FsFile, - file_name: &Path, - ) -> Result, FileTransferError>; + _local: &FsFile, + _file_name: &Path, + ) -> Result, FileTransferError> { + Err(FileTransferError::new( + FileTransferErrorType::UnsupportedFeature, + )) + } /// ### recv_file /// /// Receive file from remote with provided name /// Returns file and its size - fn recv_file(&mut self, file: &FsFile) -> Result, FileTransferError>; + /// By default returns unsupported feature + fn recv_file(&mut self, _file: &FsFile) -> Result, FileTransferError> { + Err(FileTransferError::new( + FileTransferErrorType::UnsupportedFeature, + )) + } /// ### on_sent /// @@ -230,7 +233,10 @@ pub trait FileTransfer { /// The purpose of this method is to finalize the connection with the peer when writing data. /// This is necessary for some protocols such as FTP. /// You must call this method each time you want to finalize the write of the remote file. - fn on_sent(&mut self, writable: Box) -> Result<(), FileTransferError>; + /// By default this function returns already `Ok(())` + fn on_sent(&mut self, _writable: Box) -> Result<(), FileTransferError> { + Ok(()) + } /// ### on_recv /// @@ -239,7 +245,71 @@ pub trait FileTransfer { /// The purpose of this method is to finalize the connection with the peer when reading data. /// This mighe be necessary for some protocols. /// You must call this method each time you want to finalize the read of the remote file. - fn on_recv(&mut self, readable: Box) -> Result<(), FileTransferError>; + /// By default this function returns already `Ok(())` + fn on_recv(&mut self, _readable: Box) -> Result<(), FileTransferError> { + Ok(()) + } + + /// ### send_file_wno_stream + /// + /// Send a file to remote WITHOUT using streams. + /// This method SHOULD be implemented ONLY when streams are not supported by the current file transfer. + /// The developer implementing the filetransfer user should FIRST try with `send_file` followed by `on_sent` + /// If the function returns error kind() `UnsupportedFeature`, then he should call this function. + /// By default this function uses the streams function to copy content from reader to writer + fn send_file_wno_stream( + &mut self, + src: &FsFile, + dest: &Path, + mut reader: Box, + ) -> Result<(), FileTransferError> { + match self.is_connected() { + true => { + let mut stream = self.send_file(src, dest)?; + io::copy(&mut reader, &mut stream).map_err(|e| { + FileTransferError::new_ex(FileTransferErrorType::ProtocolError, e.to_string()) + })?; + self.on_sent(stream) + } + false => Err(FileTransferError::new( + FileTransferErrorType::UninitializedSession, + )), + } + } + + /// ### recv_file_wno_stream + /// + /// Receive a file from remote WITHOUT using streams. + /// This method SHOULD be implemented ONLY when streams are not supported by the current file transfer. + /// The developer implementing the filetransfer user should FIRST try with `send_file` followed by `on_sent` + /// If the function returns error kind() `UnsupportedFeature`, then he should call this function. + /// For safety reasons this function doesn't accept the `Write` trait, but the destination path. + /// By default this function uses the streams function to copy content from reader to writer + fn recv_file_wno_stream(&mut self, src: &FsFile, dest: &Path) -> Result<(), FileTransferError> { + match self.is_connected() { + true => { + let mut writer = File::create(dest).map_err(|e| { + FileTransferError::new_ex( + FileTransferErrorType::FileCreateDenied, + format!("Could not open local file: {}", e), + ) + })?; + let mut stream = self.recv_file(src)?; + io::copy(&mut stream, &mut writer) + .map(|_| ()) + .map_err(|e| { + FileTransferError::new_ex( + FileTransferErrorType::ProtocolError, + e.to_string(), + ) + })?; + self.on_recv(stream) + } + false => Err(FileTransferError::new( + FileTransferErrorType::UninitializedSession, + )), + } + } /// ### find /// @@ -314,6 +384,7 @@ impl std::string::ToString for FileTransferProtocol { }, FileTransferProtocol::Scp => "SCP", FileTransferProtocol::Sftp => "SFTP", + FileTransferProtocol::AwsS3 => "S3", }) } } @@ -326,6 +397,7 @@ impl std::str::FromStr for FileTransferProtocol { "FTPS" => Ok(FileTransferProtocol::Ftp(true)), "SCP" => Ok(FileTransferProtocol::Scp), "SFTP" => Ok(FileTransferProtocol::Sftp), + "S3" => Ok(FileTransferProtocol::AwsS3), _ => Err(s.to_string()), } } @@ -385,6 +457,14 @@ mod tests { FileTransferProtocol::from_str("scp").ok().unwrap(), FileTransferProtocol::Scp ); + assert_eq!( + FileTransferProtocol::from_str("S3").ok().unwrap(), + FileTransferProtocol::AwsS3 + ); + assert_eq!( + FileTransferProtocol::from_str("s3").ok().unwrap(), + FileTransferProtocol::AwsS3 + ); // Error assert!(FileTransferProtocol::from_str("dummy").is_err()); // To String @@ -398,6 +478,7 @@ mod tests { ); assert_eq!(FileTransferProtocol::Scp.to_string(), String::from("SCP")); assert_eq!(FileTransferProtocol::Sftp.to_string(), String::from("SFTP")); + assert_eq!(FileTransferProtocol::AwsS3.to_string(), String::from("S3")); } #[test] diff --git a/src/filetransfer/params.rs b/src/filetransfer/params.rs index 893b172..c274ceb 100644 --- a/src/filetransfer/params.rs +++ b/src/filetransfer/params.rs @@ -32,44 +32,132 @@ use std::path::{Path, PathBuf}; /// ### FileTransferParams /// /// Holds connection parameters for file transfers -#[derive(Clone)] +#[derive(Debug, Clone)] pub struct FileTransferParams { + pub protocol: FileTransferProtocol, + pub params: ProtocolParams, + pub entry_directory: Option, +} + +/// ## ProtocolParams +/// +/// Container for protocol params +#[derive(Debug, Clone)] +pub enum ProtocolParams { + Generic(GenericProtocolParams), + AwsS3(AwsS3Params), +} + +/// ## GenericProtocolParams +/// +/// Protocol params used by most common protocols +#[derive(Debug, Clone)] +pub struct GenericProtocolParams { pub address: String, pub port: u16, - pub protocol: FileTransferProtocol, pub username: Option, pub password: Option, - pub entry_directory: Option, +} + +/// ## AwsS3Params +/// +/// Connection parameters for AWS S3 protocol +#[derive(Debug, Clone)] +pub struct AwsS3Params { + pub bucket_name: String, + pub region: String, + pub profile: Option, } impl FileTransferParams { /// ### new /// /// Instantiates a new `FileTransferParams` - pub fn new>(address: S) -> Self { + pub fn new(protocol: FileTransferProtocol, params: ProtocolParams) -> Self { Self { - address: address.as_ref().to_string(), - port: 22, - protocol: FileTransferProtocol::Sftp, - username: None, - password: None, + protocol, + params, entry_directory: None, } } - /// ### port + /// ### entry_directory /// - /// Set port for params - pub fn port(mut self, port: u16) -> Self { - self.port = port; + /// Set entry directory + pub fn entry_directory>(mut self, dir: Option

) -> Self { + self.entry_directory = dir.map(|x| x.as_ref().to_path_buf()); + self + } +} + +impl Default for FileTransferParams { + fn default() -> Self { + Self::new(FileTransferProtocol::Sftp, ProtocolParams::default()) + } +} + +impl Default for ProtocolParams { + fn default() -> Self { + Self::Generic(GenericProtocolParams::default()) + } +} + +impl ProtocolParams { + /// ### generic_params + /// + /// Retrieve generic parameters from protocol params if any + pub fn generic_params(&self) -> Option<&GenericProtocolParams> { + match self { + ProtocolParams::Generic(params) => Some(params), + _ => None, + } + } + + pub fn mut_generic_params(&mut self) -> Option<&mut GenericProtocolParams> { + match self { + ProtocolParams::Generic(params) => Some(params), + _ => None, + } + } + + /// ### s3_params + /// + /// Retrieve AWS S3 parameters if any + pub fn s3_params(&self) -> Option<&AwsS3Params> { + match self { + ProtocolParams::AwsS3(params) => Some(params), + _ => None, + } + } +} + +// -- Generic protocol params + +impl Default for GenericProtocolParams { + fn default() -> Self { + Self { + address: "localhost".to_string(), + port: 22, + username: None, + password: None, + } + } +} + +impl GenericProtocolParams { + /// ### address + /// + /// Set address to params + pub fn address>(mut self, address: S) -> Self { + self.address = address.as_ref().to_string(); self } - /// ### protocol + /// ### port /// - /// Set protocol for params - pub fn protocol(mut self, protocol: FileTransferProtocol) -> Self { - self.protocol = protocol; + /// Set port to params + pub fn port(mut self, port: u16) -> Self { + self.port = port; self } @@ -88,19 +176,20 @@ impl FileTransferParams { self.password = password.map(|x| x.as_ref().to_string()); self } - - /// ### entry_directory - /// - /// Set entry directory - pub fn entry_directory>(mut self, dir: Option

) -> Self { - self.entry_directory = dir.map(|x| x.as_ref().to_path_buf()); - self - } } -impl Default for FileTransferParams { - fn default() -> Self { - Self::new("localhost") +// -- S3 params + +impl AwsS3Params { + /// ### new + /// + /// Instantiates a new `AwsS3Params` struct + pub fn new>(bucket: S, region: S, profile: Option) -> Self { + Self { + bucket_name: bucket.as_ref().to_string(), + region: region.as_ref().to_string(), + profile: profile.map(|x| x.as_ref().to_string()), + } } } @@ -112,26 +201,49 @@ mod test { #[test] fn test_filetransfer_params() { - let params: FileTransferParams = FileTransferParams::new("test.rebex.net") - .port(2222) - .protocol(FileTransferProtocol::Scp) - .username(Some("omar")) - .password(Some("foobar")) - .entry_directory(Some(&Path::new("/tmp"))); - assert_eq!(params.address.as_str(), "test.rebex.net"); - assert_eq!(params.port, 2222); + let params: FileTransferParams = + FileTransferParams::new(FileTransferProtocol::Scp, ProtocolParams::default()) + .entry_directory(Some(&Path::new("/tmp"))); + assert_eq!( + params.params.generic_params().unwrap().address.as_str(), + "localhost" + ); assert_eq!(params.protocol, FileTransferProtocol::Scp); - assert_eq!(params.username.as_ref().unwrap(), "omar"); - assert_eq!(params.password.as_ref().unwrap(), "foobar"); + assert_eq!( + params.entry_directory.as_deref().unwrap(), + Path::new("/tmp") + ); } #[test] - fn test_filetransfer_params_default() { - let params: FileTransferParams = FileTransferParams::default(); + fn params_default() { + let params: GenericProtocolParams = ProtocolParams::default() + .generic_params() + .unwrap() + .to_owned(); assert_eq!(params.address.as_str(), "localhost"); assert_eq!(params.port, 22); - assert_eq!(params.protocol, FileTransferProtocol::Sftp); assert!(params.username.is_none()); assert!(params.password.is_none()); } + + #[test] + fn params_aws_s3() { + let params: AwsS3Params = AwsS3Params::new("omar", "eu-west-1", Some("test")); + assert_eq!(params.bucket_name.as_str(), "omar"); + assert_eq!(params.region.as_str(), "eu-west-1"); + assert_eq!(params.profile.as_deref().unwrap(), "test"); + } + + #[test] + fn references() { + let mut params = ProtocolParams::AwsS3(AwsS3Params::new("omar", "eu-west-1", Some("test"))); + assert!(params.s3_params().is_some()); + assert!(params.generic_params().is_none()); + assert!(params.mut_generic_params().is_none()); + let mut params = ProtocolParams::default(); + assert!(params.s3_params().is_none()); + assert!(params.generic_params().is_some()); + assert!(params.mut_generic_params().is_some()); + } } diff --git a/src/filetransfer/ftp_transfer.rs b/src/filetransfer/transfer/ftp.rs similarity index 92% rename from src/filetransfer/ftp_transfer.rs rename to src/filetransfer/transfer/ftp.rs index b0f5b82..4d9ea65 100644 --- a/src/filetransfer/ftp_transfer.rs +++ b/src/filetransfer/transfer/ftp.rs @@ -1,4 +1,4 @@ -//! ## Ftp_transfer +//! ## FTP transfer //! //! `ftp_transfer` is the module which provides the implementation for the FTP/FTPS file transfer @@ -25,7 +25,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -use super::{FileTransfer, FileTransferError, FileTransferErrorType}; +use super::{FileTransfer, FileTransferError, FileTransferErrorType, ProtocolParams}; use crate::fs::{FsDirectory, FsEntry, FsFile, UnixPex}; use crate::utils::fmt::shadow_password; use crate::utils::path; @@ -178,25 +178,24 @@ impl FileTransfer for FtpFileTransfer { /// /// Connect to the remote server - fn connect( - &mut self, - address: String, - port: u16, - username: Option, - password: Option, - ) -> Result, FileTransferError> { - // Get stream - info!("Connecting to {}:{}", address, port); - let mut stream: FtpStream = match FtpStream::connect(format!("{}:{}", address, port)) { - Ok(stream) => stream, - Err(err) => { - error!("Failed to connect: {}", err); - return Err(FileTransferError::new_ex( - FileTransferErrorType::ConnectionError, - err.to_string(), - )); - } + fn connect(&mut self, params: &ProtocolParams) -> Result, FileTransferError> { + let params = match params.generic_params() { + Some(params) => params, + None => return Err(FileTransferError::new(FileTransferErrorType::BadAddress)), }; + // Get stream + info!("Connecting to {}:{}", params.address, params.port); + let mut stream: FtpStream = + match FtpStream::connect(format!("{}:{}", params.address, params.port)) { + Ok(stream) => stream, + Err(err) => { + error!("Failed to connect: {}", err); + return Err(FileTransferError::new_ex( + FileTransferErrorType::ConnectionError, + err.to_string(), + )); + } + }; // If SSL, open secure session if self.ftps { info!("Setting up TLS stream..."); @@ -214,7 +213,7 @@ impl FileTransfer for FtpFileTransfer { )); } }; - stream = match stream.into_secure(ctx, address.as_str()) { + stream = match stream.into_secure(ctx, params.address.as_str()) { Ok(s) => s, Err(err) => { error!("Failed to setup TLS stream: {}", err); @@ -226,12 +225,12 @@ impl FileTransfer for FtpFileTransfer { }; } // Login (use anonymous if credentials are unspecified) - let username: String = match username { - Some(u) => u, + let username: String = match ¶ms.username { + Some(u) => u.to_string(), None => String::from("anonymous"), }; - let password: String = match password { - Some(pwd) => pwd, + let password: String = match ¶ms.password { + Some(pwd) => pwd.to_string(), None => String::new(), }; info!( @@ -645,6 +644,7 @@ impl FileTransfer for FtpFileTransfer { mod tests { use super::*; + use crate::filetransfer::params::GenericProtocolParams; use crate::utils::file::open_file; #[cfg(feature = "with-containers")] use crate::utils::test_helpers::write_file; @@ -672,17 +672,15 @@ mod tests { // Sample file let (entry, file): (FsFile, tempfile::NamedTempFile) = create_sample_file_entry(); // Connect - #[cfg(not(feature = "github-actions"))] - let hostname: String = String::from("127.0.0.1"); - #[cfg(feature = "github-actions")] let hostname: String = String::from("127.0.0.1"); assert!(ftp - .connect( - hostname, - 10021, - Some(String::from("test")), - Some(String::from("test")), - ) + .connect(&ProtocolParams::Generic( + GenericProtocolParams::default() + .address(hostname) + .port(10021) + .username(Some("test")) + .password(Some("test")) + )) .is_ok()); assert_eq!(ftp.is_connected(), true); // Get pwd @@ -810,12 +808,13 @@ mod tests { let mut ftp: FtpFileTransfer = FtpFileTransfer::new(false); // Connect assert!(ftp - .connect( - String::from("127.0.0.1"), - 10021, - Some(String::from("omar")), - Some(String::from("ommlar")), - ) + .connect(&ProtocolParams::Generic( + GenericProtocolParams::default() + .address("127.0.0.1") + .port(10021) + .username(Some("omar")) + .password(Some("ommlar")) + )) .is_err()); } @@ -824,7 +823,13 @@ mod tests { fn test_filetransfer_ftp_no_credentials() { let mut ftp: FtpFileTransfer = FtpFileTransfer::new(false); assert!(ftp - .connect(String::from("127.0.0.1"), 10021, None, None) + .connect(&ProtocolParams::Generic( + GenericProtocolParams::default() + .address("127.0.0.1") + .port(10021) + .username::<&str>(None) + .password::<&str>(None) + )) .is_err()); } @@ -833,12 +838,13 @@ mod tests { let mut ftp: FtpFileTransfer = FtpFileTransfer::new(false); // Connect assert!(ftp - .connect( - String::from("mybadserver.veryverybad.awful"), - 21, - Some(String::from("omar")), - Some(String::from("ommlar")), - ) + .connect(&ProtocolParams::Generic( + GenericProtocolParams::default() + .address("mybad.veribad.server") + .port(21) + .username::<&str>(None) + .password::<&str>(None) + )) .is_err()); } @@ -890,12 +896,13 @@ mod tests { let mut ftp: FtpFileTransfer = FtpFileTransfer::new(false); // Connect assert!(ftp - .connect( - String::from("test.rebex.net"), - 21, - Some(String::from("demo")), - Some(String::from("password")) - ) + .connect(&ProtocolParams::Generic( + GenericProtocolParams::default() + .address("test.rebex.net") + .port(21) + .username(Some("demo")) + .password(Some("password")) + )) .is_ok()); // Pwd assert_eq!(ftp.pwd().ok().unwrap(), PathBuf::from("/")); diff --git a/src/filetransfer/transfer/mod.rs b/src/filetransfer/transfer/mod.rs new file mode 100644 index 0000000..0662bdb --- /dev/null +++ b/src/filetransfer/transfer/mod.rs @@ -0,0 +1,18 @@ +//! # transfer +//! +//! This module exposes all the file transfers supported by termscp + +// -- import +use super::{FileTransfer, FileTransferError, FileTransferErrorType, ProtocolParams}; + +// -- modules +mod ftp; +mod s3; +mod scp; +mod sftp; + +// -- export +pub use self::s3::S3FileTransfer; +pub use ftp::FtpFileTransfer; +pub use scp::ScpFileTransfer; +pub use sftp::SftpFileTransfer; diff --git a/src/filetransfer/transfer/s3/mod.rs b/src/filetransfer/transfer/s3/mod.rs new file mode 100644 index 0000000..8f167fe --- /dev/null +++ b/src/filetransfer/transfer/s3/mod.rs @@ -0,0 +1,697 @@ +//! ## S3 transfer +//! +//! S3 file transfer module + +/** + * MIT License + * + * termscp - Copyright (c) 2021 Christian Visintin + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +// -- mod +mod object; + +// Locals +use super::{FileTransfer, FileTransferError, FileTransferErrorType, ProtocolParams}; +use crate::fs::{FsDirectory, FsEntry, FsFile}; +use crate::utils::path; +use object::S3Object; + +// ext +use s3::creds::Credentials; +use s3::serde_types::Object; +use s3::{Bucket, Region}; +use std::fs::File; +use std::io::Read; +use std::path::{Path, PathBuf}; +use std::str::FromStr; + +/// ## S3FileTransfer +/// +/// Aws s3 file transfer +pub struct S3FileTransfer { + bucket: Option, + wrkdir: PathBuf, +} + +impl Default for S3FileTransfer { + fn default() -> Self { + Self { + bucket: None, + wrkdir: PathBuf::from("/"), + } + } +} + +impl S3FileTransfer { + /// ### list_objects + /// + /// List objects contained in `p` path + fn list_objects(&self, p: &Path, list_dir: bool) -> Result, FileTransferError> { + // Make path relative + let key: String = Self::fmt_path(p, list_dir); + debug!("Query list directory {}; key: {}", p.display(), key); + self.query_objects(key, true) + } + + /// ### stat_object + /// + /// Stat an s3 object + fn stat_object(&self, p: &Path) -> Result { + let key: String = Self::fmt_path(p, false); + debug!("Query stat object {}; key: {}", p.display(), key); + let objects = self.query_objects(key, false)?; + // Absolutize path + let absol: PathBuf = path::absolutize(Path::new("/"), p); + // Find associated object + match objects + .into_iter() + .find(|x| x.path.as_path() == absol.as_path()) + { + Some(obj) => Ok(obj), + None => Err(FileTransferError::new_ex( + FileTransferErrorType::NoSuchFileOrDirectory, + format!("{}: No such file or directory", p.display()), + )), + } + } + + /// ### query_objects + /// + /// Query objects at key + fn query_objects( + &self, + key: String, + only_direct_children: bool, + ) -> Result, FileTransferError> { + let results = self.bucket.as_ref().unwrap().list(key.clone(), None); + match results { + Ok(entries) => { + let mut objects: Vec = Vec::new(); + entries.iter().for_each(|x| { + x.contents + .iter() + .filter(|x| { + if only_direct_children { + Self::list_object_should_be_kept(x, key.as_str()) + } else { + true + } + }) + .for_each(|x| objects.push(S3Object::from(x))) + }); + debug!("Found objects: {:?}", objects); + Ok(objects) + } + Err(e) => Err(FileTransferError::new_ex( + FileTransferErrorType::DirStatFailed, + e.to_string(), + )), + } + } + + /// ### list_object_should_be_kept + /// + /// Returns whether object should be kept after list command. + /// The object won't be kept if: + /// + /// 1. is not a direct child of provided dir + fn list_object_should_be_kept(obj: &Object, dir: &str) -> bool { + Self::is_direct_child(obj.key.as_str(), dir) + } + + /// ### is_direct_child + /// + /// Checks whether Object's key is direct child of `parent` path. + fn is_direct_child(key: &str, parent: &str) -> bool { + key == format!("{}{}", parent, S3Object::object_name(key)) + || key == format!("{}{}/", parent, S3Object::object_name(key)) + } + + /// ### resolve + /// + /// Make s3 absolute path from a given path + fn resolve(&self, p: &Path) -> PathBuf { + path::diff_paths(path::absolutize(self.wrkdir.as_path(), p), &Path::new("/")) + .unwrap_or_default() + } + + /// ### fmt_fs_entry_path + /// + /// fmt path for fsentry according to format expected by s3 + fn fmt_fs_file_path(f: &FsFile) -> String { + Self::fmt_path(f.abs_path.as_path(), false) + } + + /// ### fmt_path + /// + /// fmt path for fsentry according to format expected by s3 + fn fmt_path(p: &Path, is_dir: bool) -> String { + // prevent root as slash + if p == Path::new("/") { + return "".to_string(); + } + // Remove root only if absolute + #[cfg(target_family = "unix")] + let is_absolute: bool = p.is_absolute(); + // NOTE: don't use is_absolute: on windows won't work + #[cfg(target_family = "windows")] + let is_absolute: bool = p.display().to_string().starts_with('/'); + let p: PathBuf = match is_absolute { + true => path::diff_paths(p, &Path::new("/")).unwrap_or_default(), + false => p.to_path_buf(), + }; + // NOTE: windows only: resolve paths + #[cfg(target_family = "windows")] + let p: PathBuf = PathBuf::from(path_slash::PathExt::to_slash_lossy(p.as_path()).as_str()); + // Fmt + match is_dir { + true => { + let mut p: String = p.display().to_string(); + if !p.ends_with('/') { + p.push('/'); + } + p + } + false => p.to_string_lossy().to_string(), + } + } +} + +impl FileTransfer for S3FileTransfer { + /// ### connect + /// + /// Connect to the remote server + /// Can return banner / welcome message on success + fn connect(&mut self, params: &ProtocolParams) -> Result, FileTransferError> { + // Verify parameters are S3 + let params = match params.s3_params() { + Some(params) => params, + None => return Err(FileTransferError::new(FileTransferErrorType::BadAddress)), + }; + // Load credentials + debug!("Loading credentials... (profile {:?})", params.profile); + let credentials: Credentials = + Credentials::new(None, None, None, None, params.profile.as_deref()).map_err(|e| { + FileTransferError::new_ex( + FileTransferErrorType::AuthenticationFailed, + format!("Could not load s3 credentials: {}", e), + ) + })?; + // Parse region + debug!("Parsing region {}", params.region); + let region: Region = Region::from_str(params.region.as_str()).map_err(|e| { + FileTransferError::new_ex( + FileTransferErrorType::AuthenticationFailed, + format!("Could not parse s3 region: {}", e), + ) + })?; + debug!( + "Credentials loaded! Connecting to bucket {}...", + params.bucket_name + ); + self.bucket = Some( + Bucket::new(params.bucket_name.as_str(), region, credentials).map_err(|e| { + FileTransferError::new_ex( + FileTransferErrorType::AuthenticationFailed, + format!("Could not connect to bucket {}: {}", params.bucket_name, e), + ) + })?, + ); + info!("Connection successfully established"); + Ok(None) + } + + /// ### disconnect + /// + /// Disconnect from the remote server + fn disconnect(&mut self) -> Result<(), FileTransferError> { + info!("Disconnecting from S3 bucket..."); + match self.bucket.take() { + Some(bucket) => { + drop(bucket); + Ok(()) + } + None => Err(FileTransferError::new( + FileTransferErrorType::UninitializedSession, + )), + } + } + + /// ### is_connected + /// + /// Indicates whether the client is connected to remote + fn is_connected(&self) -> bool { + self.bucket.is_some() + } + + /// ### pwd + /// + /// Print working directory + fn pwd(&mut self) -> Result { + info!("PWD"); + match self.is_connected() { + true => Ok(self.wrkdir.clone()), + false => Err(FileTransferError::new( + FileTransferErrorType::UninitializedSession, + )), + } + } + + /// ### change_dir + /// + /// Change working directory + fn change_dir(&mut self, dir: &Path) -> Result { + match &self.bucket.is_some() { + true => { + // Always allow entering root + if dir == Path::new("/") { + self.wrkdir = dir.to_path_buf(); + info!("New working directory: {}", self.wrkdir.display()); + return Ok(self.wrkdir.clone()); + } + // Check if directory exists + debug!("Entering directory {}...", dir.display()); + let dir_p: PathBuf = self.resolve(dir); + let dir_s: String = Self::fmt_path(dir_p.as_path(), true); + debug!("Searching for key {} (path: {})...", dir_s, dir_p.display()); + // Check if directory already exists + if self + .stat_object(PathBuf::from(dir_s.as_str()).as_path()) + .is_ok() + { + self.wrkdir = path::absolutize(Path::new("/"), dir_p.as_path()); + info!("New working directory: {}", self.wrkdir.display()); + Ok(self.wrkdir.clone()) + } else { + Err(FileTransferError::new( + FileTransferErrorType::NoSuchFileOrDirectory, + )) + } + } + false => Err(FileTransferError::new( + FileTransferErrorType::UninitializedSession, + )), + } + } + + /// ### copy + /// + /// Copy file to destination + fn copy(&mut self, _src: &FsEntry, _dst: &Path) -> Result<(), FileTransferError> { + Err(FileTransferError::new( + FileTransferErrorType::UnsupportedFeature, + )) + } + + /// ### list_dir + /// + /// List directory entries + fn list_dir(&mut self, path: &Path) -> Result, FileTransferError> { + match self.is_connected() { + true => self + .list_objects(path, true) + .map(|x| x.into_iter().map(|x| x.into()).collect()), + false => Err(FileTransferError::new( + FileTransferErrorType::UninitializedSession, + )), + } + } + + /// ### mkdir + /// + /// Make directory + /// In case the directory already exists, it must return an Error of kind `FileTransferErrorType::DirectoryAlreadyExists` + fn mkdir(&mut self, dir: &Path) -> Result<(), FileTransferError> { + match &self.bucket { + Some(bucket) => { + let dir: String = Self::fmt_path(self.resolve(dir).as_path(), true); + debug!("Making directory {}...", dir); + // Check if directory already exists + if self + .stat_object(PathBuf::from(dir.as_str()).as_path()) + .is_ok() + { + error!("Directory {} already exists", dir); + return Err(FileTransferError::new( + FileTransferErrorType::DirectoryAlreadyExists, + )); + } + bucket + .put_object(dir.as_str(), &[]) + .map(|_| ()) + .map_err(|e| { + FileTransferError::new_ex( + FileTransferErrorType::FileCreateDenied, + format!("Could not make directory: {}", e), + ) + }) + } + None => Err(FileTransferError::new( + FileTransferErrorType::UninitializedSession, + )), + } + } + + /// ### remove + /// + /// Remove a file or a directory + fn remove(&mut self, file: &FsEntry) -> Result<(), FileTransferError> { + let path = Self::fmt_path( + path::diff_paths(file.get_abs_path(), &Path::new("/")) + .unwrap_or_default() + .as_path(), + file.is_dir(), + ); + info!("Removing object {}...", path); + match &self.bucket { + Some(bucket) => bucket.delete_object(path).map(|_| ()).map_err(|e| { + FileTransferError::new_ex( + FileTransferErrorType::ProtocolError, + format!("Could not remove file: {}", e), + ) + }), + None => Err(FileTransferError::new( + FileTransferErrorType::UninitializedSession, + )), + } + } + + /// ### rename + /// + /// Rename file or a directory + fn rename(&mut self, _file: &FsEntry, _dst: &Path) -> Result<(), FileTransferError> { + Err(FileTransferError::new( + FileTransferErrorType::UnsupportedFeature, + )) + } + + /// ### stat + /// + /// Stat file and return FsEntry + fn stat(&mut self, p: &Path) -> Result { + match self.is_connected() { + true => { + // First try as a "file" + let path: PathBuf = self.resolve(p); + if let Ok(obj) = self.stat_object(path.as_path()) { + return Ok(obj.into()); + } + // Try as a "directory" + debug!("Failed to stat object as file; trying as a directory..."); + let path: PathBuf = PathBuf::from(Self::fmt_path(path.as_path(), true)); + self.stat_object(path.as_path()).map(|x| x.into()) + } + false => Err(FileTransferError::new( + FileTransferErrorType::UninitializedSession, + )), + } + } + + /// ### exec + /// + /// Execute a command on remote host + fn exec(&mut self, _cmd: &str) -> Result { + Err(FileTransferError::new( + FileTransferErrorType::UnsupportedFeature, + )) + } + + /// ### send_file_wno_stream + /// + /// Send a file to remote WITHOUT using streams. + /// This method SHOULD be implemented ONLY when streams are not supported by the current file transfer. + /// The developer implementing the filetransfer user should FIRST try with `send_file` followed by `on_sent` + /// If the function returns error kind() `UnsupportedFeature`, then he should call this function. + /// By default this function uses the streams function to copy content from reader to writer + fn send_file_wno_stream( + &mut self, + _src: &FsFile, + dest: &Path, + mut reader: Box, + ) -> Result<(), FileTransferError> { + match &mut self.bucket { + Some(bucket) => { + let key = Self::fmt_path(dest, false); + info!("Query PUT for key '{}'", key); + bucket + .put_object_stream(&mut reader, key.as_str()) + .map(|_| ()) + .map_err(|e| { + FileTransferError::new_ex( + FileTransferErrorType::ProtocolError, + format!("Could not put file: {}", e), + ) + }) + } + None => Err(FileTransferError::new( + FileTransferErrorType::UninitializedSession, + )), + } + } + + /// ### recv_file_wno_stream + /// + /// Receive a file from remote WITHOUT using streams. + /// This method SHOULD be implemented ONLY when streams are not supported by the current file transfer. + /// The developer implementing the filetransfer user should FIRST try with `send_file` followed by `on_sent` + /// If the function returns error kind() `UnsupportedFeature`, then he should call this function. + /// By default this function uses the streams function to copy content from reader to writer + fn recv_file_wno_stream(&mut self, src: &FsFile, dest: &Path) -> Result<(), FileTransferError> { + match &mut self.bucket { + Some(bucket) => { + let mut writer = File::create(dest).map_err(|e| { + FileTransferError::new_ex( + FileTransferErrorType::FileCreateDenied, + format!("Could not open local file: {}", e), + ) + })?; + let key = Self::fmt_fs_file_path(src); + info!("Query GET for key '{}'", key); + bucket + .get_object_stream(key.as_str(), &mut writer) + .map(|_| ()) + .map_err(|e| { + FileTransferError::new_ex( + FileTransferErrorType::ProtocolError, + format!("Could not get file: {}", e), + ) + }) + } + None => Err(FileTransferError::new( + FileTransferErrorType::UninitializedSession, + )), + } + } +} + +#[cfg(test)] +mod test { + + use super::*; + #[cfg(feature = "with-s3-ci")] + use crate::filetransfer::params::AwsS3Params; + #[cfg(feature = "with-s3-ci")] + use crate::utils::random; + use crate::utils::test_helpers; + + use pretty_assertions::assert_eq; + #[cfg(feature = "with-s3-ci")] + use std::env; + #[cfg(feature = "with-s3-ci")] + use tempfile::NamedTempFile; + + #[test] + fn s3_new() { + let s3: S3FileTransfer = S3FileTransfer::default(); + assert_eq!(s3.wrkdir.as_path(), Path::new("/")); + assert!(s3.bucket.is_none()); + } + + #[test] + fn s3_is_direct_child() { + assert_eq!(S3FileTransfer::is_direct_child("pippo/", ""), true); + assert_eq!( + S3FileTransfer::is_direct_child("pippo/sottocartella/", ""), + false + ); + assert_eq!( + S3FileTransfer::is_direct_child("pippo/sottocartella/", "pippo/"), + true + ); + assert_eq!( + S3FileTransfer::is_direct_child("pippo/sottocartella/", "pippo"), // This case must be handled indeed + false + ); + assert_eq!( + S3FileTransfer::is_direct_child( + "pippo/sottocartella/readme.md", + "pippo/sottocartella/" + ), + true + ); + assert_eq!( + S3FileTransfer::is_direct_child( + "pippo/sottocartella/readme.md", + "pippo/sottocartella/" + ), + true + ); + } + + #[test] + fn s3_resolve() { + let mut s3: S3FileTransfer = S3FileTransfer::default(); + s3.wrkdir = PathBuf::from("/tmp"); + // Absolute + assert_eq!( + s3.resolve(&Path::new("/tmp/sottocartella/")).as_path(), + Path::new("tmp/sottocartella") + ); + // Relative + assert_eq!( + s3.resolve(&Path::new("subfolder/")).as_path(), + Path::new("tmp/subfolder") + ); + } + + #[test] + fn s3_fmt_fs_file_path() { + let f: FsFile = + test_helpers::make_fsentry(&Path::new("/tmp/omar.txt"), false).unwrap_file(); + assert_eq!( + S3FileTransfer::fmt_fs_file_path(&f).as_str(), + "tmp/omar.txt" + ); + } + + #[test] + fn s3_fmt_path() { + assert_eq!( + S3FileTransfer::fmt_path(&Path::new("/tmp/omar.txt"), false).as_str(), + "tmp/omar.txt" + ); + assert_eq!( + S3FileTransfer::fmt_path(&Path::new("omar.txt"), false).as_str(), + "omar.txt" + ); + assert_eq!( + S3FileTransfer::fmt_path(&Path::new("/tmp/subfolder"), true).as_str(), + "tmp/subfolder/" + ); + assert_eq!( + S3FileTransfer::fmt_path(&Path::new("tmp/subfolder"), true).as_str(), + "tmp/subfolder/" + ); + assert_eq!( + S3FileTransfer::fmt_path(&Path::new("tmp"), true).as_str(), + "tmp/" + ); + assert_eq!( + S3FileTransfer::fmt_path(&Path::new("tmp/"), true).as_str(), + "tmp/" + ); + assert_eq!(S3FileTransfer::fmt_path(&Path::new("/"), true).as_str(), ""); + } + + // -- test transfer + #[cfg(feature = "with-s3-ci")] + #[test] + fn s3_filetransfer() { + // Gather s3 environment args + let bucket: String = env::var("AWS_S3_BUCKET").ok().unwrap(); + let region: String = env::var("AWS_S3_REGION").ok().unwrap(); + let params = get_ftparams(bucket, region); + // Get transfer + let mut s3 = S3FileTransfer::default(); + // Connect + assert!(s3.connect(¶ms).is_ok()); + // Check is connected + assert_eq!(s3.is_connected(), true); + // Pwd + assert_eq!(s3.pwd().ok().unwrap(), PathBuf::from("/")); + // Go to github-ci directory + assert!(s3.change_dir(&Path::new("/github-ci")).is_ok()); + assert_eq!(s3.pwd().ok().unwrap(), PathBuf::from("/github-ci")); + // Find + assert_eq!(s3.find("*.jpg").ok().unwrap().len(), 1); + // List directory (3 entries) + assert_eq!(s3.list_dir(&Path::new("/github-ci")).ok().unwrap().len(), 3); + // Go to playground + assert!(s3.change_dir(&Path::new("/github-ci/playground")).is_ok()); + assert_eq!( + s3.pwd().ok().unwrap(), + PathBuf::from("/github-ci/playground") + ); + // Create directory + let dir_name: String = format!("{}/", random::random_alphanumeric_with_len(8)); + let mut dir_path: PathBuf = PathBuf::from("/github-ci/playground"); + dir_path.push(dir_name.as_str()); + let dir_entry = test_helpers::make_fsentry(dir_path.as_path(), true); + assert!(s3.mkdir(dir_path.as_path()).is_ok()); + assert!(s3.change_dir(dir_path.as_path()).is_ok()); + // Copy/rename file is unsupported + assert!(s3.copy(&dir_entry, &Path::new("/copia")).is_err()); + assert!(s3.rename(&dir_entry, &Path::new("/copia")).is_err()); + // Exec is unsupported + assert!(s3.exec("omar!").is_err()); + // Stat file + let entry = s3 + .stat(&Path::new("/github-ci/avril_lavigne.jpg")) + .ok() + .unwrap() + .unwrap_file(); + assert_eq!(entry.name.as_str(), "avril_lavigne.jpg"); + assert_eq!( + entry.abs_path.as_path(), + Path::new("/github-ci/avril_lavigne.jpg") + ); + assert_eq!(entry.ftype.as_deref().unwrap(), "jpg"); + assert_eq!(entry.size, 101738); + assert_eq!(entry.user, None); + assert_eq!(entry.group, None); + assert_eq!(entry.unix_pex, None); + // Download file + let (local_file_entry, local_file): (FsFile, NamedTempFile) = + test_helpers::create_sample_file_entry(); + let remote_entry = + test_helpers::make_fsentry(&Path::new("/github-ci/avril_lavigne.jpg"), false) + .unwrap_file(); + assert!(s3 + .recv_file_wno_stream(&remote_entry, local_file.path()) + .is_ok()); + // Upload file + let mut dest_path = dir_path.clone(); + dest_path.push("aurellia_lavagna.jpg"); + let reader = Box::new(File::open(local_file.path()).ok().unwrap()); + assert!(s3 + .send_file_wno_stream(&local_file_entry, dest_path.as_path(), reader) + .is_ok()); + // Remove temp dir + assert!(s3.remove(&dir_entry).is_ok()); + // Disconnect + assert!(s3.disconnect().is_ok()); + } + + #[cfg(feature = "with-s3-ci")] + fn get_ftparams(bucket: String, region: String) -> ProtocolParams { + ProtocolParams::AwsS3(AwsS3Params::new(bucket, region, None)) + } +} diff --git a/src/filetransfer/transfer/s3/object.rs b/src/filetransfer/transfer/s3/object.rs new file mode 100644 index 0000000..245447a --- /dev/null +++ b/src/filetransfer/transfer/s3/object.rs @@ -0,0 +1,247 @@ +//! ## S3 object +//! +//! This module exposes the S3Object structure, which is an intermediate structure to work with +//! S3 objects. Easy to be converted into a FsEntry. + +/** + * MIT License + * + * termscp - Copyright (c) 2021 Christian Visintin + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +use super::{FsDirectory, FsEntry, FsFile, Object}; +use crate::utils::parser::parse_datetime; +use crate::utils::path; + +use std::path::{Path, PathBuf}; +use std::time::{SystemTime, UNIX_EPOCH}; + +/// ## S3Object +/// +/// An intermediate struct to work with s3 `Object`. +/// Really easy to be converted into a `FsEntry` +#[derive(Debug)] +pub struct S3Object { + pub name: String, + pub path: PathBuf, + pub size: usize, + pub last_modified: SystemTime, + /// Whether or not represents a directory. I already know directories don't exist in s3! + pub is_dir: bool, +} + +impl From<&Object> for S3Object { + fn from(obj: &Object) -> Self { + let is_dir: bool = obj.key.ends_with('/'); + let abs_path: PathBuf = path::absolutize( + PathBuf::from("/").as_path(), + PathBuf::from(obj.key.as_str()).as_path(), + ); + let last_modified: SystemTime = + match parse_datetime(obj.last_modified.as_str(), "%Y-%m-%dT%H:%M:%S%Z") { + Ok(dt) => dt, + Err(_) => UNIX_EPOCH, + }; + Self { + name: Self::object_name(obj.key.as_str()), + path: abs_path, + size: obj.size as usize, + last_modified, + is_dir, + } + } +} + +impl From for FsEntry { + fn from(obj: S3Object) -> Self { + let abs_path: PathBuf = path::absolutize(Path::new("/"), obj.path.as_path()); + match obj.is_dir { + true => FsEntry::Directory(FsDirectory { + name: obj.name, + abs_path, + last_change_time: obj.last_modified, + last_access_time: obj.last_modified, + creation_time: obj.last_modified, + symlink: None, + user: None, + group: None, + unix_pex: None, + }), + false => FsEntry::File(FsFile { + name: obj.name, + ftype: obj + .path + .extension() + .map(|x| x.to_string_lossy().to_string()), + abs_path, + size: obj.size, + last_change_time: obj.last_modified, + last_access_time: obj.last_modified, + creation_time: obj.last_modified, + symlink: None, + user: None, + group: None, + unix_pex: None, + }), + } + } +} + +impl S3Object { + /// ### object_name + /// + /// Get object name from key + pub fn object_name(key: &str) -> String { + let mut tokens = key.split('/'); + let count = tokens.clone().count(); + let demi_last: String = match count > 1 { + true => tokens.nth(count - 2).unwrap().to_string(), + false => String::new(), + }; + if let Some(last) = tokens.last() { + // If last is not empty, return last one + if !last.is_empty() { + return last.to_string(); + } + } + // Return demi last + demi_last + } +} + +#[cfg(test)] +mod test { + + use super::*; + + use pretty_assertions::assert_eq; + use std::time::Duration; + + #[test] + fn object_to_s3object_file() { + let obj: Object = Object { + key: String::from("pippo/sottocartella/chiedo.gif"), + e_tag: String::default(), + size: 1516966, + owner: None, + storage_class: String::default(), + last_modified: String::from("2021-08-28T10:20:37.000Z"), + }; + let s3_obj: S3Object = S3Object::from(&obj); + assert_eq!(s3_obj.name.as_str(), "chiedo.gif"); + assert_eq!( + s3_obj.path.as_path(), + Path::new("/pippo/sottocartella/chiedo.gif") + ); + assert_eq!(s3_obj.size, 1516966); + assert_eq!(s3_obj.is_dir, false); + assert_eq!( + s3_obj + .last_modified + .duration_since(SystemTime::UNIX_EPOCH) + .ok() + .unwrap(), + Duration::from_secs(1630146037) + ); + } + + #[test] + fn object_to_s3object_dir() { + let obj: Object = Object { + key: String::from("temp/"), + e_tag: String::default(), + size: 0, + owner: None, + storage_class: String::default(), + last_modified: String::from("2021-08-28T10:20:37.000Z"), + }; + let s3_obj: S3Object = S3Object::from(&obj); + assert_eq!(s3_obj.name.as_str(), "temp"); + assert_eq!(s3_obj.path.as_path(), Path::new("/temp")); + assert_eq!(s3_obj.size, 0); + assert_eq!(s3_obj.is_dir, true); + assert_eq!( + s3_obj + .last_modified + .duration_since(SystemTime::UNIX_EPOCH) + .ok() + .unwrap(), + Duration::from_secs(1630146037) + ); + } + + #[test] + fn fsentry_from_s3obj_file() { + let obj: S3Object = S3Object { + name: String::from("chiedo.gif"), + path: PathBuf::from("/pippo/sottocartella/chiedo.gif"), + size: 1516966, + is_dir: false, + last_modified: UNIX_EPOCH, + }; + let entry: FsFile = FsEntry::from(obj).unwrap_file(); + assert_eq!(entry.name.as_str(), "chiedo.gif"); + assert_eq!( + entry.abs_path.as_path(), + Path::new("/pippo/sottocartella/chiedo.gif") + ); + assert_eq!(entry.creation_time, UNIX_EPOCH); + assert_eq!(entry.last_change_time, UNIX_EPOCH); + assert_eq!(entry.last_access_time, UNIX_EPOCH); + assert_eq!(entry.size, 1516966); + assert_eq!(entry.ftype.unwrap().as_str(), "gif"); + assert_eq!(entry.user, None); + assert_eq!(entry.group, None); + assert_eq!(entry.unix_pex, None); + } + + #[test] + fn fsentry_from_s3obj_directory() { + let obj: S3Object = S3Object { + name: String::from("temp"), + path: PathBuf::from("/temp"), + size: 0, + is_dir: true, + last_modified: UNIX_EPOCH, + }; + let entry: FsDirectory = FsEntry::from(obj).unwrap_dir(); + assert_eq!(entry.name.as_str(), "temp"); + assert_eq!(entry.abs_path.as_path(), Path::new("/temp")); + assert_eq!(entry.creation_time, UNIX_EPOCH); + assert_eq!(entry.last_change_time, UNIX_EPOCH); + assert_eq!(entry.last_access_time, UNIX_EPOCH); + assert_eq!(entry.user, None); + assert_eq!(entry.group, None); + assert_eq!(entry.unix_pex, None); + } + + #[test] + fn object_name() { + assert_eq!( + S3Object::object_name("pippo/sottocartella/chiedo.gif").as_str(), + "chiedo.gif" + ); + assert_eq!( + S3Object::object_name("pippo/sottocartella/").as_str(), + "sottocartella" + ); + assert_eq!(S3Object::object_name("pippo/").as_str(), "pippo"); + } +} diff --git a/src/filetransfer/scp_transfer.rs b/src/filetransfer/transfer/scp.rs similarity index 95% rename from src/filetransfer/scp_transfer.rs rename to src/filetransfer/transfer/scp.rs index 400b035..cf4e161 100644 --- a/src/filetransfer/scp_transfer.rs +++ b/src/filetransfer/transfer/scp.rs @@ -1,4 +1,4 @@ -//! ## SCP_Transfer +//! ## SCP transfer //! //! `scps_transfer` is the module which provides the implementation for the SCP file transfer @@ -26,7 +26,7 @@ * SOFTWARE. */ // Locals -use super::{FileTransfer, FileTransferError, FileTransferErrorType}; +use super::{FileTransfer, FileTransferError, FileTransferErrorType, ProtocolParams}; use crate::fs::{FsDirectory, FsEntry, FsFile, UnixPex}; use crate::system::sshkey_storage::SshKeyStorage; use crate::utils::fmt::{fmt_time, shadow_password}; @@ -333,17 +333,15 @@ impl FileTransfer for ScpFileTransfer { /// ### connect /// /// Connect to the remote server - fn connect( - &mut self, - address: String, - port: u16, - username: Option, - password: Option, - ) -> Result, FileTransferError> { + fn connect(&mut self, params: &ProtocolParams) -> Result, FileTransferError> { + let params = match params.generic_params() { + Some(params) => params, + None => return Err(FileTransferError::new(FileTransferErrorType::BadAddress)), + }; // Setup tcp stream - info!("Connecting to {}:{}", address, port); + info!("Connecting to {}:{}", params.address, params.port); let socket_addresses: Vec = - match format!("{}:{}", address, port).to_socket_addrs() { + match format!("{}:{}", params.address, params.port).to_socket_addrs() { Ok(s) => s.collect(), Err(err) => { return Err(FileTransferError::new_ex( @@ -398,14 +396,14 @@ impl FileTransfer for ScpFileTransfer { err.to_string(), )); } - let username: String = match username { - Some(u) => u, + let username: String = match ¶ms.username { + Some(u) => u.to_string(), None => String::from(""), }; // Check if it is possible to authenticate using a RSA key match self .key_storage - .resolve(address.as_str(), username.as_str()) + .resolve(params.address.as_str(), username.as_str()) { Some(rsa_key) => { debug!( @@ -418,7 +416,7 @@ impl FileTransfer for ScpFileTransfer { username.as_str(), None, rsa_key.as_path(), - password.as_deref(), + params.password.as_deref(), ) { error!("Authentication failed: {}", err); return Err(FileTransferError::new_ex( @@ -432,11 +430,16 @@ impl FileTransfer for ScpFileTransfer { debug!( "Authenticating with username {} and password {}", username, - shadow_password(password.as_deref().unwrap_or("")) + shadow_password(params.password.as_deref().unwrap_or("")) ); if let Err(err) = session.userauth_password( username.as_str(), - password.unwrap_or_else(|| String::from("")).as_str(), + params + .password + .as_ref() + .cloned() + .unwrap_or_else(|| String::from("")) + .as_str(), ) { error!("Authentication failed: {}", err); return Err(FileTransferError::new_ex( @@ -942,36 +945,13 @@ impl FileTransfer for ScpFileTransfer { )), } } - - /// ### on_sent - /// - /// Finalize send method. - /// This method must be implemented only if necessary; in case you don't need it, just return `Ok(())` - /// The purpose of this method is to finalize the connection with the peer when writing data. - /// This is necessary for some protocols such as FTP. - /// You must call this method each time you want to finalize the write of the remote file. - fn on_sent(&mut self, _writable: Box) -> Result<(), FileTransferError> { - // Nothing to do - Ok(()) - } - - /// ### on_recv - /// - /// Finalize recv method. - /// This method must be implemented only if necessary; in case you don't need it, just return `Ok(())` - /// The purpose of this method is to finalize the connection with the peer when reading data. - /// This mighe be necessary for some protocols. - /// You must call this method each time you want to finalize the read of the remote file. - fn on_recv(&mut self, _readable: Box) -> Result<(), FileTransferError> { - // Nothing to do - Ok(()) - } } #[cfg(test)] mod tests { use super::*; + use crate::filetransfer::params::GenericProtocolParams; use crate::utils::test_helpers::make_fsentry; use pretty_assertions::assert_eq; @@ -993,12 +973,13 @@ mod tests { let (entry, file): (FsFile, tempfile::NamedTempFile) = create_sample_file_entry(); // Connect assert!(client - .connect( - String::from("127.0.0.1"), - 10222, - Some(String::from("sftp")), - Some(String::from("password")) - ) + .connect(&ProtocolParams::Generic( + GenericProtocolParams::default() + .address("127.0.0.1") + .port(10222) + .username(Some("sftp")) + .password(Some("password")) + )) .is_ok()); // Check session and sftp assert!(client.session.is_some()); @@ -1180,12 +1161,13 @@ mod tests { let mut client: ScpFileTransfer = ScpFileTransfer::new(storage); // Connect assert!(client - .connect( - String::from("127.0.0.1"), - 10222, - Some(String::from("sftp")), - None, - ) + .connect(&ProtocolParams::Generic( + GenericProtocolParams::default() + .address("127.0.0.1") + .port(10222) + .username(Some("sftp")) + .password::<&str>(None) + )) .is_ok()); assert_eq!(client.is_connected(), true); assert!(client.disconnect().is_ok()); @@ -1195,12 +1177,13 @@ mod tests { fn test_filetransfer_scp_bad_auth() { let mut client: ScpFileTransfer = ScpFileTransfer::new(SshKeyStorage::empty()); assert!(client - .connect( - String::from("127.0.0.1"), - 10222, - Some(String::from("demo")), - Some(String::from("badpassword")) - ) + .connect(&ProtocolParams::Generic( + GenericProtocolParams::default() + .address("127.0.0.1") + .port(10222) + .username(Some("sftp")) + .password(Some("badpassword")) + )) .is_err()); } @@ -1209,7 +1192,13 @@ mod tests { fn test_filetransfer_scp_no_credentials() { let mut client: ScpFileTransfer = ScpFileTransfer::new(SshKeyStorage::empty()); assert!(client - .connect(String::from("127.0.0.1"), 10222, None, None) + .connect(&ProtocolParams::Generic( + GenericProtocolParams::default() + .address("127.0.0.1") + .port(10222) + .username::<&str>(None) + .password::<&str>(None) + )) .is_err()); } @@ -1217,12 +1206,13 @@ mod tests { fn test_filetransfer_scp_bad_server() { let mut client: ScpFileTransfer = ScpFileTransfer::new(SshKeyStorage::empty()); assert!(client - .connect( - String::from("mybadserver.veryverybad.awful"), - 22, - None, - None - ) + .connect(&ProtocolParams::Generic( + GenericProtocolParams::default() + .address("mybad.verybad.server") + .port(10222) + .username(Some("sftp")) + .password(Some("password")) + )) .is_err()); } diff --git a/src/filetransfer/sftp_transfer.rs b/src/filetransfer/transfer/sftp.rs similarity index 91% rename from src/filetransfer/sftp_transfer.rs rename to src/filetransfer/transfer/sftp.rs index ca4ea96..7e86455 100644 --- a/src/filetransfer/sftp_transfer.rs +++ b/src/filetransfer/transfer/sftp.rs @@ -1,4 +1,4 @@ -//! ## SFTP_Transfer +//! ## SFTP transfer //! //! `sftp_transfer` is the module which provides the implementation for the SFTP file transfer @@ -26,7 +26,7 @@ * SOFTWARE. */ // Locals -use super::{FileTransfer, FileTransferError, FileTransferErrorType}; +use super::{FileTransfer, FileTransferError, FileTransferErrorType, ProtocolParams}; use crate::fs::{FsDirectory, FsEntry, FsFile, UnixPex}; use crate::system::sshkey_storage::SshKeyStorage; use crate::utils::fmt::{fmt_time, shadow_password}; @@ -257,17 +257,15 @@ impl FileTransfer for SftpFileTransfer { /// ### connect /// /// Connect to the remote server - fn connect( - &mut self, - address: String, - port: u16, - username: Option, - password: Option, - ) -> Result, FileTransferError> { + fn connect(&mut self, params: &ProtocolParams) -> Result, FileTransferError> { + let params = match params.generic_params() { + Some(params) => params, + None => return Err(FileTransferError::new(FileTransferErrorType::BadAddress)), + }; // Setup tcp stream - info!("Connecting to {}:{}", address, port); + info!("Connecting to {}:{}", params.address, params.port); let socket_addresses: Vec = - match format!("{}:{}", address, port).to_socket_addrs() { + match format!("{}:{}", params.address, params.port).to_socket_addrs() { Ok(s) => s.collect(), Err(err) => { return Err(FileTransferError::new_ex( @@ -321,14 +319,14 @@ impl FileTransfer for SftpFileTransfer { err.to_string(), )); } - let username: String = match username { - Some(u) => u, + let username: String = match ¶ms.username { + Some(u) => u.to_string(), None => String::from(""), }; // Check if it is possible to authenticate using a RSA key match self .key_storage - .resolve(address.as_str(), username.as_str()) + .resolve(params.address.as_str(), username.as_str()) { Some(rsa_key) => { debug!( @@ -341,7 +339,7 @@ impl FileTransfer for SftpFileTransfer { username.as_str(), None, rsa_key.as_path(), - password.as_deref(), + params.password.as_deref(), ) { error!("Authentication failed: {}", err); return Err(FileTransferError::new_ex( @@ -355,11 +353,16 @@ impl FileTransfer for SftpFileTransfer { debug!( "Authenticating with username {} and password {}", username, - shadow_password(password.as_deref().unwrap_or("")) + shadow_password(params.password.as_deref().unwrap_or("")) ); if let Err(err) = session.userauth_password( username.as_str(), - password.unwrap_or_else(|| String::from("")).as_str(), + params + .password + .as_ref() + .cloned() + .unwrap_or_else(|| String::from("")) + .as_str(), ) { error!("Authentication failed: {}", err); return Err(FileTransferError::new_ex( @@ -766,36 +769,21 @@ impl FileTransfer for SftpFileTransfer { } } } - - /// ### on_sent - /// - /// Finalize send method. This method must be implemented only if necessary. - /// The purpose of this method is to finalize the connection with the peer when writing data. - /// This is necessary for some protocols such as FTP. - /// You must call this method each time you want to finalize the write of the remote file. - fn on_sent(&mut self, _writable: Box) -> Result<(), FileTransferError> { - Ok(()) - } - - /// ### on_recv - /// - /// Finalize recv method. This method must be implemented only if necessary. - /// The purpose of this method is to finalize the connection with the peer when reading data. - /// This mighe be necessary for some protocols. - /// You must call this method each time you want to finalize the read of the remote file. - fn on_recv(&mut self, _readable: Box) -> Result<(), FileTransferError> { - Ok(()) - } } #[cfg(test)] mod tests { use super::*; + use crate::filetransfer::params::GenericProtocolParams; use crate::utils::test_helpers::make_fsentry; #[cfg(feature = "with-containers")] - use crate::utils::test_helpers::{create_sample_file_entry, write_file, write_ssh_key}; + use crate::utils::test_helpers::{ + create_sample_file, create_sample_file_entry, write_file, write_ssh_key, + }; use pretty_assertions::assert_eq; + #[cfg(feature = "with-containers")] + use std::fs::File; #[test] fn test_filetransfer_sftp_new() { @@ -814,12 +802,13 @@ mod tests { let (entry, file): (FsFile, tempfile::NamedTempFile) = create_sample_file_entry(); // Connect assert!(client - .connect( - String::from("127.0.0.1"), - 10022, - Some(String::from("sftp")), - Some(String::from("password")) - ) + .connect(&ProtocolParams::Generic( + GenericProtocolParams::default() + .address("127.0.0.1") + .port(10022) + .username(Some("sftp")) + .password(Some("password")) + )) .is_ok()); // Check session and sftp assert!(client.session.is_some()); @@ -889,6 +878,11 @@ mod tests { .unwrap(); write_file(&file, &mut writable); assert!(client.on_sent(writable).is_ok()); + // Upload file without stream + let reader = Box::new(File::open(entry.abs_path.as_path()).ok().unwrap()); + assert!(client + .send_file_wno_stream(&entry, PathBuf::from("README2.md").as_path(), reader) + .is_ok()); // Upload file (err) assert!(client .send_file(&entry, PathBuf::from("/ommlar/omarone").as_path()) @@ -898,10 +892,10 @@ mod tests { .list_dir(PathBuf::from("/tmp/omar").as_path()) .ok() .unwrap(); - assert_eq!(list.len(), 2); + assert_eq!(list.len(), 3); // Find assert_eq!(client.find("*.txt").ok().unwrap().len(), 1); - assert_eq!(client.find("*.md").ok().unwrap().len(), 1); + assert_eq!(client.find("*.md").ok().unwrap().len(), 2); assert_eq!(client.find("*.jpeg").ok().unwrap().len(), 0); // Rename assert!(client @@ -955,6 +949,9 @@ mod tests { let mut data: Vec = vec![0; 1024]; assert!(readable.read(&mut data).is_ok()); assert!(client.on_recv(readable).is_ok()); + let dest_file = create_sample_file(); + // Receive file wno stream + assert!(client.recv_file_wno_stream(&file, dest_file.path()).is_ok()); // Receive file (err) assert!(client.recv_file(&entry).is_err()); // Cleanup @@ -979,12 +976,13 @@ mod tests { let mut client: SftpFileTransfer = SftpFileTransfer::new(storage); // Connect assert!(client - .connect( - String::from("127.0.0.1"), - 10022, - Some(String::from("sftp")), - None, - ) + .connect(&ProtocolParams::Generic( + GenericProtocolParams::default() + .address("127.0.0.1") + .port(10022) + .username(Some("sftp")) + .password::<&str>(None) + )) .is_ok()); assert_eq!(client.is_connected(), true); assert!(client.disconnect().is_ok()); @@ -994,12 +992,13 @@ mod tests { fn test_filetransfer_sftp_bad_auth() { let mut client: SftpFileTransfer = SftpFileTransfer::new(SshKeyStorage::empty()); assert!(client - .connect( - String::from("127.0.0.1"), - 10022, - Some(String::from("demo")), - Some(String::from("badpassword")) - ) + .connect(&ProtocolParams::Generic( + GenericProtocolParams::default() + .address("127.0.0.1") + .port(10022) + .username(Some("sftp")) + .password(Some("badpassword")) + )) .is_err()); } @@ -1008,7 +1007,13 @@ mod tests { fn test_filetransfer_sftp_no_credentials() { let mut client: SftpFileTransfer = SftpFileTransfer::new(SshKeyStorage::empty()); assert!(client - .connect(String::from("127.0.0.1"), 10022, None, None) + .connect(&ProtocolParams::Generic( + GenericProtocolParams::default() + .address("127.0.0.1") + .port(10022) + .username::<&str>(None) + .password::<&str>(None) + )) .is_err()); } @@ -1018,12 +1023,13 @@ mod tests { let mut client: SftpFileTransfer = SftpFileTransfer::new(SshKeyStorage::empty()); // Connect assert!(client - .connect( - String::from("127.0.0.1"), - 10022, - Some(String::from("sftp")), - Some(String::from("password")) - ) + .connect(&ProtocolParams::Generic( + GenericProtocolParams::default() + .address("127.0.0.1") + .port(10022) + .username(Some("sftp")) + .password(Some("password")) + )) .is_ok()); // get realpath assert!(client @@ -1054,12 +1060,13 @@ mod tests { fn test_filetransfer_sftp_bad_server() { let mut client: SftpFileTransfer = SftpFileTransfer::new(SshKeyStorage::empty()); assert!(client - .connect( - String::from("mybadserver.veryverybad.awful"), - 22, - None, - None - ) + .connect(&ProtocolParams::Generic( + GenericProtocolParams::default() + .address("myverybad.verybad.server") + .port(10022) + .username(Some("sftp")) + .password(Some("password")) + )) .is_err()); } diff --git a/src/host/mod.rs b/src/host/mod.rs index 4440840..1061079 100644 --- a/src/host/mod.rs +++ b/src/host/mod.rs @@ -38,7 +38,9 @@ use std::fs::set_permissions; use std::os::unix::fs::{MetadataExt, PermissionsExt}; // Locals -use crate::fs::{FsDirectory, FsEntry, FsFile, UnixPex}; +#[cfg(target_family = "unix")] +use crate::fs::UnixPex; +use crate::fs::{FsDirectory, FsEntry, FsFile}; use crate::utils::path; /// ## HostErrorType diff --git a/src/lib.rs b/src/lib.rs index b1f2840..40475e5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -52,6 +52,7 @@ extern crate open; extern crate path_slash; extern crate rand; extern crate regex; +extern crate s3; extern crate ssh2; extern crate suppaftp; extern crate tempfile; diff --git a/src/main.rs b/src/main.rs index 2797cbd..126bbee 100644 --- a/src/main.rs +++ b/src/main.rs @@ -66,7 +66,12 @@ enum Task { #[derive(FromArgs)] #[argh(description = " -where positional can be: [protocol://user@address:port:wrkdir] [local-wrkdir] +where positional can be: [address] [local-wrkdir] + +Address syntax can be: + + - `protocol://user@address:port:wrkdir` for protocols such as Sftp, Scp, Ftp + - `s3://bucket-name@region:profile:/wrkdir` for Aws S3 protocol Please, report issues to Please, consider supporting the author ")] @@ -180,7 +185,9 @@ fn parse_args(args: Args) -> Result { Ok(mut remote) => { // If password is provided, set password if let Some(passwd) = args.password { - remote = remote.password(Some(passwd)); + if let Some(mut params) = remote.params.mut_generic_params() { + params.password = Some(passwd); + } } // Set params run_opts.remote = Some(remote); @@ -209,25 +216,26 @@ fn parse_args(args: Args) -> Result { fn read_password(run_opts: &mut RunOpts) -> Result<(), String> { // Initialize client if necessary if let Some(remote) = run_opts.remote.as_mut() { - debug!("User has specified remote options: address: {:?}, port: {:?}, protocol: {:?}, user: {:?}, password: {}", remote.address, remote.port, remote.protocol, remote.username, utils::fmt::shadow_password(remote.password.as_deref().unwrap_or(""))); - if remote.password.is_none() { - // Ask password if unspecified - remote.password = match rpassword::read_password_from_tty(Some("Password: ")) { - Ok(p) => { - if p.is_empty() { - None - } else { - debug!( - "Read password from tty: {}", - utils::fmt::shadow_password(p.as_str()) - ); - Some(p) + if let Some(mut params) = remote.params.mut_generic_params() { + if params.password.is_none() { + // Ask password if unspecified + params.password = match rpassword::read_password_from_tty(Some("Password: ")) { + Ok(p) => { + if p.is_empty() { + None + } else { + debug!( + "Read password from tty: {}", + utils::fmt::shadow_password(p.as_str()) + ); + Some(p) + } } - } - Err(_) => { - return Err("Could not read password from prompt".to_string()); - } - }; + Err(_) => { + return Err("Could not read password from prompt".to_string()); + } + }; + } } } Ok(()) diff --git a/src/system/bookmarks_client.rs b/src/system/bookmarks_client.rs index 4fc4805..bac7ee1 100644 --- a/src/system/bookmarks_client.rs +++ b/src/system/bookmarks_client.rs @@ -34,14 +34,13 @@ use crate::config::{ bookmarks::{Bookmark, UserHosts}, serialization::{deserialize, serialize, SerializerError, SerializerErrorKind}, }; -use crate::filetransfer::FileTransferProtocol; +use crate::filetransfer::FileTransferParams; use crate::utils::crypto; use crate::utils::fmt::fmt_time; use crate::utils::random::random_alphanumeric_with_len; // Ext use std::fs::OpenOptions; use std::path::{Path, PathBuf}; -use std::str::FromStr; use std::string::ToString; use std::time::SystemTime; @@ -166,59 +165,45 @@ impl BookmarksClient { /// ### get_bookmark /// /// Get bookmark associated to key - pub fn get_bookmark( - &self, - key: &str, - ) -> Option<(String, u16, FileTransferProtocol, String, Option)> { - let entry: &Bookmark = self.hosts.bookmarks.get(key)?; + pub fn get_bookmark(&self, key: &str) -> Option { debug!("Getting bookmark {}", key); - Some(( - entry.address.clone(), - entry.port, - match FileTransferProtocol::from_str(entry.protocol.as_str()) { - Ok(proto) => proto, - Err(err) => { - error!( - "Found invalid protocol in bookmarks: {}; defaulting to SFTP", - err - ); - FileTransferProtocol::Sftp // Default + let mut entry: Bookmark = self.hosts.bookmarks.get(key).cloned()?; + // Decrypt password first + if let Some(pwd) = entry.password.as_mut() { + match self.decrypt_str(pwd.as_str()) { + Ok(decrypted_pwd) => { + *pwd = decrypted_pwd; } - }, - entry.username.clone(), - match &entry.password { - // Decrypted password if Some; if decryption fails return None - Some(pwd) => match self.decrypt_str(pwd.as_str()) { - Ok(decrypted_pwd) => Some(decrypted_pwd), - Err(err) => { - error!("Failed to decrypt password for bookmark: {}", err); - None - } - }, - None => None, - }, - )) + Err(err) => { + error!("Failed to decrypt password for bookmark: {}", err); + } + } + } + // Then convert into + Some(FileTransferParams::from(entry)) } /// ### add_recent /// /// Add a new recent to bookmarks - pub fn add_bookmark( + pub fn add_bookmark>( &mut self, - name: String, - addr: String, - port: u16, - protocol: FileTransferProtocol, - username: String, - password: Option, + name: S, + params: FileTransferParams, + save_password: bool, ) { + let name: String = name.as_ref().to_string(); if name.is_empty() { error!("Fatal error; bookmark name is empty"); panic!("Bookmark name can't be empty"); } // Make bookmark - info!("Added bookmark {} with address {}", name, addr); - let host: Bookmark = self.make_bookmark(addr, port, protocol, username, password); + info!("Added bookmark {}", name); + let mut host: Bookmark = self.make_bookmark(params); + // If not save_password, set password to `None` + if !save_password { + host.password = None; + } self.hosts.bookmarks.insert(name, host); } @@ -239,43 +224,25 @@ impl BookmarksClient { /// ### get_recent /// /// Get recent associated to key - pub fn get_recent(&self, key: &str) -> Option<(String, u16, FileTransferProtocol, String)> { + pub fn get_recent(&self, key: &str) -> Option { // NOTE: password is not decrypted; recents will never have password info!("Getting bookmark {}", key); - let entry: &Bookmark = self.hosts.recents.get(key)?; - Some(( - entry.address.clone(), - entry.port, - match FileTransferProtocol::from_str(entry.protocol.as_str()) { - Ok(proto) => proto, - Err(err) => { - error!( - "Found invalid protocol in bookmarks: {}; defaulting to SFTP", - err - ); - FileTransferProtocol::Sftp // Default - } - }, - entry.username.clone(), - )) + let entry: Bookmark = self.hosts.recents.get(key).cloned()?; + Some(FileTransferParams::from(entry)) } /// ### add_recent /// /// Add a new recent to bookmarks - pub fn add_recent( - &mut self, - addr: String, - port: u16, - protocol: FileTransferProtocol, - username: String, - ) { + pub fn add_recent(&mut self, params: FileTransferParams) { // Make bookmark - let host: Bookmark = self.make_bookmark(addr, port, protocol, username, None); + let mut host: Bookmark = self.make_bookmark(params); + // Null password for recents + host.password = None; // Check if duplicated - for recent_host in self.hosts.recents.values() { - if *recent_host == host { - debug!("Discarding recent since duplicated ({})", host.address); + for (key, value) in &self.hosts.recents { + if *value == host { + debug!("Discarding recent since duplicated ({})", key); // Don't save duplicates return; } @@ -300,7 +267,7 @@ impl BookmarksClient { } } let name: String = fmt_time(SystemTime::now(), "ISO%Y%m%dT%H%M%S"); - info!("Saved recent host {} ({})", name, host.address); + info!("Saved recent host {}", name); self.hosts.recents.insert(name, host); } @@ -376,21 +343,13 @@ impl BookmarksClient { /// ### make_bookmark /// /// Make bookmark from credentials - fn make_bookmark( - &self, - addr: String, - port: u16, - protocol: FileTransferProtocol, - username: String, - password: Option, - ) -> Bookmark { - Bookmark { - address: addr, - port, - username, - protocol: protocol.to_string(), - password: password.map(|p| self.encrypt_str(p.as_str())), + fn make_bookmark(&self, params: FileTransferParams) -> Bookmark { + let mut bookmark: Bookmark = Bookmark::from(params); + // Encrypt password + if let Some(pwd) = bookmark.password { + bookmark.password = Some(self.encrypt_str(pwd.as_str())); } + bookmark } /// ### encrypt_str @@ -419,6 +378,8 @@ impl BookmarksClient { mod tests { use super::*; + use crate::filetransfer::params::GenericProtocolParams; + use crate::filetransfer::{FileTransferProtocol, ProtocolParams}; use pretty_assertions::assert_eq; use std::thread::sleep; @@ -473,19 +434,23 @@ mod tests { BookmarksClient::new(cfg_path.as_path(), key_path.as_path(), 16).unwrap(); // Add some bookmarks client.add_bookmark( - String::from("raspberry"), - String::from("192.168.1.31"), - 22, - FileTransferProtocol::Sftp, - String::from("pi"), - Some(String::from("mypassword")), + "raspberry", + make_generic_ftparams( + FileTransferProtocol::Sftp, + "192.168.1.31", + 22, + "pi", + Some("mypassword"), + ), + true, ); - client.add_recent( - String::from("192.168.1.31"), - 22, + client.add_recent(make_generic_ftparams( FileTransferProtocol::Sftp, - String::from("pi"), - ); + "192.168.1.31", + 22, + "pi", + Some("mypassword"), + )); let recent_key: String = String::from(client.iter_recents().next().unwrap()); assert!(client.write_bookmarks().is_ok()); let key: String = client.key.clone(); @@ -494,19 +459,18 @@ mod tests { BookmarksClient::new(cfg_path.as_path(), key_path.as_path(), 16).unwrap(); // Verify it loaded parameters correctly assert_eq!(client.key, key); - let bookmark: (String, u16, FileTransferProtocol, String, Option) = - client.get_bookmark(&String::from("raspberry")).unwrap(); + let bookmark = ftparams_to_tup(client.get_bookmark("raspberry").unwrap()); assert_eq!(bookmark.0, String::from("192.168.1.31")); assert_eq!(bookmark.1, 22); assert_eq!(bookmark.2, FileTransferProtocol::Sftp); assert_eq!(bookmark.3, String::from("pi")); assert_eq!(*bookmark.4.as_ref().unwrap(), String::from("mypassword")); - let bookmark: (String, u16, FileTransferProtocol, String) = - client.get_recent(&recent_key).unwrap(); + let bookmark = ftparams_to_tup(client.get_recent(&recent_key).unwrap()); assert_eq!(bookmark.0, String::from("192.168.1.31")); assert_eq!(bookmark.1, 22); assert_eq!(bookmark.2, FileTransferProtocol::Sftp); assert_eq!(bookmark.3, String::from("pi")); + assert_eq!(bookmark.4, None); } #[test] @@ -519,26 +483,31 @@ mod tests { BookmarksClient::new(cfg_path.as_path(), key_path.as_path(), 16).unwrap(); // Add bookmark client.add_bookmark( - String::from("raspberry"), - String::from("192.168.1.31"), - 22, - FileTransferProtocol::Sftp, - String::from("pi"), - Some(String::from("mypassword")), + "raspberry", + make_generic_ftparams( + FileTransferProtocol::Sftp, + "192.168.1.31", + 22, + "pi", + Some("mypassword"), + ), + true, ); client.add_bookmark( - String::from("raspberry2"), - String::from("192.168.1.32"), - 22, - FileTransferProtocol::Sftp, - String::from("pi"), - Some(String::from("mypassword2")), + "raspberry2", + make_generic_ftparams( + FileTransferProtocol::Sftp, + "192.168.1.31", + 22, + "pi", + Some("mypassword2"), + ), + true, ); // Iter assert_eq!(client.iter_bookmarks().count(), 2); // Get bookmark - let bookmark: (String, u16, FileTransferProtocol, String, Option) = - client.get_bookmark(&String::from("raspberry")).unwrap(); + let bookmark = ftparams_to_tup(client.get_bookmark(&String::from("raspberry")).unwrap()); assert_eq!(bookmark.0, String::from("192.168.1.31")); assert_eq!(bookmark.1, 22); assert_eq!(bookmark.2, FileTransferProtocol::Sftp); @@ -565,15 +534,45 @@ mod tests { BookmarksClient::new(cfg_path.as_path(), key_path.as_path(), 16).unwrap(); // Add bookmark client.add_bookmark( - String::from(""), - String::from("192.168.1.31"), - 22, - FileTransferProtocol::Sftp, - String::from("pi"), - Some(String::from("mypassword")), + "", + make_generic_ftparams( + FileTransferProtocol::Sftp, + "192.168.1.31", + 22, + "pi", + Some("mypassword"), + ), + true, ); } + #[test] + fn save_bookmark_wno_password() { + let tmp_dir: tempfile::TempDir = TempDir::new().ok().unwrap(); + let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path()); + // Initialize a new bookmarks client + let mut client: BookmarksClient = + BookmarksClient::new(cfg_path.as_path(), key_path.as_path(), 16).unwrap(); + // Add bookmark + client.add_bookmark( + "raspberry", + make_generic_ftparams( + FileTransferProtocol::Sftp, + "192.168.1.31", + 22, + "pi", + Some("mypassword"), + ), + false, + ); + let bookmark = ftparams_to_tup(client.get_bookmark(&String::from("raspberry")).unwrap()); + assert_eq!(bookmark.0, String::from("192.168.1.31")); + assert_eq!(bookmark.1, 22); + assert_eq!(bookmark.2, FileTransferProtocol::Sftp); + assert_eq!(bookmark.3, String::from("pi")); + assert_eq!(bookmark.4, None); + } + #[test] fn test_system_bookmarks_manipulate_recents() { @@ -583,22 +582,23 @@ mod tests { let mut client: BookmarksClient = BookmarksClient::new(cfg_path.as_path(), key_path.as_path(), 16).unwrap(); // Add bookmark - client.add_recent( - String::from("192.168.1.31"), - 22, + client.add_recent(make_generic_ftparams( FileTransferProtocol::Sftp, - String::from("pi"), - ); + "192.168.1.31", + 22, + "pi", + Some("mypassword"), + )); // Iter assert_eq!(client.iter_recents().count(), 1); let key: String = String::from(client.iter_recents().next().unwrap()); // Get bookmark - let bookmark: (String, u16, FileTransferProtocol, String) = - client.get_recent(&key).unwrap(); + let bookmark = ftparams_to_tup(client.get_recent(&key).unwrap()); assert_eq!(bookmark.0, String::from("192.168.1.31")); assert_eq!(bookmark.1, 22); assert_eq!(bookmark.2, FileTransferProtocol::Sftp); assert_eq!(bookmark.3, String::from("pi")); + assert_eq!(bookmark.4, None); // Write bookmarks assert!(client.write_bookmarks().is_ok()); // Delete bookmark @@ -618,18 +618,20 @@ mod tests { let mut client: BookmarksClient = BookmarksClient::new(cfg_path.as_path(), key_path.as_path(), 16).unwrap(); // Add bookmark - client.add_recent( - String::from("192.168.1.31"), - 22, + client.add_recent(make_generic_ftparams( FileTransferProtocol::Sftp, - String::from("pi"), - ); - client.add_recent( - String::from("192.168.1.31"), + "192.168.1.31", 22, + "pi", + Some("mypassword"), + )); + client.add_recent(make_generic_ftparams( FileTransferProtocol::Sftp, - String::from("pi"), - ); + "192.168.1.31", + 22, + "pi", + Some("mypassword"), + )); // There should be only one recent assert_eq!(client.iter_recents().count(), 1); } @@ -644,39 +646,60 @@ mod tests { BookmarksClient::new(cfg_path.as_path(), key_path.as_path(), 2).unwrap(); // Add recent, wait 1 second for each one (cause the name depends on time) // 1 - client.add_recent( - String::from("192.168.1.1"), - 22, + client.add_recent(make_generic_ftparams( FileTransferProtocol::Sftp, - String::from("pi"), - ); + "192.168.1.1", + 22, + "pi", + Some("mypassword"), + )); sleep(Duration::from_secs(1)); // 2 - client.add_recent( - String::from("192.168.1.2"), - 22, + client.add_recent(make_generic_ftparams( FileTransferProtocol::Sftp, - String::from("pi"), - ); + "192.168.1.2", + 22, + "pi", + Some("mypassword"), + )); sleep(Duration::from_secs(1)); // 3 - client.add_recent( - String::from("192.168.1.3"), - 22, + client.add_recent(make_generic_ftparams( FileTransferProtocol::Sftp, - String::from("pi"), - ); + "192.168.1.3", + 22, + "pi", + Some("mypassword"), + )); // Limit is 2 assert_eq!(client.iter_recents().count(), 2); // Check that 192.168.1.1 has been removed let key: String = client.iter_recents().nth(0).unwrap().to_string(); assert!(matches!( - client.hosts.recents.get(&key).unwrap().address.as_str(), + client + .hosts + .recents + .get(&key) + .unwrap() + .address + .as_ref() + .cloned() + .unwrap_or_default() + .as_str(), "192.168.1.2" | "192.168.1.3" )); let key: String = client.iter_recents().nth(1).unwrap().to_string(); assert!(matches!( - client.hosts.recents.get(&key).unwrap().address.as_str(), + client + .hosts + .recents + .get(&key) + .unwrap() + .address + .as_ref() + .cloned() + .unwrap_or_default() + .as_str(), "192.168.1.2" | "192.168.1.3" )); } @@ -691,12 +714,15 @@ mod tests { BookmarksClient::new(cfg_path.as_path(), key_path.as_path(), 16).unwrap(); // Add bookmark client.add_bookmark( - String::from(""), - String::from("192.168.1.31"), - 22, - FileTransferProtocol::Sftp, - String::from("pi"), - Some(String::from("mypassword")), + "", + make_generic_ftparams( + FileTransferProtocol::Sftp, + "192.168.1.31", + 22, + "pi", + Some("mypassword"), + ), + true, ); } @@ -724,4 +750,35 @@ mod tests { c.push("bookmarks.toml"); (c, k) } + + fn make_generic_ftparams( + protocol: FileTransferProtocol, + address: &str, + port: u16, + username: &str, + password: Option<&str>, + ) -> FileTransferParams { + let params = ProtocolParams::Generic( + GenericProtocolParams::default() + .address(address) + .port(port) + .username(Some(username)) + .password(password), + ); + FileTransferParams::new(protocol, params) + } + + fn ftparams_to_tup( + params: FileTransferParams, + ) -> (String, u16, FileTransferProtocol, String, Option) { + let protocol = params.protocol; + let p = params.params.generic_params().unwrap(); + ( + p.address.to_string(), + p.port, + protocol, + p.username.as_ref().cloned().unwrap_or_default(), + p.password.as_ref().cloned(), + ) + } } diff --git a/src/ui/activities/auth/bookmarks.rs b/src/ui/activities/auth/bookmarks.rs index dcd9946..11b0a34 100644 --- a/src/ui/activities/auth/bookmarks.rs +++ b/src/ui/activities/auth/bookmarks.rs @@ -26,14 +26,15 @@ * SOFTWARE. */ // Locals -use super::{AuthActivity, FileTransferProtocol}; +use super::{AuthActivity, FileTransferParams}; +use crate::filetransfer::params::{AwsS3Params, GenericProtocolParams, ProtocolParams}; use crate::system::bookmarks_client::BookmarksClient; use crate::system::environment; // Ext use std::path::PathBuf; use tui_realm_stdlib::{input::InputPropsBuilder, radio::RadioPropsBuilder}; -use tuirealm::{Payload, PropsBuilder, Value}; +use tuirealm::PropsBuilder; impl AuthActivity { /// ### del_bookmark @@ -62,9 +63,7 @@ impl AuthActivity { if let Some(key) = self.bookmarks_list.get(idx) { if let Some(bookmark) = bookmarks_cli.get_bookmark(key) { // Load parameters into components - self.load_bookmark_into_gui( - bookmark.0, bookmark.1, bookmark.2, bookmark.3, bookmark.4, - ); + self.load_bookmark_into_gui(bookmark); } } } @@ -74,20 +73,15 @@ impl AuthActivity { /// /// Save current input fields as a bookmark pub(super) fn save_bookmark(&mut self, name: String, save_password: bool) { - let (address, port, protocol, username, password) = self.get_input(); + let params = match self.collect_host_params() { + Ok(p) => p, + Err(e) => { + self.mount_error(e); + return; + } + }; if let Some(bookmarks_cli) = self.bookmarks_client.as_mut() { - // Check if password must be saved - let password: Option = match save_password { - true => match self - .view - .get_state(super::COMPONENT_RADIO_BOOKMARK_SAVE_PWD) - { - Some(Payload::One(Value::Usize(0))) => Some(password), // Yes - _ => None, // No such component / No - }, - false => None, - }; - bookmarks_cli.add_bookmark(name.clone(), address, port, protocol, username, password); + bookmarks_cli.add_bookmark(name.clone(), params, save_password); // Save bookmarks self.write_bookmarks(); // Remove `name` from bookmarks if exists @@ -122,9 +116,7 @@ impl AuthActivity { if let Some(key) = self.recents_list.get(idx) { if let Some(bookmark) = client.get_recent(key) { // Load parameters - self.load_bookmark_into_gui( - bookmark.0, bookmark.1, bookmark.2, bookmark.3, None, - ); + self.load_bookmark_into_gui(bookmark); } } } @@ -134,9 +126,15 @@ impl AuthActivity { /// /// Save current input fields as a "recent" pub(super) fn save_recent(&mut self) { - let (address, port, protocol, username, _password) = self.get_input(); + let params = match self.collect_host_params() { + Ok(p) => p, + Err(e) => { + self.mount_error(e); + return; + } + }; if let Some(bookmarks_cli) = self.bookmarks_client.as_mut() { - bookmarks_cli.add_recent(address, port, protocol, username); + bookmarks_cli.add_recent(params); // Save bookmarks self.write_bookmarks(); } @@ -234,40 +232,66 @@ impl AuthActivity { /// ### load_bookmark_into_gui /// /// Load bookmark data into the gui components - fn load_bookmark_into_gui( - &mut self, - addr: String, - port: u16, - protocol: FileTransferProtocol, - username: String, - password: Option, - ) { + fn load_bookmark_into_gui(&mut self, bookmark: FileTransferParams) { // Load parameters into components + if let Some(props) = self.view.get_props(super::COMPONENT_RADIO_PROTOCOL) { + let props = RadioPropsBuilder::from(props) + .with_value(Self::protocol_enum_to_opt(bookmark.protocol)) + .build(); + self.view.update(super::COMPONENT_RADIO_PROTOCOL, props); + } + match bookmark.params { + ProtocolParams::AwsS3(params) => self.load_bookmark_s3_into_gui(params), + ProtocolParams::Generic(params) => self.load_bookmark_generic_into_gui(params), + } + } + + fn load_bookmark_generic_into_gui(&mut self, params: GenericProtocolParams) { if let Some(props) = self.view.get_props(super::COMPONENT_INPUT_ADDR) { - let props = InputPropsBuilder::from(props).with_value(addr).build(); + let props = InputPropsBuilder::from(props) + .with_value(params.address.clone()) + .build(); self.view.update(super::COMPONENT_INPUT_ADDR, props); } if let Some(props) = self.view.get_props(super::COMPONENT_INPUT_PORT) { let props = InputPropsBuilder::from(props) - .with_value(port.to_string()) + .with_value(params.port.to_string()) .build(); self.view.update(super::COMPONENT_INPUT_PORT, props); } - if let Some(props) = self.view.get_props(super::COMPONENT_RADIO_PROTOCOL) { - let props = RadioPropsBuilder::from(props) - .with_value(Self::protocol_enum_to_opt(protocol)) - .build(); - self.view.update(super::COMPONENT_RADIO_PROTOCOL, props); - } + if let Some(props) = self.view.get_props(super::COMPONENT_INPUT_USERNAME) { - let props = InputPropsBuilder::from(props).with_value(username).build(); + let props = InputPropsBuilder::from(props) + .with_value(params.username.as_deref().unwrap_or_default().to_string()) + .build(); self.view.update(super::COMPONENT_INPUT_USERNAME, props); } - if let Some(password) = password { - if let Some(props) = self.view.get_props(super::COMPONENT_INPUT_PASSWORD) { - let props = InputPropsBuilder::from(props).with_value(password).build(); - self.view.update(super::COMPONENT_INPUT_PASSWORD, props); - } + if let Some(props) = self.view.get_props(super::COMPONENT_INPUT_PASSWORD) { + let props = InputPropsBuilder::from(props) + .with_value(params.password.as_deref().unwrap_or_default().to_string()) + .build(); + self.view.update(super::COMPONENT_INPUT_PASSWORD, props); + } + } + + fn load_bookmark_s3_into_gui(&mut self, params: AwsS3Params) { + if let Some(props) = self.view.get_props(super::COMPONENT_INPUT_S3_BUCKET) { + let props = InputPropsBuilder::from(props) + .with_value(params.bucket_name.clone()) + .build(); + self.view.update(super::COMPONENT_INPUT_S3_BUCKET, props); + } + if let Some(props) = self.view.get_props(super::COMPONENT_INPUT_S3_REGION) { + let props = InputPropsBuilder::from(props) + .with_value(params.region.clone()) + .build(); + self.view.update(super::COMPONENT_INPUT_S3_REGION, props); + } + if let Some(props) = self.view.get_props(super::COMPONENT_INPUT_S3_PROFILE) { + let props = InputPropsBuilder::from(props) + .with_value(params.profile.as_deref().unwrap_or_default().to_string()) + .build(); + self.view.update(super::COMPONENT_INPUT_S3_PROFILE, props); } } } diff --git a/src/ui/activities/auth/misc.rs b/src/ui/activities/auth/misc.rs index 85e9545..ecdf57e 100644 --- a/src/ui/activities/auth/misc.rs +++ b/src/ui/activities/auth/misc.rs @@ -26,6 +26,7 @@ * SOFTWARE. */ use super::{AuthActivity, FileTransferParams, FileTransferProtocol}; +use crate::filetransfer::params::{AwsS3Params, GenericProtocolParams, ProtocolParams}; impl AuthActivity { /// ### protocol_opt_to_enum @@ -36,6 +37,7 @@ impl AuthActivity { 1 => FileTransferProtocol::Scp, 2 => FileTransferProtocol::Ftp(false), 3 => FileTransferProtocol::Ftp(true), + 4 => FileTransferProtocol::AwsS3, _ => FileTransferProtocol::Sftp, } } @@ -49,6 +51,7 @@ impl AuthActivity { FileTransferProtocol::Scp => 1, FileTransferProtocol::Ftp(false) => 2, FileTransferProtocol::Ftp(true) => 3, + FileTransferProtocol::AwsS3 => 4, } } @@ -59,6 +62,7 @@ impl AuthActivity { match protocol { FileTransferProtocol::Sftp | FileTransferProtocol::Scp => 22, FileTransferProtocol::Ftp(_) => 21, + FileTransferProtocol::AwsS3 => 22, // Doesn't matter, since not used } } @@ -83,15 +87,24 @@ impl AuthActivity { /// ### collect_host_params /// - /// Get input values from fields or return an error if fields are invalid + /// Collect host params as `FileTransferParams` pub(super) fn collect_host_params(&self) -> Result { - let (address, port, protocol, username, password): ( - String, - u16, - FileTransferProtocol, - String, - String, - ) = self.get_input(); + let protocol: FileTransferProtocol = self.get_protocol(); + match protocol { + FileTransferProtocol::AwsS3 => self.collect_s3_host_params(protocol), + protocol => self.collect_generic_host_params(protocol), + } + } + + /// ### collect_generic_host_params + /// + /// Get input values from fields or return an error if fields are invalid to work as generic + pub(super) fn collect_generic_host_params( + &self, + protocol: FileTransferProtocol, + ) -> Result { + let (address, port, username, password): (String, u16, String, String) = + self.get_generic_params_input(); if address.is_empty() { return Err("Invalid host"); } @@ -99,17 +112,42 @@ impl AuthActivity { return Err("Invalid port"); } Ok(FileTransferParams { - address, - port, protocol, - username: match username.is_empty() { - true => None, - false => Some(username), - }, - password: match password.is_empty() { - true => None, - false => Some(password), - }, + params: ProtocolParams::Generic( + GenericProtocolParams::default() + .address(address) + .port(port) + .username(match username.is_empty() { + true => None, + false => Some(username), + }) + .password(match password.is_empty() { + true => None, + false => Some(password), + }), + ), + entry_directory: None, + }) + } + + /// ### collect_s3_host_params + /// + /// Get input values from fields or return an error if fields are invalid to work as aws s3 + pub(super) fn collect_s3_host_params( + &self, + protocol: FileTransferProtocol, + ) -> Result { + let (bucket, region, profile): (String, String, Option) = + self.get_s3_params_input(); + if bucket.is_empty() { + return Err("Invalid bucket"); + } + if region.is_empty() { + return Err("Invalid region"); + } + Ok(FileTransferParams { + protocol, + params: ProtocolParams::AwsS3(AwsS3Params::new(bucket, region, profile)), entry_directory: None, }) } diff --git a/src/ui/activities/auth/mod.rs b/src/ui/activities/auth/mod.rs index d956412..5fa1bfc 100644 --- a/src/ui/activities/auth/mod.rs +++ b/src/ui/activities/auth/mod.rs @@ -57,6 +57,9 @@ const COMPONENT_INPUT_PORT: &str = "INPUT_PORT"; const COMPONENT_INPUT_USERNAME: &str = "INPUT_USERNAME"; const COMPONENT_INPUT_PASSWORD: &str = "INPUT_PASSWORD"; const COMPONENT_INPUT_BOOKMARK_NAME: &str = "INPUT_BOOKMARK_NAME"; +const COMPONENT_INPUT_S3_BUCKET: &str = "INPUT_S3_BUCKET"; +const COMPONENT_INPUT_S3_REGION: &str = "INPUT_S3_REGION"; +const COMPONENT_INPUT_S3_PROFILE: &str = "INPUT_S3_PROFILE"; const COMPONENT_RADIO_PROTOCOL: &str = "RADIO_PROTOCOL"; const COMPONENT_RADIO_QUIT: &str = "RADIO_QUIT"; const COMPONENT_RADIO_BOOKMARK_DEL_BOOKMARK: &str = "RADIO_DELETE_BOOKMARK"; @@ -163,6 +166,16 @@ impl AuthActivity { fn theme(&self) -> &Theme { self.context().theme_provider().theme() } + + /// ### input_mask + /// + /// Get current input mask to show + fn input_mask(&self) -> InputMask { + match self.get_protocol() { + FileTransferProtocol::AwsS3 => InputMask::AwsS3, + _ => InputMask::Generic, + } + } } impl Activity for AuthActivity { @@ -261,3 +274,12 @@ impl Activity for AuthActivity { } } } + +/// ## InputMask +/// +/// Auth form input mask +#[derive(Eq, PartialEq)] +enum InputMask { + Generic, + AwsS3, +} diff --git a/src/ui/activities/auth/update.rs b/src/ui/activities/auth/update.rs index dd2275d..da9ed83 100644 --- a/src/ui/activities/auth/update.rs +++ b/src/ui/activities/auth/update.rs @@ -27,8 +27,9 @@ */ // locals use super::{ - AuthActivity, FileTransferProtocol, COMPONENT_BOOKMARKS_LIST, COMPONENT_INPUT_ADDR, + AuthActivity, FileTransferProtocol, InputMask, COMPONENT_BOOKMARKS_LIST, COMPONENT_INPUT_ADDR, COMPONENT_INPUT_BOOKMARK_NAME, COMPONENT_INPUT_PASSWORD, COMPONENT_INPUT_PORT, + COMPONENT_INPUT_S3_BUCKET, COMPONENT_INPUT_S3_PROFILE, COMPONENT_INPUT_S3_REGION, COMPONENT_INPUT_USERNAME, COMPONENT_RADIO_BOOKMARK_DEL_BOOKMARK, COMPONENT_RADIO_BOOKMARK_DEL_RECENT, COMPONENT_RADIO_BOOKMARK_SAVE_PWD, COMPONENT_RADIO_PROTOCOL, COMPONENT_RADIO_QUIT, COMPONENT_RECENTS_LIST, COMPONENT_TEXT_ERROR, @@ -53,54 +54,80 @@ impl Update for AuthActivity { Some(msg) => match msg { // Focus ( DOWN ) (COMPONENT_RADIO_PROTOCOL, key) if key == &MSG_KEY_DOWN => { - // Give focus to port - self.view.active(COMPONENT_INPUT_ADDR); + // Give focus based on current mask + match self.input_mask() { + InputMask::Generic => self.view.active(COMPONENT_INPUT_ADDR), + InputMask::AwsS3 => self.view.active(COMPONENT_INPUT_S3_BUCKET), + }; None } + // -- generic mask (DOWN) (COMPONENT_INPUT_ADDR, key) if key == &MSG_KEY_DOWN => { - // Give focus to port self.view.active(COMPONENT_INPUT_PORT); None } (COMPONENT_INPUT_PORT, key) if key == &MSG_KEY_DOWN => { - // Give focus to port self.view.active(COMPONENT_INPUT_USERNAME); None } (COMPONENT_INPUT_USERNAME, key) if key == &MSG_KEY_DOWN => { - // Give focus to port self.view.active(COMPONENT_INPUT_PASSWORD); None } (COMPONENT_INPUT_PASSWORD, key) if key == &MSG_KEY_DOWN => { - // Give focus to port + self.view.active(COMPONENT_RADIO_PROTOCOL); + None + } + // -- s3 mask (DOWN) + (COMPONENT_INPUT_S3_BUCKET, key) if key == &MSG_KEY_DOWN => { + self.view.active(COMPONENT_INPUT_S3_REGION); + None + } + (COMPONENT_INPUT_S3_REGION, key) if key == &MSG_KEY_DOWN => { + self.view.active(COMPONENT_INPUT_S3_PROFILE); + None + } + (COMPONENT_INPUT_S3_PROFILE, key) if key == &MSG_KEY_DOWN => { self.view.active(COMPONENT_RADIO_PROTOCOL); None } // Focus ( UP ) + // -- generic (UP) (COMPONENT_INPUT_PASSWORD, key) if key == &MSG_KEY_UP => { - // Give focus to port self.view.active(COMPONENT_INPUT_USERNAME); None } (COMPONENT_INPUT_USERNAME, key) if key == &MSG_KEY_UP => { - // Give focus to port self.view.active(COMPONENT_INPUT_PORT); None } (COMPONENT_INPUT_PORT, key) if key == &MSG_KEY_UP => { - // Give focus to port self.view.active(COMPONENT_INPUT_ADDR); None } (COMPONENT_INPUT_ADDR, key) if key == &MSG_KEY_UP => { - // Give focus to port self.view.active(COMPONENT_RADIO_PROTOCOL); None } + // -- s3 (UP) + (COMPONENT_INPUT_S3_BUCKET, key) if key == &MSG_KEY_UP => { + self.view.active(COMPONENT_RADIO_PROTOCOL); + None + } + (COMPONENT_INPUT_S3_REGION, key) if key == &MSG_KEY_UP => { + self.view.active(COMPONENT_INPUT_S3_BUCKET); + None + } + (COMPONENT_INPUT_S3_PROFILE, key) if key == &MSG_KEY_UP => { + self.view.active(COMPONENT_INPUT_S3_REGION); + None + } (COMPONENT_RADIO_PROTOCOL, key) if key == &MSG_KEY_UP => { - // Give focus to port - self.view.active(COMPONENT_INPUT_PASSWORD); + // Give focus based on current mask + match self.input_mask() { + InputMask::Generic => self.view.active(COMPONENT_INPUT_PASSWORD), + InputMask::AwsS3 => self.view.active(COMPONENT_INPUT_S3_PROFILE), + }; None } // Protocol - On Change @@ -144,14 +171,20 @@ impl Update for AuthActivity { // Enter (COMPONENT_BOOKMARKS_LIST, Msg::OnSubmit(Payload::One(Value::Usize(idx)))) => { self.load_bookmark(*idx); - // Give focus to input password - self.view.active(COMPONENT_INPUT_PASSWORD); + // Give focus to input password (or to protocol if not generic) + self.view.active(match self.input_mask() { + InputMask::Generic => COMPONENT_INPUT_PASSWORD, + InputMask::AwsS3 => COMPONENT_INPUT_S3_BUCKET, + }); None } (COMPONENT_RECENTS_LIST, Msg::OnSubmit(Payload::One(Value::Usize(idx)))) => { self.load_recent(*idx); // Give focus to input password - self.view.active(COMPONENT_INPUT_PASSWORD); + self.view.active(match self.input_mask() { + InputMask::Generic => COMPONENT_INPUT_PASSWORD, + InputMask::AwsS3 => COMPONENT_INPUT_S3_BUCKET, + }); None } // Bookmark radio @@ -320,7 +353,7 @@ impl Update for AuthActivity { if key == &MSG_KEY_TAB => { // Give focus to address - self.view.active(COMPONENT_INPUT_ADDR); + self.view.active(COMPONENT_RADIO_PROTOCOL); None } // Any , go to bookmarks diff --git a/src/ui/activities/auth/view.rs b/src/ui/activities/auth/view.rs index ba3adc8..ee42c2e 100644 --- a/src/ui/activities/auth/view.rs +++ b/src/ui/activities/auth/view.rs @@ -26,7 +26,9 @@ * SOFTWARE. */ // Locals -use super::{AuthActivity, Context, FileTransferProtocol}; +use super::{AuthActivity, Context, FileTransferProtocol, InputMask}; +use crate::filetransfer::params::ProtocolParams; +use crate::filetransfer::FileTransferParams; use crate::ui::components::bookmark_list::{BookmarkList, BookmarkListPropsBuilder}; use crate::utils::ui::draw_area_in; // Ext @@ -109,7 +111,7 @@ impl AuthActivity { .with_inverted_color(Color::Black) .with_borders(Borders::ALL, BorderType::Rounded, protocol_color) .with_title("Protocol", Alignment::Left) - .with_options(&["SFTP", "SCP", "FTP", "FTPS"]) + .with_options(&["SFTP", "SCP", "FTP", "FTPS", "AWS S3"]) .with_value(Self::protocol_enum_to_opt(default_protocol)) .rewind(true) .build(), @@ -163,6 +165,39 @@ impl AuthActivity { .build(), )), ); + // Bucket + self.view.mount( + super::COMPONENT_INPUT_S3_BUCKET, + Box::new(Input::new( + InputPropsBuilder::default() + .with_foreground(addr_color) + .with_borders(Borders::ALL, BorderType::Rounded, addr_color) + .with_label("Bucket name", Alignment::Left) + .build(), + )), + ); + // Region + self.view.mount( + super::COMPONENT_INPUT_S3_REGION, + Box::new(Input::new( + InputPropsBuilder::default() + .with_foreground(port_color) + .with_borders(Borders::ALL, BorderType::Rounded, port_color) + .with_label("Region", Alignment::Left) + .build(), + )), + ); + // Profile + self.view.mount( + super::COMPONENT_INPUT_S3_PROFILE, + Box::new(Input::new( + InputPropsBuilder::default() + .with_foreground(username_color) + .with_borders(Borders::ALL, BorderType::Rounded, username_color) + .with_label("Profile", Alignment::Left) + .build(), + )), + ); // Version notice if let Some(version) = self .context() @@ -240,20 +275,43 @@ impl AuthActivity { let auth_chunks = Layout::default() .constraints( [ - Constraint::Length(1), // h1 - Constraint::Length(1), // h2 - Constraint::Length(1), // Version - Constraint::Length(3), // protocol - Constraint::Length(3), // host - Constraint::Length(3), // port - Constraint::Length(3), // username - Constraint::Length(3), // password - Constraint::Length(3), // footer + Constraint::Length(1), // h1 + Constraint::Length(1), // h2 + Constraint::Length(1), // Version + Constraint::Length(3), // protocol + Constraint::Length(self.input_mask_size()), // Input mask + Constraint::Length(3), // footer ] .as_ref(), ) .direction(Direction::Vertical) .split(chunks[0]); + // Input mask chunks + let input_mask = match self.input_mask() { + InputMask::AwsS3 => Layout::default() + .constraints( + [ + Constraint::Length(3), // bucket + Constraint::Length(3), // region + Constraint::Length(3), // profile + ] + .as_ref(), + ) + .direction(Direction::Vertical) + .split(auth_chunks[4]), + InputMask::Generic => Layout::default() + .constraints( + [ + Constraint::Length(3), // host + Constraint::Length(3), // port + Constraint::Length(3), // username + Constraint::Length(3), // password + ] + .as_ref(), + ) + .direction(Direction::Vertical) + .split(auth_chunks[4]), + }; // Create bookmark chunks let bookmark_chunks = Layout::default() .constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref()) @@ -269,16 +327,29 @@ impl AuthActivity { .render(super::COMPONENT_TEXT_NEW_VERSION, f, auth_chunks[2]); self.view .render(super::COMPONENT_RADIO_PROTOCOL, f, auth_chunks[3]); + // Render input mask + match self.input_mask() { + InputMask::AwsS3 => { + self.view + .render(super::COMPONENT_INPUT_S3_BUCKET, f, input_mask[0]); + self.view + .render(super::COMPONENT_INPUT_S3_REGION, f, input_mask[1]); + self.view + .render(super::COMPONENT_INPUT_S3_PROFILE, f, input_mask[2]); + } + InputMask::Generic => { + self.view + .render(super::COMPONENT_INPUT_ADDR, f, input_mask[0]); + self.view + .render(super::COMPONENT_INPUT_PORT, f, input_mask[1]); + self.view + .render(super::COMPONENT_INPUT_USERNAME, f, input_mask[2]); + self.view + .render(super::COMPONENT_INPUT_PASSWORD, f, input_mask[3]); + } + } self.view - .render(super::COMPONENT_INPUT_ADDR, f, auth_chunks[4]); - self.view - .render(super::COMPONENT_INPUT_PORT, f, auth_chunks[5]); - self.view - .render(super::COMPONENT_INPUT_USERNAME, f, auth_chunks[6]); - self.view - .render(super::COMPONENT_INPUT_PASSWORD, f, auth_chunks[7]); - self.view - .render(super::COMPONENT_TEXT_FOOTER, f, auth_chunks[8]); + .render(super::COMPONENT_TEXT_FOOTER, f, auth_chunks[5]); // Bookmark chunks self.view .render(super::COMPONENT_BOOKMARKS_LIST, f, bookmark_chunks[0]); @@ -388,19 +459,13 @@ impl AuthActivity { .bookmarks_list .iter() .map(|x| { - let entry: (String, u16, FileTransferProtocol, String, _) = self - .bookmarks_client - .as_ref() - .unwrap() - .get_bookmark(x) - .unwrap(); - format!( - "{} ({}://{}@{}:{})", + Self::fmt_bookmark( x, - entry.2.to_string().to_lowercase(), - entry.3, - entry.0, - entry.1 + self.bookmarks_client + .as_ref() + .unwrap() + .get_bookmark(x) + .unwrap(), ) }) .collect(); @@ -426,19 +491,12 @@ impl AuthActivity { .recents_list .iter() .map(|x| { - let entry: (String, u16, FileTransferProtocol, String) = self - .bookmarks_client - .as_ref() - .unwrap() - .get_recent(x) - .unwrap(); - - format!( - "{}://{}@{}:{}", - entry.2.to_string().to_lowercase(), - entry.3, - entry.0, - entry.1 + Self::fmt_recent( + self.bookmarks_client + .as_ref() + .unwrap() + .get_recent(x) + .unwrap(), ) }) .collect(); @@ -743,16 +801,32 @@ impl AuthActivity { self.view.umount(super::COMPONENT_TEXT_NEW_VERSION_NOTES); } - /// ### get_input + /// ### get_protocol + /// + /// Get protocol from view + pub(super) fn get_protocol(&self) -> FileTransferProtocol { + self.get_input_protocol() + } + + /// ### get_generic_params /// /// Collect input values from view - pub(super) fn get_input(&self) -> (String, u16, FileTransferProtocol, String, String) { + pub(super) fn get_generic_params_input(&self) -> (String, u16, String, String) { let addr: String = self.get_input_addr(); let port: u16 = self.get_input_port(); - let protocol: FileTransferProtocol = self.get_input_protocol(); let username: String = self.get_input_username(); let password: String = self.get_input_password(); - (addr, port, protocol, username, password) + (addr, port, username, password) + } + + /// ### get_s3_params_input + /// + /// Collect s3 input values from view + pub(super) fn get_s3_params_input(&self) -> (String, String, Option) { + let bucket: String = self.get_input_s3_bucket(); + let region: String = self.get_input_s3_region(); + let profile: Option = self.get_input_s3_profile(); + (bucket, region, profile) } pub(super) fn get_input_addr(&self) -> String { @@ -792,4 +866,75 @@ impl AuthActivity { _ => String::new(), } } + + pub(super) fn get_input_s3_bucket(&self) -> String { + match self.view.get_state(super::COMPONENT_INPUT_S3_BUCKET) { + Some(Payload::One(Value::Str(x))) => x, + _ => String::new(), + } + } + + pub(super) fn get_input_s3_region(&self) -> String { + match self.view.get_state(super::COMPONENT_INPUT_S3_REGION) { + Some(Payload::One(Value::Str(x))) => x, + _ => String::new(), + } + } + + pub(super) fn get_input_s3_profile(&self) -> Option { + match self.view.get_state(super::COMPONENT_INPUT_S3_PROFILE) { + Some(Payload::One(Value::Str(x))) => match x.is_empty() { + true => None, + false => Some(x), + }, + _ => None, + } + } + + /// ### input_mask_size + /// + /// Returns the input mask size based on current input mask + pub(super) fn input_mask_size(&self) -> u16 { + match self.input_mask() { + InputMask::AwsS3 => 9, + InputMask::Generic => 12, + } + } + + /// ### fmt_bookmark + /// + /// Format bookmark to display on ui + fn fmt_bookmark(name: &str, b: FileTransferParams) -> String { + let addr: String = Self::fmt_recent(b); + format!("{} ({})", name, addr) + } + + /// ### fmt_recent + /// + /// Format recent connection to display on ui + fn fmt_recent(b: FileTransferParams) -> String { + let protocol: String = b.protocol.to_string().to_lowercase(); + match b.params { + ProtocolParams::AwsS3(s3) => { + let profile: String = match s3.profile { + Some(p) => format!("[{}]", p), + None => String::default(), + }; + format!( + "{}://{} ({}) {}", + protocol, s3.bucket_name, s3.region, profile + ) + } + ProtocolParams::Generic(params) => { + let username: String = match params.username { + None => String::default(), + Some(u) => format!("{}@", u), + }; + format!( + "{}://{}{}:{}", + protocol, username, params.address, params.port + ) + } + } + } } diff --git a/src/ui/activities/filetransfer/actions/copy.rs b/src/ui/activities/filetransfer/actions/copy.rs index 3970603..2d67963 100644 --- a/src/ui/activities/filetransfer/actions/copy.rs +++ b/src/ui/activities/filetransfer/actions/copy.rs @@ -125,7 +125,7 @@ impl FileTransferActivity { Err(err) => match err.kind() { FileTransferErrorType::UnsupportedFeature => { // If copy is not supported, perform the tricky copy - self.tricky_copy(entry, dest); + let _ = self.tricky_copy(entry, dest); } _ => self.log_and_alert( LogLevel::Error, @@ -143,7 +143,7 @@ impl FileTransferActivity { /// ### tricky_copy /// /// Tricky copy will be used whenever copy command is not available on remote host - fn tricky_copy(&mut self, entry: FsEntry, dest: &Path) { + pub(super) fn tricky_copy(&mut self, entry: FsEntry, dest: &Path) -> Result<(), String> { // NOTE: VERY IMPORTANT; wait block must be umounted or something really bad will happen self.umount_wait(); // match entry @@ -157,7 +157,7 @@ impl FileTransferActivity { LogLevel::Error, format!("Copy failed: could not create temporary file: {}", err), ); - return; + return Err(String::from("Could not create temporary file")); } }; // Download file @@ -170,7 +170,7 @@ impl FileTransferActivity { LogLevel::Error, format!("Copy failed: could not download to temporary file: {}", err), ); - return; + return Err(err); } // Get local fs entry let tmpfile_entry: FsFile = match self.host.stat(tmpfile.path()) { @@ -184,7 +184,7 @@ impl FileTransferActivity { err ), ); - return; + return Err(err.to_string()); } }; // Upload file to destination @@ -202,8 +202,9 @@ impl FileTransferActivity { err ), ); - return; + return Err(err); } + Ok(()) } FsEntry::Directory(_) => { let tempdir: tempfile::TempDir = match tempfile::TempDir::new() { @@ -213,7 +214,7 @@ impl FileTransferActivity { LogLevel::Error, format!("Copy failed: could not create temporary directory: {}", err), ); - return; + return Err(err.to_string()); } }; // Get path of dest @@ -227,7 +228,7 @@ impl FileTransferActivity { LogLevel::Error, format!("Copy failed: failed to download file: {}", err), ); - return; + return Err(err); } // Stat dir let tempdir_entry: FsEntry = match self.host.stat(tempdir_path.as_path()) { @@ -241,7 +242,7 @@ impl FileTransferActivity { err ), ); - return; + return Err(err.to_string()); } }; // Upload to destination @@ -255,8 +256,9 @@ impl FileTransferActivity { LogLevel::Error, format!("Copy failed: failed to send file: {}", err), ); - return; + return Err(err); } + Ok(()) } } } diff --git a/src/ui/activities/filetransfer/actions/newfile.rs b/src/ui/activities/filetransfer/actions/newfile.rs index ac65f79..fe68350 100644 --- a/src/ui/activities/filetransfer/actions/newfile.rs +++ b/src/ui/activities/filetransfer/actions/newfile.rs @@ -27,6 +27,7 @@ */ // locals use super::{FileTransferActivity, FsEntry, LogLevel}; +use std::fs::File; use std::path::PathBuf; impl FileTransferActivity { @@ -99,24 +100,29 @@ impl FileTransferActivity { }; if let FsEntry::File(local_file) = local_file { // Create file - match self.client.send_file(&local_file, file_path.as_path()) { + let reader = Box::new(match File::open(tfile.path()) { + Ok(f) => f, + Err(err) => { + self.log_and_alert( + LogLevel::Error, + format!("Could not open tempfile: {}", err), + ); + return; + } + }); + match self + .client + .send_file_wno_stream(&local_file, file_path.as_path(), reader) + { Err(err) => self.log_and_alert( LogLevel::Error, format!("Could not create file \"{}\": {}", file_path.display(), err), ), - Ok(writer) => { - // Finalize write - if let Err(err) = self.client.on_sent(writer) { - self.log_and_alert( - LogLevel::Warn, - format!("Could not finalize file: {}", err), - ); - } else { - self.log( - LogLevel::Info, - format!("Created file \"{}\"", file_path.display()), - ); - } + Ok(_) => { + self.log( + LogLevel::Info, + format!("Created file \"{}\"", file_path.display()), + ); // Reload files self.reload_remote_dir(); } diff --git a/src/ui/activities/filetransfer/actions/rename.rs b/src/ui/activities/filetransfer/actions/rename.rs index 80f3fd5..31aaad5 100644 --- a/src/ui/activities/filetransfer/actions/rename.rs +++ b/src/ui/activities/filetransfer/actions/rename.rs @@ -27,6 +27,7 @@ */ // locals use super::{FileTransferActivity, FsEntry, LogLevel, SelectedEntry}; +use crate::filetransfer::FileTransferErrorType; use std::path::{Path, PathBuf}; impl FileTransferActivity { @@ -114,6 +115,9 @@ impl FileTransferActivity { ), ); } + Err(err) if err.kind() == FileTransferErrorType::UnsupportedFeature => { + self.tricky_move(entry, dest); + } Err(err) => self.log_and_alert( LogLevel::Error, format!( @@ -125,4 +129,41 @@ impl FileTransferActivity { ), } } + + /// ### tricky_move + /// + /// Tricky move will be used whenever copy command is not available on remote host. + /// It basically uses the tricky_copy function, then it just deletes the previous entry (`entry`) + fn tricky_move(&mut self, entry: &FsEntry, dest: &Path) { + debug!( + "Using tricky-move to move entry {} to {}", + entry.get_abs_path().display(), + dest.display() + ); + if self.tricky_copy(entry.clone(), dest).is_ok() { + // Delete remote existing entry + debug!("Tricky-copy worked; removing existing remote entry"); + match self.client.remove(entry) { + Ok(_) => self.log( + LogLevel::Info, + format!( + "Moved \"{}\" to \"{}\"", + entry.get_abs_path().display(), + dest.display() + ), + ), + Err(err) => self.log_and_alert( + LogLevel::Error, + format!( + "Copied \"{}\" to \"{}\"; but failed to remove src: {}", + entry.get_abs_path().display(), + dest.display(), + err + ), + ), + } + } else { + error!("Tricky move aborted due to tricky-copy failure"); + } + } } diff --git a/src/ui/activities/filetransfer/lib/transfer.rs b/src/ui/activities/filetransfer/lib/transfer.rs index 2fc7429..2816f51 100644 --- a/src/ui/activities/filetransfer/lib/transfer.rs +++ b/src/ui/activities/filetransfer/lib/transfer.rs @@ -140,6 +140,10 @@ impl ProgressStates { /// /// Calculate progress in a range between 0.0 to 1.0 pub fn calc_progress(&self) -> f64 { + // Prevent dividing by 0 + if self.total == 0 { + return 0.0; + } let prog: f64 = (self.written as f64) / (self.total as f64); match prog > 1.0 { true => 1.0, @@ -238,6 +242,11 @@ mod test { // Check if terminated at started states.started = Instant::now(); assert_eq!(states.calc_bytes_per_second(), 1024); + // Divide by zero + let states: ProgressStates = ProgressStates::default(); + assert_eq!(states.total, 0); + assert_eq!(states.written, 0); + assert_eq!(states.calc_progress(), 0.0); } #[test] diff --git a/src/ui/activities/filetransfer/misc.rs b/src/ui/activities/filetransfer/misc.rs index 60360d7..7fdce4f 100644 --- a/src/ui/activities/filetransfer/misc.rs +++ b/src/ui/activities/filetransfer/misc.rs @@ -23,6 +23,7 @@ */ // Locals use super::{ConfigClient, FileTransferActivity, LogLevel, LogRecord}; +use crate::filetransfer::ProtocolParams; use crate::system::environment; use crate::system::sshkey_storage::SshKeyStorage; use crate::utils::path; @@ -134,4 +135,15 @@ impl FileTransferActivity { pub(super) fn remote_to_abs_path(&self, path: &Path) -> PathBuf { path::absolutize(self.remote().wrkdir.as_path(), path) } + + /// ### get_remote_hostname + /// + /// Get remote hostname + pub(super) fn get_remote_hostname(&self) -> String { + let ft_params = self.context().ft_params().unwrap(); + match &ft_params.params { + ProtocolParams::Generic(params) => params.address.clone(), + ProtocolParams::AwsS3(params) => params.bucket_name.clone(), + } + } } diff --git a/src/ui/activities/filetransfer/mod.rs b/src/ui/activities/filetransfer/mod.rs index 3d3a655..d768ed8 100644 --- a/src/ui/activities/filetransfer/mod.rs +++ b/src/ui/activities/filetransfer/mod.rs @@ -36,10 +36,8 @@ pub(self) mod view; // locals use super::{Activity, Context, ExitReason}; use crate::config::themes::Theme; -use crate::filetransfer::ftp_transfer::FtpFileTransfer; -use crate::filetransfer::scp_transfer::ScpFileTransfer; -use crate::filetransfer::sftp_transfer::SftpFileTransfer; -use crate::filetransfer::{FileTransfer, FileTransferProtocol}; +use crate::filetransfer::{FileTransfer, FileTransferProtocol, ProtocolParams}; +use crate::filetransfer::{FtpFileTransfer, S3FileTransfer, ScpFileTransfer, SftpFileTransfer}; use crate::fs::explorer::FileExplorer; use crate::fs::FsEntry; use crate::host::Localhost; @@ -155,6 +153,7 @@ impl FileTransferActivity { FileTransferProtocol::Scp => { Box::new(ScpFileTransfer::new(Self::make_ssh_storage(&config_client))) } + FileTransferProtocol::AwsS3 => Box::new(S3FileTransfer::default()), }, browser: Browser::new(&config_client), log_records: VecDeque::with_capacity(256), // 256 events is enough I guess @@ -237,6 +236,28 @@ impl FileTransferActivity { fn theme(&self) -> &Theme { self.context().theme_provider().theme() } + + /// ### get_connection_msg + /// + /// Get connection message to show to client + fn get_connection_msg(params: &ProtocolParams) -> String { + match params { + ProtocolParams::Generic(params) => { + info!( + "Client is not connected to remote; connecting to {}:{}", + params.address, params.port + ); + format!("Connecting to {}:{}…", params.address, params.port) + } + ProtocolParams::AwsS3(params) => { + info!( + "Client is not connected to remote; connecting to {} ({})", + params.bucket_name, params.region + ); + format!("Connecting to {}…", params.bucket_name) + } + } + } } /** @@ -290,12 +311,9 @@ impl Activity for FileTransferActivity { } // Check if connected (popup must be None, otherwise would try reconnecting in loop in case of error) if !self.client.is_connected() && self.view.get_props(COMPONENT_TEXT_FATAL).is_none() { - let params = self.context().ft_params().unwrap(); - info!( - "Client is not connected to remote; connecting to {}:{}", - params.address, params.port - ); - let msg: String = format!("Connecting to {}:{}…", params.address, params.port); + let ftparams = self.context().ft_params().unwrap(); + // print params + let msg: String = Self::get_connection_msg(&ftparams.params); // Set init state to connecting popup self.mount_wait(msg.as_str()); // Force ui draw diff --git a/src/ui/activities/filetransfer/session.rs b/src/ui/activities/filetransfer/session.rs index a9a4eb7..cb4a0ff 100644 --- a/src/ui/activities/filetransfer/session.rs +++ b/src/ui/activities/filetransfer/session.rs @@ -34,6 +34,7 @@ use crate::utils::fmt::fmt_millis; // Ext use bytesize::ByteSize; +use std::fs::File; use std::io::{Read, Seek, Write}; use std::path::{Path, PathBuf}; use std::time::Instant; @@ -76,22 +77,20 @@ impl FileTransferActivity { /// /// Connect to remote pub(super) fn connect(&mut self) { - let params = self.context().ft_params().unwrap().clone(); - let addr: String = params.address.clone(); - let entry_dir: Option = params.entry_directory.clone(); + let ft_params = self.context().ft_params().unwrap().clone(); + let entry_dir: Option = ft_params.entry_directory.clone(); // Connect to remote - match self.client.connect( - params.address, - params.port, - params.username, - params.password, - ) { + match self.client.connect(&ft_params.params) { Ok(welcome) => { if let Some(banner) = welcome { // Log welcome self.log( LogLevel::Info, - format!("Established connection with '{}': \"{}\"", addr, banner), + format!( + "Established connection with '{}': \"{}\"", + self.get_remote_hostname(), + banner + ), ); } // Try to change directory to entry directory @@ -121,8 +120,7 @@ impl FileTransferActivity { /// /// disconnect from remote pub(super) fn disconnect(&mut self) { - let params = self.context().ft_params().unwrap(); - let msg: String = format!("Disconnecting from {}…", params.address); + let msg: String = format!("Disconnecting from {}…", self.get_remote_hostname()); // Show popup disconnecting self.mount_wait(msg.as_str()); // Disconnect @@ -442,103 +440,165 @@ impl FileTransferActivity { // Upload file // Try to open local file match self.host.open_file_read(local.abs_path.as_path()) { - Ok(mut fhnd) => match self.client.send_file(local, remote) { - Ok(mut rhnd) => { - // Write file - let file_size: usize = - fhnd.seek(std::io::SeekFrom::End(0)).unwrap_or(0) as usize; - // Init transfer - self.transfer.partial.init(file_size); - // rewind - if let Err(err) = fhnd.seek(std::io::SeekFrom::Start(0)) { - return Err(TransferErrorReason::CouldNotRewind(err)); - } - // Write remote file - let mut total_bytes_written: usize = 0; - let mut last_progress_val: f64 = 0.0; - let mut last_input_event_fetch: Option = None; - // While the entire file hasn't been completely written, - // Or filetransfer has been aborted - while total_bytes_written < file_size && !self.transfer.aborted() { - // Handle input events (each 500ms) or if never fetched before - if last_input_event_fetch.is_none() - || last_input_event_fetch - .unwrap_or_else(Instant::now) - .elapsed() - .as_millis() - >= 500 - { - // Read events - self.read_input_event(); - // Reset instant - last_input_event_fetch = Some(Instant::now()); - } - // Read till you can - let mut buffer: [u8; 65536] = [0; 65536]; - let delta: usize = match fhnd.read(&mut buffer) { - Ok(bytes_read) => { - total_bytes_written += bytes_read; - if bytes_read == 0 { - continue; - } else { - let mut delta: usize = 0; - while delta < bytes_read { - // Write bytes - match rhnd.write(&buffer[delta..bytes_read]) { - Ok(bytes) => { - delta += bytes; - } - Err(err) => { - return Err(TransferErrorReason::RemoteIoError( - err, - )); - } - } - } - delta + Ok(fhnd) => match self.client.send_file(local, remote) { + Ok(rhnd) => { + self.filetransfer_send_one_with_stream(local, remote, file_name, fhnd, rhnd) + } + Err(err) if err.kind() == FileTransferErrorType::UnsupportedFeature => { + self.filetransfer_send_one_wno_stream(local, remote, file_name, fhnd) + } + Err(err) => Err(TransferErrorReason::FileTransferError(err)), + }, + Err(err) => Err(TransferErrorReason::HostError(err)), + } + } + + /// ### filetransfer_send_one_with_stream + /// + /// Send file to remote using stream + fn filetransfer_send_one_with_stream( + &mut self, + local: &FsFile, + remote: &Path, + file_name: String, + mut reader: File, + mut writer: Box, + ) -> Result<(), TransferErrorReason> { + // Write file + let file_size: usize = reader.seek(std::io::SeekFrom::End(0)).unwrap_or(0) as usize; + // Init transfer + self.transfer.partial.init(file_size); + // rewind + if let Err(err) = reader.seek(std::io::SeekFrom::Start(0)) { + return Err(TransferErrorReason::CouldNotRewind(err)); + } + // Write remote file + let mut total_bytes_written: usize = 0; + let mut last_progress_val: f64 = 0.0; + let mut last_input_event_fetch: Option = None; + // While the entire file hasn't been completely written, + // Or filetransfer has been aborted + while total_bytes_written < file_size && !self.transfer.aborted() { + // Handle input events (each 500ms) or if never fetched before + if last_input_event_fetch.is_none() + || last_input_event_fetch + .unwrap_or_else(Instant::now) + .elapsed() + .as_millis() + >= 500 + { + // Read events + self.read_input_event(); + // Reset instant + last_input_event_fetch = Some(Instant::now()); + } + // Read till you can + let mut buffer: [u8; 65536] = [0; 65536]; + let delta: usize = match reader.read(&mut buffer) { + Ok(bytes_read) => { + total_bytes_written += bytes_read; + if bytes_read == 0 { + continue; + } else { + let mut delta: usize = 0; + while delta < bytes_read { + // Write bytes + match writer.write(&buffer[delta..bytes_read]) { + Ok(bytes) => { + delta += bytes; + } + Err(err) => { + return Err(TransferErrorReason::RemoteIoError(err)); } } - Err(err) => { - return Err(TransferErrorReason::LocalIoError(err)); - } - }; - // Increase progress - self.transfer.partial.update_progress(delta); - self.transfer.full.update_progress(delta); - // Draw only if a significant progress has been made (performance improvement) - if last_progress_val < self.transfer.partial.calc_progress() - 0.01 { - // Draw - self.update_progress_bar(format!("Uploading \"{}\"…", file_name)); - self.view(); - last_progress_val = self.transfer.partial.calc_progress(); } + delta } - // Finalize stream - if let Err(err) = self.client.on_sent(rhnd) { - self.log( - LogLevel::Warn, - format!("Could not finalize remote stream: \"{}\"", err), - ); - } - // if upload was abrupted, return error - if self.transfer.aborted() { - return Err(TransferErrorReason::Abrupted); - } - self.log( - LogLevel::Info, - format!( - "Saved file \"{}\" to \"{}\" (took {} seconds; at {}/s)", - local.abs_path.display(), - remote.display(), - fmt_millis(self.transfer.partial.started().elapsed()), - ByteSize(self.transfer.partial.calc_bytes_per_second()), - ), - ); } - Err(err) => return Err(TransferErrorReason::FileTransferError(err)), - }, - Err(err) => return Err(TransferErrorReason::HostError(err)), + Err(err) => { + return Err(TransferErrorReason::LocalIoError(err)); + } + }; + // Increase progress + self.transfer.partial.update_progress(delta); + self.transfer.full.update_progress(delta); + // Draw only if a significant progress has been made (performance improvement) + if last_progress_val < self.transfer.partial.calc_progress() - 0.01 { + // Draw + self.update_progress_bar(format!("Uploading \"{}\"…", file_name)); + self.view(); + last_progress_val = self.transfer.partial.calc_progress(); + } } + // Finalize stream + if let Err(err) = self.client.on_sent(writer) { + self.log( + LogLevel::Warn, + format!("Could not finalize remote stream: \"{}\"", err), + ); + } + // if upload was abrupted, return error + if self.transfer.aborted() { + return Err(TransferErrorReason::Abrupted); + } + self.log( + LogLevel::Info, + format!( + "Saved file \"{}\" to \"{}\" (took {} seconds; at {}/s)", + local.abs_path.display(), + remote.display(), + fmt_millis(self.transfer.partial.started().elapsed()), + ByteSize(self.transfer.partial.calc_bytes_per_second()), + ), + ); + Ok(()) + } + + /// ### filetransfer_send_one_wno_stream + /// + /// Send an `FsFile` to remote without using streams. + fn filetransfer_send_one_wno_stream( + &mut self, + local: &FsFile, + remote: &Path, + file_name: String, + mut reader: File, + ) -> Result<(), TransferErrorReason> { + // Write file + let file_size: usize = reader.seek(std::io::SeekFrom::End(0)).unwrap_or(0) as usize; + // Init transfer + self.transfer.partial.init(file_size); + // rewind + if let Err(err) = reader.seek(std::io::SeekFrom::Start(0)) { + return Err(TransferErrorReason::CouldNotRewind(err)); + } + // Draw before + self.update_progress_bar(format!("Uploading \"{}\"…", file_name)); + self.view(); + // Send file + if let Err(err) = self + .client + .send_file_wno_stream(local, remote, Box::new(reader)) + { + return Err(TransferErrorReason::FileTransferError(err)); + } + // Set transfer size ok + self.transfer.partial.update_progress(file_size); + self.transfer.full.update_progress(file_size); + // Draw again after + self.update_progress_bar(format!("Uploading \"{}\"…", file_name)); + self.view(); + // log and return Ok + self.log( + LogLevel::Info, + format!( + "Saved file \"{}\" to \"{}\" (took {} seconds; at {}/s)", + local.abs_path.display(), + remote.display(), + fmt_millis(self.transfer.partial.started().elapsed()), + ByteSize(self.transfer.partial.calc_bytes_per_second()), + ), + ); Ok(()) } @@ -796,120 +856,187 @@ impl FileTransferActivity { ) -> Result<(), TransferErrorReason> { // Try to open local file match self.host.open_file_write(local) { - Ok(mut local_file) => { + Ok(local_file) => { // Download file from remote match self.client.recv_file(remote) { - Ok(mut rhnd) => { - let mut total_bytes_written: usize = 0; - // Init transfer - self.transfer.partial.init(remote.size); - // Write local file - let mut last_progress_val: f64 = 0.0; - let mut last_input_event_fetch: Option = None; - // While the entire file hasn't been completely read, - // Or filetransfer has been aborted - while total_bytes_written < remote.size && !self.transfer.aborted() { - // Handle input events (each 500 ms) or is None - if last_input_event_fetch.is_none() - || last_input_event_fetch - .unwrap_or_else(Instant::now) - .elapsed() - .as_millis() - >= 500 - { - // Read events - self.read_input_event(); - // Reset instant - last_input_event_fetch = Some(Instant::now()); - } - // Read till you can - let mut buffer: [u8; 65536] = [0; 65536]; - let delta: usize = match rhnd.read(&mut buffer) { - Ok(bytes_read) => { - total_bytes_written += bytes_read; - if bytes_read == 0 { - continue; - } else { - let mut delta: usize = 0; - while delta < bytes_read { - // Write bytes - match local_file.write(&buffer[delta..bytes_read]) { - Ok(bytes) => delta += bytes, - Err(err) => { - return Err(TransferErrorReason::LocalIoError( - err, - )); - } - } - } - delta - } - } - Err(err) => { - return Err(TransferErrorReason::RemoteIoError(err)); - } - }; - // Set progress - self.transfer.partial.update_progress(delta); - self.transfer.full.update_progress(delta); - // Draw only if a significant progress has been made (performance improvement) - if last_progress_val < self.transfer.partial.calc_progress() - 0.01 { - // Draw - self.update_progress_bar(format!("Downloading \"{}\"", file_name)); - self.view(); - last_progress_val = self.transfer.partial.calc_progress(); - } - } - // Finalize stream - if let Err(err) = self.client.on_recv(rhnd) { - self.log( - LogLevel::Warn, - format!("Could not finalize remote stream: \"{}\"", err), - ); - } - // If download was abrupted, return Error - if self.transfer.aborted() { - return Err(TransferErrorReason::Abrupted); - } - // Apply file mode to file - #[cfg(any( - target_family = "unix", - target_os = "macos", - target_os = "linux" - ))] - if let Some((owner, group, others)) = remote.unix_pex { - if let Err(err) = self - .host - .chmod(local, (owner.as_byte(), group.as_byte(), others.as_byte())) - { - self.log( - LogLevel::Error, - format!( - "Could not apply file mode {:?} to \"{}\": {}", - (owner.as_byte(), group.as_byte(), others.as_byte()), - local.display(), - err - ), - ); - } - } - // Log - self.log( - LogLevel::Info, - format!( - "Saved file \"{}\" to \"{}\" (took {} seconds; at {}/s)", - remote.abs_path.display(), - local.display(), - fmt_millis(self.transfer.partial.started().elapsed()), - ByteSize(self.transfer.partial.calc_bytes_per_second()), - ), - ); + Ok(rhnd) => self.filetransfer_recv_one_with_stream( + local, remote, file_name, rhnd, local_file, + ), + Err(err) if err.kind() == FileTransferErrorType::UnsupportedFeature => { + self.filetransfer_recv_one_wno_stream(local, remote, file_name) } - Err(err) => return Err(TransferErrorReason::FileTransferError(err)), + Err(err) => Err(TransferErrorReason::FileTransferError(err)), } } - Err(err) => return Err(TransferErrorReason::HostError(err)), + Err(err) => Err(TransferErrorReason::HostError(err)), } + } + + /// ### filetransfer_recv_one_with_stream + /// + /// Receive an `FsEntry` from remote using stream + fn filetransfer_recv_one_with_stream( + &mut self, + local: &Path, + remote: &FsFile, + file_name: String, + mut reader: Box, + mut writer: File, + ) -> Result<(), TransferErrorReason> { + let mut total_bytes_written: usize = 0; + // Init transfer + self.transfer.partial.init(remote.size); + // Write local file + let mut last_progress_val: f64 = 0.0; + let mut last_input_event_fetch: Option = None; + // While the entire file hasn't been completely read, + // Or filetransfer has been aborted + while total_bytes_written < remote.size && !self.transfer.aborted() { + // Handle input events (each 500 ms) or is None + if last_input_event_fetch.is_none() + || last_input_event_fetch + .unwrap_or_else(Instant::now) + .elapsed() + .as_millis() + >= 500 + { + // Read events + self.read_input_event(); + // Reset instant + last_input_event_fetch = Some(Instant::now()); + } + // Read till you can + let mut buffer: [u8; 65536] = [0; 65536]; + let delta: usize = match reader.read(&mut buffer) { + Ok(bytes_read) => { + total_bytes_written += bytes_read; + if bytes_read == 0 { + continue; + } else { + let mut delta: usize = 0; + while delta < bytes_read { + // Write bytes + match writer.write(&buffer[delta..bytes_read]) { + Ok(bytes) => delta += bytes, + Err(err) => { + return Err(TransferErrorReason::LocalIoError(err)); + } + } + } + delta + } + } + Err(err) => { + return Err(TransferErrorReason::RemoteIoError(err)); + } + }; + // Set progress + self.transfer.partial.update_progress(delta); + self.transfer.full.update_progress(delta); + // Draw only if a significant progress has been made (performance improvement) + if last_progress_val < self.transfer.partial.calc_progress() - 0.01 { + // Draw + self.update_progress_bar(format!("Downloading \"{}\"", file_name)); + self.view(); + last_progress_val = self.transfer.partial.calc_progress(); + } + } + // Finalize stream + if let Err(err) = self.client.on_recv(reader) { + self.log( + LogLevel::Warn, + format!("Could not finalize remote stream: \"{}\"", err), + ); + } + // If download was abrupted, return Error + if self.transfer.aborted() { + return Err(TransferErrorReason::Abrupted); + } + // Apply file mode to file + #[cfg(target_family = "unix")] + if let Some((owner, group, others)) = remote.unix_pex { + if let Err(err) = self + .host + .chmod(local, (owner.as_byte(), group.as_byte(), others.as_byte())) + { + self.log( + LogLevel::Error, + format!( + "Could not apply file mode {:?} to \"{}\": {}", + (owner.as_byte(), group.as_byte(), others.as_byte()), + local.display(), + err + ), + ); + } + } + // Log + self.log( + LogLevel::Info, + format!( + "Saved file \"{}\" to \"{}\" (took {} seconds; at {}/s)", + remote.abs_path.display(), + local.display(), + fmt_millis(self.transfer.partial.started().elapsed()), + ByteSize(self.transfer.partial.calc_bytes_per_second()), + ), + ); + Ok(()) + } + + /// ### filetransfer_recv_one_with_stream + /// + /// Receive an `FsEntry` from remote without using stream + fn filetransfer_recv_one_wno_stream( + &mut self, + local: &Path, + remote: &FsFile, + file_name: String, + ) -> Result<(), TransferErrorReason> { + // Init transfer + self.transfer.partial.init(remote.size); + // Draw before transfer + self.update_progress_bar(format!("Downloading \"{}\"", file_name)); + self.view(); + // recv wno stream + if let Err(err) = self.client.recv_file_wno_stream(remote, local) { + return Err(TransferErrorReason::FileTransferError(err)); + } + // Update progress at the end + self.transfer.partial.update_progress(remote.size); + self.transfer.full.update_progress(remote.size); + // Draw after transfer + self.update_progress_bar(format!("Downloading \"{}\"", file_name)); + self.view(); + // Apply file mode to file + #[cfg(target_family = "unix")] + if let Some((owner, group, others)) = remote.unix_pex { + if let Err(err) = self + .host + .chmod(local, (owner.as_byte(), group.as_byte(), others.as_byte())) + { + self.log( + LogLevel::Error, + format!( + "Could not apply file mode {:?} to \"{}\": {}", + (owner.as_byte(), group.as_byte(), others.as_byte()), + local.display(), + err + ), + ); + } + } + // Log + self.log( + LogLevel::Info, + format!( + "Saved file \"{}\" to \"{}\" (took {} seconds; at {}/s)", + remote.abs_path.display(), + local.display(), + fmt_millis(self.transfer.partial.started().elapsed()), + ByteSize(self.transfer.partial.calc_bytes_per_second()), + ), + ); Ok(()) } diff --git a/src/ui/activities/filetransfer/update.rs b/src/ui/activities/filetransfer/update.rs index 3dc40fc..39fe2a2 100644 --- a/src/ui/activities/filetransfer/update.rs +++ b/src/ui/activities/filetransfer/update.rs @@ -810,14 +810,14 @@ impl FileTransferActivity { .store() .get_unsigned(super::STORAGE_EXPLORER_WIDTH) .unwrap_or(256); - let params = self.context().ft_params().unwrap(); + let hostname = self.get_remote_hostname(); let hostname: String = format!( "{}:{} ", - params.address, + hostname, fmt_path_elide_ex( self.remote().wrkdir.as_path(), width, - params.address.len() + 3 // 3 because of '/…/' + hostname.len() + 3 // 3 because of '/…/' ) ); let files: Vec = self diff --git a/src/ui/activities/setup/view/setup.rs b/src/ui/activities/setup/view/setup.rs index 218c8fb..fa195cb 100644 --- a/src/ui/activities/setup/view/setup.rs +++ b/src/ui/activities/setup/view/setup.rs @@ -81,12 +81,7 @@ impl SetupActivity { .with_inverted_color(Color::Black) .with_borders(Borders::ALL, BorderType::Rounded, Color::LightCyan) .with_title("Default file transfer protocol", Alignment::Left) - .with_options(&[ - String::from("SFTP"), - String::from("SCP"), - String::from("FTP"), - String::from("FTPS"), - ]) + .with_options(&["SFTP", "SCP", "FTP", "FTPS", "AWS S3"]) .rewind(true) .build(), )), @@ -265,6 +260,7 @@ impl SetupActivity { FileTransferProtocol::Scp => 1, FileTransferProtocol::Ftp(false) => 2, FileTransferProtocol::Ftp(true) => 3, + FileTransferProtocol::AwsS3 => 4, }; let props = RadioPropsBuilder::from(props).with_value(protocol).build(); let _ = self @@ -334,6 +330,7 @@ impl SetupActivity { 1 => FileTransferProtocol::Scp, 2 => FileTransferProtocol::Ftp(false), 3 => FileTransferProtocol::Ftp(true), + 4 => FileTransferProtocol::AwsS3, _ => FileTransferProtocol::Sftp, }; self.config_mut().set_default_protocol(protocol); diff --git a/src/utils/parser.rs b/src/utils/parser.rs index 7359b44..5b3f2ce 100644 --- a/src/utils/parser.rs +++ b/src/utils/parser.rs @@ -26,7 +26,10 @@ * SOFTWARE. */ // Locals -use crate::filetransfer::{FileTransferParams, FileTransferProtocol}; +use crate::filetransfer::{ + params::{AwsS3Params, GenericProtocolParams, ProtocolParams}, + FileTransferParams, FileTransferProtocol, +}; #[cfg(not(test))] // NOTE: don't use configuration during tests use crate::system::config_client::ConfigClient; #[cfg(not(test))] // NOTE: don't use configuration during tests @@ -43,15 +46,34 @@ use tuirealm::tui::style::Color; // Regex lazy_static! { + + /** + * This regex matches the protocol used as option + * Regex matches: + * - group 1: Some(protocol) | None + * - group 2: Some(other args) + */ + static ref REMOTE_OPT_PROTOCOL_REGEX: Regex = Regex::new(r"(?:([a-z0-9]+)://)?(?:(.+))").unwrap(); + /** * Regex matches: - * - group 1: Some(protocol) | None - * - group 2: Some(user) | None - * - group 3: Address - * - group 4: Some(port) | None - * - group 5: Some(path) | None + * - group 1: Some(user) | None + * - group 2: Address + * - group 3: Some(port) | None + * - group 4: Some(path) | None */ - static ref REMOTE_OPT_REGEX: Regex = Regex::new(r"(?:([a-z]+)://)?(?:([^@]+)@)?(?:([^:]+))(?::((?:[0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])(?:[0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])))?(?::([^:]+))?").ok().unwrap(); + static ref REMOTE_GENERIC_OPT_REGEX: Regex = Regex::new(r"(?:([^@]+)@)?(?:([^:]+))(?::((?:[0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])(?:[0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])))?(?::([^:]+))?").ok().unwrap(); + + /** + * Regex matches: + * - group 1: Bucket + * - group 2: Region + * - group 3: Some(profile) | None + * - group 4: Some(path) | None + */ + static ref REMOTE_S3_OPT_REGEX: Regex = Regex::new(r"(?:([^@]+)@)(?:([^:]+))(?::([a-zA-Z0-9][^:]+))?(?::([^:]+))?").unwrap(); + + /** * Regex matches: * - group 1: Version @@ -75,6 +97,8 @@ lazy_static! { static ref COLOR_RGB_REGEX: Regex = Regex::new(r"^(rgb)?\(?([01]?\d\d?|2[0-4]\d|25[0-5])(\W+)([01]?\d\d?|2[0-4]\d|25[0-5])\W+(([01]?\d\d?|2[0-4]\d|25[0-5])\)?)").unwrap(); } +// -- remote opts + /// ### parse_remote_opt /// /// Parse remote option string. Returns in case of success a RemoteOptions struct @@ -93,10 +117,10 @@ lazy_static! { /// - sftp://172.26.104.1:4022 /// - sftp://172.26.104.1 /// - ... -pub fn parse_remote_opt(remote: &str) -> Result { +pub fn parse_remote_opt(s: &str) -> Result { // Set protocol to default protocol #[cfg(not(test))] // NOTE: don't use configuration during tests - let mut protocol: FileTransferProtocol = match environment::init_config_dir() { + let default_protocol: FileTransferProtocol = match environment::init_config_dir() { Ok(p) => match p { Some(p) => { // Create config client @@ -111,28 +135,60 @@ pub fn parse_remote_opt(remote: &str) -> Result { Err(_) => FileTransferProtocol::Sftp, }; #[cfg(test)] // NOTE: during test set protocol just to Sftp - let mut protocol: FileTransferProtocol = FileTransferProtocol::Sftp; - // Match against regex - match REMOTE_OPT_REGEX.captures(remote) { + let default_protocol: FileTransferProtocol = FileTransferProtocol::Sftp; + // Get protocol + let (protocol, s): (FileTransferProtocol, String) = + parse_remote_opt_protocol(s, default_protocol)?; + // Match against regex for protocol type + match protocol { + FileTransferProtocol::AwsS3 => parse_s3_remote_opt(s.as_str()), + protocol => parse_generic_remote_opt(s.as_str(), protocol), + } +} + +/// ### parse_remote_opt_protocol +/// +/// Parse protocol from CLI option. In case of success, return the protocol to be used and the remaining arguments +fn parse_remote_opt_protocol( + s: &str, + default: FileTransferProtocol, +) -> Result<(FileTransferProtocol, String), String> { + match REMOTE_OPT_PROTOCOL_REGEX.captures(s) { + Some(groups) => { + // Parse protocol or use default + let protocol = groups.get(1).map(|x| { + FileTransferProtocol::from_str(x.as_str()) + .map_err(|_| format!("Unknown protocol \"{}\"", x.as_str())) + }); + let protocol = match protocol { + Some(Ok(protocol)) => protocol, + Some(Err(err)) => return Err(err), + None => default, + }; + // Return protocol and remaining arguments + Ok(( + protocol, + groups + .get(2) + .map(|x| x.as_str().to_string()) + .unwrap_or_default(), + )) + } + None => Err("Invalid args".to_string()), + } +} + +/// ### parse_generic_remote_opt +/// +/// Parse generic remote options +fn parse_generic_remote_opt( + s: &str, + protocol: FileTransferProtocol, +) -> Result { + match REMOTE_GENERIC_OPT_REGEX.captures(s) { Some(groups) => { - // Match protocol - let mut port: u16 = 22; - if let Some(group) = groups.get(1) { - // Set protocol from group - let (m_protocol, m_port) = match FileTransferProtocol::from_str(group.as_str()) { - Ok(proto) => match proto { - FileTransferProtocol::Ftp(_) => (proto, 21), - FileTransferProtocol::Scp => (proto, 22), - FileTransferProtocol::Sftp => (proto, 22), - }, - Err(_) => return Err(format!("Unknown protocol \"{}\"", group.as_str())), - }; - // NOTE: tuple destructuring assignment is not supported yet :( - protocol = m_protocol; - port = m_port; - } // Match user - let username: Option = match groups.get(2) { + let username: Option = match groups.get(1) { Some(group) => Some(group.as_str().to_string()), None => match protocol { // If group is empty, set to current user @@ -143,25 +199,62 @@ pub fn parse_remote_opt(remote: &str) -> Result { }, }; // Get address - let address: String = match groups.get(3) { + let address: String = match groups.get(2) { Some(group) => group.as_str().to_string(), None => return Err(String::from("Missing address")), }; // Get port - if let Some(group) = groups.get(4) { - port = match group.as_str().parse::() { + let port: u16 = match groups.get(3) { + Some(port) => match port.as_str().parse::() { + // Try to parse port Ok(p) => p, - Err(err) => return Err(format!("Bad port \"{}\": {}", group.as_str(), err)), - }; - } + Err(err) => return Err(format!("Bad port \"{}\": {}", port.as_str(), err)), + }, + None => match protocol { + // Set port based on protocol + FileTransferProtocol::Ftp(_) => 21, + FileTransferProtocol::Scp => 22, + FileTransferProtocol::Sftp => 22, + _ => 22, // Doesn't matter + }, + }; // Get workdir let entry_directory: Option = - groups.get(5).map(|group| PathBuf::from(group.as_str())); - Ok(FileTransferParams::new(address) - .port(port) - .protocol(protocol) - .username(username) - .entry_directory(entry_directory)) + groups.get(4).map(|group| PathBuf::from(group.as_str())); + let params: ProtocolParams = ProtocolParams::Generic( + GenericProtocolParams::default() + .address(address) + .port(port) + .username(username), + ); + Ok(FileTransferParams::new(protocol, params).entry_directory(entry_directory)) + } + None => Err(String::from("Bad remote host syntax!")), + } +} + +/// ### parse_s3_remote_opt +/// +/// Parse remote options for s3 protocol +fn parse_s3_remote_opt(s: &str) -> Result { + match REMOTE_S3_OPT_REGEX.captures(s) { + Some(groups) => { + let bucket: String = groups + .get(1) + .map(|x| x.as_str().to_string()) + .unwrap_or_default(); + let region: String = groups + .get(2) + .map(|x| x.as_str().to_string()) + .unwrap_or_default(); + let profile: Option = groups.get(3).map(|x| x.as_str().to_string()); + let entry_directory: Option = + groups.get(4).map(|group| PathBuf::from(group.as_str())); + Ok(FileTransferParams::new( + FileTransferProtocol::AwsS3, + ProtocolParams::AwsS3(AwsS3Params::new(bucket, region, profile)), + ) + .entry_directory(entry_directory)) } None => Err(String::from("Bad remote host syntax!")), } @@ -470,101 +563,127 @@ mod tests { let result: FileTransferParams = parse_remote_opt(&String::from("172.26.104.1")) .ok() .unwrap(); - assert_eq!(result.address, String::from("172.26.104.1")); - assert_eq!(result.port, 22); + let params = result.params.generic_params().unwrap(); assert_eq!(result.protocol, FileTransferProtocol::Sftp); - assert!(result.username.is_some()); + assert_eq!(params.address, String::from("172.26.104.1")); + assert_eq!(params.port, 22); + assert!(params.username.is_some()); // User case let result: FileTransferParams = parse_remote_opt(&String::from("root@172.26.104.1")) .ok() .unwrap(); - assert_eq!(result.address, String::from("172.26.104.1")); - assert_eq!(result.port, 22); + let params = result.params.generic_params().unwrap(); assert_eq!(result.protocol, FileTransferProtocol::Sftp); - assert_eq!(result.username.unwrap(), String::from("root")); + assert_eq!(params.address, String::from("172.26.104.1")); + assert_eq!(params.port, 22); + assert_eq!( + params.username.as_deref().unwrap().to_string(), + String::from("root") + ); assert!(result.entry_directory.is_none()); // User + port let result: FileTransferParams = parse_remote_opt(&String::from("root@172.26.104.1:8022")) .ok() .unwrap(); - assert_eq!(result.address, String::from("172.26.104.1")); - assert_eq!(result.port, 8022); + let params = result.params.generic_params().unwrap(); + assert_eq!(params.address, String::from("172.26.104.1")); + assert_eq!(params.port, 8022); + assert_eq!( + params.username.as_deref().unwrap().to_string(), + String::from("root") + ); assert_eq!(result.protocol, FileTransferProtocol::Sftp); - assert_eq!(result.username.unwrap(), String::from("root")); assert!(result.entry_directory.is_none()); // Port only let result: FileTransferParams = parse_remote_opt(&String::from("172.26.104.1:4022")) .ok() .unwrap(); - assert_eq!(result.address, String::from("172.26.104.1")); - assert_eq!(result.port, 4022); + let params = result.params.generic_params().unwrap(); assert_eq!(result.protocol, FileTransferProtocol::Sftp); - assert!(result.username.is_some()); + assert_eq!(params.address, String::from("172.26.104.1")); + assert_eq!(params.port, 4022); + assert!(params.username.is_some()); assert!(result.entry_directory.is_none()); // Protocol let result: FileTransferParams = parse_remote_opt(&String::from("ftp://172.26.104.1")) .ok() .unwrap(); - assert_eq!(result.address, String::from("172.26.104.1")); - assert_eq!(result.port, 21); // Fallback to ftp default + let params = result.params.generic_params().unwrap(); assert_eq!(result.protocol, FileTransferProtocol::Ftp(false)); - assert!(result.username.is_none()); // Doesn't fall back + assert_eq!(params.address, String::from("172.26.104.1")); + assert_eq!(params.port, 21); // Fallback to ftp default + assert!(params.username.is_none()); // Doesn't fall back assert!(result.entry_directory.is_none()); // Protocol let result: FileTransferParams = parse_remote_opt(&String::from("sftp://172.26.104.1")) .ok() .unwrap(); - assert_eq!(result.address, String::from("172.26.104.1")); - assert_eq!(result.port, 22); // Fallback to sftp default + let params = result.params.generic_params().unwrap(); assert_eq!(result.protocol, FileTransferProtocol::Sftp); - assert!(result.username.is_some()); // Doesn't fall back + assert_eq!(params.address, String::from("172.26.104.1")); + assert_eq!(params.port, 22); // Fallback to sftp default + assert!(params.username.is_some()); // Doesn't fall back assert!(result.entry_directory.is_none()); let result: FileTransferParams = parse_remote_opt(&String::from("scp://172.26.104.1")) .ok() .unwrap(); - assert_eq!(result.address, String::from("172.26.104.1")); - assert_eq!(result.port, 22); // Fallback to scp default + let params = result.params.generic_params().unwrap(); assert_eq!(result.protocol, FileTransferProtocol::Scp); - assert!(result.username.is_some()); // Doesn't fall back + assert_eq!(params.address, String::from("172.26.104.1")); + assert_eq!(params.port, 22); // Fallback to scp default + assert!(params.username.is_some()); // Doesn't fall back assert!(result.entry_directory.is_none()); // Protocol + user let result: FileTransferParams = parse_remote_opt(&String::from("ftps://anon@172.26.104.1")) .ok() .unwrap(); - assert_eq!(result.address, String::from("172.26.104.1")); - assert_eq!(result.port, 21); // Fallback to ftp default + let params = result.params.generic_params().unwrap(); assert_eq!(result.protocol, FileTransferProtocol::Ftp(true)); - assert_eq!(result.username.unwrap(), String::from("anon")); + assert_eq!(params.address, String::from("172.26.104.1")); + assert_eq!(params.port, 21); // Fallback to ftp default + assert_eq!( + params.username.as_deref().unwrap().to_string(), + String::from("anon") + ); assert!(result.entry_directory.is_none()); // Path let result: FileTransferParams = parse_remote_opt(&String::from("root@172.26.104.1:8022:/var")) .ok() .unwrap(); - assert_eq!(result.address, String::from("172.26.104.1")); - assert_eq!(result.port, 8022); + let params = result.params.generic_params().unwrap(); assert_eq!(result.protocol, FileTransferProtocol::Sftp); - assert_eq!(result.username.unwrap(), String::from("root")); + assert_eq!(params.address, String::from("172.26.104.1")); + assert_eq!(params.port, 8022); + assert_eq!( + params.username.as_deref().unwrap().to_string(), + String::from("root") + ); assert_eq!(result.entry_directory.unwrap(), PathBuf::from("/var")); // Port only let result: FileTransferParams = parse_remote_opt(&String::from("172.26.104.1:home")) .ok() .unwrap(); - assert_eq!(result.address, String::from("172.26.104.1")); - assert_eq!(result.port, 22); + let params = result.params.generic_params().unwrap(); assert_eq!(result.protocol, FileTransferProtocol::Sftp); - assert!(result.username.is_some()); + assert_eq!(params.address, String::from("172.26.104.1")); + assert_eq!(params.port, 22); + assert!(params.username.is_some()); assert_eq!(result.entry_directory.unwrap(), PathBuf::from("home")); // All together now let result: FileTransferParams = parse_remote_opt(&String::from("ftp://anon@172.26.104.1:8021:/tmp")) .ok() .unwrap(); - assert_eq!(result.address, String::from("172.26.104.1")); - assert_eq!(result.port, 8021); // Fallback to ftp default + let params = result.params.generic_params().unwrap(); assert_eq!(result.protocol, FileTransferProtocol::Ftp(false)); - assert_eq!(result.username.unwrap(), String::from("anon")); + assert_eq!(params.address, String::from("172.26.104.1")); + assert_eq!(params.port, 8021); // Fallback to ftp default + assert_eq!( + params.username.as_deref().unwrap().to_string(), + String::from("anon") + ); assert_eq!(result.entry_directory.unwrap(), PathBuf::from("/tmp")); // bad syntax // Bad protocol @@ -573,6 +692,56 @@ mod tests { assert!(parse_remote_opt(&String::from("scp://172.26.104.1:650000")).is_err()); } + #[test] + fn parse_aws_s3_opt() { + // Simple + let result: FileTransferParams = + parse_remote_opt(&String::from("s3://mybucket@eu-central-1")) + .ok() + .unwrap(); + let params = result.params.s3_params().unwrap(); + assert_eq!(result.protocol, FileTransferProtocol::AwsS3); + assert_eq!(result.entry_directory, None); + assert_eq!(params.bucket_name.as_str(), "mybucket"); + assert_eq!(params.region.as_str(), "eu-central-1"); + assert_eq!(params.profile, None); + // With profile + let result: FileTransferParams = + parse_remote_opt(&String::from("s3://mybucket@eu-central-1:default")) + .ok() + .unwrap(); + let params = result.params.s3_params().unwrap(); + assert_eq!(result.protocol, FileTransferProtocol::AwsS3); + assert_eq!(result.entry_directory, None); + assert_eq!(params.bucket_name.as_str(), "mybucket"); + assert_eq!(params.region.as_str(), "eu-central-1"); + assert_eq!(params.profile.as_deref(), Some("default")); + // With wrkdir only + let result: FileTransferParams = + parse_remote_opt(&String::from("s3://mybucket@eu-central-1:/foobar")) + .ok() + .unwrap(); + let params = result.params.s3_params().unwrap(); + assert_eq!(result.protocol, FileTransferProtocol::AwsS3); + assert_eq!(result.entry_directory, Some(PathBuf::from("/foobar"))); + assert_eq!(params.bucket_name.as_str(), "mybucket"); + assert_eq!(params.region.as_str(), "eu-central-1"); + assert_eq!(params.profile, None); + // With all arguments + let result: FileTransferParams = + parse_remote_opt(&String::from("s3://mybucket@eu-central-1:default:/foobar")) + .ok() + .unwrap(); + let params = result.params.s3_params().unwrap(); + assert_eq!(result.protocol, FileTransferProtocol::AwsS3); + assert_eq!(result.entry_directory, Some(PathBuf::from("/foobar"))); + assert_eq!(params.bucket_name.as_str(), "mybucket"); + assert_eq!(params.region.as_str(), "eu-central-1"); + assert_eq!(params.profile.as_deref(), Some("default")); + // -- bad args + assert!(parse_remote_opt(&String::from("s3://mybucket:default:/foobar")).is_err()); + } + #[test] fn test_utils_parse_lstime() { // Good cases diff --git a/src/utils/path.rs b/src/utils/path.rs index 1621009..6a2ec82 100644 --- a/src/utils/path.rs +++ b/src/utils/path.rs @@ -2,7 +2,7 @@ //! //! Path related utilities -use std::path::{Path, PathBuf}; +use std::path::{Component, Path, PathBuf}; /// ### absolutize /// @@ -24,6 +24,64 @@ pub fn absolutize(wrkdir: &Path, target: &Path) -> PathBuf { } } +/// ### diff_paths +/// +/// This function will get the difference from path `path` to `base`. Basically will remove `base` from `path` +/// +/// For example: +/// +/// ```rust +/// assert_eq!(diff_paths(&Path::new("/foo/bar"), &Path::new("/")).as_path(), Path::new("foo/bar")); +/// assert_eq!(diff_paths(&Path::new("/foo/bar"), &Path::new("/foo")).as_path(), Path::new("bar")); +/// ``` +/// +/// This function has been written by +/// and is licensed under the APACHE-2/MIT license +pub fn diff_paths(path: P, base: B) -> Option +where + P: AsRef, + B: AsRef, +{ + let path = path.as_ref(); + let base = base.as_ref(); + + if path.is_absolute() != base.is_absolute() { + if path.is_absolute() { + Some(PathBuf::from(path)) + } else { + None + } + } else { + let mut ita = path.components(); + let mut itb = base.components(); + let mut comps: Vec = vec![]; + loop { + match (ita.next(), itb.next()) { + (None, None) => break, + (Some(a), None) => { + comps.push(a); + comps.extend(ita.by_ref()); + break; + } + (None, _) => comps.push(Component::ParentDir), + (Some(a), Some(b)) if comps.is_empty() && a == b => (), + (Some(a), Some(b)) if b == Component::CurDir => comps.push(a), + (Some(_), Some(b)) if b == Component::ParentDir => return None, + (Some(a), Some(_)) => { + comps.push(Component::ParentDir); + for _ in itb { + comps.push(Component::ParentDir); + } + comps.push(a); + comps.extend(ita.by_ref()); + break; + } + } + } + Some(comps.iter().map(|c| c.as_os_str()).collect()) + } +} + #[cfg(test)] mod test { @@ -40,4 +98,26 @@ mod test { Path::new("/tmp/readme.txt") ); } + + #[test] + fn calc_diff_paths() { + assert_eq!( + diff_paths(&Path::new("/foo/bar"), &Path::new("/")) + .unwrap() + .as_path(), + Path::new("foo/bar") + ); + assert_eq!( + diff_paths(&Path::new("/foo/bar"), &Path::new("/foo")) + .unwrap() + .as_path(), + Path::new("bar") + ); + assert_eq!( + diff_paths(&Path::new("/foo/bar/chiedo.gif"), &Path::new("/")) + .unwrap() + .as_path(), + Path::new("foo/bar/chiedo.gif") + ); + } } diff --git a/src/utils/test_helpers.rs b/src/utils/test_helpers.rs index 8ec02f0..534a768 100644 --- a/src/utils/test_helpers.rs +++ b/src/utils/test_helpers.rs @@ -28,9 +28,9 @@ use crate::fs::{FsDirectory, FsEntry, FsFile, UnixPex}; // ext use std::fs::File; -#[cfg(feature = "with-containers")] +#[cfg(any(feature = "with-containers", feature = "with-s3-ci"))] use std::fs::OpenOptions; -#[cfg(feature = "with-containers")] +#[cfg(any(feature = "with-containers", feature = "with-s3-ci"))] use std::io::Read; use std::io::Write; use std::path::{Path, PathBuf}; @@ -97,7 +97,7 @@ pub fn make_dir_at(dir: &Path, dirname: &str) -> std::io::Result<()> { std::fs::create_dir(p.as_path()) } -#[cfg(feature = "with-containers")] +#[cfg(any(feature = "with-containers", feature = "with-s3-ci"))] pub fn write_file(file: &NamedTempFile, writable: &mut Box) { let mut fhnd = OpenOptions::new() .create(false) @@ -153,7 +153,8 @@ RorU9FCmS/654wAAABFyb290QDhjNTBmZDRjMzQ1YQECAw== /// ### make_fsentry /// /// Create a FsEntry at specified path -pub fn make_fsentry(path: PathBuf, is_dir: bool) -> FsEntry { +pub fn make_fsentry>(path: P, is_dir: bool) -> FsEntry { + let path: PathBuf = path.as_ref().to_path_buf(); match is_dir { true => FsEntry::Directory(FsDirectory { name: path.file_name().unwrap().to_string_lossy().to_string(), From 1f115dea92f8fa23dea9090c7f1538fbe2fab0b6 Mon Sep 17 00:00:00 2001 From: veeso Date: Fri, 10 Sep 2021 20:51:05 +0200 Subject: [PATCH 03/40] Strip executables when making release --- dist/build/x86_64/Dockerfile | 6 +++--- dist/build/x86_64_centos7/Dockerfile | 4 ++-- dist/build/x86_64_debian8/Dockerfile | 4 ++-- dist/build/x86_64_debian9/Dockerfile | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dist/build/x86_64/Dockerfile b/dist/build/x86_64/Dockerfile index d365023..e776f22 100644 --- a/dist/build/x86_64/Dockerfile +++ b/dist/build/x86_64/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.48.0 AS builder +FROM rust:1.55.0 AS builder WORKDIR /usr/src/ # Add toolchains @@ -10,9 +10,9 @@ RUN git clone https://github.com/veeso/termscp.git # Set workdir to termscp WORKDIR /usr/src/termscp/ # Install cargo RPM/Deb -RUN cargo install cargo-deb cargo-rpm +RUN cargo install cargo-deb cargo-rpm cargo-strip # Build for x86_64 -RUN cargo build --release --target x86_64-unknown-linux-gnu +RUN cargo build --release --target x86_64-unknown-linux-gnu && cargo strip # Build pkgs RUN cargo deb && cargo rpm init && cargo rpm build diff --git a/dist/build/x86_64_centos7/Dockerfile b/dist/build/x86_64_centos7/Dockerfile index 65a9375..6e63aa8 100644 --- a/dist/build/x86_64_centos7/Dockerfile +++ b/dist/build/x86_64_centos7/Dockerfile @@ -18,9 +18,9 @@ RUN git clone https://github.com/veeso/termscp.git # Set workdir to termscp WORKDIR /usr/src/termscp/ # Install cargo arxch -RUN source $HOME/.cargo/env && cargo install cargo-rpm +RUN source $HOME/.cargo/env && cargo install cargo-rpm cargo-strip # Build for x86_64 -RUN source $HOME/.cargo/env && cargo build --release +RUN source $HOME/.cargo/env && cargo build --release && cargo strip # Build pkgs RUN source $HOME/.cargo/env && yum -y install rpm-build && cargo rpm init && cargo rpm build CMD ["sh"] diff --git a/dist/build/x86_64_debian8/Dockerfile b/dist/build/x86_64_debian8/Dockerfile index e3971e2..a138551 100644 --- a/dist/build/x86_64_debian8/Dockerfile +++ b/dist/build/x86_64_debian8/Dockerfile @@ -20,9 +20,9 @@ RUN git clone https://github.com/veeso/termscp.git # Set workdir to termscp WORKDIR /usr/src/termscp/ # Install cargo deb -RUN . $HOME/.cargo/env && cargo install cargo-deb +RUN . $HOME/.cargo/env && cargo install cargo-deb cargo-strip # Build for x86_64 -RUN . $HOME/.cargo/env && cargo build --release +RUN . $HOME/.cargo/env && cargo build --release && cargo strip # Build pkgs RUN . $HOME/.cargo/env && cargo deb diff --git a/dist/build/x86_64_debian9/Dockerfile b/dist/build/x86_64_debian9/Dockerfile index e78c72c..1356c64 100644 --- a/dist/build/x86_64_debian9/Dockerfile +++ b/dist/build/x86_64_debian9/Dockerfile @@ -20,9 +20,9 @@ RUN git clone https://github.com/veeso/termscp.git # Set workdir to termscp WORKDIR /usr/src/termscp/ # Install cargo deb -RUN . $HOME/.cargo/env && cargo install cargo-deb +RUN . $HOME/.cargo/env && cargo install cargo-deb cargo-strip # Build for x86_64 -RUN . $HOME/.cargo/env && cargo build --release +RUN . $HOME/.cargo/env && cargo build --release && cargo strip # Build pkgs RUN . $HOME/.cargo/env && cargo deb From f69489fc8f214acd1352ab029e2ade86bc6f2068 Mon Sep 17 00:00:00 2001 From: veeso Date: Fri, 10 Sep 2021 20:58:26 +0200 Subject: [PATCH 04/40] FileTransferResult --- src/filetransfer/mod.rs | 63 ++++++++++++++--------------- src/filetransfer/transfer/ftp.rs | 34 ++++++++-------- src/filetransfer/transfer/mod.rs | 4 +- src/filetransfer/transfer/s3/mod.rs | 36 +++++++++-------- src/filetransfer/transfer/scp.rs | 34 ++++++++-------- src/filetransfer/transfer/sftp.rs | 36 +++++++++-------- 6 files changed, 108 insertions(+), 99 deletions(-) diff --git a/src/filetransfer/mod.rs b/src/filetransfer/mod.rs index 4208890..cfc1195 100644 --- a/src/filetransfer/mod.rs +++ b/src/filetransfer/mod.rs @@ -62,15 +62,6 @@ pub struct FileTransferError { msg: Option, } -impl FileTransferError { - /// ### kind - /// - /// Returns the error kind - pub fn kind(&self) -> FileTransferErrorType { - self.code - } -} - /// ## FileTransferErrorType /// /// FileTransferErrorType defines the possible errors available for a file transfer @@ -118,6 +109,13 @@ impl FileTransferError { err.msg = Some(msg); err } + + /// ### kind + /// + /// Returns the error kind + pub fn kind(&self) -> FileTransferErrorType { + self.code + } } impl std::fmt::Display for FileTransferError { @@ -129,6 +127,11 @@ impl std::fmt::Display for FileTransferError { } } +/// ## FileTransferResult +/// +/// Result type returned by a `FileTransfer` implementation +pub type FileTransferResult = Result; + /// ## FileTransfer /// /// File transfer trait must be implemented by all the file transfers and defines the method used by a generic file transfer @@ -137,12 +140,12 @@ pub trait FileTransfer { /// /// Connect to the remote server /// Can return banner / welcome message on success - fn connect(&mut self, params: &ProtocolParams) -> Result, FileTransferError>; + fn connect(&mut self, params: &ProtocolParams) -> FileTransferResult>; /// ### disconnect /// /// Disconnect from the remote server - fn disconnect(&mut self) -> Result<(), FileTransferError>; + fn disconnect(&mut self) -> FileTransferResult<()>; /// ### is_connected /// @@ -153,50 +156,50 @@ pub trait FileTransfer { /// /// Print working directory - fn pwd(&mut self) -> Result; + fn pwd(&mut self) -> FileTransferResult; /// ### change_dir /// /// Change working directory - fn change_dir(&mut self, dir: &Path) -> Result; + fn change_dir(&mut self, dir: &Path) -> FileTransferResult; /// ### copy /// /// Copy file to destination - fn copy(&mut self, src: &FsEntry, dst: &Path) -> Result<(), FileTransferError>; + fn copy(&mut self, src: &FsEntry, dst: &Path) -> FileTransferResult<()>; /// ### list_dir /// /// List directory entries - fn list_dir(&mut self, path: &Path) -> Result, FileTransferError>; + fn list_dir(&mut self, path: &Path) -> FileTransferResult>; /// ### mkdir /// /// Make directory /// In case the directory already exists, it must return an Error of kind `FileTransferErrorType::DirectoryAlreadyExists` - fn mkdir(&mut self, dir: &Path) -> Result<(), FileTransferError>; + fn mkdir(&mut self, dir: &Path) -> FileTransferResult<()>; /// ### remove /// /// Remove a file or a directory - fn remove(&mut self, file: &FsEntry) -> Result<(), FileTransferError>; + fn remove(&mut self, file: &FsEntry) -> FileTransferResult<()>; /// ### rename /// /// Rename file or a directory - fn rename(&mut self, file: &FsEntry, dst: &Path) -> Result<(), FileTransferError>; + fn rename(&mut self, file: &FsEntry, dst: &Path) -> FileTransferResult<()>; /// ### stat /// /// Stat file and return FsEntry - fn stat(&mut self, path: &Path) -> Result; + fn stat(&mut self, path: &Path) -> FileTransferResult; /// ### exec /// /// Execute a command on remote host - fn exec(&mut self, cmd: &str) -> Result; + fn exec(&mut self, cmd: &str) -> FileTransferResult; /// ### send_file /// @@ -209,7 +212,7 @@ pub trait FileTransfer { &mut self, _local: &FsFile, _file_name: &Path, - ) -> Result, FileTransferError> { + ) -> FileTransferResult> { Err(FileTransferError::new( FileTransferErrorType::UnsupportedFeature, )) @@ -220,7 +223,7 @@ pub trait FileTransfer { /// Receive file from remote with provided name /// Returns file and its size /// By default returns unsupported feature - fn recv_file(&mut self, _file: &FsFile) -> Result, FileTransferError> { + fn recv_file(&mut self, _file: &FsFile) -> FileTransferResult> { Err(FileTransferError::new( FileTransferErrorType::UnsupportedFeature, )) @@ -234,7 +237,7 @@ pub trait FileTransfer { /// This is necessary for some protocols such as FTP. /// You must call this method each time you want to finalize the write of the remote file. /// By default this function returns already `Ok(())` - fn on_sent(&mut self, _writable: Box) -> Result<(), FileTransferError> { + fn on_sent(&mut self, _writable: Box) -> FileTransferResult<()> { Ok(()) } @@ -246,7 +249,7 @@ pub trait FileTransfer { /// This mighe be necessary for some protocols. /// You must call this method each time you want to finalize the read of the remote file. /// By default this function returns already `Ok(())` - fn on_recv(&mut self, _readable: Box) -> Result<(), FileTransferError> { + fn on_recv(&mut self, _readable: Box) -> FileTransferResult<()> { Ok(()) } @@ -262,7 +265,7 @@ pub trait FileTransfer { src: &FsFile, dest: &Path, mut reader: Box, - ) -> Result<(), FileTransferError> { + ) -> FileTransferResult<()> { match self.is_connected() { true => { let mut stream = self.send_file(src, dest)?; @@ -285,7 +288,7 @@ pub trait FileTransfer { /// If the function returns error kind() `UnsupportedFeature`, then he should call this function. /// For safety reasons this function doesn't accept the `Write` trait, but the destination path. /// By default this function uses the streams function to copy content from reader to writer - fn recv_file_wno_stream(&mut self, src: &FsFile, dest: &Path) -> Result<(), FileTransferError> { + fn recv_file_wno_stream(&mut self, src: &FsFile, dest: &Path) -> FileTransferResult<()> { match self.is_connected() { true => { let mut writer = File::create(dest).map_err(|e| { @@ -315,7 +318,7 @@ pub trait FileTransfer { /// /// Find files from current directory (in all subdirectories) whose name matches the provided search /// Search supports wildcards ('?', '*') - fn find(&mut self, search: &str) -> Result, FileTransferError> { + fn find(&mut self, search: &str) -> FileTransferResult> { match self.is_connected() { true => { // Starting from current directory, iter dir @@ -335,11 +338,7 @@ pub trait FileTransfer { /// Search recursively in `dir` for file matching the wildcard. /// NOTE: DON'T RE-IMPLEMENT THIS FUNCTION, unless the file transfer provides a faster way to do so /// NOTE: don't call this method from outside; consider it as private - fn iter_search( - &mut self, - dir: &Path, - filter: &WildMatch, - ) -> Result, FileTransferError> { + fn iter_search(&mut self, dir: &Path, filter: &WildMatch) -> FileTransferResult> { let mut drained: Vec = Vec::new(); // Scan directory match self.list_dir(dir) { diff --git a/src/filetransfer/transfer/ftp.rs b/src/filetransfer/transfer/ftp.rs index 4d9ea65..112c455 100644 --- a/src/filetransfer/transfer/ftp.rs +++ b/src/filetransfer/transfer/ftp.rs @@ -25,7 +25,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -use super::{FileTransfer, FileTransferError, FileTransferErrorType, ProtocolParams}; +use super::{ + FileTransfer, FileTransferError, FileTransferErrorType, FileTransferResult, ProtocolParams, +}; use crate::fs::{FsDirectory, FsEntry, FsFile, UnixPex}; use crate::utils::fmt::shadow_password; use crate::utils::path; @@ -178,7 +180,7 @@ impl FileTransfer for FtpFileTransfer { /// /// Connect to the remote server - fn connect(&mut self, params: &ProtocolParams) -> Result, FileTransferError> { + fn connect(&mut self, params: &ProtocolParams) -> FileTransferResult> { let params = match params.generic_params() { Some(params) => params, None => return Err(FileTransferError::new(FileTransferErrorType::BadAddress)), @@ -270,7 +272,7 @@ impl FileTransfer for FtpFileTransfer { /// /// Disconnect from the remote server - fn disconnect(&mut self) -> Result<(), FileTransferError> { + fn disconnect(&mut self) -> FileTransferResult<()> { info!("Disconnecting from FTP server..."); match &mut self.stream { Some(stream) => match stream.quit() { @@ -300,7 +302,7 @@ impl FileTransfer for FtpFileTransfer { /// /// Print working directory - fn pwd(&mut self) -> Result { + fn pwd(&mut self) -> FileTransferResult { info!("PWD"); match &mut self.stream { Some(stream) => match stream.pwd() { @@ -320,7 +322,7 @@ impl FileTransfer for FtpFileTransfer { /// /// Change working directory - fn change_dir(&mut self, dir: &Path) -> Result { + fn change_dir(&mut self, dir: &Path) -> FileTransferResult { let dir: PathBuf = Self::resolve(dir); info!("Changing directory to {}", dir.display()); match &mut self.stream { @@ -340,7 +342,7 @@ impl FileTransfer for FtpFileTransfer { /// ### copy /// /// Copy file to destination - fn copy(&mut self, _src: &FsEntry, _dst: &Path) -> Result<(), FileTransferError> { + fn copy(&mut self, _src: &FsEntry, _dst: &Path) -> FileTransferResult<()> { // FTP doesn't support file copy debug!("COPY issues (will fail, since unsupported)"); Err(FileTransferError::new( @@ -352,7 +354,7 @@ impl FileTransfer for FtpFileTransfer { /// /// List directory entries - fn list_dir(&mut self, path: &Path) -> Result, FileTransferError> { + fn list_dir(&mut self, path: &Path) -> FileTransferResult> { let dir: PathBuf = Self::resolve(path); info!("LIST dir {}", dir.display()); match &mut self.stream { @@ -376,7 +378,7 @@ impl FileTransfer for FtpFileTransfer { /// ### mkdir /// /// In case the directory already exists, it must return an Error of kind `FileTransferErrorType::DirectoryAlreadyExists` - fn mkdir(&mut self, dir: &Path) -> Result<(), FileTransferError> { + fn mkdir(&mut self, dir: &Path) -> FileTransferResult<()> { let dir: PathBuf = Self::resolve(dir); info!("MKDIR {}", dir.display()); match &mut self.stream { @@ -406,7 +408,7 @@ impl FileTransfer for FtpFileTransfer { /// ### remove /// /// Remove a file or a directory - fn remove(&mut self, fsentry: &FsEntry) -> Result<(), FileTransferError> { + fn remove(&mut self, fsentry: &FsEntry) -> FileTransferResult<()> { if self.stream.is_none() { return Err(FileTransferError::new( FileTransferErrorType::UninitializedSession, @@ -493,7 +495,7 @@ impl FileTransfer for FtpFileTransfer { /// ### rename /// /// Rename file or a directory - fn rename(&mut self, file: &FsEntry, dst: &Path) -> Result<(), FileTransferError> { + fn rename(&mut self, file: &FsEntry, dst: &Path) -> FileTransferResult<()> { let dst: PathBuf = Self::resolve(dst); info!( "Renaming {} to {}", @@ -525,7 +527,7 @@ impl FileTransfer for FtpFileTransfer { /// ### stat /// /// Stat file and return FsEntry - fn stat(&mut self, _path: &Path) -> Result { + fn stat(&mut self, _path: &Path) -> FileTransferResult { match &mut self.stream { Some(_) => Err(FileTransferError::new( FileTransferErrorType::UnsupportedFeature, @@ -539,7 +541,7 @@ impl FileTransfer for FtpFileTransfer { /// ### exec /// /// Execute a command on remote host - fn exec(&mut self, _cmd: &str) -> Result { + fn exec(&mut self, _cmd: &str) -> FileTransferResult { Err(FileTransferError::new( FileTransferErrorType::UnsupportedFeature, )) @@ -555,7 +557,7 @@ impl FileTransfer for FtpFileTransfer { &mut self, _local: &FsFile, file_name: &Path, - ) -> Result, FileTransferError> { + ) -> FileTransferResult> { let file_name: PathBuf = Self::resolve(file_name); info!("Sending file {}", file_name.display()); match &mut self.stream { @@ -576,7 +578,7 @@ impl FileTransfer for FtpFileTransfer { /// /// Receive file from remote with provided name /// Returns file and its size - fn recv_file(&mut self, file: &FsFile) -> Result, FileTransferError> { + fn recv_file(&mut self, file: &FsFile) -> FileTransferResult> { info!("Receiving file {}", file.abs_path.display()); match &mut self.stream { Some(stream) => match stream.retr_as_stream(&file.abs_path.as_path().to_string_lossy()) @@ -600,7 +602,7 @@ impl FileTransfer for FtpFileTransfer { /// The purpose of this method is to finalize the connection with the peer when writing data. /// This is necessary for some protocols such as FTP. /// You must call this method each time you want to finalize the write of the remote file. - fn on_sent(&mut self, writable: Box) -> Result<(), FileTransferError> { + fn on_sent(&mut self, writable: Box) -> FileTransferResult<()> { info!("Finalizing put stream"); match &mut self.stream { Some(stream) => match stream.finalize_put_stream(writable) { @@ -623,7 +625,7 @@ impl FileTransfer for FtpFileTransfer { /// The purpose of this method is to finalize the connection with the peer when reading data. /// This mighe be necessary for some protocols. /// You must call this method each time you want to finalize the read of the remote file. - fn on_recv(&mut self, readable: Box) -> Result<(), FileTransferError> { + fn on_recv(&mut self, readable: Box) -> FileTransferResult<()> { info!("Finalizing get"); match &mut self.stream { Some(stream) => match stream.finalize_retr_stream(readable) { diff --git a/src/filetransfer/transfer/mod.rs b/src/filetransfer/transfer/mod.rs index 0662bdb..955e544 100644 --- a/src/filetransfer/transfer/mod.rs +++ b/src/filetransfer/transfer/mod.rs @@ -3,7 +3,9 @@ //! This module exposes all the file transfers supported by termscp // -- import -use super::{FileTransfer, FileTransferError, FileTransferErrorType, ProtocolParams}; +use super::{ + FileTransfer, FileTransferError, FileTransferErrorType, FileTransferResult, ProtocolParams, +}; // -- modules mod ftp; diff --git a/src/filetransfer/transfer/s3/mod.rs b/src/filetransfer/transfer/s3/mod.rs index 8f167fe..142913f 100644 --- a/src/filetransfer/transfer/s3/mod.rs +++ b/src/filetransfer/transfer/s3/mod.rs @@ -29,7 +29,9 @@ mod object; // Locals -use super::{FileTransfer, FileTransferError, FileTransferErrorType, ProtocolParams}; +use super::{ + FileTransfer, FileTransferError, FileTransferErrorType, FileTransferResult, ProtocolParams, +}; use crate::fs::{FsDirectory, FsEntry, FsFile}; use crate::utils::path; use object::S3Object; @@ -64,7 +66,7 @@ impl S3FileTransfer { /// ### list_objects /// /// List objects contained in `p` path - fn list_objects(&self, p: &Path, list_dir: bool) -> Result, FileTransferError> { + fn list_objects(&self, p: &Path, list_dir: bool) -> FileTransferResult> { // Make path relative let key: String = Self::fmt_path(p, list_dir); debug!("Query list directory {}; key: {}", p.display(), key); @@ -74,7 +76,7 @@ impl S3FileTransfer { /// ### stat_object /// /// Stat an s3 object - fn stat_object(&self, p: &Path) -> Result { + fn stat_object(&self, p: &Path) -> FileTransferResult { let key: String = Self::fmt_path(p, false); debug!("Query stat object {}; key: {}", p.display(), key); let objects = self.query_objects(key, false)?; @@ -100,7 +102,7 @@ impl S3FileTransfer { &self, key: String, only_direct_children: bool, - ) -> Result, FileTransferError> { + ) -> FileTransferResult> { let results = self.bucket.as_ref().unwrap().list(key.clone(), None); match results { Ok(entries) => { @@ -200,7 +202,7 @@ impl FileTransfer for S3FileTransfer { /// /// Connect to the remote server /// Can return banner / welcome message on success - fn connect(&mut self, params: &ProtocolParams) -> Result, FileTransferError> { + fn connect(&mut self, params: &ProtocolParams) -> FileTransferResult> { // Verify parameters are S3 let params = match params.s3_params() { Some(params) => params, @@ -242,7 +244,7 @@ impl FileTransfer for S3FileTransfer { /// ### disconnect /// /// Disconnect from the remote server - fn disconnect(&mut self) -> Result<(), FileTransferError> { + fn disconnect(&mut self) -> FileTransferResult<()> { info!("Disconnecting from S3 bucket..."); match self.bucket.take() { Some(bucket) => { @@ -265,7 +267,7 @@ impl FileTransfer for S3FileTransfer { /// ### pwd /// /// Print working directory - fn pwd(&mut self) -> Result { + fn pwd(&mut self) -> FileTransferResult { info!("PWD"); match self.is_connected() { true => Ok(self.wrkdir.clone()), @@ -278,7 +280,7 @@ impl FileTransfer for S3FileTransfer { /// ### change_dir /// /// Change working directory - fn change_dir(&mut self, dir: &Path) -> Result { + fn change_dir(&mut self, dir: &Path) -> FileTransferResult { match &self.bucket.is_some() { true => { // Always allow entering root @@ -315,7 +317,7 @@ impl FileTransfer for S3FileTransfer { /// ### copy /// /// Copy file to destination - fn copy(&mut self, _src: &FsEntry, _dst: &Path) -> Result<(), FileTransferError> { + fn copy(&mut self, _src: &FsEntry, _dst: &Path) -> FileTransferResult<()> { Err(FileTransferError::new( FileTransferErrorType::UnsupportedFeature, )) @@ -324,7 +326,7 @@ impl FileTransfer for S3FileTransfer { /// ### list_dir /// /// List directory entries - fn list_dir(&mut self, path: &Path) -> Result, FileTransferError> { + fn list_dir(&mut self, path: &Path) -> FileTransferResult> { match self.is_connected() { true => self .list_objects(path, true) @@ -339,7 +341,7 @@ impl FileTransfer for S3FileTransfer { /// /// Make directory /// In case the directory already exists, it must return an Error of kind `FileTransferErrorType::DirectoryAlreadyExists` - fn mkdir(&mut self, dir: &Path) -> Result<(), FileTransferError> { + fn mkdir(&mut self, dir: &Path) -> FileTransferResult<()> { match &self.bucket { Some(bucket) => { let dir: String = Self::fmt_path(self.resolve(dir).as_path(), true); @@ -373,7 +375,7 @@ impl FileTransfer for S3FileTransfer { /// ### remove /// /// Remove a file or a directory - fn remove(&mut self, file: &FsEntry) -> Result<(), FileTransferError> { + fn remove(&mut self, file: &FsEntry) -> FileTransferResult<()> { let path = Self::fmt_path( path::diff_paths(file.get_abs_path(), &Path::new("/")) .unwrap_or_default() @@ -397,7 +399,7 @@ impl FileTransfer for S3FileTransfer { /// ### rename /// /// Rename file or a directory - fn rename(&mut self, _file: &FsEntry, _dst: &Path) -> Result<(), FileTransferError> { + fn rename(&mut self, _file: &FsEntry, _dst: &Path) -> FileTransferResult<()> { Err(FileTransferError::new( FileTransferErrorType::UnsupportedFeature, )) @@ -406,7 +408,7 @@ impl FileTransfer for S3FileTransfer { /// ### stat /// /// Stat file and return FsEntry - fn stat(&mut self, p: &Path) -> Result { + fn stat(&mut self, p: &Path) -> FileTransferResult { match self.is_connected() { true => { // First try as a "file" @@ -428,7 +430,7 @@ impl FileTransfer for S3FileTransfer { /// ### exec /// /// Execute a command on remote host - fn exec(&mut self, _cmd: &str) -> Result { + fn exec(&mut self, _cmd: &str) -> FileTransferResult { Err(FileTransferError::new( FileTransferErrorType::UnsupportedFeature, )) @@ -446,7 +448,7 @@ impl FileTransfer for S3FileTransfer { _src: &FsFile, dest: &Path, mut reader: Box, - ) -> Result<(), FileTransferError> { + ) -> FileTransferResult<()> { match &mut self.bucket { Some(bucket) => { let key = Self::fmt_path(dest, false); @@ -474,7 +476,7 @@ impl FileTransfer for S3FileTransfer { /// The developer implementing the filetransfer user should FIRST try with `send_file` followed by `on_sent` /// If the function returns error kind() `UnsupportedFeature`, then he should call this function. /// By default this function uses the streams function to copy content from reader to writer - fn recv_file_wno_stream(&mut self, src: &FsFile, dest: &Path) -> Result<(), FileTransferError> { + fn recv_file_wno_stream(&mut self, src: &FsFile, dest: &Path) -> FileTransferResult<()> { match &mut self.bucket { Some(bucket) => { let mut writer = File::create(dest).map_err(|e| { diff --git a/src/filetransfer/transfer/scp.rs b/src/filetransfer/transfer/scp.rs index cf4e161..78eb151 100644 --- a/src/filetransfer/transfer/scp.rs +++ b/src/filetransfer/transfer/scp.rs @@ -26,7 +26,9 @@ * SOFTWARE. */ // Locals -use super::{FileTransfer, FileTransferError, FileTransferErrorType, ProtocolParams}; +use super::{ + FileTransfer, FileTransferError, FileTransferErrorType, FileTransferResult, ProtocolParams, +}; use crate::fs::{FsDirectory, FsEntry, FsFile, UnixPex}; use crate::system::sshkey_storage::SshKeyStorage; use crate::utils::fmt::{fmt_time, shadow_password}; @@ -278,7 +280,7 @@ impl ScpFileTransfer { &mut self, path: &Path, cmd: &str, - ) -> Result { + ) -> FileTransferResult { self.perform_shell_cmd(format!("cd \"{}\"; {}", path.display(), cmd).as_str()) } @@ -286,7 +288,7 @@ impl ScpFileTransfer { /// /// Perform a shell command and read the output from shell /// This operation is, obviously, blocking. - fn perform_shell_cmd(&mut self, cmd: &str) -> Result { + fn perform_shell_cmd(&mut self, cmd: &str) -> FileTransferResult { match self.session.as_mut() { Some(session) => { debug!("Running command: {}", cmd); @@ -333,7 +335,7 @@ impl FileTransfer for ScpFileTransfer { /// ### connect /// /// Connect to the remote server - fn connect(&mut self, params: &ProtocolParams) -> Result, FileTransferError> { + fn connect(&mut self, params: &ProtocolParams) -> FileTransferResult> { let params = match params.generic_params() { Some(params) => params, None => return Err(FileTransferError::new(FileTransferErrorType::BadAddress)), @@ -472,7 +474,7 @@ impl FileTransfer for ScpFileTransfer { /// ### disconnect /// /// Disconnect from the remote server - fn disconnect(&mut self) -> Result<(), FileTransferError> { + fn disconnect(&mut self) -> FileTransferResult<()> { info!("Disconnecting from remote..."); match self.session.as_ref() { Some(session) => { @@ -506,7 +508,7 @@ impl FileTransfer for ScpFileTransfer { /// /// Print working directory - fn pwd(&mut self) -> Result { + fn pwd(&mut self) -> FileTransferResult { info!("PWD: {}", self.wrkdir.display()); match self.is_connected() { true => Ok(self.wrkdir.clone()), @@ -520,7 +522,7 @@ impl FileTransfer for ScpFileTransfer { /// /// Change working directory - fn change_dir(&mut self, dir: &Path) -> Result { + fn change_dir(&mut self, dir: &Path) -> FileTransferResult { match self.is_connected() { true => { let p: PathBuf = self.wrkdir.clone(); @@ -564,7 +566,7 @@ impl FileTransfer for ScpFileTransfer { /// ### copy /// /// Copy file to destination - fn copy(&mut self, src: &FsEntry, dst: &Path) -> Result<(), FileTransferError> { + fn copy(&mut self, src: &FsEntry, dst: &Path) -> FileTransferResult<()> { match self.is_connected() { true => { let dst: PathBuf = Self::resolve(dst); @@ -612,7 +614,7 @@ impl FileTransfer for ScpFileTransfer { /// /// List directory entries - fn list_dir(&mut self, path: &Path) -> Result, FileTransferError> { + fn list_dir(&mut self, path: &Path) -> FileTransferResult> { match self.is_connected() { true => { // Send ls -l to path @@ -657,7 +659,7 @@ impl FileTransfer for ScpFileTransfer { /// /// Make directory /// In case the directory already exists, it must return an Error of kind `FileTransferErrorType::DirectoryAlreadyExists` - fn mkdir(&mut self, dir: &Path) -> Result<(), FileTransferError> { + fn mkdir(&mut self, dir: &Path) -> FileTransferResult<()> { match self.is_connected() { true => { let dir: PathBuf = Self::resolve(dir); @@ -703,7 +705,7 @@ impl FileTransfer for ScpFileTransfer { /// ### remove /// /// Remove a file or a directory - fn remove(&mut self, file: &FsEntry) -> Result<(), FileTransferError> { + fn remove(&mut self, file: &FsEntry) -> FileTransferResult<()> { // Yay, we have rm -rf here :D match self.is_connected() { true => { @@ -741,7 +743,7 @@ impl FileTransfer for ScpFileTransfer { /// ### rename /// /// Rename file or a directory - fn rename(&mut self, file: &FsEntry, dst: &Path) -> Result<(), FileTransferError> { + fn rename(&mut self, file: &FsEntry, dst: &Path) -> FileTransferResult<()> { match self.is_connected() { true => { // Get path @@ -784,7 +786,7 @@ impl FileTransfer for ScpFileTransfer { /// ### stat /// /// Stat file and return FsEntry - fn stat(&mut self, path: &Path) -> Result { + fn stat(&mut self, path: &Path) -> FileTransferResult { let path: PathBuf = Self::absolutize(self.wrkdir.as_path(), path); match self.is_connected() { true => { @@ -829,7 +831,7 @@ impl FileTransfer for ScpFileTransfer { /// ### exec /// /// Execute a command on remote host - fn exec(&mut self, cmd: &str) -> Result { + fn exec(&mut self, cmd: &str) -> FileTransferResult { match self.is_connected() { true => { let p: PathBuf = self.wrkdir.clone(); @@ -858,7 +860,7 @@ impl FileTransfer for ScpFileTransfer { &mut self, local: &FsFile, file_name: &Path, - ) -> Result, FileTransferError> { + ) -> FileTransferResult> { match self.session.as_ref() { Some(session) => { let file_name: PathBuf = Self::absolutize(self.wrkdir.as_path(), file_name); @@ -925,7 +927,7 @@ impl FileTransfer for ScpFileTransfer { /// /// Receive file from remote with provided name /// Returns file and its size - fn recv_file(&mut self, file: &FsFile) -> Result, FileTransferError> { + fn recv_file(&mut self, file: &FsFile) -> FileTransferResult> { match self.session.as_ref() { Some(session) => { info!("Receiving file {}", file.abs_path.display()); diff --git a/src/filetransfer/transfer/sftp.rs b/src/filetransfer/transfer/sftp.rs index 7e86455..49ec4f9 100644 --- a/src/filetransfer/transfer/sftp.rs +++ b/src/filetransfer/transfer/sftp.rs @@ -26,7 +26,9 @@ * SOFTWARE. */ // Locals -use super::{FileTransfer, FileTransferError, FileTransferErrorType, ProtocolParams}; +use super::{ + FileTransfer, FileTransferError, FileTransferErrorType, FileTransferResult, ProtocolParams, +}; use crate::fs::{FsDirectory, FsEntry, FsFile, UnixPex}; use crate::system::sshkey_storage::SshKeyStorage; use crate::utils::fmt::{fmt_time, shadow_password}; @@ -64,7 +66,7 @@ impl SftpFileTransfer { /// ### get_abs_path /// /// Get absolute path from path argument and check if it exists - fn get_remote_path(&self, p: &Path) -> Result { + fn get_remote_path(&self, p: &Path) -> FileTransferResult { match p.is_relative() { true => { let mut root: PathBuf = self.wrkdir.clone(); @@ -202,7 +204,7 @@ impl SftpFileTransfer { /// ### perform_shell_cmd_with /// /// Perform a shell command, but change directory to specified path first - fn perform_shell_cmd_with_path(&mut self, cmd: &str) -> Result { + fn perform_shell_cmd_with_path(&mut self, cmd: &str) -> FileTransferResult { self.perform_shell_cmd(format!("cd \"{}\"; {}", self.wrkdir.display(), cmd).as_str()) } @@ -210,7 +212,7 @@ impl SftpFileTransfer { /// /// Perform a shell command and read the output from shell /// This operation is, obviously, blocking. - fn perform_shell_cmd(&mut self, cmd: &str) -> Result { + fn perform_shell_cmd(&mut self, cmd: &str) -> FileTransferResult { match self.session.as_mut() { Some(session) => { // Create channel @@ -257,7 +259,7 @@ impl FileTransfer for SftpFileTransfer { /// ### connect /// /// Connect to the remote server - fn connect(&mut self, params: &ProtocolParams) -> Result, FileTransferError> { + fn connect(&mut self, params: &ProtocolParams) -> FileTransferResult> { let params = match params.generic_params() { Some(params) => params, None => return Err(FileTransferError::new(FileTransferErrorType::BadAddress)), @@ -413,7 +415,7 @@ impl FileTransfer for SftpFileTransfer { /// ### disconnect /// /// Disconnect from the remote server - fn disconnect(&mut self) -> Result<(), FileTransferError> { + fn disconnect(&mut self) -> FileTransferResult<()> { info!("Disconnecting from remote..."); match self.session.as_ref() { Some(session) => { @@ -447,7 +449,7 @@ impl FileTransfer for SftpFileTransfer { /// ### pwd /// /// Print working directory - fn pwd(&mut self) -> Result { + fn pwd(&mut self) -> FileTransferResult { info!("PWD: {}", self.wrkdir.display()); match self.sftp { Some(_) => Ok(self.wrkdir.clone()), @@ -460,7 +462,7 @@ impl FileTransfer for SftpFileTransfer { /// ### change_dir /// /// Change working directory - fn change_dir(&mut self, dir: &Path) -> Result { + fn change_dir(&mut self, dir: &Path) -> FileTransferResult { match self.sftp.as_ref() { Some(_) => { // Change working directory @@ -477,7 +479,7 @@ impl FileTransfer for SftpFileTransfer { /// ### copy /// /// Copy file to destination - fn copy(&mut self, src: &FsEntry, dst: &Path) -> Result<(), FileTransferError> { + fn copy(&mut self, src: &FsEntry, dst: &Path) -> FileTransferResult<()> { // NOTE: use SCP command to perform copy (UNSAFE) match self.is_connected() { true => { @@ -523,7 +525,7 @@ impl FileTransfer for SftpFileTransfer { /// ### list_dir /// /// List directory entries - fn list_dir(&mut self, path: &Path) -> Result, FileTransferError> { + fn list_dir(&mut self, path: &Path) -> FileTransferResult> { match self.sftp.as_ref() { Some(sftp) => { // Get path @@ -556,7 +558,7 @@ impl FileTransfer for SftpFileTransfer { /// /// Make directory /// In case the directory already exists, it must return an Error of kind `FileTransferErrorType::DirectoryAlreadyExists` - fn mkdir(&mut self, dir: &Path) -> Result<(), FileTransferError> { + fn mkdir(&mut self, dir: &Path) -> FileTransferResult<()> { match self.sftp.as_ref() { Some(sftp) => { // Make directory @@ -586,7 +588,7 @@ impl FileTransfer for SftpFileTransfer { /// ### remove /// /// Remove a file or a directory - fn remove(&mut self, file: &FsEntry) -> Result<(), FileTransferError> { + fn remove(&mut self, file: &FsEntry) -> FileTransferResult<()> { if self.sftp.is_none() { return Err(FileTransferError::new( FileTransferErrorType::UninitializedSession, @@ -630,7 +632,7 @@ impl FileTransfer for SftpFileTransfer { /// ### rename /// /// Rename file or a directory - fn rename(&mut self, file: &FsEntry, dst: &Path) -> Result<(), FileTransferError> { + fn rename(&mut self, file: &FsEntry, dst: &Path) -> FileTransferResult<()> { match self.sftp.as_ref() { None => Err(FileTransferError::new( FileTransferErrorType::UninitializedSession, @@ -659,7 +661,7 @@ impl FileTransfer for SftpFileTransfer { /// ### stat /// /// Stat file and return FsEntry - fn stat(&mut self, path: &Path) -> Result { + fn stat(&mut self, path: &Path) -> FileTransferResult { match self.sftp.as_ref() { Some(sftp) => { // Get path @@ -683,7 +685,7 @@ impl FileTransfer for SftpFileTransfer { /// ### exec /// /// Execute a command on remote host - fn exec(&mut self, cmd: &str) -> Result { + fn exec(&mut self, cmd: &str) -> FileTransferResult { info!("Executing command {}", cmd); match self.is_connected() { true => match self.perform_shell_cmd_with_path(cmd) { @@ -708,7 +710,7 @@ impl FileTransfer for SftpFileTransfer { &mut self, local: &FsFile, file_name: &Path, - ) -> Result, FileTransferError> { + ) -> FileTransferResult> { match self.sftp.as_ref() { None => Err(FileTransferError::new( FileTransferErrorType::UninitializedSession, @@ -749,7 +751,7 @@ impl FileTransfer for SftpFileTransfer { /// ### recv_file /// /// Receive file from remote with provided name - fn recv_file(&mut self, file: &FsFile) -> Result, FileTransferError> { + fn recv_file(&mut self, file: &FsFile) -> FileTransferResult> { match self.sftp.as_ref() { None => Err(FileTransferError::new( FileTransferErrorType::UninitializedSession, From 3f3180015855e95b4c3eaf1c8c7713dcd48b2f84 Mon Sep 17 00:00:00 2001 From: veeso Date: Sat, 11 Sep 2021 21:53:38 +0200 Subject: [PATCH 05/40] Updated dependencies --- CHANGELOG.md | 3 + Cargo.lock | 152 +++++++++++------------ Cargo.toml | 4 +- src/ui/activities/auth/bookmarks.rs | 2 +- src/ui/activities/auth/view.rs | 10 +- src/ui/activities/filetransfer/update.rs | 2 +- src/ui/activities/filetransfer/view.rs | 10 +- src/ui/activities/setup/view/mod.rs | 6 +- src/ui/activities/setup/view/setup.rs | 5 +- src/ui/activities/setup/view/ssh_keys.rs | 5 +- src/ui/activities/setup/view/theme.rs | 2 +- src/ui/components/color_picker.rs | 2 +- 12 files changed, 95 insertions(+), 108 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 674c6fc..dfba0f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,9 @@ Released on ?? - Operate on your bucket directly from the file explorer - You can also save your buckets as bookmarks - Aws s3 reads credentials directly from your credentials file at `$HOME/.aws/credentials` or from environment. Read more in the user manual. +- Dependencies: + - Updated `argh` to `0.1.6` + - Updated `tui-realm-stdlib` to `0.6.2` ## 0.6.1 diff --git a/Cargo.lock b/Cargo.lock index 08919a4..d00746f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -65,9 +65,9 @@ checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" [[package]] name = "argh" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7317a549bc17c5278d9e72bb6e62c6aa801ac2567048e39ebc1c194249323e" +checksum = "f023c76cd7975f9969f8e29f0e461decbdc7f51048ce43427107a3d192f1c9bf" dependencies = [ "argh_derive", "argh_shared", @@ -75,9 +75,9 @@ dependencies = [ [[package]] name = "argh_derive" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60949c42375351e9442e354434b0cba2ac402c1237edf673cac3a4bf983b8d3c" +checksum = "48ad219abc0c06ca788aface2e3a1970587e3413ab70acd20e54b6ec524c1f8f" dependencies = [ "argh_shared", "heck", @@ -88,9 +88,9 @@ dependencies = [ [[package]] name = "argh_shared" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a61eb019cb8f415d162cb9f12130ee6bbe9168b7d953c17f4ad049e4051ca00" +checksum = "38de00daab4eac7d753e97697066238d67ce9d7e2d823ab4f72fe14af29f3f33" [[package]] name = "async-trait" @@ -234,9 +234,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "cc" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" +checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0" [[package]] name = "cfg-if" @@ -330,9 +330,9 @@ checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" [[package]] name = "cpufeatures" -version = "0.1.5" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" +checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" dependencies = [ "libc", ] @@ -356,7 +356,7 @@ dependencies = [ "crossterm_winapi", "libc", "mio", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "signal-hook", "signal-hook-mio", "winapi", @@ -383,9 +383,9 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" +checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" dependencies = [ "quote", "syn", @@ -510,9 +510,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" +checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" [[package]] name = "generic-array" @@ -634,15 +634,15 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "js-sys" -version = "0.3.53" +version = "0.3.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d" +checksum = "1866b355d9c878e5e607473cbe3f63282c0b7aad2db1dbebf55076c686918254" dependencies = [ "wasm-bindgen", ] @@ -667,9 +667,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.99" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" +checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" [[package]] name = "libssh2-sys" @@ -708,9 +708,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" dependencies = [ "scopeguard", ] @@ -831,8 +831,8 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework 2.3.1", - "security-framework-sys 2.3.0", + "security-framework 2.4.2", + "security-framework-sys 2.4.2", "tempfile", ] @@ -861,9 +861,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba" +checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" dependencies = [ "autocfg", "num-integer", @@ -1007,13 +1007,13 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", - "lock_api 0.4.4", - "parking_lot_core 0.8.3", + "lock_api 0.4.5", + "parking_lot_core 0.8.5", ] [[package]] @@ -1032,9 +1032,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ "cfg-if 1.0.0", "instant", @@ -1094,9 +1094,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.28" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" +checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" dependencies = [ "unicode-xid", ] @@ -1392,15 +1392,15 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.3.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" +checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" dependencies = [ "bitflags", "core-foundation 0.9.1", "core-foundation-sys 0.8.2", "libc", - "security-framework-sys 2.3.0", + "security-framework-sys 2.4.2", ] [[package]] @@ -1415,9 +1415,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.3.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" +checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" dependencies = [ "core-foundation-sys 0.8.2", "libc", @@ -1425,9 +1425,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.127" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" +checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" dependencies = [ "serde_derive", ] @@ -1446,9 +1446,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.127" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" +checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ "proc-macro2", "quote", @@ -1457,9 +1457,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" +checksum = "a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950" dependencies = [ "itoa", "ryu", @@ -1468,9 +1468,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.5" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" +checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" dependencies = [ "block-buffer", "cfg-if 1.0.0", @@ -1481,9 +1481,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "470c5a6397076fae0094aaf06a08e6ba6f37acb77d3b1b91ea92b4d6c8650c39" +checksum = "9c98891d737e271a2954825ef19e46bd16bdb98e2746f2eec4f7a4ef7946efd1" dependencies = [ "libc", "signal-hook-registry", @@ -1571,9 +1571,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.74" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" +checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" dependencies = [ "proc-macro2", "quote", @@ -1656,18 +1656,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.26" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" +checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.26" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" +checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c" dependencies = [ "proc-macro2", "quote", @@ -1713,9 +1713,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92036be488bb6594459f2e03b60e42df6f937fe6ca5c5ffdcb539c6b84dc40f5" +checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce" dependencies = [ "autocfg", "pin-project-lite", @@ -1756,9 +1756,9 @@ dependencies = [ [[package]] name = "tui-realm-stdlib" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bff91e1cdc741a7487d8cb20ac038e5ba926a0ec97b0f2ea918ac75640b9da5" +checksum = "54af02e93599f275c1eb0286235c935f60501d7ae1b554cfb1c9c584ca0193ff" dependencies = [ "textwrap", "tuirealm", @@ -1777,9 +1777,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.13.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" +checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" [[package]] name = "unicode-bidi" @@ -1831,9 +1831,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "ureq" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2475a6781e9bc546e7b64f4013d2f4032c8c6a40fcffd7c6f4ee734a890972ab" +checksum = "3131cd6cb18488da91da1d10ed31e966f453c06b65bf010d35638456976a3fd7" dependencies = [ "base64", "chunked_transfer", @@ -1895,9 +1895,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.76" +version = "0.2.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0" +checksum = "5e68338db6becec24d3c7977b5bf8a48be992c934b5d07177e3931f5dc9b076c" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -1905,9 +1905,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.76" +version = "0.2.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041" +checksum = "f34c405b4f0658583dba0c1c7c9b694f3cac32655db463b56c254a1c75269523" dependencies = [ "bumpalo", "lazy_static", @@ -1920,9 +1920,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.76" +version = "0.2.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef" +checksum = "b9d5a6580be83b19dc570a8f9c324251687ab2184e57086f71625feb57ec77c8" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1930,9 +1930,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.76" +version = "0.2.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad" +checksum = "e3775a030dc6f5a0afd8a84981a21cc92a781eb429acef9ecce476d0c9113e92" dependencies = [ "proc-macro2", "quote", @@ -1943,15 +1943,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.76" +version = "0.2.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29" +checksum = "c279e376c7a8e8752a8f1eaa35b7b0bee6bb9fb0cdacfa97cc3f1f289c87e2b4" [[package]] name = "web-sys" -version = "0.3.53" +version = "0.3.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c" +checksum = "0a84d70d1ec7d2da2d26a5bd78f4bca1b8c3254805363ce743b7a05bc30d195a" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index 0b88c4f..91c18a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ name = "termscp" path = "src/main.rs" [dependencies] -argh = "0.1.5" +argh = "0.1.6" bitflags = "1.3.2" bytesize = "1.1.0" chrono = "0.4.19" @@ -53,7 +53,7 @@ tempfile = "3.1.0" textwrap = "0.14.2" thiserror = "^1.0.0" toml = "0.5.8" -tui-realm-stdlib = "0.6.0" +tui-realm-stdlib = "0.6.2" tuirealm = "0.6.0" ureq = { version = "2.1.0", features = [ "json" ] } whoami = "1.1.1" diff --git a/src/ui/activities/auth/bookmarks.rs b/src/ui/activities/auth/bookmarks.rs index 11b0a34..699f04c 100644 --- a/src/ui/activities/auth/bookmarks.rs +++ b/src/ui/activities/auth/bookmarks.rs @@ -33,7 +33,7 @@ use crate::system::environment; // Ext use std::path::PathBuf; -use tui_realm_stdlib::{input::InputPropsBuilder, radio::RadioPropsBuilder}; +use tui_realm_stdlib::{InputPropsBuilder, RadioPropsBuilder}; use tuirealm::PropsBuilder; impl AuthActivity { diff --git a/src/ui/activities/auth/view.rs b/src/ui/activities/auth/view.rs index ee42c2e..f546963 100644 --- a/src/ui/activities/auth/view.rs +++ b/src/ui/activities/auth/view.rs @@ -33,13 +33,9 @@ use crate::ui::components::bookmark_list::{BookmarkList, BookmarkListPropsBuilde use crate::utils::ui::draw_area_in; // Ext use tui_realm_stdlib::{ - input::{Input, InputPropsBuilder}, - label::{Label, LabelPropsBuilder}, - list::{List, ListPropsBuilder}, - paragraph::{Paragraph, ParagraphPropsBuilder}, - radio::{Radio, RadioPropsBuilder}, - span::{Span, SpanPropsBuilder}, - textarea::{Textarea, TextareaPropsBuilder}, + Input, InputPropsBuilder, Label, LabelPropsBuilder, List, ListPropsBuilder, Paragraph, + ParagraphPropsBuilder, Radio, RadioPropsBuilder, Span, SpanPropsBuilder, Textarea, + TextareaPropsBuilder, }; use tuirealm::tui::{ layout::{Constraint, Direction, Layout}, diff --git a/src/ui/activities/filetransfer/update.rs b/src/ui/activities/filetransfer/update.rs index 39fe2a2..716f762 100644 --- a/src/ui/activities/filetransfer/update.rs +++ b/src/ui/activities/filetransfer/update.rs @@ -42,7 +42,7 @@ use crate::ui::components::{file_list::FileListPropsBuilder, logbox::LogboxProps use crate::ui::keymap::*; use crate::utils::fmt::fmt_path_elide_ex; // externals -use tui_realm_stdlib::progress_bar::ProgressBarPropsBuilder; +use tui_realm_stdlib::ProgressBarPropsBuilder; use tuirealm::{ props::{Alignment, PropsBuilder, TableBuilder, TextSpan}, tui::style::Color, diff --git a/src/ui/activities/filetransfer/view.rs b/src/ui/activities/filetransfer/view.rs index 840345b..91542a8 100644 --- a/src/ui/activities/filetransfer/view.rs +++ b/src/ui/activities/filetransfer/view.rs @@ -40,13 +40,9 @@ use crate::utils::ui::draw_area_in; use bytesize::ByteSize; use std::path::PathBuf; use tui_realm_stdlib::{ - input::{Input, InputPropsBuilder}, - list::{List, ListPropsBuilder}, - paragraph::{Paragraph, ParagraphPropsBuilder}, - progress_bar::{ProgressBar, ProgressBarPropsBuilder}, - radio::{Radio, RadioPropsBuilder}, - span::{Span, SpanPropsBuilder}, - table::{Table, TablePropsBuilder}, + Input, InputPropsBuilder, List, ListPropsBuilder, Paragraph, ParagraphPropsBuilder, + ProgressBar, ProgressBarPropsBuilder, Radio, RadioPropsBuilder, Span, SpanPropsBuilder, Table, + TablePropsBuilder, }; use tuirealm::props::{Alignment, PropsBuilder, TableBuilder, TextSpan}; use tuirealm::tui::{ diff --git a/src/ui/activities/setup/view/mod.rs b/src/ui/activities/setup/view/mod.rs index 994ae8f..d43eb91 100644 --- a/src/ui/activities/setup/view/mod.rs +++ b/src/ui/activities/setup/view/mod.rs @@ -36,10 +36,8 @@ pub use ssh_keys::*; pub use theme::*; // Ext use tui_realm_stdlib::{ - list::{List, ListPropsBuilder}, - paragraph::{Paragraph, ParagraphPropsBuilder}, - radio::{Radio, RadioPropsBuilder}, - span::{Span, SpanPropsBuilder}, + List, ListPropsBuilder, Paragraph, ParagraphPropsBuilder, Radio, RadioPropsBuilder, Span, + SpanPropsBuilder, }; use tuirealm::props::{Alignment, PropsBuilder, TableBuilder, TextSpan}; use tuirealm::tui::{ diff --git a/src/ui/activities/setup/view/setup.rs b/src/ui/activities/setup/view/setup.rs index fa195cb..6ff051b 100644 --- a/src/ui/activities/setup/view/setup.rs +++ b/src/ui/activities/setup/view/setup.rs @@ -33,10 +33,7 @@ use crate::fs::explorer::GroupDirs; use crate::utils::ui::draw_area_in; // Ext use std::path::PathBuf; -use tui_realm_stdlib::{ - input::{Input, InputPropsBuilder}, - radio::{Radio, RadioPropsBuilder}, -}; +use tui_realm_stdlib::{Input, InputPropsBuilder, Radio, RadioPropsBuilder}; use tuirealm::tui::{ layout::{Constraint, Direction, Layout}, style::Color, diff --git a/src/ui/activities/setup/view/ssh_keys.rs b/src/ui/activities/setup/view/ssh_keys.rs index 756c618..c99393a 100644 --- a/src/ui/activities/setup/view/ssh_keys.rs +++ b/src/ui/activities/setup/view/ssh_keys.rs @@ -31,10 +31,7 @@ use super::{Context, SetupActivity}; use crate::ui::components::bookmark_list::{BookmarkList, BookmarkListPropsBuilder}; use crate::utils::ui::draw_area_in; // Ext -use tui_realm_stdlib::{ - input::{Input, InputPropsBuilder}, - radio::{Radio, RadioPropsBuilder}, -}; +use tui_realm_stdlib::{Input, InputPropsBuilder, Radio, RadioPropsBuilder}; use tuirealm::tui::{ layout::{Constraint, Direction, Layout}, style::Color, diff --git a/src/ui/activities/setup/view/theme.rs b/src/ui/activities/setup/view/theme.rs index e3af5dc..8f7264a 100644 --- a/src/ui/activities/setup/view/theme.rs +++ b/src/ui/activities/setup/view/theme.rs @@ -33,7 +33,7 @@ use crate::ui::components::color_picker::{ColorPicker, ColorPickerPropsBuilder}; use crate::utils::parser::parse_color; use crate::utils::ui::draw_area_in; // Ext -use tui_realm_stdlib::label::{Label, LabelPropsBuilder}; +use tui_realm_stdlib::{Label, LabelPropsBuilder}; use tuirealm::tui::{ layout::{Constraint, Direction, Layout}, style::Color, diff --git a/src/ui/components/color_picker.rs b/src/ui/components/color_picker.rs index c1ba2bb..36ae99d 100644 --- a/src/ui/components/color_picker.rs +++ b/src/ui/components/color_picker.rs @@ -30,7 +30,7 @@ use crate::utils::fmt::fmt_color; use crate::utils::parser::parse_color; // ext -use tui_realm_stdlib::input::{Input, InputPropsBuilder}; +use tui_realm_stdlib::{Input, InputPropsBuilder}; use tuirealm::event::Event; use tuirealm::props::{Alignment, Props, PropsBuilder}; use tuirealm::tui::{ From 8bb05406c87006d85669f6ac03ab8a7c12a72980 Mon Sep 17 00:00:00 2001 From: veeso Date: Sat, 11 Sep 2021 22:06:18 +0200 Subject: [PATCH 06/40] upcoming features --- README.md | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 96a4b17..3d2b535 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,9 @@

Developed by @veeso

Current version: 0.7.0 (FIXME: 31/08/2021)

-[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) [![Docs](https://docs.rs/termscp/badge.svg)](https://docs.rs/termscp) +[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) -[![Linux](https://github.com/veeso/termscp/workflows/Linux/badge.svg)](https://github.com/veeso/termscp/actions) [![MacOs](https://github.com/veeso/termscp/workflows/MacOS/badge.svg)](https://github.com/veeso/termscp/actions) [![Windows](https://github.com/veeso/termscp/workflows/Windows/badge.svg)](https://github.com/veeso/termscp/actions) [![FreeBSD](https://github.com/veeso/termscp/workflows/FreeBSD/badge.svg)](https://github.com/veeso/termscp/actions) [![Coverage Status](https://coveralls.io/repos/github/veeso/termscp/badge.svg)](https://coveralls.io/github/veeso/termscp) +[![Linux](https://github.com/veeso/termscp/workflows/Linux/badge.svg)](https://github.com/veeso/termscp/actions) [![MacOs](https://github.com/veeso/termscp/workflows/MacOS/badge.svg)](https://github.com/veeso/termscp/actions) [![Windows](https://github.com/veeso/termscp/workflows/Windows/badge.svg)](https://github.com/veeso/termscp/actions) [![FreeBSD](https://github.com/veeso/termscp/workflows/FreeBSD/badge.svg)](https://github.com/veeso/termscp/actions) [![Coverage Status](https://coveralls.io/repos/github/veeso/termscp/badge.svg)](https://coveralls.io/github/veeso/termscp) [![Docs](https://docs.rs/termscp/badge.svg)](https://docs.rs/termscp) --- @@ -121,16 +121,11 @@ The developer documentation can be found on Rust Docs at Date: Fri, 10 Sep 2021 22:22:15 +0200 Subject: [PATCH 07/40] Auto update (w/ cli) --- CHANGELOG.md | 13 +- Cargo.lock | 606 ++++++++++++++++++++++++---- Cargo.toml | 2 +- README.md | 13 +- dist/build/{deploy.sh => docker.sh} | 9 +- dist/build/freebsd.sh | 30 ++ dist/build/macos.sh | 30 ++ dist/build/windows.ps1 | 20 + dist/build/x86_64/Dockerfile | 13 +- docs/man.md | 1 + src/lib.rs | 2 +- src/main.rs | 20 + src/support.rs | 23 +- src/system/auto_update.rs | 233 +++++++++++ src/system/mod.rs | 1 + src/ui/activities/auth/misc.rs | 30 ++ src/ui/activities/auth/mod.rs | 13 +- src/ui/activities/auth/update.rs | 42 +- src/ui/activities/auth/view.rs | 111 ++++- src/utils/git.rs | 95 ----- src/utils/mod.rs | 1 - 21 files changed, 1093 insertions(+), 215 deletions(-) rename dist/build/{deploy.sh => docker.sh} (72%) create mode 100755 dist/build/freebsd.sh create mode 100755 dist/build/macos.sh create mode 100755 dist/build/windows.ps1 create mode 100644 src/system/auto_update.rs delete mode 100644 src/utils/git.rs diff --git a/CHANGELOG.md b/CHANGELOG.md index dfba0f2..9c1abbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,13 +28,20 @@ Released on ?? > 🍁 Autumn update 🍇 - **Aws S3** - - Added support for the aws-s3 protocol - - Operate on your bucket directly from the file explorer - - You can also save your buckets as bookmarks + - Added support for the aws-s3 protocol. + - Operate on your bucket directly from the file explorer. + - You can also save your buckets as bookmarks. - Aws s3 reads credentials directly from your credentials file at `$HOME/.aws/credentials` or from environment. Read more in the user manual. +- **Auto update** ⬇️ + - Possibility to update termscp directly via GUI or CLI. + - Install update via CLI running `(sudo) termscp --update`. + - Install update via GUI from auth form: when the "new version message" is displayed press ``, then enter `YES` in the radio input asking whether to install the update. - Dependencies: + - Added `rust-s3 0.27-rc4` + - Added `self_update 0.27.0` - Updated `argh` to `0.1.6` - Updated `tui-realm-stdlib` to `0.6.2` + - Removed `ureq` ## 0.6.1 diff --git a/Cargo.lock b/Cargo.lock index d00746f..1236ac0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,12 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + [[package]] name = "aes" version = "0.6.0" @@ -263,12 +269,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "chunked_transfer" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" - [[package]] name = "cipher" version = "0.2.5" @@ -287,6 +287,21 @@ dependencies = [ "bitflags", ] +[[package]] +name = "console" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "regex", + "terminal_size", + "unicode-width", + "winapi", +] + [[package]] name = "content_inspector" version = "0.2.4" @@ -346,6 +361,15 @@ dependencies = [ "debug-helper", ] +[[package]] +name = "crc32fast" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +dependencies = [ + "cfg-if 1.0.0", +] + [[package]] name = "crossterm" version = "0.20.0" @@ -477,6 +501,45 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "filetime" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.2.10", + "winapi", +] + +[[package]] +name = "flate2" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80edafed416a46fb378521624fab1cfa2eb514784fd8921adbe8a8d8321da811" +dependencies = [ + "cfg-if 1.0.0", + "crc32fast", + "libc", + "miniz_oxide", +] + [[package]] name = "fnv" version = "1.0.7" @@ -508,12 +571,55 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "futures-channel" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" +dependencies = [ + "futures-core", +] + [[package]] name = "futures-core" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" +[[package]] +name = "futures-io" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" + +[[package]] +name = "futures-sink" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" + +[[package]] +name = "futures-task" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" + +[[package]] +name = "futures-util" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" +dependencies = [ + "autocfg", + "futures-core", + "futures-io", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + [[package]] name = "generic-array" version = "0.14.4" @@ -546,6 +652,25 @@ dependencies = [ "wasi 0.10.0+wasi-snapshot-preview1", ] +[[package]] +name = "h2" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7f3675cfef6a30c8031cf9e6493ebdc3bb3272a3fea3923c4210d1830e6a472" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hashbrown" version = "0.9.1" @@ -555,6 +680,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + [[package]] name = "heck" version = "0.3.3" @@ -564,6 +695,15 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + [[package]] name = "hex" version = "0.4.3" @@ -612,6 +752,66 @@ dependencies = [ "itoa", ] +[[package]] +name = "http-body" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" + +[[package]] +name = "httpdate" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" + +[[package]] +name = "hyper" +version = "0.14.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13f67199e765030fa08fe0bd581af683f0d5bc04ea09c2b1102012c5fb90e7fd" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + [[package]] name = "idna" version = "0.2.3" @@ -623,6 +823,28 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "indexmap" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +dependencies = [ + "autocfg", + "hashbrown 0.11.2", +] + +[[package]] +name = "indicatif" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" +dependencies = [ + "console", + "lazy_static", + "number_prefix", + "regex", +] + [[package]] name = "instant" version = "0.1.10" @@ -632,6 +854,12 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "ipnet" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" + [[package]] name = "itoa" version = "0.4.8" @@ -787,6 +1015,12 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + [[package]] name = "minidom" version = "0.13.0" @@ -796,6 +1030,16 @@ dependencies = [ "quick-xml", ] +[[package]] +name = "miniz_oxide" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +dependencies = [ + "adler", + "autocfg", +] + [[package]] name = "mio" version = "0.7.13" @@ -921,6 +1165,22 @@ dependencies = [ "autocfg", ] +[[package]] +name = "num_cpus" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "number_prefix" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" + [[package]] name = "once_cell" version = "1.8.0" @@ -983,7 +1243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485" dependencies = [ "dlv-list", - "hashbrown", + "hashbrown 0.9.1", ] [[package]] @@ -1062,12 +1322,27 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +[[package]] +name = "pest" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +dependencies = [ + "ucd-trie", +] + [[package]] name = "pin-project-lite" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + [[package]] name = "pkg-config" version = "0.3.19" @@ -1252,18 +1527,38 @@ dependencies = [ ] [[package]] -name = "ring" -version = "0.16.20" +name = "reqwest" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22" dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "lazy_static", + "log", + "mime", + "native-tls", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", "web-sys", - "winapi", + "winreg", ] [[package]] @@ -1316,19 +1611,6 @@ dependencies = [ "url", ] -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64", - "log", - "ring", - "sct", - "webpki", -] - [[package]] name = "ryu" version = "1.0.5" @@ -1351,16 +1633,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "secret-service" version = "1.1.3" @@ -1423,6 +1695,45 @@ dependencies = [ "libc", ] +[[package]] +name = "self_update" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb85f1802f7b987237b8525c0fde86ea86f31c957c1875467c727d5b921179c" +dependencies = [ + "either", + "flate2", + "hyper", + "indicatif", + "log", + "quick-xml", + "regex", + "reqwest", + "semver", + "serde_json", + "tar", + "tempfile", + "zip", +] + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + [[package]] name = "serde" version = "1.0.130" @@ -1466,6 +1777,18 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_urlencoded" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + [[package]] name = "sha2" version = "0.9.8" @@ -1520,6 +1843,12 @@ dependencies = [ "termcolor", ] +[[package]] +name = "slab" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" + [[package]] name = "smallvec" version = "1.6.1" @@ -1533,10 +1862,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" [[package]] -name = "spin" -version = "0.5.2" +name = "socket2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" +dependencies = [ + "libc", + "winapi", +] [[package]] name = "ssh2" @@ -1580,6 +1913,17 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "tar" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f5515d3add52e0bbdcad7b83c388bb36ba7b754dda3b5f5bc2d38640cdba5c" +dependencies = [ + "filetime", + "libc", + "xattr", +] + [[package]] name = "tempfile" version = "3.2.0" @@ -1603,6 +1947,16 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "terminal_size" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "termscp" version = "0.7.0" @@ -1627,6 +1981,7 @@ dependencies = [ "regex", "rpassword", "rust-s3", + "self_update", "serde", "simplelog", "ssh2", @@ -1637,7 +1992,6 @@ dependencies = [ "toml", "tui-realm-stdlib", "tuirealm", - "ureq", "users", "whoami", "wildmatch 2.1.0", @@ -1718,7 +2072,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce" dependencies = [ "autocfg", + "bytes", + "libc", + "memchr", + "mio", + "num_cpus", "pin-project-lite", + "winapi", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +dependencies = [ + "native-tls", + "tokio", ] [[package]] @@ -1732,6 +2102,20 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-util" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d3725d3efa29485e87311c5b699de63cde14b00ed4d256b8318aa30ca452cd" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio", +] + [[package]] name = "toml" version = "0.5.8" @@ -1741,6 +2125,38 @@ dependencies = [ "serde", ] +[[package]] +name = "tower-service" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" + +[[package]] +name = "tracing" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" +dependencies = [ + "cfg-if 1.0.0", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + [[package]] name = "tui" version = "0.16.0" @@ -1781,6 +2197,12 @@ version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" +[[package]] +name = "ucd-trie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" + [[package]] name = "unicode-bidi" version = "0.3.6" @@ -1823,30 +2245,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "ureq" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3131cd6cb18488da91da1d10ed31e966f453c06b65bf010d35638456976a3fd7" -dependencies = [ - "base64", - "chunked_transfer", - "log", - "once_cell", - "rustls", - "serde", - "serde_json", - "url", - "webpki", - "webpki-roots", -] - [[package]] name = "url" version = "2.2.2" @@ -1881,6 +2279,16 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + [[package]] name = "wasi" version = "0.9.0+wasi-snapshot-preview1" @@ -1900,6 +2308,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e68338db6becec24d3c7977b5bf8a48be992c934b5d07177e3931f5dc9b076c" dependencies = [ "cfg-if 1.0.0", + "serde", + "serde_json", "wasm-bindgen-macro", ] @@ -1918,6 +2328,18 @@ dependencies = [ "wasm-bindgen-shared", ] +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95fded345a6559c2cfee778d562300c581f7d4ff3edb9b0d230d69800d213972" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "wasm-bindgen-macro" version = "0.2.77" @@ -1957,25 +2379,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" -dependencies = [ - "webpki", -] - [[package]] name = "which" version = "4.2.2" @@ -2040,8 +2443,39 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "winreg" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +dependencies = [ + "winapi", +] + +[[package]] +name = "xattr" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" +dependencies = [ + "libc", +] + [[package]] name = "xml-rs" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" + +[[package]] +name = "zip" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" +dependencies = [ + "byteorder", + "crc32fast", + "flate2", + "thiserror", + "time", +] diff --git a/Cargo.toml b/Cargo.toml index 91c18a9..ac0e6b1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,6 +45,7 @@ rand = "0.8.4" regex = "1.5.4" rpassword = "5.0.1" rust-s3 = { version = "0.27.0-rc4", default-features = false, features = [ "sync-native-tls", "sync" ] } +self_update = { version = "0.27.0", features = [ "archive-tar", "archive-zip", "compression-flate2", "compression-zip-deflate" ] } serde = { version = "^1.0.0", features = [ "derive" ] } simplelog = "0.10.0" ssh2 = "0.9.0" @@ -55,7 +56,6 @@ thiserror = "^1.0.0" toml = "0.5.8" tui-realm-stdlib = "0.6.2" tuirealm = "0.6.0" -ureq = { version = "2.1.0", features = [ "json" ] } whoami = "1.1.1" wildmatch = "2.0.0" diff --git a/README.md b/README.md index 3d2b535..412cec9 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ ## About termscp 🖥 -Termscp is a feature rich terminal file transfer and explorer, with support for SCP/SFTP/FTP/S3. So basically is a terminal utility with an TUI to connect to a remote server to retrieve and upload files and to interact with the local file system. It is **Linux**, **MacOS**, **BSD** and **Windows** compatible and supports SFTP, SCP, FTP, FTPS and S3. +Termscp is a feature rich terminal file transfer and explorer, with support for SCP/SFTP/FTP/S3. So basically is a terminal utility with an TUI to connect to a remote server to retrieve and upload files and to interact with the local file system. It is **Linux**, **MacOS**, **FreeBSD** and **Windows** compatible and supports SFTP, SCP, FTP, FTPS and S3. ![Explorer](assets/images/explorer.gif) @@ -33,10 +33,10 @@ Termscp is a feature rich terminal file transfer and explorer, with support for ## Features 🎁 - 📁 Different communication protocols - - SFTP - - SCP - - FTP and FTPS - - Aws S3 + - **SFTP** + - **SCP** + - **FTP** and **FTPS** + - **Aws S3** - 🖥 Explore and operate on the remote and on the local machine file system with a handy UI - Create, remove, rename, search, view and edit files - ⭐ Connect to your favourite hosts through built-in bookmarks and recent connections @@ -71,6 +71,8 @@ while if you're a Windows user, you can install termscp with [Chocolatey](https: For more information or other platforms, please visit [veeso.github.io](https://veeso.github.io/termscp/#get-started) to view all installation methods. +⚠️ If you're looking on how to update termscp just run termscp from CLI with: `(sudo) termscp --update` ⚠️ + ### Requirements ❗ - **Linux** users: @@ -157,6 +159,7 @@ termscp is powered by these aweseome projects: - [open-rs](https://github.com/Byron/open-rs) - [rpassword](https://github.com/conradkleinespel/rpassword) - [rust-s3](https://github.com/durch/rust-s3) +- [self_update](https://github.com/jaemk/self_update) - [ssh2-rs](https://github.com/alexcrichton/ssh2-rs) - [suppaftp](https://github.com/veeso/suppaftp) - [textwrap](https://github.com/mgeisler/textwrap) diff --git a/dist/build/deploy.sh b/dist/build/docker.sh similarity index 72% rename from dist/build/deploy.sh rename to dist/build/docker.sh index 89f836d..237c8e2 100755 --- a/dist/build/deploy.sh +++ b/dist/build/docker.sh @@ -1,7 +1,7 @@ #!/bin/bash if [ -z "$1" ]; then - echo "Usage: deploy.sh " + echo "Usage: docker.sh " exit 1 fi @@ -19,8 +19,15 @@ cd x86_64_debian9/ docker build --tag termscp-${VERSION}-x86_64_debian9 . cd - mkdir -p ${PKGS_DIR}/deb/ +mkdir -p ${PKGS_DIR}/x86_64-unknown-linux-gnu/ CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_debian9 termscp-${VERSION}-x86_64_debian9) docker cp ${CONTAINER_NAME}:/usr/src/termscp/target/debian/termscp_${VERSION}_amd64.deb ${PKGS_DIR}/deb/ +docker cp ${CONTAINER_NAME}:/usr/src/termscp/target/release/termscp ${PKGS_DIR}/x86_64-unknown-linux-gnu/ +# Make tar.gz +cd ${PKGS_DIR}/x84_64-unknown-linux-gnu/ +tar cvzf termscp-v${VERSION}-x86_64-unknown-linux-gnu.tar.gz termscp +rm termscp +cd - # Build x86_64_centos7 cd x86_64_centos7/ docker build --tag termscp-${VERSION}-x86_64_centos7 . diff --git a/dist/build/freebsd.sh b/dist/build/freebsd.sh new file mode 100755 index 0000000..753b8e9 --- /dev/null +++ b/dist/build/freebsd.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +if [ -z "$1" ]; then + echo "Usage: freebsd.sh " + exit 1 +fi + +VERSION=$1 + +set -e # Don't fail + +# Go to root dir +cd ../../ +# Check if in correct directory +if [ ! -f Cargo.toml ]; then + echo "Please start freebsd.sh from dist/build/ directory" + exit 1 +fi + +# Build release +cargo build --release && cargo strip +# Make pkg +cd target/release/ +PKG="termscp-v${VERSION}-x86_64-unknown-freebsd.tar.gz" +tar czf $PKG termscp +sha256sum $PKG +mkdir -p ../../dist/pkgs/freebsd/ +mv $PKG ../../dist/pkgs/freebsd/$PKG + +exit $? diff --git a/dist/build/macos.sh b/dist/build/macos.sh new file mode 100755 index 0000000..37dab50 --- /dev/null +++ b/dist/build/macos.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +if [ -z "$1" ]; then + echo "Usage: macos.sh " + exit 1 +fi + +VERSION=$1 + +set -e # Don't fail + +# Go to root dir +cd ../../ +# Check if in correct directory +if [ ! -f Cargo.toml ]; then + echo "Please start macos.sh from dist/build/ directory" + exit 1 +fi + +# Build release +cargo build --release && cargo strip +# Make pkg +cd target/release/ +PKG="termscp-v${VERSION}-x86_64-apple-darwin.tar.gz" +tar czf $PKG termscp +sha256sum $PKG +mkdir -p ../../dist/pkgs/macos/ +mv $PKG ../../dist/pkgs/macos/$PKG + +exit $? diff --git a/dist/build/windows.ps1 b/dist/build/windows.ps1 new file mode 100755 index 0000000..419bd90 --- /dev/null +++ b/dist/build/windows.ps1 @@ -0,0 +1,20 @@ +$ErrorActionPreference = 'Stop'; + +if ($args.Count -eq 0) { + Write-Output "Usage: windows.ps1 " + exit 1 +} + +$version = $args[0] + +# Go to root directory +Set-Location ..\..\ +# Build +cargo build --release +# Make zip +$zipName = "termscp-v$version-x86_64-pc-windows-msvc.zip" +Set-Location .\target\release\ +Compress-Archive termscp $zipName +# Get checksum +checksum.exe -t sha256 $zipName +Move-Item $zipName .\..\..\dist\pkgs\windows\$zipName diff --git a/dist/build/x86_64/Dockerfile b/dist/build/x86_64/Dockerfile index e776f22..38b3849 100644 --- a/dist/build/x86_64/Dockerfile +++ b/dist/build/x86_64/Dockerfile @@ -4,16 +4,21 @@ WORKDIR /usr/src/ # Add toolchains RUN rustup target add x86_64-unknown-linux-gnu # Install dependencies -RUN apt update && apt install -y rpm +RUN apt update && apt install -y \ + git \ + gcc \ + pkg-config \ + libssl-dev \ + libssh2-1-dev \ + libdbus-1-dev \ + curl # Clone repository RUN git clone https://github.com/veeso/termscp.git # Set workdir to termscp WORKDIR /usr/src/termscp/ # Install cargo RPM/Deb -RUN cargo install cargo-deb cargo-rpm cargo-strip +RUN cargo install cargo-strip # Build for x86_64 RUN cargo build --release --target x86_64-unknown-linux-gnu && cargo strip -# Build pkgs -RUN cargo deb && cargo rpm init && cargo rpm build CMD ["sh"] diff --git a/docs/man.md b/docs/man.md index d635fae..07d4012 100644 --- a/docs/man.md +++ b/docs/man.md @@ -37,6 +37,7 @@ termscp can be started with the following options: - `-c, --config` Open termscp starting from the configuration page - `-q, --quiet` Disable logging - `-t, --theme ` Import specified theme +- `-u, --update` Update termscp to latest version - `-v, --version` Print version info - `-h, --help` Print help page diff --git a/src/lib.rs b/src/lib.rs index 40475e5..4e9aa6c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -53,13 +53,13 @@ extern crate path_slash; extern crate rand; extern crate regex; extern crate s3; +extern crate self_update; extern crate ssh2; extern crate suppaftp; extern crate tempfile; extern crate textwrap; extern crate tui_realm_stdlib; extern crate tuirealm; -extern crate ureq; #[cfg(target_family = "unix")] extern crate users; extern crate whoami; diff --git a/src/main.rs b/src/main.rs index 126bbee..c1e37bb 100644 --- a/src/main.rs +++ b/src/main.rs @@ -62,6 +62,7 @@ use system::logging; enum Task { Activity(NextActivity), ImportTheme(PathBuf), + InstallUpdate, } #[derive(FromArgs)] @@ -84,6 +85,12 @@ struct Args { quiet: bool, #[argh(option, short = 't', description = "import specified theme")] theme: Option, + #[argh( + switch, + short = 'u', + description = "update termscp to the latest version" + )] + update: bool, #[argh( option, short = 'T', @@ -177,6 +184,9 @@ fn parse_args(args: Args) -> Result { if let Some(theme) = args.theme { run_opts.task = Task::ImportTheme(PathBuf::from(theme)); } + if args.update { + run_opts.task = Task::InstallUpdate; + } // @! Ordinary mode // Remote argument if let Some(remote) = args.positional.get(0) { @@ -256,6 +266,16 @@ fn run(mut run_opts: RunOpts) -> i32 { 1 } }, + Task::InstallUpdate => match support::install_update() { + Ok(msg) => { + println!("{}", msg); + 0 + } + Err(err) => { + eprintln!("Could not install update: {}", err); + 1 + } + }, Task::Activity(activity) => { // Get working directory let wrkdir: PathBuf = match env::current_dir() { diff --git a/src/support.rs b/src/support.rs index 150fb42..b564ada 100644 --- a/src/support.rs +++ b/src/support.rs @@ -26,7 +26,11 @@ * SOFTWARE. */ // mod -use crate::system::{environment, theme_provider::ThemeProvider}; +use crate::system::{ + auto_update::{Update, UpdateStatus}, + environment, + theme_provider::ThemeProvider, +}; use std::fs; use std::path::{Path, PathBuf}; @@ -51,6 +55,23 @@ pub fn import_theme(p: &Path) -> Result<(), String> { .map_err(|e| format!("Could not import theme: {}", e)) } +/// ### install_update +/// +/// Install latest version of termscp if an update is available +pub fn install_update() -> Result { + match Update::default() + .show_progress(true) + .ask_confirm(true) + .upgrade() + { + Ok(UpdateStatus::AlreadyUptodate) => Ok("termscp is already up to date".to_string()), + Ok(UpdateStatus::UpdateInstalled(v)) => { + Ok(format!("termscp has been updated to version {}", v)) + } + Err(err) => Err(err.to_string()), + } +} + /// ### get_config_dir /// /// Get configuration directory diff --git a/src/system/auto_update.rs b/src/system/auto_update.rs new file mode 100644 index 0000000..40ff3a2 --- /dev/null +++ b/src/system/auto_update.rs @@ -0,0 +1,233 @@ +//! ## Auto update +//! +//! Automatic update module. This module is used to upgrade the current version of termscp to the latest available on Github + +/** + * MIT License + * + * termscp - Copyright (c) 2021 Christian Visintin + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +use crate::utils::parser::parse_semver; + +pub use self_update::errors::Error as UpdateError; +use self_update::{ + backends::github::Update as GithubUpdater, cargo_crate_version, update::Release as UpdRelease, + Status, +}; + +/// ### UpdateStatus +/// +/// The status of the update in case of success +#[derive(Debug, Eq, PartialEq)] +pub enum UpdateStatus { + /// Termscp is already up to date + AlreadyUptodate, + /// The update has been correctly installed + UpdateInstalled(String), +} + +/// ## Release +/// +/// Info related to a github release +#[derive(Debug)] +pub struct Release { + pub version: String, + pub body: String, +} + +/// ## Update +/// +/// The update structure defines the options used to install the update. +/// Once you're fine with the options, just call the `upgrade()` method to upgrade termscp. +#[derive(Debug)] +pub struct Update { + ask_confirm: bool, + progress: bool, +} + +impl Update { + /// ### show_progress + /// + /// Set whether to show or not the progress bar + pub fn show_progress(mut self, opt: bool) -> Self { + self.progress = opt; + self + } + + /// ### ask_confirm + /// + /// Set whether to ask for confirm when updating + pub fn ask_confirm(mut self, opt: bool) -> Self { + self.ask_confirm = opt; + self + } + + pub fn upgrade(self) -> Result { + info!("Updating termscp..."); + GithubUpdater::configure() + // Set default options + .repo_owner("veeso") + .repo_name("termscp") + .bin_name("termscp") + .current_version(cargo_crate_version!()) + .no_confirm(!self.ask_confirm) + .show_download_progress(self.progress) + .show_output(self.progress) + .build()? + .update() + .map(UpdateStatus::from) + } + + /// ### is_new_version_available + /// + /// Returns whether a new version of termscp is available + /// In case of success returns Ok(Option), where the Option is Some(new_version); + /// otherwise if no version is available, return None + /// In case of error returns Error with the error description + pub fn is_new_version_available() -> Result, UpdateError> { + info!("Checking whether a new version is available..."); + GithubUpdater::configure() + // Set default options + .repo_owner("veeso") + .repo_name("termscp") + .bin_name("termscp") + .current_version(cargo_crate_version!()) + .no_confirm(true) + .show_download_progress(false) + .show_output(false) + .build()? + .get_latest_release() + .map(Release::from) + .map(Self::check_version) + } + + /// ### check_version + /// + /// In case received version is newer than current one, version as Some is returned; otherwise None + fn check_version(r: Release) -> Option { + match parse_semver(r.version.as_str()) { + Some(new_version) => { + // Check if version is different + debug!( + "New version: {}; current version: {}", + new_version, + cargo_crate_version!() + ); + if new_version.as_str() > "cargo_crate_version!()" { + Some(r) // New version is available + } else { + None // No new version + } + } + None => None, + } + } +} + +impl Default for Update { + fn default() -> Self { + Self { + progress: false, + ask_confirm: false, + } + } +} + +impl From for UpdateStatus { + fn from(s: Status) -> Self { + match s { + Status::UpToDate(_) => Self::AlreadyUptodate, + Status::Updated(v) => Self::UpdateInstalled(v), + } + } +} + +impl From for Release { + fn from(r: UpdRelease) -> Self { + Self { + version: r.version, + body: r.body.unwrap_or_default(), + } + } +} + +#[cfg(test)] +mod test { + + use super::*; + + use pretty_assertions::assert_eq; + + #[test] + fn auto_update_default() { + let upd: Update = Update::default(); + assert_eq!(upd.ask_confirm, false); + assert_eq!(upd.progress, false); + let upd = upd.ask_confirm(true).show_progress(true); + assert_eq!(upd.ask_confirm, true); + assert_eq!(upd.progress, true); + } + + #[test] + fn auto_update() { + // Wno version + assert_eq!( + Update::default() + .show_progress(true) + .upgrade() + .ok() + .unwrap(), + UpdateStatus::AlreadyUptodate, + ); + } + + #[test] + fn check_for_updates() { + println!("{:?}", Update::is_new_version_available()); + assert!(Update::is_new_version_available().is_ok()); + } + + #[test] + fn update_status() { + assert_eq!( + UpdateStatus::from(Status::Updated(String::from("0.6.0"))), + UpdateStatus::UpdateInstalled(String::from("0.6.0")) + ); + assert_eq!( + UpdateStatus::from(Status::UpToDate(String::from("0.6.0"))), + UpdateStatus::AlreadyUptodate + ); + } + + #[test] + fn release() { + let release: UpdRelease = UpdRelease { + name: String::from("termscp 0.7.0"), + version: String::from("0.7.0"), + date: String::from("2021-09-12T00:00:00Z"), + body: Some(String::from("fixed everything")), + assets: vec![], + }; + let release: Release = Release::from(release); + assert_eq!(release.body.as_str(), "fixed everything"); + assert_eq!(release.version.as_str(), "0.7.0"); + } +} diff --git a/src/system/mod.rs b/src/system/mod.rs index c702b60..1f201a7 100644 --- a/src/system/mod.rs +++ b/src/system/mod.rs @@ -26,6 +26,7 @@ * SOFTWARE. */ // modules +pub mod auto_update; pub mod bookmarks_client; pub mod config_client; pub mod environment; diff --git a/src/ui/activities/auth/misc.rs b/src/ui/activities/auth/misc.rs index ecdf57e..a18dd03 100644 --- a/src/ui/activities/auth/misc.rs +++ b/src/ui/activities/auth/misc.rs @@ -27,6 +27,9 @@ */ use super::{AuthActivity, FileTransferParams, FileTransferProtocol}; use crate::filetransfer::params::{AwsS3Params, GenericProtocolParams, ProtocolParams}; +use crate::system::auto_update::{Update, UpdateStatus}; + +use tuirealm::tui::style::Color; impl AuthActivity { /// ### protocol_opt_to_enum @@ -151,4 +154,31 @@ impl AuthActivity { entry_directory: None, }) } + + // -- update install + + /// ### install_update + /// + /// Install latest termscp version via GUI + pub(super) fn install_update(&mut self) { + // Umount release notes + self.umount_release_notes(); + // Mount wait box + self.mount_wait("Installing update. Please wait…"); + // Install update + let result = Update::default().show_progress(false).upgrade(); + // Umount wait + self.umount_wait(); + // Show outcome + match result { + Ok(UpdateStatus::AlreadyUptodate) => { + self.mount_info("termscp is already up to date!", Color::Cyan) + } + Ok(UpdateStatus::UpdateInstalled(ver)) => self.mount_info( + format!("termscp has been updated to version {}!", ver), + Color::Green, + ), + Err(err) => self.mount_error(format!("Could not install update: {}", err)), + } + } } diff --git a/src/ui/activities/auth/mod.rs b/src/ui/activities/auth/mod.rs index 5fa1bfc..248263c 100644 --- a/src/ui/activities/auth/mod.rs +++ b/src/ui/activities/auth/mod.rs @@ -35,8 +35,8 @@ mod view; use super::{Activity, Context, ExitReason}; use crate::config::themes::Theme; use crate::filetransfer::{FileTransferParams, FileTransferProtocol}; +use crate::system::auto_update::{Release, Update as TermscpUpdate}; use crate::system::bookmarks_client::BookmarksClient; -use crate::utils::git; // Includes use crossterm::event::Event; @@ -51,6 +51,8 @@ const COMPONENT_TEXT_NEW_VERSION_NOTES: &str = "TEXTAREA_NEW_VERSION"; const COMPONENT_TEXT_FOOTER: &str = "TEXT_FOOTER"; const COMPONENT_TEXT_HELP: &str = "TEXT_HELP"; const COMPONENT_TEXT_ERROR: &str = "TEXT_ERROR"; +const COMPONENT_TEXT_INFO: &str = "TEXT_INFO"; +const COMPONENT_TEXT_WAIT: &str = "TEXT_WAIT"; const COMPONENT_TEXT_SIZE_ERR: &str = "TEXT_SIZE_ERR"; const COMPONENT_INPUT_ADDR: &str = "INPUT_ADDRESS"; const COMPONENT_INPUT_PORT: &str = "INPUT_PORT"; @@ -65,6 +67,7 @@ const COMPONENT_RADIO_QUIT: &str = "RADIO_QUIT"; const COMPONENT_RADIO_BOOKMARK_DEL_BOOKMARK: &str = "RADIO_DELETE_BOOKMARK"; const COMPONENT_RADIO_BOOKMARK_DEL_RECENT: &str = "RADIO_DELETE_RECENT"; const COMPONENT_RADIO_BOOKMARK_SAVE_PWD: &str = "RADIO_SAVE_PASSWORD"; +const COMPONENT_RADIO_INSTALL_UPDATE: &str = "RADIO_INSTALL_UPDATE"; const COMPONENT_BOOKMARKS_LIST: &str = "BOOKMARKS_LIST"; const COMPONENT_RECENTS_LIST: &str = "RECENTS_LIST"; @@ -119,12 +122,12 @@ impl AuthActivity { if ctx.config().get_check_for_updates() { debug!("Check for updates is enabled"); // Send request - match git::check_for_updates(env!("CARGO_PKG_VERSION")) { - Ok(Some(git::GithubTag { tag_name, body })) => { + match TermscpUpdate::is_new_version_available() { + Ok(Some(Release { version, body })) => { // If some, store version and release notes - info!("Latest version is: {}", tag_name); + info!("Latest version is: {}", version); ctx.store_mut() - .set_string(STORE_KEY_LATEST_VERSION, tag_name); + .set_string(STORE_KEY_LATEST_VERSION, version); ctx.store_mut().set_string(STORE_KEY_RELEASE_NOTES, body); } Ok(None) => { diff --git a/src/ui/activities/auth/update.rs b/src/ui/activities/auth/update.rs index da9ed83..de76419 100644 --- a/src/ui/activities/auth/update.rs +++ b/src/ui/activities/auth/update.rs @@ -32,8 +32,9 @@ use super::{ COMPONENT_INPUT_S3_BUCKET, COMPONENT_INPUT_S3_PROFILE, COMPONENT_INPUT_S3_REGION, COMPONENT_INPUT_USERNAME, COMPONENT_RADIO_BOOKMARK_DEL_BOOKMARK, COMPONENT_RADIO_BOOKMARK_DEL_RECENT, COMPONENT_RADIO_BOOKMARK_SAVE_PWD, - COMPONENT_RADIO_PROTOCOL, COMPONENT_RADIO_QUIT, COMPONENT_RECENTS_LIST, COMPONENT_TEXT_ERROR, - COMPONENT_TEXT_HELP, COMPONENT_TEXT_NEW_VERSION_NOTES, COMPONENT_TEXT_SIZE_ERR, + COMPONENT_RADIO_INSTALL_UPDATE, COMPONENT_RADIO_PROTOCOL, COMPONENT_RADIO_QUIT, + COMPONENT_RECENTS_LIST, COMPONENT_TEXT_ERROR, COMPONENT_TEXT_HELP, COMPONENT_TEXT_INFO, + COMPONENT_TEXT_NEW_VERSION_NOTES, COMPONENT_TEXT_SIZE_ERR, COMPONENT_TEXT_WAIT, }; use crate::ui::keymap::*; use tui_realm_stdlib::InputPropsBuilder; @@ -252,15 +253,44 @@ impl Update for AuthActivity { self.umount_error(); None } - (COMPONENT_TEXT_ERROR, _) => None, - (COMPONENT_TEXT_NEW_VERSION_NOTES, key) - if key == &MSG_KEY_ESC || key == &MSG_KEY_ENTER => - { + // -- Text info + (COMPONENT_TEXT_INFO, key) if key == &MSG_KEY_ESC || key == &MSG_KEY_ENTER => { + // Umount text info + self.umount_info(); + None + } + (COMPONENT_TEXT_ERROR, _) | (COMPONENT_TEXT_INFO, _) => None, + // -- Text wait + (COMPONENT_TEXT_WAIT, _) => None, + // -- Release notes + (COMPONENT_TEXT_NEW_VERSION_NOTES, key) if key == &MSG_KEY_ESC => { // Umount release notes self.umount_release_notes(); None } + (COMPONENT_TEXT_NEW_VERSION_NOTES, key) if key == &MSG_KEY_TAB => { + // Focus to radio update + self.view.active(COMPONENT_RADIO_INSTALL_UPDATE); + None + } (COMPONENT_TEXT_NEW_VERSION_NOTES, _) => None, + // -- Install update radio + (COMPONENT_RADIO_INSTALL_UPDATE, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => { + // Install update + self.install_update(); + None + } + (COMPONENT_RADIO_INSTALL_UPDATE, Msg::OnSubmit(Payload::One(Value::Usize(1)))) => { + // Umount + self.umount_release_notes(); + None + } + (COMPONENT_RADIO_INSTALL_UPDATE, key) if key == &MSG_KEY_TAB => { + // Focus to changelog + self.view.active(COMPONENT_TEXT_NEW_VERSION_NOTES); + None + } + (COMPONENT_RADIO_INSTALL_UPDATE, _) => None, // Help (_, key) if key == &MSG_KEY_CTRL_H => { // Show help diff --git a/src/ui/activities/auth/view.rs b/src/ui/activities/auth/view.rs index f546963..91863df 100644 --- a/src/ui/activities/auth/view.rs +++ b/src/ui/activities/auth/view.rs @@ -209,7 +209,7 @@ impl AuthActivity { .with_spans(vec![ TextSpan::from("termscp "), TextSpan::new(version.as_str()).underlined().bold(), - TextSpan::from(" is NOW available! Get it from ; view release notes with "), + TextSpan::from(" is NOW available! Install update and view release notes with "), ]) .build(), )), @@ -360,6 +360,22 @@ impl AuthActivity { self.view.render(super::COMPONENT_TEXT_ERROR, f, popup); } } + if let Some(props) = self.view.get_props(super::COMPONENT_TEXT_INFO) { + if props.visible { + let popup = draw_area_in(f.size(), 50, 10); + f.render_widget(Clear, popup); + // make popup + self.view.render(super::COMPONENT_TEXT_INFO, f, popup); + } + } + if let Some(props) = self.view.get_props(super::COMPONENT_TEXT_WAIT) { + if props.visible { + let popup = draw_area_in(f.size(), 50, 10); + f.render_widget(Clear, popup); + // make popup + self.view.render(super::COMPONENT_TEXT_WAIT, f, popup); + } + } if let Some(props) = self.view.get_props(super::COMPONENT_TEXT_SIZE_ERR) { if props.visible { let popup = draw_area_in(f.size(), 80, 20); @@ -403,10 +419,22 @@ impl AuthActivity { if let Some(props) = self.view.get_props(super::COMPONENT_TEXT_NEW_VERSION_NOTES) { if props.visible { // make popup - let popup = draw_area_in(f.size(), 90, 90); + let popup = draw_area_in(f.size(), 90, 85); f.render_widget(Clear, popup); + let popup_chunks = Layout::default() + .direction(Direction::Vertical) + .constraints( + [ + Constraint::Percentage(90), // Notes + Constraint::Length(3), // Install radio + ] + .as_ref(), + ) + .split(popup); self.view - .render(super::COMPONENT_TEXT_NEW_VERSION_NOTES, f, popup); + .render(super::COMPONENT_TEXT_NEW_VERSION_NOTES, f, popup_chunks[0]); + self.view + .render(super::COMPONENT_RADIO_INSTALL_UPDATE, f, popup_chunks[1]); } } if let Some(props) = self.view.get_props(super::COMPONENT_TEXT_HELP) { @@ -515,7 +543,7 @@ impl AuthActivity { /// ### mount_error /// /// Mount error box - pub(super) fn mount_error(&mut self, text: &str) { + pub(super) fn mount_error>(&mut self, text: S) { // Mount let err_color = self.theme().misc_error_dialog; self.view.mount( @@ -526,7 +554,7 @@ impl AuthActivity { .with_borders(Borders::ALL, BorderType::Thick, err_color) .bold() .with_text_alignment(Alignment::Center) - .with_texts(vec![TextSpan::from(text)]) + .with_texts(vec![TextSpan::from(text.as_ref().to_string())]) .build(), )), ); @@ -541,6 +569,61 @@ impl AuthActivity { self.view.umount(super::COMPONENT_TEXT_ERROR); } + /// ### mount_info + /// + /// Mount info box + pub(super) fn mount_info>(&mut self, text: S, color: Color) { + // Mount + self.view.mount( + super::COMPONENT_TEXT_INFO, + Box::new(Paragraph::new( + ParagraphPropsBuilder::default() + .with_borders(Borders::ALL, BorderType::Thick, color) + .bold() + .with_text_alignment(Alignment::Center) + .with_texts(vec![TextSpan::from(text.as_ref().to_string())]) + .with_foreground(color) + .build(), + )), + ); + // Give focus to error + self.view.active(super::COMPONENT_TEXT_INFO); + } + + /// ### umount_info + /// + /// Umount info message + pub(super) fn umount_info(&mut self) { + self.view.umount(super::COMPONENT_TEXT_INFO); + } + + /// ### mount_error + /// + /// Mount wait box + pub(super) fn mount_wait(&mut self, text: &str) { + // Mount + self.view.mount( + super::COMPONENT_TEXT_WAIT, + Box::new(Paragraph::new( + ParagraphPropsBuilder::default() + .with_borders(Borders::ALL, BorderType::Thick, Color::Reset) + .bold() + .with_text_alignment(Alignment::Center) + .with_texts(vec![TextSpan::from(text)]) + .build(), + )), + ); + // Give focus to error + self.view.active(super::COMPONENT_TEXT_WAIT); + } + + /// ### umount_wait + /// + /// Umount wait message + pub(super) fn umount_wait(&mut self) { + self.view.umount(super::COMPONENT_TEXT_WAIT); + } + /// ### mount_size_err /// /// Mount size error @@ -785,7 +868,22 @@ impl AuthActivity { .build(), )), ); - self.view.active(super::COMPONENT_TEXT_NEW_VERSION_NOTES); + // Mount install popup + self.view.mount( + super::COMPONENT_RADIO_INSTALL_UPDATE, + Box::new(Radio::new( + RadioPropsBuilder::default() + .with_color(Color::LightYellow) + .with_inverted_color(Color::Black) + .with_borders(Borders::ALL, BorderType::Rounded, Color::LightYellow) + .with_title("Install new version?", Alignment::Left) + .with_options(&["Yes", "No"]) + .with_value(0) + .rewind(true) + .build(), + )), + ); + self.view.active(super::COMPONENT_RADIO_INSTALL_UPDATE); } } } @@ -795,6 +893,7 @@ impl AuthActivity { /// Umount release notes text area pub(super) fn umount_release_notes(&mut self) { self.view.umount(super::COMPONENT_TEXT_NEW_VERSION_NOTES); + self.view.umount(super::COMPONENT_RADIO_INSTALL_UPDATE); } /// ### get_protocol diff --git a/src/utils/git.rs b/src/utils/git.rs deleted file mode 100644 index 7ed9bea..0000000 --- a/src/utils/git.rs +++ /dev/null @@ -1,95 +0,0 @@ -//! ## git -//! -//! `git` is the module which provides utilities to interact through the GIT API and to perform some stuff at git level - -/** - * MIT License - * - * termscp - Copyright (c) 2021 Christian Visintin - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -// Locals -use super::parser::parse_semver; -// Others -use serde::Deserialize; - -#[derive(Debug, Deserialize)] -/// ## GithubTag -/// -/// Info related to a github tag -pub struct GithubTag { - pub tag_name: String, - pub body: String, -} - -/// ### check_for_updates -/// -/// Check if there is a new version available for termscp. -/// This is performed through the Github API -/// In case of success returns Ok(Option), where the Option is Some(new_version); otherwise if no version is available, return None -/// In case of error returns Error with the error description - -pub fn check_for_updates(current_version: &str) -> Result, String> { - // Send request - let github_tag: Result = - match ureq::get("https://api.github.com/repos/veeso/termscp/releases/latest").call() { - Ok(response) => response.into_json::().map_err(|x| x.to_string()), - Err(err) => Err(err.to_string()), - }; - // Check version - match github_tag { - Err(err) => Err(err), - Ok(tag) => { - // Parse version - match parse_semver(tag.tag_name.as_str()) { - Some(new_version) => { - // Check if version is different - if new_version.as_str() > current_version { - Ok(Some(tag)) // New version is available - } else { - Ok(None) // No new version - } - } - None => Err(String::from("Got bad response from Github")), - } - } - } -} - -#[cfg(test)] -mod tests { - - use super::*; - - #[test] - #[cfg(not(all( - any( - target_os = "macos", - target_os = "freebsd", - target_os = "netbsd", - target_os = "netbsd" - ), - feature = "github-actions" - )))] - fn test_utils_git_check_for_updates() { - assert!(check_for_updates("100.0.0").ok().unwrap().is_none()); - assert!(check_for_updates("0.0.1").ok().unwrap().is_some()); - } -} diff --git a/src/utils/mod.rs b/src/utils/mod.rs index 71d2835..f12692e 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -29,7 +29,6 @@ pub mod crypto; pub mod file; pub mod fmt; -pub mod git; pub mod parser; pub mod path; pub mod random; From 8c88fbe10f258faabfd85d1b1df309e8b18d7568 Mon Sep 17 00:00:00 2001 From: veeso Date: Sun, 12 Sep 2021 10:01:52 +0200 Subject: [PATCH 08/40] cargo lock update --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1236ac0..238a803 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2052,9 +2052,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" +checksum = "5241dd6f21443a3606b432718b166d3cedc962fd4b8bea54a8bc7f514ebda986" dependencies = [ "tinyvec_macros", ] @@ -2330,9 +2330,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.26" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fded345a6559c2cfee778d562300c581f7d4ff3edb9b0d230d69800d213972" +checksum = "a87d738d4abc4cf22f6eb142f5b9a81301331ee3c767f2fef2fda4e325492060" dependencies = [ "cfg-if 1.0.0", "js-sys", From 77476596f4fb7e7fdd61a0a87e06c5289ba3af3b Mon Sep 17 00:00:00 2001 From: veeso Date: Thu, 16 Sep 2021 16:54:43 +0200 Subject: [PATCH 09/40] Fixed new version check --- src/system/auto_update.rs | 2 +- src/ui/activities/auth/misc.rs | 4 +++- src/ui/activities/auth/view.rs | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/system/auto_update.rs b/src/system/auto_update.rs index 40ff3a2..44257b9 100644 --- a/src/system/auto_update.rs +++ b/src/system/auto_update.rs @@ -131,7 +131,7 @@ impl Update { new_version, cargo_crate_version!() ); - if new_version.as_str() > "cargo_crate_version!()" { + if new_version.as_str() > cargo_crate_version!() { Some(r) // New version is available } else { None // No new version diff --git a/src/ui/activities/auth/misc.rs b/src/ui/activities/auth/misc.rs index a18dd03..b1c62df 100644 --- a/src/ui/activities/auth/misc.rs +++ b/src/ui/activities/auth/misc.rs @@ -164,7 +164,9 @@ impl AuthActivity { // Umount release notes self.umount_release_notes(); // Mount wait box - self.mount_wait("Installing update. Please wait…"); + self.mount_wait("Installing update. Please wait…", Color::LightYellow); + // Refresh UI + self.view(); // Install update let result = Update::default().show_progress(false).upgrade(); // Umount wait diff --git a/src/ui/activities/auth/view.rs b/src/ui/activities/auth/view.rs index 91863df..d9bc988 100644 --- a/src/ui/activities/auth/view.rs +++ b/src/ui/activities/auth/view.rs @@ -579,10 +579,10 @@ impl AuthActivity { Box::new(Paragraph::new( ParagraphPropsBuilder::default() .with_borders(Borders::ALL, BorderType::Thick, color) + .with_foreground(color) .bold() .with_text_alignment(Alignment::Center) .with_texts(vec![TextSpan::from(text.as_ref().to_string())]) - .with_foreground(color) .build(), )), ); @@ -600,13 +600,14 @@ impl AuthActivity { /// ### mount_error /// /// Mount wait box - pub(super) fn mount_wait(&mut self, text: &str) { + pub(super) fn mount_wait(&mut self, text: &str, color: Color) { // Mount self.view.mount( super::COMPONENT_TEXT_WAIT, Box::new(Paragraph::new( ParagraphPropsBuilder::default() - .with_borders(Borders::ALL, BorderType::Thick, Color::Reset) + .with_borders(Borders::ALL, BorderType::Thick, color) + .with_foreground(color) .bold() .with_text_alignment(Alignment::Center) .with_texts(vec![TextSpan::from(text)]) From c824d009864f27a0f23555d1d213f6661e4a27f6 Mon Sep 17 00:00:00 2001 From: veeso Date: Fri, 17 Sep 2021 09:52:35 +0200 Subject: [PATCH 10/40] Removed auto-update test for macos (blocks on github/CI) --- src/system/auto_update.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/system/auto_update.rs b/src/system/auto_update.rs index 44257b9..0194d4d 100644 --- a/src/system/auto_update.rs +++ b/src/system/auto_update.rs @@ -187,6 +187,7 @@ mod test { } #[test] + #[cfg(not(all(target_os = "macos", feature = "github-actions")))] fn auto_update() { // Wno version assert_eq!( @@ -200,6 +201,7 @@ mod test { } #[test] + #[cfg(not(all(target_os = "macos", feature = "github-actions")))] fn check_for_updates() { println!("{:?}", Update::is_new_version_available()); assert!(Update::is_new_version_available().is_ok()); From 96c997c38a2c74cffe29ec93786ca42212f2cef8 Mon Sep 17 00:00:00 2001 From: veeso Date: Sat, 18 Sep 2021 14:22:00 +0200 Subject: [PATCH 11/40] dirs 4.0.0 --- CHANGELOG.md | 1 + Cargo.lock | 89 +++++++++++++++++++++++++++++----------------------- Cargo.toml | 2 +- 3 files changed, 51 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c1abbd..1176c67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ Released on ?? - Added `rust-s3 0.27-rc4` - Added `self_update 0.27.0` - Updated `argh` to `0.1.6` + - Updated `dirs` to `4.0.0` - Updated `tui-realm-stdlib` to `0.6.2` - Removed `ureq` diff --git a/Cargo.lock b/Cargo.lock index 238a803..0f03c17 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -65,9 +65,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" +checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" [[package]] name = "argh" @@ -153,7 +153,7 @@ checksum = "1331d069460a674d42bd27c12b47ce578f789954c7bd7f239fd030771eca6616" dependencies = [ "anyhow", "attohttpc 0.16.3", - "dirs", + "dirs 3.0.2", "rust-ini", "serde", "serde-xml-rs", @@ -210,9 +210,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "bumpalo" -version = "3.7.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" +checksum = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538" [[package]] name = "byteorder" @@ -354,9 +354,9 @@ dependencies = [ [[package]] name = "crc-any" -version = "2.3.12" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79269446ee9793fb06fb297c61dd65e53e880fd10bdb222d544db1a98a2f083b" +checksum = "44c268ef4daf6fe48c6794ffb5e138afb6ea405b7987ec8f8501b817a84a56d6" dependencies = [ "debug-helper", ] @@ -465,6 +465,15 @@ dependencies = [ "dirs-sys", ] +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + [[package]] name = "dirs-sys" version = "0.3.6" @@ -530,9 +539,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80edafed416a46fb378521624fab1cfa2eb514784fd8921adbe8a8d8321da811" +checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" dependencies = [ "cfg-if 1.0.0", "crc32fast", @@ -777,9 +786,9 @@ checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" [[package]] name = "hyper" -version = "0.14.12" +version = "0.14.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13f67199e765030fa08fe0bd581af683f0d5bc04ea09c2b1102012c5fb90e7fd" +checksum = "15d1cfb9e4f68655fa04c01f59edb405b6074a0f7118ea881e5026e4a1cd8593" dependencies = [ "bytes", "futures-channel", @@ -868,9 +877,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "js-sys" -version = "0.3.54" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1866b355d9c878e5e607473cbe3f63282c0b7aad2db1dbebf55076c686918254" +checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" dependencies = [ "wasm-bindgen", ] @@ -895,9 +904,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.101" +version = "0.2.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" +checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103" [[package]] name = "libssh2-sys" @@ -1768,9 +1777,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.67" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950" +checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" dependencies = [ "itoa", "ryu", @@ -1863,9 +1872,9 @@ checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" [[package]] name = "socket2" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" +checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" dependencies = [ "libc", "winapi", @@ -1967,7 +1976,7 @@ dependencies = [ "chrono", "content_inspector", "crossterm", - "dirs", + "dirs 4.0.0", "edit", "hostname", "keyring", @@ -2133,9 +2142,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.26" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" +checksum = "84f96e095c0c82419687c20ddf5cb3eadb61f4e1405923c9dc8e53a1adacbda8" dependencies = [ "cfg-if 1.0.0", "pin-project-lite", @@ -2144,9 +2153,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8" +checksum = "46125608c26121c81b0c6d693eab5a420e416da7e43c426d2e8f7df8da8a3acf" dependencies = [ "lazy_static", ] @@ -2235,9 +2244,9 @@ checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" [[package]] name = "unicode-width" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[package]] name = "unicode-xid" @@ -2303,9 +2312,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.77" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e68338db6becec24d3c7977b5bf8a48be992c934b5d07177e3931f5dc9b076c" +checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" dependencies = [ "cfg-if 1.0.0", "serde", @@ -2315,9 +2324,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.77" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f34c405b4f0658583dba0c1c7c9b694f3cac32655db463b56c254a1c75269523" +checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" dependencies = [ "bumpalo", "lazy_static", @@ -2330,9 +2339,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a87d738d4abc4cf22f6eb142f5b9a81301331ee3c767f2fef2fda4e325492060" +checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2342,9 +2351,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.77" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d5a6580be83b19dc570a8f9c324251687ab2184e57086f71625feb57ec77c8" +checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2352,9 +2361,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.77" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3775a030dc6f5a0afd8a84981a21cc92a781eb429acef9ecce476d0c9113e92" +checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" dependencies = [ "proc-macro2", "quote", @@ -2365,15 +2374,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.77" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c279e376c7a8e8752a8f1eaa35b7b0bee6bb9fb0cdacfa97cc3f1f289c87e2b4" +checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" [[package]] name = "web-sys" -version = "0.3.54" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a84d70d1ec7d2da2d26a5bd78f4bca1b8c3254805363ce743b7a05bc30d195a" +checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index ac0e6b1..dd8732c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ bytesize = "1.1.0" chrono = "0.4.19" content_inspector = "0.2.4" crossterm = "0.20" -dirs = "3.0.1" +dirs = "4.0.0" edit = "0.1.3" hostname = "0.3.1" keyring = { version = "0.10.1", optional = true } From ed3225ed84c677086e64a83c87a1e7d3a556dbd6 Mon Sep 17 00:00:00 2001 From: veeso Date: Sat, 18 Sep 2021 22:07:59 +0200 Subject: [PATCH 12/40] User manual updates --- docs/man.md | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/docs/man.md b/docs/man.md index 07d4012..f998947 100644 --- a/docs/man.md +++ b/docs/man.md @@ -174,7 +174,7 @@ All the actions are available when working with multiple files, but be aware tha When enabled, synchronized browsing, will allow you to synchronize the navigation between the two panels. This means that whenever you'll change the working directory on one panel, the same action will be reproduced on the other panel. If you want to enable synchronized browsing just press ``; press twice to disable. While enabled, the synchronized browising state will be reported on the status bar on `ON`. -*Warning*: at the moment, whenever you try to access an unexisting directory, you won't be prompted to create it. This might change in a future update. +> ❗ at the moment, whenever you try to access an unexisting directory, you won't be prompted to create it. This might change in a future update. ### Open and Open With 🚪 @@ -208,14 +208,7 @@ Bookmarks will be saved, if possible at: - `FOLDERID_RoamingAppData\termscp\` on Windows For bookmarks only (this won't apply to recent hosts) it is also possible to save the password used to authenticate. The password is not saved by default and must be specified through the prompt when saving a new Bookmark. - -> I was very undecided about storing passwords in termscp. The reason? Saving a password on your computer might give access to a hacker to any server you've registered. But I must admit by myself that for many machines typing the password everytime is really boring, also many times I have to work with machines in LAN, which wouldn't provide any advantage to an attacker, So I came out with a good compromise for passwords. - -I warmly suggest you to follow these guidelines in order to decide whether you should or you shouldn't save passwords: - -- **DON'T** save passwords for machines which are exposed on the internet, save passwords only for machines in LAN -- Make sure your machine is protected by attackers. If possible encrypt your disk and don't leave your PC unlocked while you're away. -- Preferably, save passwords only when a compromising of the target machine wouldn't be a problem. +If you're concerned about the security of the password saved for your bookmarks, please read the [chapter below 👀](#are-my-passwords-safe-). In order to create a new bookmark, just follow these steps: @@ -231,12 +224,12 @@ whenever you want to use the previously saved connection, just press `` to ### Are my passwords Safe 😈 -Well, Yep 😉. +Sure 😉. As said before, bookmarks are saved in your configuration directory along with passwords. Passwords are obviously not plain text, they are encrypted with **AES-128**. Does this make them safe? Absolutely! (except for BSD and WSL users 😢) On **Windows**, **Linux** and **MacOS** the passwords are stored, if possible (but should be), respectively in the *Windows Vault*, in the *system keyring* and into the *Keychain*. This is actually super-safe and is directly managed by your operating system. -❗ Please, notice that if you're a Linux user, you should really read the [chapter below 👀](#linux-keyring), because the keyring might not be enabled or supported on your system! +❗ Please, notice that if you're a Linux user, you'd better to read the [chapter below 👀](#linux-keyring), because the keyring might not be enabled or supported on your system! On *BSD* and *WSL*, on the other hand, the key used to encrypt your passwords is stored on your drive (at $HOME/.config/termscp). It is then, still possible to retrieve the key to decrypt passwords. Luckily, the location of the key guarantees your key can't be read by users different from yours, but yeah, I still wouldn't save the password for a server exposed on the internet 😉. @@ -448,7 +441,7 @@ No. The reason is quite simple: when an issue happens, you must be able to know > If trace level is set for logging, is the file going to reach a huge size? -Probably not, unless you never quit termscp, but I think that's likely to happne. A long session may produce up to 10MB of log files (I said a long session), but I think a normal session won't exceed 2MB. +Probably not, unless you never quit termscp, but I think that's unlikely to happen. A long session may produce up to 10MB of log files (I said a long session), but I think a normal session won't exceed 2MB. > I don't want logging, can I turn it off? From 88a0685097f887a5d6657730020f7bc028bd9495 Mon Sep 17 00:00:00 2001 From: veeso Date: Sun, 19 Sep 2021 10:48:16 +0200 Subject: [PATCH 13/40] Added misc_info_dialog to themes --- CHANGELOG.md | 2 ++ docs/man.md | 20 ++++++++++++++++++++ src/config/serialization.rs | 1 + src/config/themes.rs | 7 +++++++ src/ui/activities/setup/actions.rs | 3 +++ src/ui/activities/setup/mod.rs | 1 + src/ui/activities/setup/update.rs | 14 +++++++++++--- src/ui/activities/setup/view/theme.rs | 20 ++++++++++++++------ themes/default.toml | 1 + themes/earth-wind-fire.toml | 1 + themes/horizon.toml | 1 + themes/mono-bright.toml | 1 + themes/mono-dark.toml | 1 + themes/sugarplum.toml | 1 + themes/ubuntu.toml | 1 + themes/veeso.toml | 1 + 16 files changed, 67 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1176c67..de2a054 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,8 @@ Released on ?? - Possibility to update termscp directly via GUI or CLI. - Install update via CLI running `(sudo) termscp --update`. - Install update via GUI from auth form: when the "new version message" is displayed press ``, then enter `YES` in the radio input asking whether to install the update. +- **❗ BREAKING CHANGES ❗**: + - Added a new key in themes: `misc_info_dialog`: if your theme won't load, just reload it. If you're using a customised theme, you can add to it the missing key via a text editor. Just edit the `theme.toml` in your `$CONFIG_DIR/termscp/theme.toml` and add `misc_info_dialog` (Read more in manual at Themes). - Dependencies: - Added `rust-s3 0.27-rc4` - Added `self_update 0.27.0` diff --git a/docs/man.md b/docs/man.md index f998947..0c84387 100644 --- a/docs/man.md +++ b/docs/man.md @@ -19,6 +19,7 @@ - [SSH Key Storage 🔐](#ssh-key-storage-) - [File Explorer Format](#file-explorer-format) - [Themes 🎨](#themes-) + - [My theme won't load 😱](#my-theme-wont-load-) - [Styles 💈](#styles-) - [Authentication page](#authentication-page) - [Transfer page](#transfer-page) @@ -360,6 +361,24 @@ termscp supports both the traditional explicit hex (`#rrggbb`) and rgb `rgb(r, g As said before, you can also import theme files. You can take inspiration from or directly use one of the themes provided along with termscp, located in the `themes/` directory of this repository and import them running termscp as `termscp -t `. If everything was fine, it should tell you the theme has successfully been imported. +### My theme won't load 😱 + +This is probably due to a recent update which has broken the theme. Whenever I add a new key to themes, the saved theme won't load. To fix this issues there are two really quick-fix solutions: + +1. Reload theme: whenever I release an update I will also patch the "official" themes, so you just have to download it from the repository again and re-import the theme via `-t` option + + ```sh + termscp -t + ``` + +2. Fix your theme: If you're using a custom theme, then you can edit via `vim` and add the missing key. The theme is located at `$CONFIG_DIR/termscp/theme.toml` where `$CONFIG_DIR` is: + + - FreeBSD/GNU-Linux: `$HOME/.config/` + - MacOs: `$HOME/Library/Application Support` + - Windows: `%appdata%` + + ❗ Missing keys are reported in the CHANGELOG under `BREAKING CHANGES` for the version you've just installed. + ### Styles 💈 You can find in the table below, the description for each style field. @@ -402,6 +421,7 @@ These styles applie to different part of the application. | Key | Description | |-------------------|---------------------------------------------| | misc_error_dialog | Color for error messages | +| misc_info_dialog | Color for info dialogs | | misc_input_dialog | Color for input dialogs (such as copy file) | | misc_keys | Color of text for key strokes | | misc_quit_dialog | Color for quit dialogs | diff --git a/src/config/serialization.rs b/src/config/serialization.rs index 6505c3a..57e8c1d 100644 --- a/src/config/serialization.rs +++ b/src/config/serialization.rs @@ -556,6 +556,7 @@ mod tests { auth_recents = "LightBlue" auth_username = "LightMagenta" misc_error_dialog = "Red" + misc_info_dialog = "LightYellow" misc_input_dialog = "240,240,240" misc_keys = "Cyan" misc_quit_dialog = "Yellow" diff --git a/src/config/themes.rs b/src/config/themes.rs index 39776d8..8b6f54e 100644 --- a/src/config/themes.rs +++ b/src/config/themes.rs @@ -83,6 +83,11 @@ pub struct Theme { deserialize_with = "deserialize_color", serialize_with = "serialize_color" )] + pub misc_info_dialog: Color, + #[serde( + deserialize_with = "deserialize_color", + serialize_with = "serialize_color" + )] pub misc_input_dialog: Color, #[serde( deserialize_with = "deserialize_color", @@ -183,6 +188,7 @@ impl Default for Theme { auth_recents: Color::LightBlue, auth_username: Color::LightMagenta, misc_error_dialog: Color::Red, + misc_info_dialog: Color::LightYellow, misc_input_dialog: Color::Reset, misc_keys: Color::Cyan, misc_quit_dialog: Color::Yellow, @@ -245,6 +251,7 @@ mod test { assert_eq!(theme.auth_recents, Color::LightBlue); assert_eq!(theme.auth_username, Color::LightMagenta); assert_eq!(theme.misc_error_dialog, Color::Red); + assert_eq!(theme.misc_info_dialog, Color::LightYellow); assert_eq!(theme.misc_input_dialog, Color::Reset); assert_eq!(theme.misc_keys, Color::Cyan); assert_eq!(theme.misc_quit_dialog, Color::Yellow); diff --git a/src/ui/activities/setup/actions.rs b/src/ui/activities/setup/actions.rs index 7bf2b3f..b49753c 100644 --- a/src/ui/activities/setup/actions.rs +++ b/src/ui/activities/setup/actions.rs @@ -254,6 +254,9 @@ impl SetupActivity { super::COMPONENT_COLOR_MISC_ERROR => { theme.misc_error_dialog = color; } + super::COMPONENT_COLOR_MISC_INFO => { + theme.misc_info_dialog = color; + } super::COMPONENT_COLOR_MISC_INPUT => { theme.misc_input_dialog = color; } diff --git a/src/ui/activities/setup/mod.rs b/src/ui/activities/setup/mod.rs index d615189..ec2b4ff 100644 --- a/src/ui/activities/setup/mod.rs +++ b/src/ui/activities/setup/mod.rs @@ -75,6 +75,7 @@ const COMPONENT_COLOR_AUTH_PROTOCOL: &str = "COMPONENT_COLOR_AUTH_PROTOCOL"; const COMPONENT_COLOR_AUTH_RECENTS: &str = "COMPONENT_COLOR_AUTH_RECENTS"; const COMPONENT_COLOR_AUTH_USERNAME: &str = "COMPONENT_COLOR_AUTH_USERNAME"; const COMPONENT_COLOR_MISC_ERROR: &str = "COMPONENT_COLOR_MISC_ERROR"; +const COMPONENT_COLOR_MISC_INFO: &str = "COMPONENT_COLOR_MISC_INFO"; const COMPONENT_COLOR_MISC_INPUT: &str = "COMPONENT_COLOR_MISC_INPUT"; const COMPONENT_COLOR_MISC_KEYS: &str = "COMPONENT_COLOR_MISC_KEYS"; const COMPONENT_COLOR_MISC_QUIT: &str = "COMPONENT_COLOR_MISC_QUIT"; diff --git a/src/ui/activities/setup/update.rs b/src/ui/activities/setup/update.rs index 06593e8..ffe5600 100644 --- a/src/ui/activities/setup/update.rs +++ b/src/ui/activities/setup/update.rs @@ -31,8 +31,8 @@ use super::{ SetupActivity, ViewLayout, COMPONENT_COLOR_AUTH_ADDR, COMPONENT_COLOR_AUTH_BOOKMARKS, COMPONENT_COLOR_AUTH_PASSWORD, COMPONENT_COLOR_AUTH_PORT, COMPONENT_COLOR_AUTH_PROTOCOL, COMPONENT_COLOR_AUTH_RECENTS, COMPONENT_COLOR_AUTH_USERNAME, COMPONENT_COLOR_MISC_ERROR, - COMPONENT_COLOR_MISC_INPUT, COMPONENT_COLOR_MISC_KEYS, COMPONENT_COLOR_MISC_QUIT, - COMPONENT_COLOR_MISC_SAVE, COMPONENT_COLOR_MISC_WARN, + COMPONENT_COLOR_MISC_INFO, COMPONENT_COLOR_MISC_INPUT, COMPONENT_COLOR_MISC_KEYS, + COMPONENT_COLOR_MISC_QUIT, COMPONENT_COLOR_MISC_SAVE, COMPONENT_COLOR_MISC_WARN, COMPONENT_COLOR_TRANSFER_EXPLORER_LOCAL_BG, COMPONENT_COLOR_TRANSFER_EXPLORER_LOCAL_FG, COMPONENT_COLOR_TRANSFER_EXPLORER_LOCAL_HG, COMPONENT_COLOR_TRANSFER_EXPLORER_REMOTE_BG, COMPONENT_COLOR_TRANSFER_EXPLORER_REMOTE_FG, COMPONENT_COLOR_TRANSFER_EXPLORER_REMOTE_HG, @@ -441,6 +441,10 @@ impl SetupActivity { None } (COMPONENT_COLOR_MISC_ERROR, key) if key == &MSG_KEY_DOWN => { + self.view.active(COMPONENT_COLOR_MISC_INFO); + None + } + (COMPONENT_COLOR_MISC_INFO, key) if key == &MSG_KEY_DOWN => { self.view.active(COMPONENT_COLOR_MISC_INPUT); None } @@ -551,10 +555,14 @@ impl SetupActivity { self.view.active(COMPONENT_COLOR_AUTH_RECENTS); None } - (COMPONENT_COLOR_MISC_INPUT, key) if key == &MSG_KEY_UP => { + (COMPONENT_COLOR_MISC_INFO, key) if key == &MSG_KEY_UP => { self.view.active(COMPONENT_COLOR_MISC_ERROR); None } + (COMPONENT_COLOR_MISC_INPUT, key) if key == &MSG_KEY_UP => { + self.view.active(COMPONENT_COLOR_MISC_INFO); + None + } (COMPONENT_COLOR_MISC_KEYS, key) if key == &MSG_KEY_UP => { self.view.active(COMPONENT_COLOR_MISC_INPUT); None diff --git a/src/ui/activities/setup/view/theme.rs b/src/ui/activities/setup/view/theme.rs index 8f7264a..2c51034 100644 --- a/src/ui/activities/setup/view/theme.rs +++ b/src/ui/activities/setup/view/theme.rs @@ -70,6 +70,7 @@ impl SetupActivity { // Misc self.mount_title(super::COMPONENT_COLOR_MISC_TITLE, "Misc styles"); self.mount_color_picker(super::COMPONENT_COLOR_MISC_ERROR, "Error"); + self.mount_color_picker(super::COMPONENT_COLOR_MISC_INFO, "Info dialogs"); self.mount_color_picker(super::COMPONENT_COLOR_MISC_INPUT, "Input fields"); self.mount_color_picker(super::COMPONENT_COLOR_MISC_KEYS, "Key strokes"); self.mount_color_picker(super::COMPONENT_COLOR_MISC_QUIT, "Quit dialogs"); @@ -222,12 +223,12 @@ impl SetupActivity { [ Constraint::Length(1), // Title Constraint::Length(3), // Error + Constraint::Length(3), // Info Constraint::Length(3), // Input Constraint::Length(3), // Keys Constraint::Length(3), // Quit Constraint::Length(3), // Save Constraint::Length(3), // Warn - Constraint::Length(3), // Empty ] .as_ref(), ) @@ -237,15 +238,17 @@ impl SetupActivity { self.view .render(super::COMPONENT_COLOR_MISC_ERROR, f, misc_colors_layout[1]); self.view - .render(super::COMPONENT_COLOR_MISC_INPUT, f, misc_colors_layout[2]); + .render(super::COMPONENT_COLOR_MISC_INFO, f, misc_colors_layout[2]); self.view - .render(super::COMPONENT_COLOR_MISC_KEYS, f, misc_colors_layout[3]); + .render(super::COMPONENT_COLOR_MISC_INPUT, f, misc_colors_layout[3]); self.view - .render(super::COMPONENT_COLOR_MISC_QUIT, f, misc_colors_layout[4]); + .render(super::COMPONENT_COLOR_MISC_KEYS, f, misc_colors_layout[4]); self.view - .render(super::COMPONENT_COLOR_MISC_SAVE, f, misc_colors_layout[5]); + .render(super::COMPONENT_COLOR_MISC_QUIT, f, misc_colors_layout[5]); self.view - .render(super::COMPONENT_COLOR_MISC_WARN, f, misc_colors_layout[6]); + .render(super::COMPONENT_COLOR_MISC_SAVE, f, misc_colors_layout[6]); + self.view + .render(super::COMPONENT_COLOR_MISC_WARN, f, misc_colors_layout[7]); let transfer_colors_layout_col1 = Layout::default() .direction(Direction::Vertical) @@ -405,6 +408,7 @@ impl SetupActivity { self.update_color(super::COMPONENT_COLOR_AUTH_RECENTS, theme.auth_recents); self.update_color(super::COMPONENT_COLOR_AUTH_USERNAME, theme.auth_username); self.update_color(super::COMPONENT_COLOR_MISC_ERROR, theme.misc_error_dialog); + self.update_color(super::COMPONENT_COLOR_MISC_INFO, theme.misc_info_dialog); self.update_color(super::COMPONENT_COLOR_MISC_INPUT, theme.misc_input_dialog); self.update_color(super::COMPONENT_COLOR_MISC_KEYS, theme.misc_keys); self.update_color(super::COMPONENT_COLOR_MISC_QUIT, theme.misc_quit_dialog); @@ -495,6 +499,9 @@ impl SetupActivity { let misc_error_dialog: Color = self .get_color(super::COMPONENT_COLOR_MISC_ERROR) .map_err(|_| super::COMPONENT_COLOR_MISC_ERROR)?; + let misc_info_dialog: Color = self + .get_color(super::COMPONENT_COLOR_MISC_INFO) + .map_err(|_| super::COMPONENT_COLOR_MISC_INFO)?; let misc_input_dialog: Color = self .get_color(super::COMPONENT_COLOR_MISC_INPUT) .map_err(|_| super::COMPONENT_COLOR_MISC_INPUT)?; @@ -560,6 +567,7 @@ impl SetupActivity { theme.auth_recents = auth_recents; theme.auth_username = auth_username; theme.misc_error_dialog = misc_error_dialog; + theme.misc_info_dialog = misc_info_dialog; theme.misc_input_dialog = misc_input_dialog; theme.misc_keys = misc_keys; theme.misc_quit_dialog = misc_quit_dialog; diff --git a/themes/default.toml b/themes/default.toml index 273533d..9f54d04 100644 --- a/themes/default.toml +++ b/themes/default.toml @@ -6,6 +6,7 @@ auth_protocol = "LightGreen" auth_recents = "LightBlue" auth_username = "LightMagenta" misc_error_dialog = "Red" +misc_info_dialog = "LightYellow" misc_input_dialog = "Default" misc_keys = "Cyan" misc_quit_dialog = "Yellow" diff --git a/themes/earth-wind-fire.toml b/themes/earth-wind-fire.toml index 9ad776c..c31d16a 100644 --- a/themes/earth-wind-fire.toml +++ b/themes/earth-wind-fire.toml @@ -6,6 +6,7 @@ auth_protocol = "orangered" auth_recents = "deepskyblue" auth_username = "aqua" misc_error_dialog = "crimson" +misc_info_dialog = "LightYellow" misc_input_dialog = "turquoise" misc_keys = "deeppink" misc_quit_dialog = "lime" diff --git a/themes/horizon.toml b/themes/horizon.toml index b793cdb..97bfbfd 100644 --- a/themes/horizon.toml +++ b/themes/horizon.toml @@ -6,6 +6,7 @@ auth_protocol = "coral" auth_recents = "royalblue" auth_username = "orangered" misc_error_dialog = "crimson" +misc_info_dialog = "coral" misc_input_dialog = "gold" misc_keys = "deeppink" misc_quit_dialog = "coral" diff --git a/themes/mono-bright.toml b/themes/mono-bright.toml index 86f695c..9b8d8d7 100644 --- a/themes/mono-bright.toml +++ b/themes/mono-bright.toml @@ -6,6 +6,7 @@ auth_protocol = "black" auth_recents = "#bbbbbb" auth_username = "black" misc_error_dialog = "black" +misc_info_dialog = "black" misc_input_dialog = "black" misc_keys = "black" misc_quit_dialog = "black" diff --git a/themes/mono-dark.toml b/themes/mono-dark.toml index 7fb9e01..15b93f4 100644 --- a/themes/mono-dark.toml +++ b/themes/mono-dark.toml @@ -6,6 +6,7 @@ auth_protocol = "white" auth_recents = "white" auth_username = "white" misc_error_dialog = "white" +misc_info_dialog = "white" misc_input_dialog = "white" misc_keys = "white" misc_quit_dialog = "white" diff --git a/themes/sugarplum.toml b/themes/sugarplum.toml index 2cd9fc6..0ecb617 100644 --- a/themes/sugarplum.toml +++ b/themes/sugarplum.toml @@ -6,6 +6,7 @@ auth_protocol = "deeppink" auth_recents = "lightpink" auth_username = "orchid" misc_error_dialog = "mediumvioletred" +misc_info_dialog = "plum" misc_input_dialog = "plum" misc_keys = "deeppink" misc_quit_dialog = "lightcoral" diff --git a/themes/ubuntu.toml b/themes/ubuntu.toml index 01e3bf1..0fb50fd 100644 --- a/themes/ubuntu.toml +++ b/themes/ubuntu.toml @@ -6,6 +6,7 @@ auth_protocol = "LightGreen" auth_recents = "aquamarine" auth_username = "hotpink" misc_error_dialog = "orangered" +misc_info_dialog = "LightYellow" misc_input_dialog = "snow" misc_keys = "LightCyan" misc_quit_dialog = "LightYellow" diff --git a/themes/veeso.toml b/themes/veeso.toml index c3b829d..c393382 100644 --- a/themes/veeso.toml +++ b/themes/veeso.toml @@ -6,6 +6,7 @@ auth_protocol = "greenyellow" auth_recents = "paleturquoise" auth_username = "deeppink" misc_error_dialog = "crimson" +misc_info_dialog = "SkyBlue" misc_input_dialog = "snow" misc_keys = "deeppink" misc_quit_dialog = "tomato" From 63e70233421d5a6a5d269582ca8d1eb3031dcbfe Mon Sep 17 00:00:00 2001 From: veeso Date: Sun, 19 Sep 2021 11:16:18 +0200 Subject: [PATCH 14/40] Re-use mounts in UI --- CHANGELOG.md | 2 + src/ui/activities/auth/misc.rs | 13 +- src/ui/activities/auth/view.rs | 194 +++++++--------- src/ui/activities/filetransfer/view.rs | 304 ++++++++++--------------- 4 files changed, 205 insertions(+), 308 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de2a054..986003b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,8 @@ Released on ?? - Install update via GUI from auth form: when the "new version message" is displayed press ``, then enter `YES` in the radio input asking whether to install the update. - **❗ BREAKING CHANGES ❗**: - Added a new key in themes: `misc_info_dialog`: if your theme won't load, just reload it. If you're using a customised theme, you can add to it the missing key via a text editor. Just edit the `theme.toml` in your `$CONFIG_DIR/termscp/theme.toml` and add `misc_info_dialog` (Read more in manual at Themes). +- Enhancements: + - Reuse mounts in UI, in order to reduce executable size - Dependencies: - Added `rust-s3 0.27-rc4` - Added `self_update 0.27.0` diff --git a/src/ui/activities/auth/misc.rs b/src/ui/activities/auth/misc.rs index b1c62df..78094f5 100644 --- a/src/ui/activities/auth/misc.rs +++ b/src/ui/activities/auth/misc.rs @@ -29,8 +29,6 @@ use super::{AuthActivity, FileTransferParams, FileTransferProtocol}; use crate::filetransfer::params::{AwsS3Params, GenericProtocolParams, ProtocolParams}; use crate::system::auto_update::{Update, UpdateStatus}; -use tuirealm::tui::style::Color; - impl AuthActivity { /// ### protocol_opt_to_enum /// @@ -164,7 +162,7 @@ impl AuthActivity { // Umount release notes self.umount_release_notes(); // Mount wait box - self.mount_wait("Installing update. Please wait…", Color::LightYellow); + self.mount_wait("Installing update. Please wait…"); // Refresh UI self.view(); // Install update @@ -173,13 +171,10 @@ impl AuthActivity { self.umount_wait(); // Show outcome match result { - Ok(UpdateStatus::AlreadyUptodate) => { - self.mount_info("termscp is already up to date!", Color::Cyan) + Ok(UpdateStatus::AlreadyUptodate) => self.mount_info("termscp is already up to date!"), + Ok(UpdateStatus::UpdateInstalled(ver)) => { + self.mount_info(format!("termscp has been updated to version {}!", ver)) } - Ok(UpdateStatus::UpdateInstalled(ver)) => self.mount_info( - format!("termscp has been updated to version {}!", ver), - Color::Green, - ), Err(err) => self.mount_error(format!("Could not install update: {}", err)), } } diff --git a/src/ui/activities/auth/view.rs b/src/ui/activities/auth/view.rs index d9bc988..d41f933 100644 --- a/src/ui/activities/auth/view.rs +++ b/src/ui/activities/auth/view.rs @@ -544,22 +544,8 @@ impl AuthActivity { /// /// Mount error box pub(super) fn mount_error>(&mut self, text: S) { - // Mount let err_color = self.theme().misc_error_dialog; - self.view.mount( - super::COMPONENT_TEXT_ERROR, - Box::new(Paragraph::new( - ParagraphPropsBuilder::default() - .with_foreground(err_color) - .with_borders(Borders::ALL, BorderType::Thick, err_color) - .bold() - .with_text_alignment(Alignment::Center) - .with_texts(vec![TextSpan::from(text.as_ref().to_string())]) - .build(), - )), - ); - // Give focus to error - self.view.active(super::COMPONENT_TEXT_ERROR); + self.mount_text_dialog(super::COMPONENT_TEXT_ERROR, text.as_ref(), err_color); } /// ### umount_error @@ -572,22 +558,9 @@ impl AuthActivity { /// ### mount_info /// /// Mount info box - pub(super) fn mount_info>(&mut self, text: S, color: Color) { - // Mount - self.view.mount( - super::COMPONENT_TEXT_INFO, - Box::new(Paragraph::new( - ParagraphPropsBuilder::default() - .with_borders(Borders::ALL, BorderType::Thick, color) - .with_foreground(color) - .bold() - .with_text_alignment(Alignment::Center) - .with_texts(vec![TextSpan::from(text.as_ref().to_string())]) - .build(), - )), - ); - // Give focus to error - self.view.active(super::COMPONENT_TEXT_INFO); + pub(super) fn mount_info>(&mut self, text: S) { + let color = self.theme().misc_info_dialog; + self.mount_text_dialog(super::COMPONENT_TEXT_INFO, text.as_ref(), color); } /// ### umount_info @@ -600,22 +573,9 @@ impl AuthActivity { /// ### mount_error /// /// Mount wait box - pub(super) fn mount_wait(&mut self, text: &str, color: Color) { - // Mount - self.view.mount( - super::COMPONENT_TEXT_WAIT, - Box::new(Paragraph::new( - ParagraphPropsBuilder::default() - .with_borders(Borders::ALL, BorderType::Thick, color) - .with_foreground(color) - .bold() - .with_text_alignment(Alignment::Center) - .with_texts(vec![TextSpan::from(text)]) - .build(), - )), - ); - // Give focus to error - self.view.active(super::COMPONENT_TEXT_WAIT); + pub(super) fn mount_wait(&mut self, text: &str) { + let wait_color = self.theme().misc_info_dialog; + self.mount_text_dialog(super::COMPONENT_TEXT_WAIT, text, wait_color); } /// ### umount_wait @@ -631,22 +591,11 @@ impl AuthActivity { pub(super) fn mount_size_err(&mut self) { // Mount let err_color = self.theme().misc_error_dialog; - self.view.mount( + self.mount_text_dialog( super::COMPONENT_TEXT_SIZE_ERR, - Box::new(Paragraph::new( - ParagraphPropsBuilder::default() - .with_foreground(err_color) - .with_borders(Borders::ALL, BorderType::Thick, err_color) - .bold() - .with_texts(vec![TextSpan::from( - "termscp requires at least 24 lines of height to run", - )]) - .with_text_alignment(Alignment::Center) - .build(), - )), + "termscp requires at least 24 lines of height to run", + err_color, ); - // Give focus to error - self.view.active(super::COMPONENT_TEXT_SIZE_ERR); } /// ### umount_size_err @@ -662,20 +611,13 @@ impl AuthActivity { pub(super) fn mount_quit(&mut self) { // Protocol let quit_color = self.theme().misc_quit_dialog; - self.view.mount( + self.mount_radio_dialog( super::COMPONENT_RADIO_QUIT, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(quit_color) - .with_borders(Borders::ALL, BorderType::Rounded, quit_color) - .with_inverted_color(Color::Black) - .with_title("Quit termscp?", Alignment::Center) - .with_options(&[String::from("Yes"), String::from("No")]) - .rewind(true) - .build(), - )), + "Quit termscp?", + &["Yes", "No"], + 0, + quit_color, ); - self.view.active(super::COMPONENT_RADIO_QUIT); } /// ### umount_quit @@ -690,23 +632,13 @@ impl AuthActivity { /// Mount bookmark delete dialog pub(super) fn mount_bookmark_del_dialog(&mut self) { let warn_color = self.theme().misc_warn_dialog; - self.view.mount( + self.mount_radio_dialog( super::COMPONENT_RADIO_BOOKMARK_DEL_BOOKMARK, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(warn_color) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Rounded, warn_color) - .with_title("Delete bookmark?", Alignment::Center) - .with_options(&[String::from("Yes"), String::from("No")]) - .with_value(1) - .rewind(true) - .build(), - )), + "Delete bookmark?", + &["Yes", "No"], + 1, + warn_color, ); - // Active - self.view - .active(super::COMPONENT_RADIO_BOOKMARK_DEL_BOOKMARK); } /// ### umount_bookmark_del_dialog @@ -722,22 +654,13 @@ impl AuthActivity { /// Mount recent delete dialog pub(super) fn mount_recent_del_dialog(&mut self) { let warn_color = self.theme().misc_warn_dialog; - self.view.mount( + self.mount_radio_dialog( super::COMPONENT_RADIO_BOOKMARK_DEL_RECENT, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(warn_color) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Rounded, warn_color) - .with_title("Delete bookmark?", Alignment::Center) - .with_options(&[String::from("Yes"), String::from("No")]) - .with_value(1) - .rewind(true) - .build(), - )), + "Delete bookmark?", + &["Yes", "No"], + 1, + warn_color, ); - // Active - self.view.active(super::COMPONENT_RADIO_BOOKMARK_DEL_RECENT); } /// ### umount_recent_del_dialog @@ -859,32 +782,25 @@ impl AuthActivity { if let Some(release_notes) = ctx.store().get_string(super::STORE_KEY_RELEASE_NOTES) { // make spans let spans: Vec = release_notes.lines().map(TextSpan::from).collect(); + let info_color = self.theme().misc_info_dialog; self.view.mount( super::COMPONENT_TEXT_NEW_VERSION_NOTES, Box::new(Textarea::new( TextareaPropsBuilder::default() - .with_borders(Borders::ALL, BorderType::Rounded, Color::LightYellow) + .with_borders(Borders::ALL, BorderType::Rounded, info_color) .with_title("Release notes", Alignment::Center) .with_texts(spans) .build(), )), ); // Mount install popup - self.view.mount( + self.mount_radio_dialog( super::COMPONENT_RADIO_INSTALL_UPDATE, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(Color::LightYellow) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Rounded, Color::LightYellow) - .with_title("Install new version?", Alignment::Left) - .with_options(&["Yes", "No"]) - .with_value(0) - .rewind(true) - .build(), - )), + "Install new version?", + &["Yes", "No"], + 0, + info_color, ); - self.view.active(super::COMPONENT_RADIO_INSTALL_UPDATE); } } } @@ -1033,4 +949,50 @@ impl AuthActivity { } } } + + // -- mount helpers + + fn mount_text_dialog(&mut self, id: &str, text: &str, color: Color) { + // Mount + self.view.mount( + id, + Box::new(Paragraph::new( + ParagraphPropsBuilder::default() + .with_borders(Borders::ALL, BorderType::Thick, color) + .with_foreground(color) + .bold() + .with_text_alignment(Alignment::Center) + .with_texts(vec![TextSpan::from(text)]) + .build(), + )), + ); + // Give focus to error + self.view.active(id); + } + + fn mount_radio_dialog( + &mut self, + id: &str, + text: &str, + opts: &[&str], + default: usize, + color: Color, + ) { + self.view.mount( + id, + Box::new(Radio::new( + RadioPropsBuilder::default() + .with_color(color) + .with_inverted_color(Color::Black) + .with_borders(Borders::ALL, BorderType::Rounded, color) + .with_title(text, Alignment::Center) + .with_options(opts) + .with_value(default) + .rewind(true) + .build(), + )), + ); + // Active + self.view.active(id); + } } diff --git a/src/ui/activities/filetransfer/view.rs b/src/ui/activities/filetransfer/view.rs index 91542a8..ac97d99 100644 --- a/src/ui/activities/filetransfer/view.rs +++ b/src/ui/activities/filetransfer/view.rs @@ -378,20 +378,7 @@ impl FileTransferActivity { pub(super) fn mount_error(&mut self, text: &str) { // Mount let error_color = self.theme().misc_error_dialog; - self.view.mount( - super::COMPONENT_TEXT_ERROR, - Box::new(Paragraph::new( - ParagraphPropsBuilder::default() - .with_foreground(error_color) - .with_borders(Borders::ALL, BorderType::Rounded, error_color) - .bold() - .with_text_alignment(Alignment::Center) - .with_texts(vec![TextSpan::from(text)]) - .build(), - )), - ); - // Give focus to error - self.view.active(super::COMPONENT_TEXT_ERROR); + self.mount_text_dialog(super::COMPONENT_TEXT_ERROR, text, error_color); } /// ### umount_error @@ -404,46 +391,21 @@ impl FileTransferActivity { pub(super) fn mount_fatal(&mut self, text: &str) { // Mount let error_color = self.theme().misc_error_dialog; - self.view.mount( - super::COMPONENT_TEXT_FATAL, - Box::new(Paragraph::new( - ParagraphPropsBuilder::default() - .with_foreground(error_color) - .with_borders(Borders::ALL, BorderType::Rounded, error_color) - .bold() - .with_text_alignment(Alignment::Center) - .with_texts(vec![TextSpan::from(text)]) - .build(), - )), - ); - // Give focus to error - self.view.active(super::COMPONENT_TEXT_FATAL); + self.mount_text_dialog(super::COMPONENT_TEXT_FATAL, text, error_color); } pub(super) fn mount_wait(&mut self, text: &str) { - self.mount_wait_ex(text, Color::Reset); + self.mount_wait_ex(text); } pub(super) fn mount_blocking_wait(&mut self, text: &str) { - self.mount_wait_ex(text, Color::Reset); + self.mount_wait_ex(text); self.view(); } - fn mount_wait_ex(&mut self, text: &str, color: Color) { - // Mount - let mut builder: ParagraphPropsBuilder = ParagraphPropsBuilder::default(); - builder - .with_foreground(color) - .with_borders(Borders::ALL, BorderType::Rounded, Color::White) - .bold() - .with_text_alignment(Alignment::Center) - .with_texts(vec![TextSpan::from(text)]); - self.view.mount( - super::COMPONENT_TEXT_WAIT, - Box::new(Paragraph::new(builder.build())), - ); - // Give focus to info - self.view.active(super::COMPONENT_TEXT_WAIT); + fn mount_wait_ex(&mut self, text: &str) { + let color = self.theme().misc_info_dialog; + self.mount_text_dialog(super::COMPONENT_TEXT_WAIT, text, color); } pub(super) fn umount_wait(&mut self) { @@ -456,20 +418,13 @@ impl FileTransferActivity { pub(super) fn mount_quit(&mut self) { // Protocol let quit_color = self.theme().misc_quit_dialog; - self.view.mount( + self.mount_radio_dialog( super::COMPONENT_RADIO_QUIT, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(quit_color) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Rounded, quit_color) - .with_title("Are you sure you want to quit?", Alignment::Center) - .with_options(&[String::from("Yes"), String::from("No")]) - .rewind(true) - .build(), - )), + "Are you sure you want to quit?", + &["Yes", "No"], + 0, + quit_color, ); - self.view.active(super::COMPONENT_RADIO_QUIT); } /// ### umount_quit @@ -485,20 +440,13 @@ impl FileTransferActivity { pub(super) fn mount_disconnect(&mut self) { // Protocol let quit_color = self.theme().misc_quit_dialog; - self.view.mount( + self.mount_radio_dialog( super::COMPONENT_RADIO_DISCONNECT, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(quit_color) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Rounded, quit_color) - .with_title("Are you sure you want to disconnect?", Alignment::Center) - .with_options(&[String::from("Yes"), String::from("No")]) - .rewind(true) - .build(), - )), + "Are you sure you want to disconnect?", + &["Yes", "No"], + 0, + quit_color, ); - self.view.active(super::COMPONENT_RADIO_DISCONNECT); } /// ### umount_disconnect @@ -510,17 +458,12 @@ impl FileTransferActivity { pub(super) fn mount_copy(&mut self) { let input_color = self.theme().misc_input_dialog; - self.view.mount( + self.mount_input_dialog( super::COMPONENT_INPUT_COPY, - Box::new(Input::new( - InputPropsBuilder::default() - .with_borders(Borders::ALL, BorderType::Rounded, input_color) - .with_foreground(input_color) - .with_label("Copy file(s) to…", Alignment::Center) - .build(), - )), + "Copy file(s) to…", + "", + input_color, ); - self.view.active(super::COMPONENT_INPUT_COPY); } pub(super) fn umount_copy(&mut self) { @@ -529,17 +472,12 @@ impl FileTransferActivity { pub(super) fn mount_exec(&mut self) { let input_color = self.theme().misc_input_dialog; - self.view.mount( + self.mount_input_dialog( super::COMPONENT_INPUT_EXEC, - Box::new(Input::new( - InputPropsBuilder::default() - .with_borders(Borders::ALL, BorderType::Rounded, input_color) - .with_foreground(input_color) - .with_label("Execute command", Alignment::Center) - .build(), - )), + "Execute command", + "", + input_color, ); - self.view.active(super::COMPONENT_INPUT_EXEC); } pub(super) fn umount_exec(&mut self) { @@ -586,18 +524,12 @@ impl FileTransferActivity { pub(super) fn mount_find_input(&mut self) { let input_color = self.theme().misc_input_dialog; - self.view.mount( + self.mount_input_dialog( super::COMPONENT_INPUT_FIND, - Box::new(Input::new( - InputPropsBuilder::default() - .with_borders(Borders::ALL, BorderType::Rounded, input_color) - .with_foreground(input_color) - .with_label("Search files by name", Alignment::Center) - .build(), - )), + "Search files by name", + "", + input_color, ); - // Give focus to input find - self.view.active(super::COMPONENT_INPUT_FIND); } pub(super) fn umount_find_input(&mut self) { @@ -607,17 +539,12 @@ impl FileTransferActivity { pub(super) fn mount_goto(&mut self) { let input_color = self.theme().misc_input_dialog; - self.view.mount( + self.mount_input_dialog( super::COMPONENT_INPUT_GOTO, - Box::new(Input::new( - InputPropsBuilder::default() - .with_borders(Borders::ALL, BorderType::Rounded, input_color) - .with_foreground(input_color) - .with_label("Change working directory", Alignment::Center) - .build(), - )), + "Change working directory", + "", + input_color, ); - self.view.active(super::COMPONENT_INPUT_GOTO); } pub(super) fn umount_goto(&mut self) { @@ -626,17 +553,12 @@ impl FileTransferActivity { pub(super) fn mount_mkdir(&mut self) { let input_color = self.theme().misc_input_dialog; - self.view.mount( + self.mount_input_dialog( super::COMPONENT_INPUT_MKDIR, - Box::new(Input::new( - InputPropsBuilder::default() - .with_borders(Borders::ALL, BorderType::Rounded, input_color) - .with_foreground(input_color) - .with_label("Insert directory name", Alignment::Center) - .build(), - )), + "Insert directory name", + "", + input_color, ); - self.view.active(super::COMPONENT_INPUT_MKDIR); } pub(super) fn umount_mkdir(&mut self) { @@ -645,17 +567,12 @@ impl FileTransferActivity { pub(super) fn mount_newfile(&mut self) { let input_color = self.theme().misc_input_dialog; - self.view.mount( + self.mount_input_dialog( super::COMPONENT_INPUT_NEWFILE, - Box::new(Input::new( - InputPropsBuilder::default() - .with_borders(Borders::ALL, BorderType::Rounded, input_color) - .with_foreground(input_color) - .with_label("New file name", Alignment::Center) - .build(), - )), + "New file name", + "", + input_color, ); - self.view.active(super::COMPONENT_INPUT_NEWFILE); } pub(super) fn umount_newfile(&mut self) { @@ -664,17 +581,12 @@ impl FileTransferActivity { pub(super) fn mount_openwith(&mut self) { let input_color = self.theme().misc_input_dialog; - self.view.mount( + self.mount_input_dialog( super::COMPONENT_INPUT_OPEN_WITH, - Box::new(Input::new( - InputPropsBuilder::default() - .with_borders(Borders::ALL, BorderType::Rounded, input_color) - .with_foreground(input_color) - .with_label("Open file with…", Alignment::Center) - .build(), - )), + "Open file with…", + "", + input_color, ); - self.view.active(super::COMPONENT_INPUT_OPEN_WITH); } pub(super) fn umount_openwith(&mut self) { @@ -683,17 +595,12 @@ impl FileTransferActivity { pub(super) fn mount_rename(&mut self) { let input_color = self.theme().misc_input_dialog; - self.view.mount( + self.mount_input_dialog( super::COMPONENT_INPUT_RENAME, - Box::new(Input::new( - InputPropsBuilder::default() - .with_borders(Borders::ALL, BorderType::Rounded, input_color) - .with_foreground(input_color) - .with_label("Move file(s) to…", Alignment::Center) - .build(), - )), + "Move file(s) to…", + "", + input_color, ); - self.view.active(super::COMPONENT_INPUT_RENAME); } pub(super) fn umount_rename(&mut self) { @@ -702,17 +609,7 @@ impl FileTransferActivity { pub(super) fn mount_saveas(&mut self) { let input_color = self.theme().misc_input_dialog; - self.view.mount( - super::COMPONENT_INPUT_SAVEAS, - Box::new(Input::new( - InputPropsBuilder::default() - .with_borders(Borders::ALL, BorderType::Rounded, input_color) - .with_foreground(input_color) - .with_label("Save as…", Alignment::Center) - .build(), - )), - ); - self.view.active(super::COMPONENT_INPUT_SAVEAS); + self.mount_input_dialog(super::COMPONENT_INPUT_SAVEAS, "Save as…", "", input_color); } pub(super) fn umount_saveas(&mut self) { @@ -773,25 +670,13 @@ impl FileTransferActivity { FileSorting::Name => 0, FileSorting::Size => 3, }; - self.view.mount( + self.mount_radio_dialog( super::COMPONENT_RADIO_SORTING, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(sorting_color) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Rounded, sorting_color) - .with_title("Sort files by", Alignment::Center) - .with_options(&[ - String::from("Name"), - String::from("Modify time"), - String::from("Creation time"), - String::from("Size"), - ]) - .with_value(index) - .build(), - )), + "Sort files by", + &["Name", "Modify time", "Creation time", "Size"], + index, + sorting_color, ); - self.view.active(super::COMPONENT_RADIO_SORTING); } pub(super) fn umount_file_sorting(&mut self) { @@ -800,21 +685,13 @@ impl FileTransferActivity { pub(super) fn mount_radio_delete(&mut self) { let warn_color = self.theme().misc_warn_dialog; - self.view.mount( + self.mount_radio_dialog( super::COMPONENT_RADIO_DELETE, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(warn_color) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Plain, warn_color) - .with_title("Delete file", Alignment::Center) - .with_options(&[String::from("Yes"), String::from("No")]) - .with_value(1) - .rewind(true) - .build(), - )), + "Delete file", + &["Yes", "No"], + 1, + warn_color, ); - self.view.active(super::COMPONENT_RADIO_DELETE); } pub(super) fn umount_radio_delete(&mut self) { @@ -1109,4 +986,65 @@ impl FileTransferActivity { false => "Hide", } } + + // -- Mount helpers + + fn mount_text_dialog(&mut self, id: &str, text: &str, color: Color) { + // Mount + self.view.mount( + id, + Box::new(Paragraph::new( + ParagraphPropsBuilder::default() + .with_borders(Borders::ALL, BorderType::Thick, color) + .with_foreground(color) + .bold() + .with_text_alignment(Alignment::Center) + .with_texts(vec![TextSpan::from(text)]) + .build(), + )), + ); + // Give focus to error + self.view.active(id); + } + + fn mount_input_dialog(&mut self, id: &str, text: &str, val: &str, color: Color) { + self.view.mount( + id, + Box::new(Input::new( + InputPropsBuilder::default() + .with_foreground(color) + .with_label(text, Alignment::Center) + .with_borders(Borders::ALL, BorderType::Rounded, color) + .with_value(val.to_string()) + .build(), + )), + ); + self.view.active(id); + } + + fn mount_radio_dialog( + &mut self, + id: &str, + text: &str, + opts: &[&str], + default: usize, + color: Color, + ) { + self.view.mount( + id, + Box::new(Radio::new( + RadioPropsBuilder::default() + .with_color(color) + .with_inverted_color(Color::Black) + .with_borders(Borders::ALL, BorderType::Rounded, color) + .with_title(text, Alignment::Center) + .with_options(opts) + .with_value(default) + .rewind(true) + .build(), + )), + ); + // Active + self.view.active(id); + } } From 06ffbaa2f4ea4bbf0fe472564043c9d246ae0cac Mon Sep 17 00:00:00 2001 From: veeso Date: Sat, 18 Sep 2021 15:57:05 +0200 Subject: [PATCH 15/40] Option: prompt user when about to replace an existing file caused by a file transfer --- CHANGELOG.md | 3 + docs/man.md | 1 + src/config/params.rs | 7 +- src/config/serialization.rs | 3 + src/system/config_client.rs | 31 +++++ .../activities/filetransfer/actions/find.rs | 34 ++++-- src/ui/activities/filetransfer/actions/mod.rs | 5 +- .../activities/filetransfer/actions/save.rs | 107 +++++++++++++++--- .../activities/filetransfer/lib/transfer.rs | 53 +++++++++ src/ui/activities/filetransfer/mod.rs | 4 +- src/ui/activities/filetransfer/session.rs | 10 ++ src/ui/activities/filetransfer/update.rs | 25 +++- src/ui/activities/filetransfer/view.rs | 34 ++++++ src/ui/activities/setup/mod.rs | 1 + src/ui/activities/setup/update.rs | 12 +- src/ui/activities/setup/view/setup.rs | 46 +++++++- src/ui/store.rs | 63 +++++++++++ 17 files changed, 406 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 986003b..e92aab8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,9 @@ Released on ?? - Possibility to update termscp directly via GUI or CLI. - Install update via CLI running `(sudo) termscp --update`. - Install update via GUI from auth form: when the "new version message" is displayed press ``, then enter `YES` in the radio input asking whether to install the update. +- **Prompt user when about to replace existing file on a file transfer**: + - Whenever a file transfer is about to replace an existing file on local/remote host, you will be prompted if you're sure you really want to replace that file. + - You may want to disable this option. You can go to configuration and set "Prompt when replacing existing files?" to "NO" - **❗ BREAKING CHANGES ❗**: - Added a new key in themes: `misc_info_dialog`: if your theme won't load, just reload it. If you're using a customised theme, you can add to it the missing key via a text editor. Just edit the `theme.toml` in your `$CONFIG_DIR/termscp/theme.toml` and add `misc_info_dialog` (Read more in manual at Themes). - Enhancements: diff --git a/docs/man.md b/docs/man.md index 0c84387..f2efcb2 100644 --- a/docs/man.md +++ b/docs/man.md @@ -300,6 +300,7 @@ These parameters can be changed: - **Default Protocol**: the default protocol is the default value for the file transfer protocol to be used in termscp. This applies for the login page and for the address CLI argument. - **Show Hidden Files**: select whether hidden files shall be displayed by default. You will be able to decide whether to show or not hidden files at runtime pressing `A` anyway. - **Check for updates**: if set to `yes`, termscp will fetch the Github API to check if there is a new version of termscp available. +- **Prompt when replacing existing files?**: If set to `yes`, termscp will prompt for confirmation you whenever a file transfer would cause an existing file on target host to be replaced. - **Group Dirs**: select whether directories should be groupped or not in file explorers. If `Display first` is selected, directories will be sorted using the configured method but displayed before files, viceversa if `Display last` is selected. - **Remote File formatter syntax**: syntax to display file info for each file in the remote explorer. See [File explorer format](#file-explorer-format) - **Local File formatter syntax**: syntax to display file info for each file in the local explorer. See [File explorer format](#file-explorer-format) diff --git a/src/config/params.rs b/src/config/params.rs index 09dcd04..aba9ae2 100644 --- a/src/config/params.rs +++ b/src/config/params.rs @@ -51,7 +51,8 @@ pub struct UserInterfaceConfig { pub text_editor: PathBuf, pub default_protocol: String, pub show_hidden_files: bool, - pub check_for_updates: Option, // @! Since 0.3.3 + pub check_for_updates: Option, // @! Since 0.3.3 + pub prompt_on_file_replace: Option, // @! Since 0.7.0; Default True pub group_dirs: Option, pub file_fmt: Option, // Refers to local host (for backward compatibility) pub remote_file_fmt: Option, // @! Since 0.5.0 @@ -84,6 +85,7 @@ impl Default for UserInterfaceConfig { default_protocol: FileTransferProtocol::Sftp.to_string(), show_hidden_files: false, check_for_updates: Some(true), + prompt_on_file_replace: Some(true), group_dirs: None, file_fmt: None, remote_file_fmt: None, @@ -120,6 +122,7 @@ mod tests { text_editor: PathBuf::from("nano"), show_hidden_files: true, check_for_updates: Some(true), + prompt_on_file_replace: Some(true), group_dirs: Some(String::from("first")), file_fmt: Some(String::from("{NAME}")), remote_file_fmt: Some(String::from("{USER}")), @@ -128,6 +131,7 @@ mod tests { assert_eq!(ui.text_editor, PathBuf::from("nano")); assert_eq!(ui.show_hidden_files, true); assert_eq!(ui.check_for_updates, Some(true)); + assert_eq!(ui.prompt_on_file_replace, Some(true)); assert_eq!(ui.group_dirs, Some(String::from("first"))); assert_eq!(ui.file_fmt, Some(String::from("{NAME}"))); let cfg: UserConfig = UserConfig { @@ -145,6 +149,7 @@ mod tests { assert_eq!(cfg.user_interface.text_editor, PathBuf::from("nano")); assert_eq!(cfg.user_interface.show_hidden_files, true); assert_eq!(cfg.user_interface.check_for_updates, Some(true)); + assert_eq!(cfg.user_interface.prompt_on_file_replace, Some(true)); assert_eq!(cfg.user_interface.group_dirs, Some(String::from("first"))); assert_eq!(cfg.user_interface.file_fmt, Some(String::from("{NAME}"))); assert_eq!( diff --git a/src/config/serialization.rs b/src/config/serialization.rs index 57e8c1d..48ed577 100644 --- a/src/config/serialization.rs +++ b/src/config/serialization.rs @@ -201,6 +201,7 @@ mod tests { assert_eq!(cfg.user_interface.text_editor, PathBuf::from("vim")); assert_eq!(cfg.user_interface.show_hidden_files, true); assert_eq!(cfg.user_interface.check_for_updates.unwrap(), true); + assert_eq!(cfg.user_interface.prompt_on_file_replace.unwrap(), false); assert_eq!(cfg.user_interface.group_dirs, Some(String::from("last"))); assert_eq!( cfg.user_interface.file_fmt, @@ -244,6 +245,7 @@ mod tests { assert_eq!(cfg.user_interface.show_hidden_files, true); assert_eq!(cfg.user_interface.group_dirs, None); assert!(cfg.user_interface.check_for_updates.is_none()); + assert!(cfg.user_interface.prompt_on_file_replace.is_none()); assert!(cfg.user_interface.file_fmt.is_none()); assert!(cfg.user_interface.remote_file_fmt.is_none()); // Verify keys @@ -317,6 +319,7 @@ mod tests { text_editor = "vim" show_hidden_files = true check_for_updates = true + prompt_on_file_replace = false group_dirs = "last" file_fmt = "{NAME} {PEX}" remote_file_fmt = "{NAME} {USER}" diff --git a/src/system/config_client.rs b/src/system/config_client.rs index 2a484e2..30f1913 100644 --- a/src/system/config_client.rs +++ b/src/system/config_client.rs @@ -181,6 +181,23 @@ impl ConfigClient { self.config.user_interface.check_for_updates = Some(value); } + /// ### get_prompt_on_file_replace + /// + /// Get value of `prompt_on_file_replace` + pub fn get_prompt_on_file_replace(&self) -> bool { + self.config + .user_interface + .prompt_on_file_replace + .unwrap_or(true) + } + + /// ### set_prompt_on_file_replace + /// + /// Set new value for `prompt_on_file_replace` + pub fn set_prompt_on_file_replace(&mut self, value: bool) { + self.config.user_interface.prompt_on_file_replace = Some(value); + } + /// ### get_group_dirs /// /// Get GroupDirs value from configuration (will be converted from string) @@ -580,6 +597,20 @@ mod tests { assert_eq!(client.get_check_for_updates(), false); } + #[test] + fn test_system_config_prompt_on_file_replace() { + let tmp_dir: TempDir = TempDir::new().ok().unwrap(); + let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path()); + let mut client: ConfigClient = ConfigClient::new(cfg_path.as_path(), key_path.as_path()) + .ok() + .unwrap(); + assert_eq!(client.get_prompt_on_file_replace(), true); // Null ? + client.set_prompt_on_file_replace(true); + assert_eq!(client.get_prompt_on_file_replace(), true); + client.set_prompt_on_file_replace(false); + assert_eq!(client.get_prompt_on_file_replace(), false); + } + #[test] fn test_system_config_group_dirs() { let tmp_dir: TempDir = TempDir::new().ok().unwrap(); diff --git a/src/ui/activities/filetransfer/actions/find.rs b/src/ui/activities/filetransfer/actions/find.rs index a7b9aed..6aa3f7c 100644 --- a/src/ui/activities/filetransfer/actions/find.rs +++ b/src/ui/activities/filetransfer/actions/find.rs @@ -27,7 +27,9 @@ */ // locals use super::super::browser::FileExplorerTab; -use super::{FileTransferActivity, FsEntry, LogLevel, SelectedEntry, TransferPayload}; +use super::{ + FileTransferActivity, FsEntry, LogLevel, SelectedEntry, TransferOpts, TransferPayload, +}; use std::path::PathBuf; @@ -69,7 +71,7 @@ impl FileTransferActivity { } } - pub(crate) fn action_find_transfer(&mut self, save_as: Option) { + pub(crate) fn action_find_transfer(&mut self, opts: TransferOpts) { let wrkdir: PathBuf = match self.browser.tab() { FileExplorerTab::FindLocal | FileExplorerTab::Local => self.remote().wrkdir.clone(), FileExplorerTab::FindRemote | FileExplorerTab::Remote => self.local().wrkdir.clone(), @@ -77,10 +79,19 @@ impl FileTransferActivity { match self.get_found_selected_entries() { SelectedEntry::One(entry) => match self.browser.tab() { FileExplorerTab::FindLocal | FileExplorerTab::Local => { - if let Err(err) = self.filetransfer_send( + let file_to_check = Self::file_to_check(&entry, opts.save_as.as_ref()); + if opts.check_replace + && self.config().get_prompt_on_file_replace() + && self.remote_file_exists(file_to_check.as_path()) + { + // Save pending transfer + self.set_pending_transfer( + opts.save_as.as_deref().unwrap_or_else(|| entry.get_name()), + ); + } else if let Err(err) = self.filetransfer_send( TransferPayload::Any(entry.get_realfile()), wrkdir.as_path(), - save_as, + opts.save_as, ) { self.log_and_alert( LogLevel::Error, @@ -90,10 +101,19 @@ impl FileTransferActivity { } } FileExplorerTab::FindRemote | FileExplorerTab::Remote => { - if let Err(err) = self.filetransfer_recv( + let file_to_check = Self::file_to_check(&entry, opts.save_as.as_ref()); + if opts.check_replace + && self.config().get_prompt_on_file_replace() + && self.local_file_exists(file_to_check.as_path()) + { + // Save pending transfer + self.set_pending_transfer( + opts.save_as.as_deref().unwrap_or_else(|| entry.get_name()), + ); + } else if let Err(err) = self.filetransfer_recv( TransferPayload::Any(entry.get_realfile()), wrkdir.as_path(), - save_as, + opts.save_as, ) { self.log_and_alert( LogLevel::Error, @@ -106,7 +126,7 @@ impl FileTransferActivity { SelectedEntry::Many(entries) => { // In case of selection: save multiple files in wrkdir/input let mut dest_path: PathBuf = wrkdir; - if let Some(save_as) = save_as { + if let Some(save_as) = opts.save_as { dest_path.push(save_as); } // Iter files diff --git a/src/ui/activities/filetransfer/actions/mod.rs b/src/ui/activities/filetransfer/actions/mod.rs index 9a9020e..e384951 100644 --- a/src/ui/activities/filetransfer/actions/mod.rs +++ b/src/ui/activities/filetransfer/actions/mod.rs @@ -25,7 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -pub(self) use super::{FileTransferActivity, FsEntry, LogLevel, TransferPayload}; +pub(self) use super::{ + browser::FileExplorerTab, FileTransferActivity, FsEntry, LogLevel, TransferOpts, + TransferPayload, +}; use tuirealm::{Payload, Value}; // actions diff --git a/src/ui/activities/filetransfer/actions/save.rs b/src/ui/activities/filetransfer/actions/save.rs index 4a5c238..f13437b 100644 --- a/src/ui/activities/filetransfer/actions/save.rs +++ b/src/ui/activities/filetransfer/actions/save.rs @@ -26,34 +26,85 @@ * SOFTWARE. */ // locals -use super::{FileTransferActivity, LogLevel, SelectedEntry, TransferPayload}; +use super::{ + super::STORAGE_PENDING_TRANSFER, FileExplorerTab, FileTransferActivity, FsEntry, LogLevel, + SelectedEntry, TransferOpts, TransferPayload, +}; use std::path::PathBuf; impl FileTransferActivity { pub(crate) fn action_local_saveas(&mut self, input: String) { - self.action_local_send_file(Some(input)); + self.local_send_file(TransferOpts::default().save_as(input)); } pub(crate) fn action_remote_saveas(&mut self, input: String) { - self.action_remote_recv_file(Some(input)); + self.remote_recv_file(TransferOpts::default().save_as(input)); } pub(crate) fn action_local_send(&mut self) { - self.action_local_send_file(None); + self.local_send_file(TransferOpts::default()); } pub(crate) fn action_remote_recv(&mut self) { - self.action_remote_recv_file(None); + self.remote_recv_file(TransferOpts::default()); } - fn action_local_send_file(&mut self, save_as: Option) { + /// ### action_finalize_pending_transfer + /// + /// Finalize "pending" transfer. + /// The pending transfer is created after a transfer which required a user action to be completed first. + /// The name of the file to transfer, is contained in the storage at `STORAGE_PENDING_TRANSFER`. + /// NOTE: Panics if `STORAGE_PENDING_TRANSFER` is undefined + pub(crate) fn action_finalize_pending_transfer(&mut self) { + // Retrieve pending transfer + let file_name: String = self + .context_mut() + .store_mut() + .take_string(STORAGE_PENDING_TRANSFER) + .unwrap(); + // Send file + match self.browser.tab() { + FileExplorerTab::Local => self.local_send_file( + TransferOpts::default() + .save_as(file_name) + .check_replace(false), + ), + FileExplorerTab::Remote => self.remote_recv_file( + TransferOpts::default() + .save_as(file_name) + .check_replace(false), + ), + FileExplorerTab::FindLocal | FileExplorerTab::FindRemote => self.action_find_transfer( + TransferOpts::default() + .save_as(file_name) + .check_replace(false), + ), + } + // Reload browsers + match self.browser.tab() { + FileExplorerTab::Local => self.reload_remote_dir(), + FileExplorerTab::Remote => self.reload_local_dir(), + FileExplorerTab::FindLocal | FileExplorerTab::FindRemote => {} + } + } + + fn local_send_file(&mut self, opts: TransferOpts) { let wrkdir: PathBuf = self.remote().wrkdir.clone(); match self.get_local_selected_entries() { SelectedEntry::One(entry) => { - if let Err(err) = self.filetransfer_send( + let file_to_check = Self::file_to_check(&entry, opts.save_as.as_ref()); + if opts.check_replace + && self.config().get_prompt_on_file_replace() + && self.remote_file_exists(file_to_check.as_path()) + { + // Save pending transfer + self.set_pending_transfer( + opts.save_as.as_deref().unwrap_or_else(|| entry.get_name()), + ); + } else if let Err(err) = self.filetransfer_send( TransferPayload::Any(entry.get_realfile()), wrkdir.as_path(), - save_as, + opts.save_as, ) { { self.log_and_alert( @@ -67,7 +118,7 @@ impl FileTransferActivity { SelectedEntry::Many(entries) => { // In case of selection: save multiple files in wrkdir/input let mut dest_path: PathBuf = wrkdir; - if let Some(save_as) = save_as { + if let Some(save_as) = opts.save_as { dest_path.push(save_as); } // Iter files @@ -90,14 +141,23 @@ impl FileTransferActivity { } } - fn action_remote_recv_file(&mut self, save_as: Option) { + fn remote_recv_file(&mut self, opts: TransferOpts) { let wrkdir: PathBuf = self.local().wrkdir.clone(); match self.get_remote_selected_entries() { SelectedEntry::One(entry) => { - if let Err(err) = self.filetransfer_recv( + let file_to_check = Self::file_to_check(&entry, opts.save_as.as_ref()); + if opts.check_replace + && self.config().get_prompt_on_file_replace() + && self.local_file_exists(file_to_check.as_path()) + { + // Save pending transfer + self.set_pending_transfer( + opts.save_as.as_deref().unwrap_or_else(|| entry.get_name()), + ); + } else if let Err(err) = self.filetransfer_recv( TransferPayload::Any(entry.get_realfile()), wrkdir.as_path(), - save_as, + opts.save_as, ) { { self.log_and_alert( @@ -111,7 +171,7 @@ impl FileTransferActivity { SelectedEntry::Many(entries) => { // In case of selection: save multiple files in wrkdir/input let mut dest_path: PathBuf = wrkdir; - if let Some(save_as) = save_as { + if let Some(save_as) = opts.save_as { dest_path.push(save_as); } // Iter files @@ -133,4 +193,25 @@ impl FileTransferActivity { SelectedEntry::None => {} } } + + /// ### set_pending_transfer + /// + /// Set pending transfer into storage + pub(crate) fn set_pending_transfer(&mut self, file_name: &str) { + self.mount_radio_replace(file_name); + // Put pending transfer in store + self.context_mut() + .store_mut() + .set_string(STORAGE_PENDING_TRANSFER, file_name.to_string()); + } + + /// ### file_to_check + /// + /// Get file to check for path + pub(crate) fn file_to_check(e: &FsEntry, alt: Option<&String>) -> PathBuf { + match alt { + Some(s) => PathBuf::from(s), + None => PathBuf::from(e.get_name()), + } + } } diff --git a/src/ui/activities/filetransfer/lib/transfer.rs b/src/ui/activities/filetransfer/lib/transfer.rs index 2816f51..be8b75e 100644 --- a/src/ui/activities/filetransfer/lib/transfer.rs +++ b/src/ui/activities/filetransfer/lib/transfer.rs @@ -29,6 +29,8 @@ use bytesize::ByteSize; use std::fmt; use std::time::Instant; +// -- States and progress + /// ### TransferStates /// /// TransferStates contains the states related to the transfer process @@ -195,6 +197,45 @@ impl ProgressStates { } } +// -- Options + +/// ## TransferOpts +/// +/// Defines the transfer options for transfer actions +pub struct TransferOpts { + /// Save file as + pub save_as: Option, + /// Whether to check if file is being replaced + pub check_replace: bool, +} + +impl Default for TransferOpts { + fn default() -> Self { + Self { + save_as: None, + check_replace: true, + } + } +} + +impl TransferOpts { + /// ### save_as + /// + /// Define the name of the file to be saved + pub fn save_as>(mut self, n: S) -> Self { + self.save_as = Some(n.as_ref().to_string()); + self + } + + /// ### check_replace + /// + /// Set whether to check if the file being transferred will "replace" an existing one + pub fn check_replace(mut self, opt: bool) -> Self { + self.check_replace = opt; + self + } +} + #[cfg(test)] mod test { @@ -265,4 +306,16 @@ mod test { states.reset(); assert_eq!(states.aborted(), false); } + + #[test] + fn transfer_opts() { + let opts = TransferOpts::default(); + assert_eq!(opts.check_replace, true); + assert!(opts.save_as.is_none()); + let opts = TransferOpts::default() + .check_replace(false) + .save_as("omar.txt"); + assert_eq!(opts.save_as.as_deref().unwrap(), "omar.txt"); + assert_eq!(opts.check_replace, false); + } } diff --git a/src/ui/activities/filetransfer/mod.rs b/src/ui/activities/filetransfer/mod.rs index d768ed8..74065ef 100644 --- a/src/ui/activities/filetransfer/mod.rs +++ b/src/ui/activities/filetransfer/mod.rs @@ -44,7 +44,7 @@ use crate::host::Localhost; use crate::system::config_client::ConfigClient; pub(self) use lib::browser; use lib::browser::Browser; -use lib::transfer::TransferStates; +use lib::transfer::{TransferOpts, TransferStates}; pub(self) use session::TransferPayload; // Includes @@ -57,6 +57,7 @@ use tuirealm::View; // -- Storage keys const STORAGE_EXPLORER_WIDTH: &str = "FILETRANSFER_EXPLORER_WIDTH"; +const STORAGE_PENDING_TRANSFER: &str = "FILETRANSFER_PENDING_TRANSFER"; // -- components @@ -80,6 +81,7 @@ const COMPONENT_INPUT_OPEN_WITH: &str = "INPUT_OPEN_WITH"; const COMPONENT_INPUT_RENAME: &str = "INPUT_RENAME"; const COMPONENT_INPUT_SAVEAS: &str = "INPUT_SAVEAS"; const COMPONENT_RADIO_DELETE: &str = "RADIO_DELETE"; +const COMPONENT_RADIO_REPLACE: &str = "RADIO_REPLACE"; // NOTE: used for file transfers, to choose whether to replace files const COMPONENT_RADIO_DISCONNECT: &str = "RADIO_DISCONNECT"; const COMPONENT_RADIO_QUIT: &str = "RADIO_QUIT"; const COMPONENT_RADIO_SORTING: &str = "RADIO_SORTING"; diff --git a/src/ui/activities/filetransfer/session.rs b/src/ui/activities/filetransfer/session.rs index cb4a0ff..3948e31 100644 --- a/src/ui/activities/filetransfer/session.rs +++ b/src/ui/activities/filetransfer/session.rs @@ -1187,4 +1187,14 @@ impl FileTransferActivity { } } } + + // -- file exist + + pub(crate) fn local_file_exists(&mut self, p: &Path) -> bool { + self.host.file_exists(p) + } + + pub(crate) fn remote_file_exists(&mut self, p: &Path) -> bool { + self.client.stat(p).is_ok() + } } diff --git a/src/ui/activities/filetransfer/update.rs b/src/ui/activities/filetransfer/update.rs index 716f762..c18d143 100644 --- a/src/ui/activities/filetransfer/update.rs +++ b/src/ui/activities/filetransfer/update.rs @@ -27,14 +27,14 @@ */ // locals use super::{ - actions::SelectedEntry, browser::FileExplorerTab, FileTransferActivity, LogLevel, + actions::SelectedEntry, browser::FileExplorerTab, FileTransferActivity, LogLevel, TransferOpts, COMPONENT_EXPLORER_FIND, COMPONENT_EXPLORER_LOCAL, COMPONENT_EXPLORER_REMOTE, COMPONENT_INPUT_COPY, COMPONENT_INPUT_EXEC, COMPONENT_INPUT_FIND, COMPONENT_INPUT_GOTO, COMPONENT_INPUT_MKDIR, COMPONENT_INPUT_NEWFILE, COMPONENT_INPUT_OPEN_WITH, COMPONENT_INPUT_RENAME, COMPONENT_INPUT_SAVEAS, COMPONENT_LIST_FILEINFO, COMPONENT_LOG_BOX, COMPONENT_PROGRESS_BAR_FULL, COMPONENT_PROGRESS_BAR_PARTIAL, COMPONENT_RADIO_DELETE, - COMPONENT_RADIO_DISCONNECT, COMPONENT_RADIO_QUIT, COMPONENT_RADIO_SORTING, - COMPONENT_TEXT_ERROR, COMPONENT_TEXT_FATAL, COMPONENT_TEXT_HELP, + COMPONENT_RADIO_DISCONNECT, COMPONENT_RADIO_QUIT, COMPONENT_RADIO_REPLACE, + COMPONENT_RADIO_SORTING, COMPONENT_TEXT_ERROR, COMPONENT_TEXT_FATAL, COMPONENT_TEXT_HELP, }; use crate::fs::explorer::FileSorting; use crate::fs::FsEntry; @@ -358,7 +358,7 @@ impl Update for FileTransferActivity { } (COMPONENT_EXPLORER_FIND, key) if key == &MSG_KEY_SPACE => { // Get entry - self.action_find_transfer(None); + self.action_find_transfer(TransferOpts::default()); // Reload files match self.browser.tab() { // NOTE: swapped by purpose @@ -583,7 +583,7 @@ impl Update for FileTransferActivity { FileExplorerTab::Remote => self.action_remote_saveas(input.to_string()), FileExplorerTab::FindLocal | FileExplorerTab::FindRemote => { // Get entry - self.action_find_transfer(Some(input.to_string())); + self.action_find_transfer(TransferOpts::default().save_as(input)); } } self.umount_saveas(); @@ -653,6 +653,21 @@ impl Update for FileTransferActivity { } } (COMPONENT_RADIO_DELETE, _) => None, + // -- replace + (COMPONENT_RADIO_REPLACE, key) + if key == &MSG_KEY_ESC + || key == &Msg::OnSubmit(Payload::One(Value::Usize(1))) => + { + self.umount_radio_replace(); + None + } + (COMPONENT_RADIO_REPLACE, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => { + // Choice is 'YES' + self.umount_radio_replace(); + self.action_finalize_pending_transfer(); + None + } + (COMPONENT_RADIO_REPLACE, _) => None, // -- disconnect (COMPONENT_RADIO_DISCONNECT, key) if key == &MSG_KEY_ESC diff --git a/src/ui/activities/filetransfer/view.rs b/src/ui/activities/filetransfer/view.rs index ac97d99..cbe2655 100644 --- a/src/ui/activities/filetransfer/view.rs +++ b/src/ui/activities/filetransfer/view.rs @@ -308,6 +308,14 @@ impl FileTransferActivity { self.view.render(super::COMPONENT_RADIO_DELETE, f, popup); } } + if let Some(props) = self.view.get_props(super::COMPONENT_RADIO_REPLACE) { + if props.visible { + let popup = draw_area_in(f.size(), 50, 10); + f.render_widget(Clear, popup); + // make popup + self.view.render(super::COMPONENT_RADIO_REPLACE, f, popup); + } + } if let Some(props) = self.view.get_props(super::COMPONENT_RADIO_DISCONNECT) { if props.visible { let popup = draw_area_in(f.size(), 30, 10); @@ -698,6 +706,32 @@ impl FileTransferActivity { self.view.umount(super::COMPONENT_RADIO_DELETE); } + pub(super) fn mount_radio_replace(&mut self, file_name: &str) { + let warn_color = self.theme().misc_warn_dialog; + self.view.mount( + super::COMPONENT_RADIO_REPLACE, + Box::new(Radio::new( + RadioPropsBuilder::default() + .with_color(warn_color) + .with_inverted_color(Color::Black) + .with_borders(Borders::ALL, BorderType::Plain, warn_color) + .with_title( + format!("File '{}' already exists. Overwrite file?", file_name), + Alignment::Center, + ) + .with_options(&[String::from("Yes"), String::from("No")]) + .with_value(0) + .rewind(true) + .build(), + )), + ); + self.view.active(super::COMPONENT_RADIO_REPLACE); + } + + pub(super) fn umount_radio_replace(&mut self) { + self.view.umount(super::COMPONENT_RADIO_REPLACE); + } + pub(super) fn mount_file_info(&mut self, file: &FsEntry) { let mut texts: TableBuilder = TableBuilder::default(); // Abs path diff --git a/src/ui/activities/setup/mod.rs b/src/ui/activities/setup/mod.rs index ec2b4ff..7514141 100644 --- a/src/ui/activities/setup/mod.rs +++ b/src/ui/activities/setup/mod.rs @@ -54,6 +54,7 @@ const COMPONENT_INPUT_TEXT_EDITOR: &str = "INPUT_TEXT_EDITOR"; const COMPONENT_RADIO_DEFAULT_PROTOCOL: &str = "RADIO_DEFAULT_PROTOCOL"; const COMPONENT_RADIO_HIDDEN_FILES: &str = "RADIO_HIDDEN_FILES"; const COMPONENT_RADIO_UPDATES: &str = "RADIO_CHECK_UPDATES"; +const COMPONENT_RADIO_PROMPT_ON_FILE_REPLACE: &str = "RADIO_PROMPT_ON_FILE_REPLACE"; const COMPONENT_RADIO_GROUP_DIRS: &str = "RADIO_GROUP_DIRS"; const COMPONENT_INPUT_LOCAL_FILE_FMT: &str = "INPUT_LOCAL_FILE_FMT"; const COMPONENT_INPUT_REMOTE_FILE_FMT: &str = "INPUT_REMOTE_FILE_FMT"; diff --git a/src/ui/activities/setup/update.rs b/src/ui/activities/setup/update.rs index ffe5600..b43f795 100644 --- a/src/ui/activities/setup/update.rs +++ b/src/ui/activities/setup/update.rs @@ -43,8 +43,8 @@ use super::{ COMPONENT_INPUT_REMOTE_FILE_FMT, COMPONENT_INPUT_SSH_HOST, COMPONENT_INPUT_SSH_USERNAME, COMPONENT_INPUT_TEXT_EDITOR, COMPONENT_LIST_SSH_KEYS, COMPONENT_RADIO_DEFAULT_PROTOCOL, COMPONENT_RADIO_DEL_SSH_KEY, COMPONENT_RADIO_GROUP_DIRS, COMPONENT_RADIO_HIDDEN_FILES, - COMPONENT_RADIO_QUIT, COMPONENT_RADIO_SAVE, COMPONENT_RADIO_UPDATES, COMPONENT_TEXT_ERROR, - COMPONENT_TEXT_HELP, + COMPONENT_RADIO_PROMPT_ON_FILE_REPLACE, COMPONENT_RADIO_QUIT, COMPONENT_RADIO_SAVE, + COMPONENT_RADIO_UPDATES, COMPONENT_TEXT_ERROR, COMPONENT_TEXT_HELP, }; use crate::ui::keymap::*; use crate::utils::parser::parse_color; @@ -87,6 +87,10 @@ impl SetupActivity { None } (COMPONENT_RADIO_UPDATES, key) if key == &MSG_KEY_DOWN => { + self.view.active(COMPONENT_RADIO_PROMPT_ON_FILE_REPLACE); + None + } + (COMPONENT_RADIO_PROMPT_ON_FILE_REPLACE, key) if key == &MSG_KEY_DOWN => { self.view.active(COMPONENT_RADIO_GROUP_DIRS); None } @@ -112,6 +116,10 @@ impl SetupActivity { None } (COMPONENT_RADIO_GROUP_DIRS, key) if key == &MSG_KEY_UP => { + self.view.active(COMPONENT_RADIO_PROMPT_ON_FILE_REPLACE); + None + } + (COMPONENT_RADIO_PROMPT_ON_FILE_REPLACE, key) if key == &MSG_KEY_UP => { self.view.active(COMPONENT_RADIO_UPDATES); None } diff --git a/src/ui/activities/setup/view/setup.rs b/src/ui/activities/setup/view/setup.rs index 6ff051b..f5d3f70 100644 --- a/src/ui/activities/setup/view/setup.rs +++ b/src/ui/activities/setup/view/setup.rs @@ -109,6 +109,19 @@ impl SetupActivity { .build(), )), ); + self.view.mount( + super::COMPONENT_RADIO_PROMPT_ON_FILE_REPLACE, + Box::new(Radio::new( + RadioPropsBuilder::default() + .with_color(Color::LightCyan) + .with_inverted_color(Color::Black) + .with_borders(Borders::ALL, BorderType::Rounded, Color::LightCyan) + .with_title("Prompt when replacing existing files?", Alignment::Left) + .with_options(&[String::from("Yes"), String::from("No")]) + .rewind(true) + .build(), + )), + ); self.view.mount( super::COMPONENT_RADIO_GROUP_DIRS, Box::new(Radio::new( @@ -178,6 +191,7 @@ impl SetupActivity { Constraint::Length(3), // Protocol tab Constraint::Length(3), // Hidden files Constraint::Length(3), // Updates tab + Constraint::Length(3), // Prompt file replace Constraint::Length(3), // Group dirs Constraint::Length(3), // Local Format input Constraint::Length(3), // Remote Format input @@ -193,12 +207,17 @@ impl SetupActivity { .render(super::COMPONENT_RADIO_HIDDEN_FILES, f, ui_cfg_chunks[2]); self.view .render(super::COMPONENT_RADIO_UPDATES, f, ui_cfg_chunks[3]); + self.view.render( + super::COMPONENT_RADIO_PROMPT_ON_FILE_REPLACE, + f, + ui_cfg_chunks[4], + ); self.view - .render(super::COMPONENT_RADIO_GROUP_DIRS, f, ui_cfg_chunks[4]); + .render(super::COMPONENT_RADIO_GROUP_DIRS, f, ui_cfg_chunks[5]); self.view - .render(super::COMPONENT_INPUT_LOCAL_FILE_FMT, f, ui_cfg_chunks[5]); + .render(super::COMPONENT_INPUT_LOCAL_FILE_FMT, f, ui_cfg_chunks[6]); self.view - .render(super::COMPONENT_INPUT_REMOTE_FILE_FMT, f, ui_cfg_chunks[6]); + .render(super::COMPONENT_INPUT_REMOTE_FILE_FMT, f, ui_cfg_chunks[7]); // Popups if let Some(props) = self.view.get_props(super::COMPONENT_TEXT_ERROR) { if props.visible { @@ -282,6 +301,20 @@ impl SetupActivity { let props = RadioPropsBuilder::from(props).with_value(updates).build(); let _ = self.view.update(super::COMPONENT_RADIO_UPDATES, props); } + // File replace + if let Some(props) = self + .view + .get_props(super::COMPONENT_RADIO_PROMPT_ON_FILE_REPLACE) + { + let updates: usize = match self.config().get_prompt_on_file_replace() { + true => 0, + false => 1, + }; + let props = RadioPropsBuilder::from(props).with_value(updates).build(); + let _ = self + .view + .update(super::COMPONENT_RADIO_PROMPT_ON_FILE_REPLACE, props); + } // Group dirs if let Some(props) = self.view.get_props(super::COMPONENT_RADIO_GROUP_DIRS) { let dirs: usize = match self.config().get_group_dirs() { @@ -344,6 +377,13 @@ impl SetupActivity { let check: bool = matches!(opt, 0); self.config_mut().set_check_for_updates(check); } + if let Some(Payload::One(Value::Usize(opt))) = self + .view + .get_state(super::COMPONENT_RADIO_PROMPT_ON_FILE_REPLACE) + { + let check: bool = matches!(opt, 0); + self.config_mut().set_prompt_on_file_replace(check); + } if let Some(Payload::One(Value::Str(fmt))) = self.view.get_state(super::COMPONENT_INPUT_LOCAL_FILE_FMT) { diff --git a/src/ui/store.rs b/src/ui/store.rs index 5d49d0f..9d8cb17 100644 --- a/src/ui/store.rs +++ b/src/ui/store.rs @@ -67,6 +67,7 @@ impl Store { } // -- getters + /// ### get_string /// /// Get string from store @@ -168,6 +169,58 @@ impl Store { pub fn set(&mut self, key: &str) { self.store.insert(key.to_string(), StoreState::Flag); } + + // -- Consumers + + /// ### take_string + /// + /// Take string from store + pub fn take_string(&mut self, key: &str) -> Option { + match self.store.remove(key) { + Some(StoreState::Str(s)) => Some(s), + _ => None, + } + } + + /// ### take_signed + /// + /// Take signed from store + pub fn take_signed(&mut self, key: &str) -> Option { + match self.store.remove(key) { + Some(StoreState::Signed(i)) => Some(i), + _ => None, + } + } + + /// ### take_unsigned + /// + /// Take unsigned from store + pub fn take_unsigned(&mut self, key: &str) -> Option { + match self.store.remove(key) { + Some(StoreState::Unsigned(u)) => Some(u), + _ => None, + } + } + + /// ### get_float + /// + /// Take float from store + pub fn take_float(&mut self, key: &str) -> Option { + match self.store.remove(key) { + Some(StoreState::Float(f)) => Some(f), + _ => None, + } + } + + /// ### get_boolean + /// + /// Take boolean from store + pub fn take_boolean(&mut self, key: &str) -> Option { + match self.store.remove(key) { + Some(StoreState::Boolean(b)) => Some(b), + _ => None, + } + } } #[cfg(test)] @@ -184,20 +237,30 @@ mod tests { // Test string store.set_string("test", String::from("hello")); assert_eq!(*store.get_string("test").as_ref().unwrap(), "hello"); + assert_eq!(store.take_string("test").unwrap(), "hello".to_string()); + assert_eq!(store.take_string("test"), None); // Test isize store.set_signed("number", 3005); assert_eq!(store.get_signed("number").unwrap(), 3005); + assert_eq!(store.take_signed("number").unwrap(), 3005); + assert_eq!(store.take_signed("number"), None); store.set_signed("number", -123); assert_eq!(store.get_signed("number").unwrap(), -123); // Test usize store.set_unsigned("unumber", 1024); assert_eq!(store.get_unsigned("unumber").unwrap(), 1024); + assert_eq!(store.take_unsigned("unumber").unwrap(), 1024); + assert_eq!(store.take_unsigned("unumber"), None); // Test float store.set_float("float", 3.33); assert_eq!(store.get_float("float").unwrap(), 3.33); + assert_eq!(store.take_float("float").unwrap(), 3.33); + assert_eq!(store.take_float("float"), None); // Test boolean store.set_boolean("bool", true); assert_eq!(store.get_boolean("bool").unwrap(), true); + assert_eq!(store.take_boolean("bool").unwrap(), true); + assert_eq!(store.take_boolean("bool"), None); // Test flag store.set("myflag"); assert_eq!(store.isset("myflag"), true); From 3c3d681ca040371a3e9e94ae10b2f64ce8c3008f Mon Sep 17 00:00:00 2001 From: veeso Date: Sat, 25 Sep 2021 14:29:48 +0200 Subject: [PATCH 16/40] Updated chinese manual --- docs/man-en.md | 2 +- docs/man-zh.md | 88 ++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 72 insertions(+), 18 deletions(-) diff --git a/docs/man-en.md b/docs/man-en.md index f2efcb2..7e36600 100644 --- a/docs/man-en.md +++ b/docs/man-en.md @@ -84,7 +84,7 @@ Let's see some example of this particular syntax, since it's very comfortable an #### AWS S3 address argument -Aws S3 has a different syntax for CLI address argument, for obvious reasons, but I managed to keep it the more similiar as possible to the generic address argument: +Aws S3 has a different syntax for CLI address argument, for obvious reasons, but I managed to keep it the more similar as possible to the generic address argument: ```txt s3://@[:profile][:/wrkdir] diff --git a/docs/man-zh.md b/docs/man-zh.md index 6a6dc7b..9ff77d6 100644 --- a/docs/man-zh.md +++ b/docs/man-zh.md @@ -3,6 +3,7 @@ - [操作指南 🎓](#操作指南-) - [用法](#用法) - [地址参数](#地址参数) + - [AWS S3 地址参数](#aws-s3-地址参数) - [如何输入密码](#如何输入密码) - [文件浏览](#文件浏览) - [快捷键](#快捷键) @@ -12,12 +13,14 @@ - [书签](#书签) - [我的密码安全吗？](#我的密码安全吗) - [Linux Keyring](#linux-keyring) - - [KeepassXC setup for termscp](#keepassxc-setup-for-termscp) + - [用于 termcp 的 KeepassXC 设置](#用于-termcp-的-keepassxc-设置) + - [Aws S3 凭证](#aws-s3-凭证) - [配置](#配置) - [SSH Key Storage](#ssh-key-storage) - [资源管理器格式](#资源管理器格式) - [主题](#主题) - [样式](#样式) + - [我的主题无法加载](#我的主题无法加载) - [登录页](#登录页) - [文件传输页](#文件传输页) - [Misc](#misc) @@ -78,6 +81,20 @@ termscp有两种不同的启动模式，不带参数时，termscp将显示登录 termscp scp://omar@192.168.1.31:4022:/tmp ``` +#### AWS S3 地址参数 + +出于显而易见的原因，Aws S3 对 CLI 地址参数有不同的语法，但我设法使其与通用地址参数尽可能相似： + +```txt +s3://@[:profile][:/wrkdir] +``` + +例如 + +```txt +s3://buckethead@eu-central-1:default:/assets +``` + #### 如何输入密码 你可能已经注意到，url参数中没有办法直接附加密码，你可以通过以下三种方式提供密码： @@ -90,13 +107,12 @@ termscp有两种不同的启动模式，不带参数时，termscp将显示登录 ## 文件浏览 - termscp中的文件资源管理器是指你与远程建立连接后可以看到的面板。 面板由3个部分组成（是的，就这三个）： - 本地资源管理器面板：它显示在你的屏幕左侧，显示localhost的当前目录文件列表。 - 远程资源管理器面板：它显示在你屏幕的右边，显示远程主机的当前目录文件列表。 -- Find results panel: depending on where you're searching for files (local/remote) it will replace the local or the explorer panel. This panel shows the entries matching the search query you performed.查找结果面板：根据你搜索文件的位置（本地/远程），它将取代对应资源管理器面板。这个面板显示与你执行的搜索查询相匹配的条目。 +- 查找结果面板：根据你搜索文件的位置（本地/远程），它将取代对应资源管理器面板。这个面板显示与你执行的搜索查询相匹配的条目。 为了切换面板，你需要输入 `` 来移动远程资源管理器面板，`` 来移动回本地资源管理器面板。当在查找结果面板时，你需要按``来退出面板，回到前一个面板。 @@ -153,11 +169,11 @@ termscp中的文件资源管理器是指你与远程建立连接后可以看到 启用时，同步浏览将允许你在两个面板之间同步导航操作。这意味着，每当你在一个面板上改变工作目录时，同样的动作会在另一个面板上重现。如果你想启用同步浏览，只需按下``；按两次就可以禁用。当启用时，同步浏览的状态将在状态栏上显示为`ON`。 -*警告*：目前，每当你试图访问一个不存在的目录，你不会被提示创建它。这点可能会在未来的更新中改进。 +> ❗ 目前，每当你试图访问一个不存在的目录，你不会被提示创建它。这点可能会在未来的更新中改进。 ### 打开/打开方式 -打开和打开方式的功能是由[open-rs]（https://docs.rs/crate/open/1.7.0）提供的。 +打开和打开方式的功能是由 [open-rs](https://docs.rs/crate/open/2.1.0)提供的。 执行视图命令（``）时，关联该文件类型的系统默认应用程序会被调用以打开当前文件。这依赖于操作系统默认的服务，所以要确保你的系统中至少安装了一个这样的服务： - **Windows** 用户: 无需额外操作，程序内部会调用 `start` 命令。 @@ -186,13 +202,7 @@ termscp中的文件资源管理器是指你与远程建立连接后可以看到 对于书签（不包括服务器连接历史记录）而言，也可以保存用于验证的密码。注意默认情况下不保存密码，必须在保存新书签时通过提示指定密码。 -> 我对在termscp中存储密码的做法非常持保留意见。原因是什么？在你的电脑上保存密码可能会让黑客进入你所注册的任何服务器。但我必须承认，对许多机器来说，每次都输入密码真的很无聊，而且很多时候我必须与局域网内的机器一起工作，这对攻击者来说没有任何好处，所以我想出了一个折衷办法来处理密码。 - -我强烈建议你遵循这些原则，以决定你是否应该本地保存密码： - -- **绝对不要** 在连接公网的机器上本地保存密码，只可以在局域网机器上这么做 -- 确保你的机器有网络保护措施。可以的话，对你的磁盘进行加密，并且在你离开时锁定你的电脑。 -- 最好是在确保目标机器不易受影响的情况下才保存密码。 +如果您担心为您的书签保存的密码的安全性，请阅读[以下章节](#我的密码安全吗？)👀 请按照以下步骤新建书签： @@ -226,7 +236,7 @@ termscp中的文件资源管理器是指你与远程建立连接后可以看到 - ❗对于其他桌面环境的用户，有一个很好的程序，你可以用它来获得钥匙串，这就是[KeepassXC](https://keepassxc.org/)，我在我的Manjaro中使用它（带KDE），一切都很正常。唯一的问题是，你必须设置它与termscp一起使用（但这很简单）。要开始使用KeepassXC，请阅读更多[这里]（#keepassxc-setup-for-termscp）。 - ❗如果你不想安装任何这些服务呢？好吧，这没有问题! **termscp依然能正常工作**，但它会将密钥保存在一个文件中，就像它通常为BSD和WSL做的那样。 -##### KeepassXC setup for termscp +##### 用于 termcp 的 KeepassXC 设置 参照以下步骤，为termscp配置keepassXC： @@ -240,6 +250,30 @@ termscp中的文件资源管理器是指你与远程建立连接后可以看到 --- +## Aws S3 凭证 + +为了连接到 Aws S3 存储桶，您显然必须提供一些凭据。 +基本上有两种方法可以实现这一点，而且您可能已经注意到您**不能**通过身份验证表单来做到这一点。 +因此，您可以通过以下方式为 s3 提供凭据： + +1. 使用您的凭证文件：只需通过`aws configure` 配置AWS cli，您的凭证应该已经位于`~/.aws/credentials`。 如果您使用的配置文件不同于“默认”，只需在身份验证表单的配置文件字段中提供它。 +2. **环境变量**: 您始终可以将您的凭据作为环境变量提供。 请记住，这些凭据**将始终覆盖**位于 `credentials` 文件中的凭据。 下面看看如何配置环境： + + 这些应该始终是强制性的: + + - `AWS_ACCESS_KEY_ID`: aws 访问密钥 ID（通常以 `AKIA...` 开头） + - `AWS_SECRET_ACCESS_KEY`: 秘密访问密钥 + + 如果您配置了更强的安全性，您*可能*也需要这些： + + - `AWS_SECURITY_TOKEN`: 安全令牌 + - `AWS_SESSION_TOKEN`: 会话令牌 + +⚠️ 您的凭据是安全的：termscp 不会直接操作这些值！ 您的凭据直接由 **s3** crate 使用。 +如果您对安全有一些担忧，请联系 [Github](https://github.com/durch/rust-s3) 上的库作者 ⚠️ + +--- + ## 配置 termscp支持一些用户定义参数，这些参数可以通过配置来修改。 @@ -259,6 +293,7 @@ termscp和书签一样，只需要保证这些路径是可访问的： - **Default Protocol**：默认协议是termscp中默认使用的文件传输协议。这适用于登录页和地址中的CLI参数。 - **Show Hidden Files**：选择是否应默认显示隐藏文件。你可以在运行时按 `A` 来切换是否显示隐藏的文件。 - **Check for updates**：如果设置为 `yes`，termscp将通过Github API检查是否有新版本的termscp。 +- **Prompt when replacing existing files?**: 如果设置为 `yes`，则在文件传输会导致目标主机上的现有文件被替换时，termscp 将提示您确认。 - **Group Dirs**：选择在文件浏览器中是否对文件夹进行分组。如果选择 `Display first`，目录将根据设置的方法排序，但仍显示在文件之前；如果选择 `Display last`，则正好相反。 - **Remote File formatter syntax**：在远程资源管理器中为每个文件显示文件信息的语法。参见[资源管理器格式](#资源管理器格式) - **Local File formatter syntax**：在本地资源管理器中显示每个文件的文件信息的语法。参见[资源管理器格式](#资源管理器格式) @@ -269,11 +304,11 @@ termscp和书签一样，只需要保证这些路径是可访问的： 你可以从配置中切换到到 `SSH Keys` tab页来访问SSH密钥存储，在那里你可以： -- **Add a new key**：只需按下``，你将被提示创建一个新的密钥。提供主机名/ip地址和与该钥匙关联的用户名，最后会打开一个文本编辑器：将**PRIVATE** SSH key粘贴到文本编辑器中，保存并退出。 -- **Remove an existing key**：只要在你想删除的密钥上按下``或``，就可以从 termscp 中永久删除该密钥。 -- **Edit an existing key**：只需在你想编辑的密钥上按下``，就可以修改私钥。 +- **添加新密钥**：只需按下``，你将被提示创建一个新的密钥。提供主机名/ip地址和与该钥匙关联的用户名，最后会打开一个文本编辑器：将**PRIVATE** SSH key粘贴到文本编辑器中，保存并退出。 +- **删除现有密钥**：只要在你想删除的密钥上按下``或``，就可以从 termscp 中永久删除该密钥。 +- **编辑现有密钥**：只需在你想编辑的密钥上按下``，就可以修改私钥。 -> 问：等等，我的私钥受密码保护，也是可以用的吗？ +> 问：等等，我的私钥受密码保护，也是可以用的吗？ > 答：当然可以。termscp中提供的认证密码，对用户名/密码认证和RSA密钥认证都有效。 ### 资源管理器格式 @@ -325,6 +360,24 @@ termscp支持传统的十六进制（`#rrggbb`）和RGB`rgb(r, g, b)`语法来 你可以在下面的表格中找到每个样式字段的描述。 请注意，**样式在配置页面不起作用**，以保证它总是可以访问，以防你把一切都弄乱了。 +### 我的主题无法加载 + +这可能是由于最近的更新破坏了主题。 每当我向主题添加新密钥时，保存的主题都不会加载。 要解决此问题，有两个真正的快速修复解决方案： + +1. 重新加载主题：每当我发布更新时，我也会修补“官方”主题，因此您只需再次从存储库下载它并通过 `-t` 选项重新导入主题 + + ```sh + termscp -t + ``` + +2. 修复您的主题：如果您使用自定义主题，那么您可以通过 `vim` 进行编辑并添加缺少的键。 主题位于 `$CONFIG_DIR/termscp/theme.toml`，其中 `$CONFIG_DIR` 是： + + - FreeBSD/GNU-Linux: `$HOME/.config/` + - MacOs: `$HOME/Library/Application Support` + - Windows: `%appdata%` + + ❗ 对于您刚刚安装的版本，在 `BREAKING CHANGES` 下的 `CHANGELOG` 中报告了丢失的键。 + #### 登录页 | 字段 | 描述 | @@ -362,6 +415,7 @@ termscp支持传统的十六进制（`#rrggbb`）和RGB`rgb(r, g, b)`语法来 | 字段 | 描述 | |-------------------|---------------------------------------------| | misc_error_dialog | 报错信息的颜色 | +| misc_info_dialog | 信息对话框的颜色 | | misc_input_dialog | 输入对话框的颜色（比如拷贝文件时） | | misc_keys | 键盘输入文字的颜色 | | misc_quit_dialog | 退出窗口的颜色 | From bcc6fcd2e7c2d274aae67d8896e278cddf221878 Mon Sep 17 00:00:00 2001 From: veeso Date: Sat, 25 Sep 2021 20:18:50 +0200 Subject: [PATCH 17/40] Added file replace prompt also for 'Many' --- .../activities/filetransfer/actions/find.rs | 41 ++++++++- .../activities/filetransfer/actions/save.rs | 79 ++++++++++++++--- .../activities/filetransfer/lib/transfer.rs | 6 +- src/ui/activities/filetransfer/mod.rs | 1 + src/ui/activities/filetransfer/update.rs | 26 ++++-- src/ui/activities/filetransfer/view.rs | 85 +++++++++++++++---- 6 files changed, 200 insertions(+), 38 deletions(-) diff --git a/src/ui/activities/filetransfer/actions/find.rs b/src/ui/activities/filetransfer/actions/find.rs index 6aa3f7c..e2eda45 100644 --- a/src/ui/activities/filetransfer/actions/find.rs +++ b/src/ui/activities/filetransfer/actions/find.rs @@ -130,9 +130,28 @@ impl FileTransferActivity { dest_path.push(save_as); } // Iter files - let entries = entries.iter().map(|x| x.get_realfile()).collect(); + let entries: Vec = entries.iter().map(|x| x.get_realfile()).collect(); match self.browser.tab() { FileExplorerTab::FindLocal | FileExplorerTab::Local => { + if opts.check_replace && self.config().get_prompt_on_file_replace() { + // Check which file would be replaced + let existing_files: Vec<&FsEntry> = entries + .iter() + .filter(|x| { + self.remote_file_exists( + Self::file_to_check_many(x, dest_path.as_path()).as_path(), + ) + }) + .collect(); + // Save pending transfer + if !existing_files.is_empty() { + self.set_pending_transfer_many( + existing_files, + &dest_path.to_string_lossy().to_owned(), + ); + return; + } + } if let Err(err) = self.filetransfer_send( TransferPayload::Many(entries), dest_path.as_path(), @@ -148,6 +167,26 @@ impl FileTransferActivity { } } FileExplorerTab::FindRemote | FileExplorerTab::Remote => { + if opts.check_replace && self.config().get_prompt_on_file_replace() { + // Check which file would be replaced + let existing_files: Vec<&FsEntry> = entries + .iter() + .filter(|x| { + self.local_file_exists( + Self::file_to_check_many(x, dest_path.as_path()).as_path(), + ) + }) + .collect(); + // Save pending transfer + // Save pending transfer + if !existing_files.is_empty() { + self.set_pending_transfer_many( + existing_files, + &dest_path.to_string_lossy().to_owned(), + ); + return; + } + } if let Err(err) = self.filetransfer_recv( TransferPayload::Many(entries), dest_path.as_path(), diff --git a/src/ui/activities/filetransfer/actions/save.rs b/src/ui/activities/filetransfer/actions/save.rs index f13437b..495c927 100644 --- a/src/ui/activities/filetransfer/actions/save.rs +++ b/src/ui/activities/filetransfer/actions/save.rs @@ -30,15 +30,15 @@ use super::{ super::STORAGE_PENDING_TRANSFER, FileExplorerTab, FileTransferActivity, FsEntry, LogLevel, SelectedEntry, TransferOpts, TransferPayload, }; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; impl FileTransferActivity { pub(crate) fn action_local_saveas(&mut self, input: String) { - self.local_send_file(TransferOpts::default().save_as(input)); + self.local_send_file(TransferOpts::default().save_as(Some(input))); } pub(crate) fn action_remote_saveas(&mut self, input: String) { - self.remote_recv_file(TransferOpts::default().save_as(input)); + self.remote_recv_file(TransferOpts::default().save_as(Some(input))); } pub(crate) fn action_local_send(&mut self) { @@ -57,11 +57,10 @@ impl FileTransferActivity { /// NOTE: Panics if `STORAGE_PENDING_TRANSFER` is undefined pub(crate) fn action_finalize_pending_transfer(&mut self) { // Retrieve pending transfer - let file_name: String = self + let file_name = self .context_mut() .store_mut() - .take_string(STORAGE_PENDING_TRANSFER) - .unwrap(); + .take_string(STORAGE_PENDING_TRANSFER); // Send file match self.browser.tab() { FileExplorerTab::Local => self.local_send_file( @@ -82,9 +81,12 @@ impl FileTransferActivity { } // Reload browsers match self.browser.tab() { - FileExplorerTab::Local => self.reload_remote_dir(), - FileExplorerTab::Remote => self.reload_local_dir(), - FileExplorerTab::FindLocal | FileExplorerTab::FindRemote => {} + FileExplorerTab::Local | FileExplorerTab::FindLocal => { + self.update_remote_filelist(); + } + FileExplorerTab::Remote | FileExplorerTab::FindRemote => { + self.update_local_filelist(); + } } } @@ -122,7 +124,26 @@ impl FileTransferActivity { dest_path.push(save_as); } // Iter files - let entries = entries.iter().map(|x| x.get_realfile()).collect(); + let entries: Vec = entries.iter().map(|x| x.get_realfile()).collect(); + if opts.check_replace && self.config().get_prompt_on_file_replace() { + // Check which file would be replaced + let existing_files: Vec<&FsEntry> = entries + .iter() + .filter(|x| { + self.remote_file_exists( + Self::file_to_check_many(x, dest_path.as_path()).as_path(), + ) + }) + .collect(); + // Save pending transfer + if !existing_files.is_empty() { + self.set_pending_transfer_many( + existing_files, + &dest_path.to_string_lossy().to_owned(), + ); + return; + } + } if let Err(err) = self.filetransfer_send( TransferPayload::Many(entries), dest_path.as_path(), @@ -175,7 +196,26 @@ impl FileTransferActivity { dest_path.push(save_as); } // Iter files - let entries = entries.iter().map(|x| x.get_realfile()).collect(); + let entries: Vec = entries.iter().map(|x| x.get_realfile()).collect(); + if opts.check_replace && self.config().get_prompt_on_file_replace() { + // Check which file would be replaced + let existing_files: Vec<&FsEntry> = entries + .iter() + .filter(|x| { + self.local_file_exists( + Self::file_to_check_many(x, dest_path.as_path()).as_path(), + ) + }) + .collect(); + // Save pending transfer + if !existing_files.is_empty() { + self.set_pending_transfer_many( + existing_files, + &dest_path.to_string_lossy().to_owned(), + ); + return; + } + } if let Err(err) = self.filetransfer_recv( TransferPayload::Many(entries), dest_path.as_path(), @@ -205,6 +245,17 @@ impl FileTransferActivity { .set_string(STORAGE_PENDING_TRANSFER, file_name.to_string()); } + /// ### set_pending_transfer_many + /// + /// Set pending transfer for many files into storage and mount radio + pub(crate) fn set_pending_transfer_many(&mut self, files: Vec<&FsEntry>, dest_path: &str) { + let file_names: Vec<&str> = files.iter().map(|x| x.get_name()).collect(); + self.mount_radio_replace_many(file_names.as_slice()); + self.context_mut() + .store_mut() + .set_string(STORAGE_PENDING_TRANSFER, dest_path.to_string()); + } + /// ### file_to_check /// /// Get file to check for path @@ -214,4 +265,10 @@ impl FileTransferActivity { None => PathBuf::from(e.get_name()), } } + + pub(crate) fn file_to_check_many(e: &FsEntry, wrkdir: &Path) -> PathBuf { + let mut p = wrkdir.to_path_buf(); + p.push(e.get_name()); + p + } } diff --git a/src/ui/activities/filetransfer/lib/transfer.rs b/src/ui/activities/filetransfer/lib/transfer.rs index be8b75e..263596a 100644 --- a/src/ui/activities/filetransfer/lib/transfer.rs +++ b/src/ui/activities/filetransfer/lib/transfer.rs @@ -222,8 +222,8 @@ impl TransferOpts { /// ### save_as /// /// Define the name of the file to be saved - pub fn save_as>(mut self, n: S) -> Self { - self.save_as = Some(n.as_ref().to_string()); + pub fn save_as>(mut self, n: Option) -> Self { + self.save_as = n.map(|x| x.as_ref().to_string()); self } @@ -314,7 +314,7 @@ mod test { assert!(opts.save_as.is_none()); let opts = TransferOpts::default() .check_replace(false) - .save_as("omar.txt"); + .save_as(Some("omar.txt")); assert_eq!(opts.save_as.as_deref().unwrap(), "omar.txt"); assert_eq!(opts.check_replace, false); } diff --git a/src/ui/activities/filetransfer/mod.rs b/src/ui/activities/filetransfer/mod.rs index 74065ef..74ad64f 100644 --- a/src/ui/activities/filetransfer/mod.rs +++ b/src/ui/activities/filetransfer/mod.rs @@ -88,6 +88,7 @@ const COMPONENT_RADIO_SORTING: &str = "RADIO_SORTING"; const COMPONENT_SPAN_STATUS_BAR_LOCAL: &str = "STATUS_BAR_LOCAL"; const COMPONENT_SPAN_STATUS_BAR_REMOTE: &str = "STATUS_BAR_REMOTE"; const COMPONENT_LIST_FILEINFO: &str = "LIST_FILEINFO"; +const COMPONENT_LIST_REPLACING_FILES: &str = "LIST_REPLACING_FILES"; // NOTE: used for file transfers, to list files which are going to be replaced /// ## LogLevel /// diff --git a/src/ui/activities/filetransfer/update.rs b/src/ui/activities/filetransfer/update.rs index c18d143..77169e3 100644 --- a/src/ui/activities/filetransfer/update.rs +++ b/src/ui/activities/filetransfer/update.rs @@ -31,10 +31,11 @@ use super::{ COMPONENT_EXPLORER_FIND, COMPONENT_EXPLORER_LOCAL, COMPONENT_EXPLORER_REMOTE, COMPONENT_INPUT_COPY, COMPONENT_INPUT_EXEC, COMPONENT_INPUT_FIND, COMPONENT_INPUT_GOTO, COMPONENT_INPUT_MKDIR, COMPONENT_INPUT_NEWFILE, COMPONENT_INPUT_OPEN_WITH, - COMPONENT_INPUT_RENAME, COMPONENT_INPUT_SAVEAS, COMPONENT_LIST_FILEINFO, COMPONENT_LOG_BOX, - COMPONENT_PROGRESS_BAR_FULL, COMPONENT_PROGRESS_BAR_PARTIAL, COMPONENT_RADIO_DELETE, - COMPONENT_RADIO_DISCONNECT, COMPONENT_RADIO_QUIT, COMPONENT_RADIO_REPLACE, - COMPONENT_RADIO_SORTING, COMPONENT_TEXT_ERROR, COMPONENT_TEXT_FATAL, COMPONENT_TEXT_HELP, + COMPONENT_INPUT_RENAME, COMPONENT_INPUT_SAVEAS, COMPONENT_LIST_FILEINFO, + COMPONENT_LIST_REPLACING_FILES, COMPONENT_LOG_BOX, COMPONENT_PROGRESS_BAR_FULL, + COMPONENT_PROGRESS_BAR_PARTIAL, COMPONENT_RADIO_DELETE, COMPONENT_RADIO_DISCONNECT, + COMPONENT_RADIO_QUIT, COMPONENT_RADIO_REPLACE, COMPONENT_RADIO_SORTING, COMPONENT_TEXT_ERROR, + COMPONENT_TEXT_FATAL, COMPONENT_TEXT_HELP, }; use crate::fs::explorer::FileSorting; use crate::fs::FsEntry; @@ -583,7 +584,7 @@ impl Update for FileTransferActivity { FileExplorerTab::Remote => self.action_remote_saveas(input.to_string()), FileExplorerTab::FindLocal | FileExplorerTab::FindRemote => { // Get entry - self.action_find_transfer(TransferOpts::default().save_as(input)); + self.action_find_transfer(TransferOpts::default().save_as(Some(input))); } } self.umount_saveas(); @@ -661,6 +662,12 @@ impl Update for FileTransferActivity { self.umount_radio_replace(); None } + (COMPONENT_RADIO_REPLACE, key) if key == &MSG_KEY_TAB => { + if self.is_radio_replace_extended() { + self.view.active(COMPONENT_LIST_REPLACING_FILES); + } + None + } (COMPONENT_RADIO_REPLACE, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => { // Choice is 'YES' self.umount_radio_replace(); @@ -668,6 +675,15 @@ impl Update for FileTransferActivity { None } (COMPONENT_RADIO_REPLACE, _) => None, + (COMPONENT_LIST_REPLACING_FILES, key) if key == &MSG_KEY_TAB => { + self.view.active(COMPONENT_RADIO_REPLACE); + None + } + (COMPONENT_LIST_REPLACING_FILES, key) if key == &MSG_KEY_ESC => { + self.umount_radio_replace(); + None + } + (COMPONENT_LIST_REPLACING_FILES, _) => None, // -- disconnect (COMPONENT_RADIO_DISCONNECT, key) if key == &MSG_KEY_ESC diff --git a/src/ui/activities/filetransfer/view.rs b/src/ui/activities/filetransfer/view.rs index cbe2655..c277067 100644 --- a/src/ui/activities/filetransfer/view.rs +++ b/src/ui/activities/filetransfer/view.rs @@ -310,10 +310,30 @@ impl FileTransferActivity { } if let Some(props) = self.view.get_props(super::COMPONENT_RADIO_REPLACE) { if props.visible { - let popup = draw_area_in(f.size(), 50, 10); - f.render_widget(Clear, popup); - // make popup - self.view.render(super::COMPONENT_RADIO_REPLACE, f, popup); + // NOTE: handle extended / normal modes + if self.is_radio_replace_extended() { + let popup = draw_area_in(f.size(), 50, 50); + f.render_widget(Clear, popup); + let popup_chunks = Layout::default() + .direction(Direction::Vertical) + .constraints( + [ + Constraint::Percentage(85), // List + Constraint::Percentage(15), // Radio + ] + .as_ref(), + ) + .split(popup); + self.view + .render(super::COMPONENT_LIST_REPLACING_FILES, f, popup_chunks[0]); + self.view + .render(super::COMPONENT_RADIO_REPLACE, f, popup_chunks[1]); + } else { + let popup = draw_area_in(f.size(), 50, 10); + f.render_widget(Clear, popup); + // make popup + self.view.render(super::COMPONENT_RADIO_REPLACE, f, popup); + } } } if let Some(props) = self.view.get_props(super::COMPONENT_RADIO_DISCONNECT) { @@ -708,28 +728,57 @@ impl FileTransferActivity { pub(super) fn mount_radio_replace(&mut self, file_name: &str) { let warn_color = self.theme().misc_warn_dialog; - self.view.mount( + self.mount_radio_dialog( super::COMPONENT_RADIO_REPLACE, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(warn_color) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Plain, warn_color) + format!("File '{}' already exists. Overwrite file?", file_name), + &["Yes", "No"], + 0, + warn_color, + ); + } + + pub(super) fn mount_radio_replace_many(&mut self, files: &[&str]) { + let warn_color = self.theme().misc_warn_dialog; + // Make rows + let rows = files.iter().map(|x| vec![TextSpan::new(x)]).collect(); + self.view.mount( + super::COMPONENT_LIST_REPLACING_FILES, + Box::new(List::new( + ListPropsBuilder::default() + .with_borders(Borders::ALL, BorderType::Rounded, warn_color) + .scrollable(true) + .with_highlighted_color(warn_color) + .with_highlighted_str(Some("> ")) .with_title( - format!("File '{}' already exists. Overwrite file?", file_name), + "The following files are going to be replaced", Alignment::Center, ) - .with_options(&[String::from("Yes"), String::from("No")]) - .with_value(0) - .rewind(true) + .with_foreground(warn_color) + .with_rows(rows) .build(), )), ); - self.view.active(super::COMPONENT_RADIO_REPLACE); + self.mount_radio_dialog( + super::COMPONENT_RADIO_REPLACE, + "Overwrite files?", + &["Yes", "No"], + 0, + warn_color, + ); + } + + /// ### is_radio_replace_extended + /// + /// Returns whether radio replace is in "extended" mode (for many files) + pub(super) fn is_radio_replace_extended(&self) -> bool { + self.view + .get_state(super::COMPONENT_LIST_REPLACING_FILES) + .is_some() } pub(super) fn umount_radio_replace(&mut self) { self.view.umount(super::COMPONENT_RADIO_REPLACE); + self.view.umount(super::COMPONENT_LIST_REPLACING_FILES); // NOTE: replace anyway } pub(super) fn mount_file_info(&mut self, file: &FsEntry) { @@ -1056,10 +1105,10 @@ impl FileTransferActivity { self.view.active(id); } - fn mount_radio_dialog( + fn mount_radio_dialog>( &mut self, id: &str, - text: &str, + text: S, opts: &[&str], default: usize, color: Color, @@ -1071,7 +1120,7 @@ impl FileTransferActivity { .with_color(color) .with_inverted_color(Color::Black) .with_borders(Borders::ALL, BorderType::Rounded, color) - .with_title(text, Alignment::Center) + .with_title(text.as_ref(), Alignment::Center) .with_options(opts) .with_value(default) .rewind(true) From 198d421ab086e89c817be55624f695783a1608a9 Mon Sep 17 00:00:00 2001 From: veeso Date: Sun, 26 Sep 2021 18:14:13 +0200 Subject: [PATCH 18/40] Notifications --- .github/actions-rs/grcov.yml | 1 + .github/workflows/coverage.yml | 2 + .github/workflows/freebsd.yml | 2 +- .github/workflows/linux.yml | 2 + CHANGELOG.md | 12 +- Cargo.lock | 310 ++++++++++++++++-- Cargo.toml | 1 + README.md | 3 + docs/man-en.md | 18 + docs/man-zh.md | 18 + install.sh | 2 +- src/config/params.rs | 13 + src/config/serialization.rs | 6 + src/lib.rs | 1 + src/support.rs | 34 +- src/system/config_client.rs | 64 +++- src/system/mod.rs | 1 + src/system/notifications.rs | 82 +++++ src/ui/activities/auth/misc.rs | 58 +++- src/ui/activities/auth/mod.rs | 48 +-- .../activities/filetransfer/lib/transfer.rs | 9 + src/ui/activities/filetransfer/misc.rs | 87 ++++- src/ui/activities/filetransfer/mod.rs | 24 +- src/ui/activities/filetransfer/session.rs | 170 ++++++---- src/ui/activities/setup/mod.rs | 2 + src/ui/activities/setup/update.rs | 30 +- src/ui/activities/setup/view/setup.rs | 142 ++++++-- src/ui/components/bytes.rs | 310 ++++++++++++++++++ src/ui/components/mod.rs | 1 + src/utils/fmt.rs | 29 ++ src/utils/parser.rs | 79 +++++ 31 files changed, 1363 insertions(+), 198 deletions(-) create mode 100644 src/system/notifications.rs create mode 100644 src/ui/components/bytes.rs diff --git a/.github/actions-rs/grcov.yml b/.github/actions-rs/grcov.yml index be98493..2f72d6e 100644 --- a/.github/actions-rs/grcov.yml +++ b/.github/actions-rs/grcov.yml @@ -11,6 +11,7 @@ ignore: - src/activity_manager.rs - src/filetransfer/transfer/s3/mod.rs - src/support.rs + - src/system/notifications.rs - "src/ui/activities/*" - src/ui/context.rs - src/ui/input.rs diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 396d62e..7008739 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -11,6 +11,8 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Install dependencies + run: sudo apt update && sudo apt install -y libdbus-1-dev libssh2-1-dev libssl-dev - name: Setup containers run: docker-compose -f "tests/docker-compose.yml" up -d --build - name: Setup nightly toolchain diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index a1855cb..2ef0c91 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -12,7 +12,7 @@ jobs: uses: vmactions/freebsd-vm@v0.1.4 with: usesh: true - prepare: pkg install -y curl wget libssh gcc vim + prepare: pkg install -y curl wget libssh gcc vim dbus pkgconf run: | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh && \ chmod +x /tmp/rustup.sh && \ diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 69f4b06..2f8c99e 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -11,6 +11,8 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Install dependencies + run: sudo apt update && sudo apt install -y libdbus-1-dev libssh2-1-dev libssl-dev - name: Setup containers run: docker-compose -f "tests/docker-compose.yml" up -d --build - uses: actions-rs/toolchain@v1 diff --git a/CHANGELOG.md b/CHANGELOG.md index e92aab8..64cbef5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ Released on ?? > 🍁 Autumn update 🍇 -- **Aws S3** +- **Aws S3** 🪣 - Added support for the aws-s3 protocol. - Operate on your bucket directly from the file explorer. - You can also save your buckets as bookmarks. @@ -36,7 +36,14 @@ Released on ?? - Possibility to update termscp directly via GUI or CLI. - Install update via CLI running `(sudo) termscp --update`. - Install update via GUI from auth form: when the "new version message" is displayed press ``, then enter `YES` in the radio input asking whether to install the update. -- **Prompt user when about to replace existing file on a file transfer**: +- **Notifications** 📫 + - termscp will now send Desktop notifications in these cases + - on transfer completed (minimum transfer size can be specified in configuration; default 512MB) + - on transfer error (same as above) + - on update available + - Added "notifications enabled" in configuration (Default enabled) + - Added "Notifications: minimum transfer size": if transfer size is greater or equal than the specified value, notifications for transfer will be displayed. +- **Prompt user when about to replace existing file on a file transfer** ❓ - Whenever a file transfer is about to replace an existing file on local/remote host, you will be prompted if you're sure you really want to replace that file. - You may want to disable this option. You can go to configuration and set "Prompt when replacing existing files?" to "NO" - **❗ BREAKING CHANGES ❗**: @@ -45,6 +52,7 @@ Released on ?? - Reuse mounts in UI, in order to reduce executable size - Dependencies: - Added `rust-s3 0.27-rc4` + - Added `notify_rust 4.5.3` - Added `self_update 0.27.0` - Updated `argh` to `0.1.6` - Updated `dirs` to `4.0.0` diff --git a/Cargo.lock b/Cargo.lock index 0f03c17..de668e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,8 +88,8 @@ dependencies = [ "argh_shared", "heck", "proc-macro2", - "quote", - "syn", + "quote 1.0.9", + "syn 1.0.76", ] [[package]] @@ -98,6 +98,18 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38de00daab4eac7d753e97697066238d67ce9d7e2d823ab4f72fe14af29f3f33" +[[package]] +name = "arrayref" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + [[package]] name = "async-trait" version = "0.1.51" @@ -105,8 +117,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.9", + "syn 1.0.76", ] [[package]] @@ -176,12 +188,35 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "bitflags" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" + [[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "blake2b_simd" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +dependencies = [ + "arrayref", + "arrayvec", + "constant_time_eq", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + [[package]] name = "block-buffer" version = "0.9.0" @@ -284,7 +319,7 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -302,6 +337,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + [[package]] name = "content_inspector" version = "0.2.4" @@ -370,13 +411,23 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "crossbeam-utils" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +dependencies = [ + "cfg-if 1.0.0", + "lazy_static", +] + [[package]] name = "crossterm" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ebde6a9dd5e331cd6c6f48253254d117642c31653baa475e394657c59c1f7d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossterm_winapi", "libc", "mio", @@ -411,8 +462,8 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" dependencies = [ - "quote", - "syn", + "quote 1.0.9", + "syn 1.0.76", ] [[package]] @@ -424,6 +475,17 @@ dependencies = [ "libc", ] +[[package]] +name = "dbus" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b225f88dd3718253526c38bc333b9986b547a7580abf81186c9461647b2487" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] + [[package]] name = "debug-helper" version = "0.3.12" @@ -456,6 +518,17 @@ dependencies = [ "generic-array", ] +[[package]] +name = "dirs" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" +dependencies = [ + "libc", + "redox_users 0.3.5", + "winapi", +] + [[package]] name = "dirs" version = "3.0.2" @@ -481,7 +554,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" dependencies = [ "libc", - "redox_users", + "redox_users 0.4.0", "winapi", ] @@ -908,6 +981,15 @@ version = "0.2.102" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103" +[[package]] +name = "libdbus-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" +dependencies = [ + "pkg-config", +] + [[package]] name = "libssh2-sys" version = "0.2.21" @@ -961,6 +1043,18 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "mac-notification-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb6b71a9a89cd38b395d994214297447e8e63b1ba5708a9a2b0b1048ceda76" +dependencies = [ + "cc", + "chrono", + "dirs 1.0.5", + "objc-foundation", +] + [[package]] name = "magic-crypt" version = "3.1.8" @@ -978,6 +1072,15 @@ dependencies = [ "tiger", ] +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + [[package]] name = "match_cfg" version = "0.1.0" @@ -997,8 +1100,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6007f9dad048e0a224f27ca599d669fca8cfa0dac804725aab542b2eb032bce6" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.9", + "syn 1.0.76", ] [[package]] @@ -1089,6 +1192,17 @@ dependencies = [ "tempfile", ] +[[package]] +name = "notify-rust" +version = "4.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4b2d5d72d16b6abdb6fa2c364d9363e23d6ed7c20c1a1e85fd8cd880144442c" +dependencies = [ + "dbus 0.9.4", + "mac-notification-sys", + "winrt-notification", +] + [[package]] name = "ntapi" version = "0.3.6" @@ -1190,6 +1304,35 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + [[package]] name = "once_cell" version = "1.8.0" @@ -1218,7 +1361,7 @@ version = "0.10.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "foreign-types", "libc", @@ -1382,7 +1525,7 @@ version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" dependencies = [ - "unicode-xid", + "unicode-xid 0.2.2", ] [[package]] @@ -1394,6 +1537,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "quote" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" + [[package]] name = "quote" version = "1.0.9" @@ -1496,7 +1645,18 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" +dependencies = [ + "getrandom 0.1.16", + "redox_syscall 0.1.57", + "rust-argon2", ] [[package]] @@ -1580,6 +1740,18 @@ dependencies = [ "winapi", ] +[[package]] +name = "rust-argon2" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" +dependencies = [ + "base64", + "blake2b_simd", + "constant_time_eq", + "crossbeam-utils", +] + [[package]] name = "rust-ini" version = "0.16.1" @@ -1650,7 +1822,7 @@ checksum = "6d752040301c251d653aa740dec847e95767ce312cfc469bee85eb13cbf81d8a" dependencies = [ "aes", "block-modes", - "dbus", + "dbus 0.2.3", "hkdf", "lazy_static", "num", @@ -1664,7 +1836,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation 0.7.0", "core-foundation-sys 0.7.0", "libc", @@ -1677,7 +1849,7 @@ version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation 0.9.1", "core-foundation-sys 0.8.2", "libc", @@ -1761,7 +1933,7 @@ dependencies = [ "log", "serde", "thiserror", - "xml-rs", + "xml-rs 0.8.4", ] [[package]] @@ -1771,8 +1943,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.9", + "syn 1.0.76", ] [[package]] @@ -1886,12 +2058,28 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d876d4d57f6bbf2245d43f7ec53759461f801a446d3693704aa6d27b257844d7" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libssh2-sys", "parking_lot 0.10.2", ] +[[package]] +name = "strum" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca6e4730f517e041e547ffe23d29daab8de6b73af4b6ae2a002108169f5e7da" + +[[package]] +name = "strum_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3384590878eb0cab3b128e844412e2d010821e7e091211b9d87324173ada7db8" +dependencies = [ + "quote 0.3.15", + "syn 0.11.11", +] + [[package]] name = "subtle" version = "2.4.1" @@ -1911,6 +2099,17 @@ dependencies = [ "thiserror", ] +[[package]] +name = "syn" +version = "0.11.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" +dependencies = [ + "quote 0.3.15", + "synom", + "unicode-xid 0.0.4", +] + [[package]] name = "syn" version = "1.0.76" @@ -1918,8 +2117,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" dependencies = [ "proc-macro2", - "quote", - "unicode-xid", + "quote 1.0.9", + "unicode-xid 0.2.2", +] + +[[package]] +name = "synom" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" +dependencies = [ + "unicode-xid 0.0.4", ] [[package]] @@ -1971,7 +2179,7 @@ name = "termscp" version = "0.7.0" dependencies = [ "argh", - "bitflags", + "bitflags 1.3.2", "bytesize", "chrono", "content_inspector", @@ -1983,6 +2191,7 @@ dependencies = [ "lazy_static", "log", "magic-crypt", + "notify-rust", "open", "path-slash", "pretty_assertions", @@ -2033,8 +2242,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.9", + "syn 1.0.76", ] [[package]] @@ -2172,7 +2381,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39c8ce4e27049eed97cfa363a5048b09d995e209994634a0efc26a14ab6c0c23" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cassowary", "crossterm", "unicode-segmentation", @@ -2248,6 +2457,12 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +[[package]] +name = "unicode-xid" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" + [[package]] name = "unicode-xid" version = "0.2.2" @@ -2332,8 +2547,8 @@ dependencies = [ "lazy_static", "log", "proc-macro2", - "quote", - "syn", + "quote 1.0.9", + "syn 1.0.76", "wasm-bindgen-shared", ] @@ -2355,7 +2570,7 @@ version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" dependencies = [ - "quote", + "quote 1.0.9", "wasm-bindgen-macro-support", ] @@ -2366,8 +2581,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.9", + "syn 1.0.76", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2461,6 +2676,28 @@ dependencies = [ "winapi", ] +[[package]] +name = "winrt" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e30cba82e22b083dc5a422c2ee77e20dc7927271a0dc981360c57c1453cb48d" +dependencies = [ + "winapi", +] + +[[package]] +name = "winrt-notification" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57790eb281688a4682dab44df2a1ba8b78373233bd71cb291c3e75fecb1a01c4" +dependencies = [ + "strum", + "strum_macros", + "winapi", + "winrt", + "xml-rs 0.6.1", +] + [[package]] name = "xattr" version = "0.2.2" @@ -2470,6 +2707,15 @@ dependencies = [ "libc", ] +[[package]] +name = "xml-rs" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1945e12e16b951721d7976520b0832496ef79c31602c7a29d950de79ba74621" +dependencies = [ + "bitflags 0.9.1", +] + [[package]] name = "xml-rs" version = "0.8.4" diff --git a/Cargo.toml b/Cargo.toml index dd8732c..8543eda 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,6 +40,7 @@ keyring = { version = "0.10.1", optional = true } lazy_static = "1.4.0" log = "0.4.14" magic-crypt = "3.1.7" +notify-rust = { version = "4.5.3", default-features = false, features = [ "d" ] } open = "2.0.1" rand = "0.8.4" regex = "1.5.4" diff --git a/README.md b/README.md index fb1f3bd..0caf4a2 100644 --- a/README.md +++ b/README.md @@ -82,8 +82,11 @@ For more information or other platforms, please visit [veeso.github.io](https:// - **Linux** users: - libssh - libdbus-1 + - pkg-config - **BSD** users: - libssh + - dbus + - pkgconf ### Optional Requirements ✔️ diff --git a/docs/man-en.md b/docs/man-en.md index 7e36600..0eea5c5 100644 --- a/docs/man-en.md +++ b/docs/man-en.md @@ -27,6 +27,7 @@ - [Text Editor ✏](#text-editor-) - [How do I configure the text editor 🦥](#how-do-i-configure-the-text-editor-) - [Logging 🩺](#logging-) + - [Notifications 📫](#notifications-) ## Usage ❓ @@ -304,6 +305,8 @@ These parameters can be changed: - **Group Dirs**: select whether directories should be groupped or not in file explorers. If `Display first` is selected, directories will be sorted using the configured method but displayed before files, viceversa if `Display last` is selected. - **Remote File formatter syntax**: syntax to display file info for each file in the remote explorer. See [File explorer format](#file-explorer-format) - **Local File formatter syntax**: syntax to display file info for each file in the local explorer. See [File explorer format](#file-explorer-format) +- **Enable notifications?**: If set to `Yes`, notifications will be displayed. +- **Notifications: minimum transfer size**: if transfer size is greater or equal than the specified value, notifications for transfer will be displayed. The accepted values are in format `{UNSIGNED} B/KB/MB/GB/TB/PB` ### SSH Key Storage 🔐 @@ -471,3 +474,18 @@ Yes, you can. Just start termscp with `-q or --quiet` option. You can alias term > Is logging safe? If you're concerned about security, the log file doesn't contain any plain password, so don't worry and exposes the same information the sibling file `bookmarks` reports. + +## Notifications 📫 + +Termscp will send Desktop notifications for these kind of events: + +- on **Transfer completed**: The notification will be sent once a transfer has been successfully completed. + - ❗ The notification will be displayed only if the transfer total size is at least the specified `Notifications: minimum transfer size` in the configuration. +- on **Transfer failed**: The notification will be sent once a transfer has failed due to an error. + - ❗ The notification will be displayed only if the transfer total size is at least the specified `Notifications: minimum transfer size` in the configuration. +- on **Update available**: Whenever a new version of termscp is available, a notification will be displayed. +- on **Update installed**: Whenever a new version of termscp has been installed, a notification will be displayed. +- on **Update failed**: Whenever the installation of the update fails, a notification will be displayed. + +❗ If you prefer to keep notifications turned off, you can just enter setup and set `Enable notifications?` to `No` 😉. +❗ If you want to change the minimum transfer size to display notifications, you can change the value in the configuration with key `Notifications: minimum transfer size` and set it to whatever suits better for you 🙂. diff --git a/docs/man-zh.md b/docs/man-zh.md index 9ff77d6..58c99a9 100644 --- a/docs/man-zh.md +++ b/docs/man-zh.md @@ -27,6 +27,7 @@ - [文本编辑器](#文本编辑器) - [如何配置文本编辑器？](#如何配置文本编辑器) - [日志](#日志) + - [通知](#通知) ## 用法 @@ -297,6 +298,8 @@ termscp和书签一样，只需要保证这些路径是可访问的： - **Group Dirs**：选择在文件浏览器中是否对文件夹进行分组。如果选择 `Display first`，目录将根据设置的方法排序，但仍显示在文件之前；如果选择 `Display last`，则正好相反。 - **Remote File formatter syntax**：在远程资源管理器中为每个文件显示文件信息的语法。参见[资源管理器格式](#资源管理器格式) - **Local File formatter syntax**：在本地资源管理器中显示每个文件的文件信息的语法。参见[资源管理器格式](#资源管理器格式) +- **Enable notifications?**: 如果设置为 `Yes`，则会显示通知。 +- **Notifications: minimum transfer size**: 如果传输大小大于或等于指定值，将显示传输通知。 接受的值格式为 `{UNSIGNED} B/KB/MB/GB/TB/PB` ### SSH Key Storage @@ -462,3 +465,18 @@ termscp会为每个会话创建一个日志文件，该文件在 > 日志是安全的吗？ 如果你担心安全问题，日志文件不包含任何普通的密码，所以不用担心，它暴露的信息与同级文件 `书签` 报告的信息相同。 + +## 通知 + +termscp 将针对这些类型的事件发送桌面通知： + +- **传输完成**： 传输成功完成后将发送通知。 + - ❗ 仅当传输总大小至少为配置中指定的 `Notifications: minimum transfer size` 时才会显示通知。 +- **传输失败**：一旦传输因错误而失败，将发送通知。 + - ❗ 仅当传输总大小至少为配置中指定的 `Notifications: minimum transfer size` 时才会显示通知。 +- **更新可用**：每当有新版本的termscp 可用时，都会显示通知。 +- **更新已安装**：每当安装了新版本的termscp 时，都会显示通知。 +- **更新失败**：每当更新安装失败时，都会显示通知。 + +❗ 如果您希望保持关闭通知，您只需进入设置并将 `Enable notifications?` 设置为 `No`😉。 +❗ 如果您想更改最小传输大小以显示通知，您可以使用键 `Notifications: minimum transfer size` 更改配置中的值，并将其设置为更适合您的任何值🙂。 diff --git a/install.sh b/install.sh index 2b05dde..21e6ba2 100755 --- a/install.sh +++ b/install.sh @@ -278,7 +278,7 @@ install_bsd_cargo_deps() { set -e confirm "${YELLOW}libssh, gcc${NO_COLOR} are required to install ${GREEN}termscp${NO_COLOR}; would you like to proceed?" sudo="$(elevate_priv_ex /usr/local/bin)" - $sudo pkg install -y curl wget libssh gcc + $sudo pkg install -y curl wget libssh gcc dbus pkgconf info "Dependencies installed successfully" } diff --git a/src/config/params.rs b/src/config/params.rs index aba9ae2..f20f4e3 100644 --- a/src/config/params.rs +++ b/src/config/params.rs @@ -33,6 +33,8 @@ use serde::{Deserialize, Serialize}; use std::collections::HashMap; use std::path::PathBuf; +pub const DEFAULT_NOTIFICATION_TRANSFER_THRESHOLD: u64 = 536870912; // 512MB + #[derive(Deserialize, Serialize, std::fmt::Debug)] /// ## UserConfig /// @@ -56,6 +58,8 @@ pub struct UserInterfaceConfig { pub group_dirs: Option, pub file_fmt: Option, // Refers to local host (for backward compatibility) pub remote_file_fmt: Option, // @! Since 0.5.0 + pub notifications: Option, // @! Since 0.7.0; Default true + pub notification_threshold: Option, // @! Since 0.7.0; Default 512MB } #[derive(Deserialize, Serialize, std::fmt::Debug)] @@ -89,6 +93,8 @@ impl Default for UserInterfaceConfig { group_dirs: None, file_fmt: None, remote_file_fmt: None, + notifications: Some(true), + notification_threshold: Some(DEFAULT_NOTIFICATION_TRANSFER_THRESHOLD), } } } @@ -126,6 +132,8 @@ mod tests { group_dirs: Some(String::from("first")), file_fmt: Some(String::from("{NAME}")), remote_file_fmt: Some(String::from("{USER}")), + notifications: Some(true), + notification_threshold: Some(DEFAULT_NOTIFICATION_TRANSFER_THRESHOLD), }; assert_eq!(ui.default_protocol, String::from("SFTP")); assert_eq!(ui.text_editor, PathBuf::from("nano")); @@ -156,5 +164,10 @@ mod tests { cfg.user_interface.remote_file_fmt, Some(String::from("{USER}")) ); + assert_eq!(cfg.user_interface.notifications, Some(true)); + assert_eq!( + cfg.user_interface.notification_threshold, + Some(DEFAULT_NOTIFICATION_TRANSFER_THRESHOLD) + ); } } diff --git a/src/config/serialization.rs b/src/config/serialization.rs index 48ed577..19263c1 100644 --- a/src/config/serialization.rs +++ b/src/config/serialization.rs @@ -202,6 +202,8 @@ mod tests { assert_eq!(cfg.user_interface.show_hidden_files, true); assert_eq!(cfg.user_interface.check_for_updates.unwrap(), true); assert_eq!(cfg.user_interface.prompt_on_file_replace.unwrap(), false); + assert_eq!(cfg.user_interface.notifications.unwrap(), false); + assert_eq!(cfg.user_interface.notification_threshold.unwrap(), 1024); assert_eq!(cfg.user_interface.group_dirs, Some(String::from("last"))); assert_eq!( cfg.user_interface.file_fmt, @@ -248,6 +250,8 @@ mod tests { assert!(cfg.user_interface.prompt_on_file_replace.is_none()); assert!(cfg.user_interface.file_fmt.is_none()); assert!(cfg.user_interface.remote_file_fmt.is_none()); + assert!(cfg.user_interface.notifications.is_none()); + assert!(cfg.user_interface.notification_threshold.is_none()); // Verify keys assert_eq!( *cfg.remote @@ -323,6 +327,8 @@ mod tests { group_dirs = "last" file_fmt = "{NAME} {PEX}" remote_file_fmt = "{NAME} {USER}" + notifications = false + notification_threshold = 1024 [remote.ssh_keys] "192.168.1.31" = "/home/omar/.ssh/raspberry.key" diff --git a/src/lib.rs b/src/lib.rs index 4e9aa6c..e6f99b6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -47,6 +47,7 @@ extern crate lazy_static; extern crate log; #[macro_use] extern crate magic_crypt; +extern crate notify_rust; extern crate open; #[cfg(target_os = "windows")] extern crate path_slash; diff --git a/src/support.rs b/src/support.rs index b564ada..2ad6901 100644 --- a/src/support.rs +++ b/src/support.rs @@ -28,7 +28,9 @@ // mod use crate::system::{ auto_update::{Update, UpdateStatus}, + config_client::ConfigClient, environment, + notifications::Notification, theme_provider::ThemeProvider, }; use std::fs; @@ -66,9 +68,23 @@ pub fn install_update() -> Result { { Ok(UpdateStatus::AlreadyUptodate) => Ok("termscp is already up to date".to_string()), Ok(UpdateStatus::UpdateInstalled(v)) => { + if get_config_client() + .map(|x| x.get_notifications()) + .unwrap_or(true) + { + Notification::update_installed(v.as_str()); + } Ok(format!("termscp has been updated to version {}", v)) } - Err(err) => Err(err.to_string()), + Err(err) => { + if get_config_client() + .map(|x| x.get_notifications()) + .unwrap_or(true) + { + Notification::update_failed(err.to_string()); + } + Err(err.to_string()) + } } } @@ -87,3 +103,19 @@ fn get_config_dir() -> Result { )), } } + +/// ### get_config_client +/// +/// Get configuration client +fn get_config_client() -> Option { + match get_config_dir() { + Err(_) => None, + Ok(dir) => { + let (cfg_path, ssh_key_dir) = environment::get_config_paths(dir.as_path()); + match ConfigClient::new(cfg_path.as_path(), ssh_key_dir.as_path()) { + Err(_) => None, + Ok(c) => Some(c), + } + } + } +} diff --git a/src/system/config_client.rs b/src/system/config_client.rs index 30f1913..80840ce 100644 --- a/src/system/config_client.rs +++ b/src/system/config_client.rs @@ -27,7 +27,7 @@ */ // Locals use crate::config::{ - params::UserConfig, + params::{UserConfig, DEFAULT_NOTIFICATION_TRANSFER_THRESHOLD}, serialization::{deserialize, serialize, SerializerError, SerializerErrorKind}, }; use crate::filetransfer::FileTransferProtocol; @@ -254,6 +254,37 @@ impl ConfigClient { }; } + /// ### get_notifications + /// + /// Get value of `notifications` + pub fn get_notifications(&self) -> bool { + self.config.user_interface.notifications.unwrap_or(true) + } + + /// ### set_notifications + /// + /// Set new value for `notifications` + pub fn set_notifications(&mut self, value: bool) { + self.config.user_interface.notifications = Some(value); + } + + /// ### get_notification_threshold + /// + /// Get value of `notification_threshold` + pub fn get_notification_threshold(&self) -> u64 { + self.config + .user_interface + .notification_threshold + .unwrap_or(DEFAULT_NOTIFICATION_TRANSFER_THRESHOLD) + } + + /// ### set_notification_threshold + /// + /// Set new value for `notification_threshold` + pub fn set_notification_threshold(&mut self, value: u64) { + self.config.user_interface.notification_threshold = Some(value); + } + // SSH Keys /// ### save_ssh_key @@ -657,6 +688,37 @@ mod tests { assert_eq!(client.get_remote_file_fmt(), None); } + #[test] + fn test_system_config_notifications() { + let tmp_dir: TempDir = TempDir::new().ok().unwrap(); + let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path()); + let mut client: ConfigClient = ConfigClient::new(cfg_path.as_path(), key_path.as_path()) + .ok() + .unwrap(); + assert_eq!(client.get_notifications(), true); // Null ? + client.set_notifications(true); + assert_eq!(client.get_notifications(), true); + client.set_notifications(false); + assert_eq!(client.get_notifications(), false); + } + + #[test] + fn test_system_config_remote_notification_threshold() { + let tmp_dir: TempDir = TempDir::new().ok().unwrap(); + let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path()); + let mut client: ConfigClient = ConfigClient::new(cfg_path.as_path(), key_path.as_path()) + .ok() + .unwrap(); + assert_eq!( + client.get_notification_threshold(), + DEFAULT_NOTIFICATION_TRANSFER_THRESHOLD + ); // Null ? + client.set_notification_threshold(1024); + assert_eq!(client.get_notification_threshold(), 1024); + client.set_notification_threshold(64); + assert_eq!(client.get_notification_threshold(), 64); + } + #[test] fn test_system_config_ssh_keys() { let tmp_dir: TempDir = TempDir::new().ok().unwrap(); diff --git a/src/system/mod.rs b/src/system/mod.rs index 1f201a7..f97e4a2 100644 --- a/src/system/mod.rs +++ b/src/system/mod.rs @@ -32,5 +32,6 @@ pub mod config_client; pub mod environment; pub(self) mod keys; pub mod logging; +pub mod notifications; pub mod sshkey_storage; pub mod theme_provider; diff --git a/src/system/notifications.rs b/src/system/notifications.rs new file mode 100644 index 0000000..e375c05 --- /dev/null +++ b/src/system/notifications.rs @@ -0,0 +1,82 @@ +//! # Notifications +//! +//! This module exposes the function to send notifications to the guest OS + +#[cfg(all(unix, not(target_os = "macos")))] +use notify_rust::Hint; +use notify_rust::{Notification as OsNotification, Timeout}; + +/// ## Notification +/// +/// A notification helper which provides all the functions to send the available notifications for termscp +pub struct Notification; + +impl Notification { + /// ### transfer_completed + /// + /// Notify a transfer has been completed with success + pub fn transfer_completed>(body: S) { + Self::notify( + "Transfer completed ✅", + body.as_ref(), + Some("transfer.complete"), + ); + } + + /// ### transfer_error + /// + /// Notify a transfer has failed + pub fn transfer_error>(body: S) { + Self::notify("Transfer failed ❌", body.as_ref(), Some("transfer.error")); + } + + /// ### update_available + /// + /// Notify a new version of termscp is available for download + pub fn update_available>(version: S) { + Self::notify( + "New version available ⬇️", + format!("termscp {} is now available for download", version.as_ref()).as_str(), + None, + ); + } + + /// ### update_installed + /// + /// Notify the update has been correctly installed + pub fn update_installed>(version: S) { + Self::notify( + "Update installed 🎉", + format!("termscp {} has been installed! Restart termscp to enjoy the latest version of termscp 🙂", version.as_ref()).as_str(), + None, + ); + } + + /// ### update_failed + /// + /// Notify the update installation has failed + pub fn update_failed>(err: S) { + Self::notify("Update installation failed ❌", err.as_ref(), None); + } + + /// ### notify + /// + /// Notify guest OS with provided Summary, body and optional category + /// e.g. Category is supported on FreeBSD/Linux only + #[allow(unused_variables)] + fn notify(summary: &str, body: &str, category: Option<&str>) { + let mut notification = OsNotification::new(); + // Set common params + notification + .appname(env!("CARGO_PKG_NAME")) + .summary(summary) + .body(body) + .timeout(Timeout::Milliseconds(10000)); + // Set category if any + #[cfg(all(unix, not(target_os = "macos")))] + if let Some(category) = category { + notification.hint(Hint::Category(category.to_string())); + } + let _ = notification.show(); + } +} diff --git a/src/ui/activities/auth/misc.rs b/src/ui/activities/auth/misc.rs index 78094f5..f85c09e 100644 --- a/src/ui/activities/auth/misc.rs +++ b/src/ui/activities/auth/misc.rs @@ -27,7 +27,8 @@ */ use super::{AuthActivity, FileTransferParams, FileTransferProtocol}; use crate::filetransfer::params::{AwsS3Params, GenericProtocolParams, ProtocolParams}; -use crate::system::auto_update::{Update, UpdateStatus}; +use crate::system::auto_update::{Release, Update, UpdateStatus}; +use crate::system::notifications::Notification; impl AuthActivity { /// ### protocol_opt_to_enum @@ -155,6 +156,51 @@ impl AuthActivity { // -- update install + /// ### check_for_updates + /// + /// If enabled in configuration, check for updates from Github + pub(super) fn check_for_updates(&mut self) { + debug!("Check for updates..."); + // Check version only if unset in the store + let ctx = self.context_mut(); + if !ctx.store().isset(super::STORE_KEY_LATEST_VERSION) { + debug!("Version is not set in storage"); + if ctx.config().get_check_for_updates() { + debug!("Check for updates is enabled"); + // Send request + match Update::is_new_version_available() { + Ok(Some(Release { version, body })) => { + // If some, store version and release notes + info!("Latest version is: {}", version); + if ctx.config().get_notifications() { + // Notify new version available + Notification::update_available(version.as_str()); + } + // Store info + ctx.store_mut() + .set_string(super::STORE_KEY_LATEST_VERSION, version); + ctx.store_mut() + .set_string(super::STORE_KEY_RELEASE_NOTES, body); + } + Ok(None) => { + info!("Latest version is: {} (current)", env!("CARGO_PKG_VERSION")); + // Just set flag as check + ctx.store_mut().set(super::STORE_KEY_LATEST_VERSION); + } + Err(err) => { + // Report error + error!("Failed to get latest version: {}", err); + self.mount_error( + format!("Could not check for new updates: {}", err).as_str(), + ); + } + } + } else { + info!("Check for updates is disabled"); + } + } + } + /// ### install_update /// /// Install latest termscp version via GUI @@ -173,9 +219,17 @@ impl AuthActivity { match result { Ok(UpdateStatus::AlreadyUptodate) => self.mount_info("termscp is already up to date!"), Ok(UpdateStatus::UpdateInstalled(ver)) => { + if self.config().get_notifications() { + Notification::update_installed(ver.as_str()); + } self.mount_info(format!("termscp has been updated to version {}!", ver)) } - Err(err) => self.mount_error(format!("Could not install update: {}", err)), + Err(err) => { + if self.config().get_notifications() { + Notification::update_failed(err.to_string()); + } + self.mount_error(format!("Could not install update: {}", err)) + } } } } diff --git a/src/ui/activities/auth/mod.rs b/src/ui/activities/auth/mod.rs index 248263c..a568235 100644 --- a/src/ui/activities/auth/mod.rs +++ b/src/ui/activities/auth/mod.rs @@ -35,8 +35,8 @@ mod view; use super::{Activity, Context, ExitReason}; use crate::config::themes::Theme; use crate::filetransfer::{FileTransferParams, FileTransferProtocol}; -use crate::system::auto_update::{Release, Update as TermscpUpdate}; use crate::system::bookmarks_client::BookmarksClient; +use crate::system::config_client::ConfigClient; // Includes use crossterm::event::Event; @@ -110,45 +110,6 @@ impl AuthActivity { } } - /// ### on_create - /// - /// If enabled in configuration, check for updates from Github - fn check_for_updates(&mut self) { - debug!("Check for updates..."); - // Check version only if unset in the store - let ctx: &mut Context = self.context_mut(); - if !ctx.store().isset(STORE_KEY_LATEST_VERSION) { - debug!("Version is not set in storage"); - if ctx.config().get_check_for_updates() { - debug!("Check for updates is enabled"); - // Send request - match TermscpUpdate::is_new_version_available() { - Ok(Some(Release { version, body })) => { - // If some, store version and release notes - info!("Latest version is: {}", version); - ctx.store_mut() - .set_string(STORE_KEY_LATEST_VERSION, version); - ctx.store_mut().set_string(STORE_KEY_RELEASE_NOTES, body); - } - Ok(None) => { - info!("Latest version is: {} (current)", env!("CARGO_PKG_VERSION")); - // Just set flag as check - ctx.store_mut().set(STORE_KEY_LATEST_VERSION); - } - Err(err) => { - // Report error - error!("Failed to get latest version: {}", err); - self.mount_error( - format!("Could not check for new updates: {}", err).as_str(), - ); - } - } - } else { - info!("Check for updates is disabled"); - } - } - } - /// ### context /// /// Returns a reference to context @@ -163,6 +124,13 @@ impl AuthActivity { self.context.as_mut().unwrap() } + /// ### config + /// + /// Returns config client reference + fn config(&self) -> &ConfigClient { + self.context().config() + } + /// ### theme /// /// Returns a reference to theme diff --git a/src/ui/activities/filetransfer/lib/transfer.rs b/src/ui/activities/filetransfer/lib/transfer.rs index 263596a..3a2e839 100644 --- a/src/ui/activities/filetransfer/lib/transfer.rs +++ b/src/ui/activities/filetransfer/lib/transfer.rs @@ -87,6 +87,13 @@ impl TransferStates { pub fn aborted(&self) -> bool { self.aborted } + + /// ### full_size + /// + /// Returns the size of the entire transfer + pub fn full_size(&self) -> usize { + self.full.total + } } impl Default for ProgressStates { @@ -305,6 +312,8 @@ mod test { assert_eq!(states.aborted(), true); states.reset(); assert_eq!(states.aborted(), false); + states.full.total = 1024; + assert_eq!(states.full_size(), 1024); } #[test] diff --git a/src/ui/activities/filetransfer/misc.rs b/src/ui/activities/filetransfer/misc.rs index 7fdce4f..1ae4c67 100644 --- a/src/ui/activities/filetransfer/misc.rs +++ b/src/ui/activities/filetransfer/misc.rs @@ -22,12 +22,15 @@ * SOFTWARE. */ // Locals -use super::{ConfigClient, FileTransferActivity, LogLevel, LogRecord}; +use super::{ConfigClient, FileTransferActivity, LogLevel, LogRecord, TransferPayload}; use crate::filetransfer::ProtocolParams; use crate::system::environment; +use crate::system::notifications::Notification; use crate::system::sshkey_storage::SshKeyStorage; +use crate::utils::fmt::fmt_millis; use crate::utils::path; // Ext +use bytesize::ByteSize; use std::env; use std::path::{Path, PathBuf}; use tuirealm::Update; @@ -146,4 +149,86 @@ impl FileTransferActivity { ProtocolParams::AwsS3(params) => params.bucket_name.clone(), } } + + /// ### get_connection_msg + /// + /// Get connection message to show to client + pub(super) fn get_connection_msg(params: &ProtocolParams) -> String { + match params { + ProtocolParams::Generic(params) => { + info!( + "Client is not connected to remote; connecting to {}:{}", + params.address, params.port + ); + format!("Connecting to {}:{}…", params.address, params.port) + } + ProtocolParams::AwsS3(params) => { + info!( + "Client is not connected to remote; connecting to {} ({})", + params.bucket_name, params.region + ); + format!("Connecting to {}…", params.bucket_name) + } + } + } + + /// ### notify_transfer_completed + /// + /// Send notification regarding transfer completed + /// The notification is sent only when these conditions are satisfied: + /// + /// - notifications are enabled + /// - transfer size is greater or equal than notification threshold + pub(super) fn notify_transfer_completed(&self, payload: &TransferPayload) { + if self.config().get_notifications() + && self.config().get_notification_threshold() as usize <= self.transfer.full_size() + { + Notification::transfer_completed(self.transfer_completed_msg(payload)); + } + } + + /// ### notify_transfer_error + /// + /// Send notification regarding transfer error + /// The notification is sent only when these conditions are satisfied: + /// + /// - notifications are enabled + /// - transfer size is greater or equal than notification threshold + pub(super) fn notify_transfer_error(&self, msg: &str) { + if self.config().get_notifications() + && self.config().get_notification_threshold() as usize <= self.transfer.full_size() + { + Notification::transfer_error(msg); + } + } + + fn transfer_completed_msg(&self, payload: &TransferPayload) -> String { + let transfer_stats = format!( + "took {} seconds; at {}/s", + fmt_millis(self.transfer.partial.started().elapsed()), + ByteSize(self.transfer.partial.calc_bytes_per_second()), + ); + match payload { + TransferPayload::File(file) => { + format!( + "File \"{}\" has been successfully transferred ({})", + file.name, transfer_stats + ) + } + TransferPayload::Any(entry) => { + format!( + "\"{}\" has been successfully transferred ({})", + entry.get_name(), + transfer_stats + ) + } + TransferPayload::Many(entries) => { + format!( + "{} files has been successfully transferred ({})", + entries.len(), + transfer_stats + ) + } + } + } } diff --git a/src/ui/activities/filetransfer/mod.rs b/src/ui/activities/filetransfer/mod.rs index 74ad64f..3a9f6ab 100644 --- a/src/ui/activities/filetransfer/mod.rs +++ b/src/ui/activities/filetransfer/mod.rs @@ -36,7 +36,7 @@ pub(self) mod view; // locals use super::{Activity, Context, ExitReason}; use crate::config::themes::Theme; -use crate::filetransfer::{FileTransfer, FileTransferProtocol, ProtocolParams}; +use crate::filetransfer::{FileTransfer, FileTransferProtocol}; use crate::filetransfer::{FtpFileTransfer, S3FileTransfer, ScpFileTransfer, SftpFileTransfer}; use crate::fs::explorer::FileExplorer; use crate::fs::FsEntry; @@ -239,28 +239,6 @@ impl FileTransferActivity { fn theme(&self) -> &Theme { self.context().theme_provider().theme() } - - /// ### get_connection_msg - /// - /// Get connection message to show to client - fn get_connection_msg(params: &ProtocolParams) -> String { - match params { - ProtocolParams::Generic(params) => { - info!( - "Client is not connected to remote; connecting to {}:{}", - params.address, params.port - ); - format!("Connecting to {}:{}…", params.address, params.port) - } - ProtocolParams::AwsS3(params) => { - info!( - "Client is not connected to remote; connecting to {} ({})", - params.bucket_name, params.region - ); - format!("Connecting to {}…", params.bucket_name) - } - } - } } /** diff --git a/src/ui/activities/filetransfer/session.rs b/src/ui/activities/filetransfer/session.rs index 3948e31..09cdd9f 100644 --- a/src/ui/activities/filetransfer/session.rs +++ b/src/ui/activities/filetransfer/session.rs @@ -206,17 +206,27 @@ impl FileTransferActivity { dst_name: Option, ) -> Result<(), String> { // Use different method based on payload - match payload { - TransferPayload::Any(entry) => { - self.filetransfer_send_any(&entry, curr_remote_path, dst_name) + let result = match payload { + TransferPayload::Any(ref entry) => { + self.filetransfer_send_any(entry, curr_remote_path, dst_name) } - TransferPayload::File(file) => { - self.filetransfer_send_file(&file, curr_remote_path, dst_name) + TransferPayload::File(ref file) => { + self.filetransfer_send_file(file, curr_remote_path, dst_name) } - TransferPayload::Many(entries) => { + TransferPayload::Many(ref entries) => { self.filetransfer_send_many(entries, curr_remote_path) } + }; + // Notify + match &result { + Ok(_) => { + self.notify_transfer_completed(&payload); + } + Err(e) => { + self.notify_transfer_error(e.as_str()); + } } + result } /// ### filetransfer_send_file @@ -268,10 +278,10 @@ impl FileTransferActivity { // Mount progress bar self.mount_progress_bar(format!("Uploading {}…", entry.get_abs_path().display())); // Send recurse - self.filetransfer_send_recurse(entry, curr_remote_path, dst_name); + let result = self.filetransfer_send_recurse(entry, curr_remote_path, dst_name); // Umount progress bar self.umount_progress_bar(); - Ok(()) + result } /// ### filetransfer_send_many @@ -279,7 +289,7 @@ impl FileTransferActivity { /// Send many entries to remote fn filetransfer_send_many( &mut self, - entries: Vec, + entries: &[FsEntry], curr_remote_path: &Path, ) -> Result<(), String> { // Reset states @@ -293,12 +303,14 @@ impl FileTransferActivity { // Mount progress bar self.mount_progress_bar(format!("Uploading {} entries…", entries.len())); // Send recurse - entries + let result = entries .iter() - .for_each(|x| self.filetransfer_send_recurse(x, curr_remote_path, None)); + .map(|x| self.filetransfer_send_recurse(x, curr_remote_path, None)) + .find(|x| x.is_err()) + .unwrap_or(Ok(())); // Umount progress bar self.umount_progress_bar(); - Ok(()) + result } fn filetransfer_send_recurse( @@ -306,7 +318,7 @@ impl FileTransferActivity { entry: &FsEntry, curr_remote_path: &Path, dst_name: Option, - ) { + ) -> Result<(), String> { // Write popup let file_name: String = match entry { FsEntry::Directory(dir) => dir.name.clone(), @@ -320,44 +332,42 @@ impl FileTransferActivity { }; remote_path.push(remote_file_name); // Match entry - match entry { + let result: Result<(), String> = match entry { FsEntry::File(file) => { - if let Err(err) = self.filetransfer_send_one(file, remote_path.as_path(), file_name) - { - // Log error - self.log_and_alert( - LogLevel::Error, - format!("Failed to upload file {}: {}", file.name, err), - ); - // If transfer was abrupted or there was an IO error on remote, remove file - if matches!( - err, - TransferErrorReason::Abrupted | TransferErrorReason::RemoteIoError(_) - ) { - // Stat file on remote and remove it if exists - match self.client.stat(remote_path.as_path()) { - Err(err) => self.log( - LogLevel::Error, - format!( - "Could not remove created file {}: {}", - remote_path.display(), - err + match self.filetransfer_send_one(file, remote_path.as_path(), file_name) { + Err(err) => { + // If transfer was abrupted or there was an IO error on remote, remove file + if matches!( + err, + TransferErrorReason::Abrupted | TransferErrorReason::RemoteIoError(_) + ) { + // Stat file on remote and remove it if exists + match self.client.stat(remote_path.as_path()) { + Err(err) => self.log( + LogLevel::Error, + format!( + "Could not remove created file {}: {}", + remote_path.display(), + err + ), ), - ), - Ok(entry) => { - if let Err(err) = self.client.remove(&entry) { - self.log( - LogLevel::Error, - format!( - "Could not remove created file {}: {}", - remote_path.display(), - err - ), - ); + Ok(entry) => { + if let Err(err) = self.client.remove(&entry) { + self.log( + LogLevel::Error, + format!( + "Could not remove created file {}: {}", + remote_path.display(), + err + ), + ); + } } } } + Err(err.to_string()) } + Ok(_) => Ok(()), } } FsEntry::Directory(dir) => { @@ -387,7 +397,7 @@ impl FileTransferActivity { err ), ); - return; + return Err(err.to_string()); } } // Get files in dir @@ -400,8 +410,13 @@ impl FileTransferActivity { break; } // Send entry; name is always None after first call - self.filetransfer_send_recurse(entry, remote_path.as_path(), None); + if let Err(err) = + self.filetransfer_send_recurse(entry, remote_path.as_path(), None) + { + return Err(err); + } } + Ok(()) } Err(err) => { self.log_and_alert( @@ -412,10 +427,11 @@ impl FileTransferActivity { err ), ); + Err(err.to_string()) } } } - } + }; // Scan dir on remote self.reload_remote_dir(); // If aborted; show popup @@ -426,6 +442,7 @@ impl FileTransferActivity { format!("Upload aborted for \"{}\"!", entry.get_abs_path().display()), ); } + result } /// ### filetransfer_send_file @@ -613,11 +630,23 @@ impl FileTransferActivity { local_path: &Path, dst_name: Option, ) -> Result<(), String> { - match payload { - TransferPayload::Any(entry) => self.filetransfer_recv_any(&entry, local_path, dst_name), - TransferPayload::File(file) => self.filetransfer_recv_file(&file, local_path), - TransferPayload::Many(entries) => self.filetransfer_recv_many(entries, local_path), + let result = match payload { + TransferPayload::Any(ref entry) => { + self.filetransfer_recv_any(entry, local_path, dst_name) + } + TransferPayload::File(ref file) => self.filetransfer_recv_file(file, local_path), + TransferPayload::Many(ref entries) => self.filetransfer_recv_many(entries, local_path), + }; + // Notify + match &result { + Ok(_) => { + self.notify_transfer_completed(&payload); + } + Err(e) => { + self.notify_transfer_error(e.as_str()); + } } + result } /// ### filetransfer_recv_any @@ -639,10 +668,10 @@ impl FileTransferActivity { // Mount progress bar self.mount_progress_bar(format!("Downloading {}…", entry.get_abs_path().display())); // Receive - self.filetransfer_recv_recurse(entry, local_path, dst_name); + let result = self.filetransfer_recv_recurse(entry, local_path, dst_name); // Umount progress bar self.umount_progress_bar(); - Ok(()) + result } /// ### filetransfer_recv_file @@ -669,7 +698,7 @@ impl FileTransferActivity { /// Send many entries to remote fn filetransfer_recv_many( &mut self, - entries: Vec, + entries: &[FsEntry], curr_remote_path: &Path, ) -> Result<(), String> { // Reset states @@ -683,12 +712,14 @@ impl FileTransferActivity { // Mount progress bar self.mount_progress_bar(format!("Downloading {} entries…", entries.len())); // Send recurse - entries + let result = entries .iter() - .for_each(|x| self.filetransfer_recv_recurse(x, curr_remote_path, None)); + .map(|x| self.filetransfer_recv_recurse(x, curr_remote_path, None)) + .find(|x| x.is_err()) + .unwrap_or(Ok(())); // Umount progress bar self.umount_progress_bar(); - Ok(()) + result } fn filetransfer_recv_recurse( @@ -696,14 +727,14 @@ impl FileTransferActivity { entry: &FsEntry, local_path: &Path, dst_name: Option, - ) { + ) -> Result<(), String> { // Write popup let file_name: String = match entry { FsEntry::Directory(dir) => dir.name.clone(), FsEntry::File(file) => file.name.clone(), }; // Match entry - match entry { + let result: Result<(), String> = match entry { FsEntry::File(file) => { // Get local file let mut local_file_path: PathBuf = PathBuf::from(local_path); @@ -716,10 +747,6 @@ impl FileTransferActivity { if let Err(err) = self.filetransfer_recv_one(local_file_path.as_path(), file, file_name) { - self.log_and_alert( - LogLevel::Error, - format!("Could not download file {}: {}", file.name, err), - ); // If transfer was abrupted or there was an IO error on remote, remove file if matches!( err, @@ -749,6 +776,9 @@ impl FileTransferActivity { } } } + Err(err.to_string()) + } else { + Ok(()) } } FsEntry::Directory(dir) => { @@ -798,12 +828,15 @@ impl FileTransferActivity { } // Receive entry; name is always None after first call // Local path becomes local_dir_path - self.filetransfer_recv_recurse( + if let Err(err) = self.filetransfer_recv_recurse( entry, local_dir_path.as_path(), None, - ); + ) { + return Err(err); + } } + Ok(()) } Err(err) => { self.log_and_alert( @@ -814,6 +847,7 @@ impl FileTransferActivity { err ), ); + Err(err.to_string()) } } } @@ -826,10 +860,11 @@ impl FileTransferActivity { err ), ); + Err(err.to_string()) } } } - } + }; // Reload directory on local self.reload_local_dir(); // if aborted; show alert @@ -843,6 +878,7 @@ impl FileTransferActivity { ), ); } + result } /// ### filetransfer_recv_one diff --git a/src/ui/activities/setup/mod.rs b/src/ui/activities/setup/mod.rs index 7514141..fc0730d 100644 --- a/src/ui/activities/setup/mod.rs +++ b/src/ui/activities/setup/mod.rs @@ -58,6 +58,8 @@ const COMPONENT_RADIO_PROMPT_ON_FILE_REPLACE: &str = "RADIO_PROMPT_ON_FILE_REPLA const COMPONENT_RADIO_GROUP_DIRS: &str = "RADIO_GROUP_DIRS"; const COMPONENT_INPUT_LOCAL_FILE_FMT: &str = "INPUT_LOCAL_FILE_FMT"; const COMPONENT_INPUT_REMOTE_FILE_FMT: &str = "INPUT_REMOTE_FILE_FMT"; +const COMPONENT_RADIO_NOTIFICATIONS_ENABLED: &str = "RADIO_NOTIFICATIONS_ENABLED"; +const COMPONENT_INPUT_NOTIFICATIONS_THRESHOLD: &str = "INPUT_NOTIFICATIONS_THRESHOLD"; // -- ssh keys const COMPONENT_LIST_SSH_KEYS: &str = "LIST_SSH_KEYS"; const COMPONENT_INPUT_SSH_HOST: &str = "INPUT_SSH_HOST"; diff --git a/src/ui/activities/setup/update.rs b/src/ui/activities/setup/update.rs index b43f795..cbeae39 100644 --- a/src/ui/activities/setup/update.rs +++ b/src/ui/activities/setup/update.rs @@ -40,11 +40,13 @@ use super::{ COMPONENT_COLOR_TRANSFER_PROG_BAR_FULL, COMPONENT_COLOR_TRANSFER_PROG_BAR_PARTIAL, COMPONENT_COLOR_TRANSFER_STATUS_HIDDEN, COMPONENT_COLOR_TRANSFER_STATUS_SORTING, COMPONENT_COLOR_TRANSFER_STATUS_SYNC, COMPONENT_INPUT_LOCAL_FILE_FMT, - COMPONENT_INPUT_REMOTE_FILE_FMT, COMPONENT_INPUT_SSH_HOST, COMPONENT_INPUT_SSH_USERNAME, - COMPONENT_INPUT_TEXT_EDITOR, COMPONENT_LIST_SSH_KEYS, COMPONENT_RADIO_DEFAULT_PROTOCOL, - COMPONENT_RADIO_DEL_SSH_KEY, COMPONENT_RADIO_GROUP_DIRS, COMPONENT_RADIO_HIDDEN_FILES, - COMPONENT_RADIO_PROMPT_ON_FILE_REPLACE, COMPONENT_RADIO_QUIT, COMPONENT_RADIO_SAVE, - COMPONENT_RADIO_UPDATES, COMPONENT_TEXT_ERROR, COMPONENT_TEXT_HELP, + COMPONENT_INPUT_NOTIFICATIONS_THRESHOLD, COMPONENT_INPUT_REMOTE_FILE_FMT, + COMPONENT_INPUT_SSH_HOST, COMPONENT_INPUT_SSH_USERNAME, COMPONENT_INPUT_TEXT_EDITOR, + COMPONENT_LIST_SSH_KEYS, COMPONENT_RADIO_DEFAULT_PROTOCOL, COMPONENT_RADIO_DEL_SSH_KEY, + COMPONENT_RADIO_GROUP_DIRS, COMPONENT_RADIO_HIDDEN_FILES, + COMPONENT_RADIO_NOTIFICATIONS_ENABLED, COMPONENT_RADIO_PROMPT_ON_FILE_REPLACE, + COMPONENT_RADIO_QUIT, COMPONENT_RADIO_SAVE, COMPONENT_RADIO_UPDATES, COMPONENT_TEXT_ERROR, + COMPONENT_TEXT_HELP, }; use crate::ui::keymap::*; use crate::utils::parser::parse_color; @@ -103,10 +105,26 @@ impl SetupActivity { None } (COMPONENT_INPUT_REMOTE_FILE_FMT, key) if key == &MSG_KEY_DOWN => { + self.view.active(COMPONENT_RADIO_NOTIFICATIONS_ENABLED); + None + } + (COMPONENT_RADIO_NOTIFICATIONS_ENABLED, key) if key == &MSG_KEY_DOWN => { + self.view.active(COMPONENT_INPUT_NOTIFICATIONS_THRESHOLD); + None + } + (COMPONENT_INPUT_NOTIFICATIONS_THRESHOLD, key) if key == &MSG_KEY_DOWN => { self.view.active(COMPONENT_INPUT_TEXT_EDITOR); None } // Input field + (COMPONENT_INPUT_NOTIFICATIONS_THRESHOLD, key) if key == &MSG_KEY_UP => { + self.view.active(COMPONENT_RADIO_NOTIFICATIONS_ENABLED); + None + } + (COMPONENT_RADIO_NOTIFICATIONS_ENABLED, key) if key == &MSG_KEY_UP => { + self.view.active(COMPONENT_INPUT_REMOTE_FILE_FMT); + None + } (COMPONENT_INPUT_REMOTE_FILE_FMT, key) if key == &MSG_KEY_UP => { self.view.active(COMPONENT_INPUT_LOCAL_FILE_FMT); None @@ -136,7 +154,7 @@ impl SetupActivity { None } (COMPONENT_INPUT_TEXT_EDITOR, key) if key == &MSG_KEY_UP => { - self.view.active(COMPONENT_INPUT_REMOTE_FILE_FMT); + self.view.active(COMPONENT_INPUT_NOTIFICATIONS_THRESHOLD); None } // Error or diff --git a/src/ui/activities/setup/view/setup.rs b/src/ui/activities/setup/view/setup.rs index f5d3f70..20fb80c 100644 --- a/src/ui/activities/setup/view/setup.rs +++ b/src/ui/activities/setup/view/setup.rs @@ -30,6 +30,7 @@ use super::{Context, SetupActivity}; use crate::filetransfer::FileTransferProtocol; use crate::fs::explorer::GroupDirs; +use crate::ui::components::bytes::{Bytes, BytesPropsBuilder}; use crate::utils::ui::draw_area_in; // Ext use std::path::PathBuf; @@ -143,8 +144,8 @@ impl SetupActivity { super::COMPONENT_INPUT_LOCAL_FILE_FMT, Box::new(Input::new( InputPropsBuilder::default() - .with_foreground(Color::LightBlue) - .with_borders(Borders::ALL, BorderType::Rounded, Color::LightBlue) + .with_foreground(Color::LightGreen) + .with_borders(Borders::ALL, BorderType::Rounded, Color::LightGreen) .with_label("File formatter syntax (local)", Alignment::Left) .build(), )), @@ -153,12 +154,35 @@ impl SetupActivity { super::COMPONENT_INPUT_REMOTE_FILE_FMT, Box::new(Input::new( InputPropsBuilder::default() - .with_foreground(Color::LightGreen) - .with_borders(Borders::ALL, BorderType::Rounded, Color::LightGreen) + .with_foreground(Color::LightCyan) + .with_borders(Borders::ALL, BorderType::Rounded, Color::LightCyan) .with_label("File formatter syntax (remote)", Alignment::Left) .build(), )), ); + self.view.mount( + super::COMPONENT_RADIO_NOTIFICATIONS_ENABLED, + Box::new(Radio::new( + RadioPropsBuilder::default() + .with_color(Color::LightRed) + .with_inverted_color(Color::Black) + .with_borders(Borders::ALL, BorderType::Rounded, Color::LightRed) + .with_title("Enable notifications?", Alignment::Left) + .with_options(&[String::from("Yes"), String::from("No")]) + .rewind(true) + .build(), + )), + ); + self.view.mount( + super::COMPONENT_INPUT_NOTIFICATIONS_THRESHOLD, + Box::new(Bytes::new( + BytesPropsBuilder::default() + .with_foreground(Color::LightYellow) + .with_borders(Borders::ALL, BorderType::Rounded, Color::LightYellow) + .with_label("Notifications: minimum transfer size", Alignment::Left) + .build(), + )), + ); // Load values self.load_input_values(); } @@ -173,7 +197,7 @@ impl SetupActivity { .constraints( [ Constraint::Length(3), // Current tab - Constraint::Length(21), // Main body + Constraint::Length(18), // Main body Constraint::Length(3), // Help footer ] .as_ref(), @@ -182,8 +206,13 @@ impl SetupActivity { // Render common widget self.view.render(super::COMPONENT_RADIO_TAB, f, chunks[0]); self.view.render(super::COMPONENT_TEXT_FOOTER, f, chunks[2]); - // Make chunks + // Make chunks (two columns) let ui_cfg_chunks = Layout::default() + .direction(Direction::Horizontal) + .constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref()) + .split(chunks[1]); + // Column 1 + let ui_cfg_chunks_col1 = Layout::default() .direction(Direction::Vertical) .constraints( [ @@ -193,31 +222,65 @@ impl SetupActivity { Constraint::Length(3), // Updates tab Constraint::Length(3), // Prompt file replace Constraint::Length(3), // Group dirs - Constraint::Length(3), // Local Format input - Constraint::Length(3), // Remote Format input ] .as_ref(), ) - .split(chunks[1]); + .split(ui_cfg_chunks[0]); self.view - .render(super::COMPONENT_INPUT_TEXT_EDITOR, f, ui_cfg_chunks[0]); + .render(super::COMPONENT_INPUT_TEXT_EDITOR, f, ui_cfg_chunks_col1[0]); + self.view.render( + super::COMPONENT_RADIO_DEFAULT_PROTOCOL, + f, + ui_cfg_chunks_col1[1], + ); + self.view.render( + super::COMPONENT_RADIO_HIDDEN_FILES, + f, + ui_cfg_chunks_col1[2], + ); self.view - .render(super::COMPONENT_RADIO_DEFAULT_PROTOCOL, f, ui_cfg_chunks[1]); - self.view - .render(super::COMPONENT_RADIO_HIDDEN_FILES, f, ui_cfg_chunks[2]); - self.view - .render(super::COMPONENT_RADIO_UPDATES, f, ui_cfg_chunks[3]); + .render(super::COMPONENT_RADIO_UPDATES, f, ui_cfg_chunks_col1[3]); self.view.render( super::COMPONENT_RADIO_PROMPT_ON_FILE_REPLACE, f, - ui_cfg_chunks[4], + ui_cfg_chunks_col1[4], ); self.view - .render(super::COMPONENT_RADIO_GROUP_DIRS, f, ui_cfg_chunks[5]); - self.view - .render(super::COMPONENT_INPUT_LOCAL_FILE_FMT, f, ui_cfg_chunks[6]); - self.view - .render(super::COMPONENT_INPUT_REMOTE_FILE_FMT, f, ui_cfg_chunks[7]); + .render(super::COMPONENT_RADIO_GROUP_DIRS, f, ui_cfg_chunks_col1[5]); + // Column 2 + let ui_cfg_chunks_col2 = Layout::default() + .direction(Direction::Vertical) + .constraints( + [ + Constraint::Length(3), // Local Format input + Constraint::Length(3), // Remote Format input + Constraint::Length(3), // Notifications enabled + Constraint::Length(3), // Notifications threshold + Constraint::Length(1), // Filler + ] + .as_ref(), + ) + .split(ui_cfg_chunks[1]); + self.view.render( + super::COMPONENT_INPUT_LOCAL_FILE_FMT, + f, + ui_cfg_chunks_col2[0], + ); + self.view.render( + super::COMPONENT_INPUT_REMOTE_FILE_FMT, + f, + ui_cfg_chunks_col2[1], + ); + self.view.render( + super::COMPONENT_RADIO_NOTIFICATIONS_ENABLED, + f, + ui_cfg_chunks_col2[2], + ); + self.view.render( + super::COMPONENT_INPUT_NOTIFICATIONS_THRESHOLD, + f, + ui_cfg_chunks_col2[3], + ); // Popups if let Some(props) = self.view.get_props(super::COMPONENT_TEXT_ERROR) { if props.visible { @@ -341,6 +404,31 @@ impl SetupActivity { .view .update(super::COMPONENT_INPUT_REMOTE_FILE_FMT, props); } + // Notifications enabled + if let Some(props) = self + .view + .get_props(super::COMPONENT_RADIO_NOTIFICATIONS_ENABLED) + { + let enabled: usize = match self.config().get_notifications() { + true => 0, + false => 1, + }; + let props = RadioPropsBuilder::from(props).with_value(enabled).build(); + let _ = self + .view + .update(super::COMPONENT_RADIO_NOTIFICATIONS_ENABLED, props); + } + // Notifications threshold + if let Some(props) = self + .view + .get_props(super::COMPONENT_INPUT_NOTIFICATIONS_THRESHOLD) + { + let value: u64 = self.config().get_notification_threshold(); + let props = BytesPropsBuilder::from(props).with_value(value).build(); + let _ = self + .view + .update(super::COMPONENT_INPUT_NOTIFICATIONS_THRESHOLD, props); + } } /// ### collect_input_values @@ -404,5 +492,17 @@ impl SetupActivity { }; self.config_mut().set_group_dirs(dirs); } + if let Some(Payload::One(Value::Usize(opt))) = self + .view + .get_state(super::COMPONENT_RADIO_NOTIFICATIONS_ENABLED) + { + self.config_mut().set_notifications(opt == 0); + } + if let Some(Payload::One(Value::U64(bytes))) = self + .view + .get_state(super::COMPONENT_INPUT_NOTIFICATIONS_THRESHOLD) + { + self.config_mut().set_notification_threshold(bytes); + } } } diff --git a/src/ui/components/bytes.rs b/src/ui/components/bytes.rs new file mode 100644 index 0000000..92d2a38 --- /dev/null +++ b/src/ui/components/bytes.rs @@ -0,0 +1,310 @@ +//! ## Bytes +//! +//! `Bytes` component extends an `Input` component in order to provide an input type for byte size. + +/** + * MIT License + * + * termscp - Copyright (c) 2021 Christian Visintin + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +// locals +use crate::utils::fmt::fmt_bytes; +use crate::utils::parser::parse_bytesize; +// ext +use tui_realm_stdlib::{Input, InputPropsBuilder}; +use tuirealm::event::Event; +use tuirealm::props::{Alignment, Props, PropsBuilder}; +use tuirealm::tui::{ + layout::Rect, + style::Color, + widgets::{BorderType, Borders}, +}; +use tuirealm::{Component, Frame, Msg, Payload, Value}; + +// -- props + +/// ## BytesPropsBuilder +/// +/// A wrapper around an `InputPropsBuilder` +pub struct BytesPropsBuilder { + puppet: InputPropsBuilder, +} + +impl Default for BytesPropsBuilder { + fn default() -> Self { + Self { + puppet: InputPropsBuilder::default(), + } + } +} + +impl PropsBuilder for BytesPropsBuilder { + fn build(&mut self) -> Props { + self.puppet.build() + } + + fn hidden(&mut self) -> &mut Self { + self.puppet.hidden(); + self + } + + fn visible(&mut self) -> &mut Self { + self.puppet.visible(); + self + } +} + +impl From for BytesPropsBuilder { + fn from(props: Props) -> Self { + BytesPropsBuilder { + puppet: InputPropsBuilder::from(props), + } + } +} + +impl BytesPropsBuilder { + /// ### with_borders + /// + /// Set component borders style + pub fn with_borders( + &mut self, + borders: Borders, + variant: BorderType, + color: Color, + ) -> &mut Self { + self.puppet.with_borders(borders, variant, color); + self + } + + /// ### with_label + /// + /// Set input label + pub fn with_label>(&mut self, label: S, alignment: Alignment) -> &mut Self { + self.puppet.with_label(label, alignment); + self + } + + /// ### with_color + /// + /// Set initial value for component + pub fn with_foreground(&mut self, color: Color) -> &mut Self { + self.puppet.with_foreground(color); + self + } + + /// ### with_color + /// + /// Set initial value for component + pub fn with_value(&mut self, val: u64) -> &mut Self { + self.puppet.with_value(fmt_bytes(val)); + self + } +} + +// -- component + +/// ## Bytes +/// +/// a wrapper component of `Input` which adds a superset of rules to behave as a color picker +pub struct Bytes { + input: Input, + native_color: Color, +} + +impl Bytes { + /// ### new + /// + /// Instantiate a new `Bytes` + pub fn new(props: Props) -> Self { + // Instantiate a new color picker using input + Self { + native_color: props.foreground, + input: Input::new(props), + } + } + + /// ### update_colors + /// + /// Update colors to match selected color, with provided one + fn update_colors(&mut self, color: Color) { + let mut props = self.get_props(); + props.foreground = color; + props.borders.color = color; + let _ = self.input.update(props); + } +} + +impl Component for Bytes { + /// ### render + /// + /// Based on the current properties and states, renders a widget using the provided render engine in the provided Area + /// If focused, cursor is also set (if supported by widget) + #[cfg(not(tarpaulin_include))] + fn render(&self, render: &mut Frame, area: Rect) { + self.input.render(render, area); + } + + /// ### update + /// + /// Update component properties + /// Properties should first be retrieved through `get_props` which creates a builder from + /// existing properties and then edited before calling update. + /// Returns a Msg to the view + fn update(&mut self, props: Props) -> Msg { + let msg: Msg = self.input.update(props); + match msg { + Msg::OnChange(Payload::One(Value::Str(input))) => { + match parse_bytesize(input.as_str()) { + Some(bytes) => { + // return OK + self.update_colors(self.native_color); + Msg::OnChange(Payload::One(Value::U64(bytes.as_u64()))) + } + None => { + // Invalid color + self.update_colors(Color::Red); + Msg::None + } + } + } + msg => msg, + } + } + + /// ### get_props + /// + /// Returns a props builder starting from component properties. + /// This returns a prop builder in order to make easier to create + /// new properties for the element. + fn get_props(&self) -> Props { + self.input.get_props() + } + + /// ### on + /// + /// Handle input event and update internal states. + /// Returns a Msg to the view + fn on(&mut self, ev: Event) -> Msg { + // Capture message from input + match self.input.on(ev) { + Msg::OnChange(Payload::One(Value::Str(input))) => { + // Capture color and validate + match parse_bytesize(input.as_str()) { + Some(bytes) => { + // Update color and return OK + self.update_colors(self.native_color); + Msg::OnChange(Payload::One(Value::U64(bytes.as_u64()))) + } + None => { + // Invalid color + self.update_colors(Color::Red); + Msg::None + } + } + } + Msg::OnSubmit(_) => Msg::None, + msg => msg, + } + } + + /// ### get_state + /// + /// Get current state from component + /// For this component returns Unsigned if the input type is a number, otherwise a text + /// The value is always the current input. + fn get_state(&self) -> Payload { + match self.input.get_state() { + Payload::One(Value::Str(bytes)) => match parse_bytesize(bytes.as_str()) { + None => Payload::None, + Some(bytes) => Payload::One(Value::U64(bytes.as_u64())), + }, + _ => Payload::None, + } + } + + // -- events + + /// ### blur + /// + /// Blur component; basically remove focus + fn blur(&mut self) { + self.input.blur(); + } + + /// ### active + /// + /// Active component; basically give focus + fn active(&mut self) { + self.input.active(); + } +} + +#[cfg(test)] +mod test { + use super::*; + + use crossterm::event::{KeyCode, KeyEvent}; + use pretty_assertions::assert_eq; + + #[test] + fn bytes_input() { + let mut component: Bytes = Bytes::new( + BytesPropsBuilder::default() + .visible() + .with_value(1024) + .with_borders(Borders::ALL, BorderType::Double, Color::Rgb(204, 170, 0)) + .with_label("omar", Alignment::Left) + .with_foreground(Color::Red) + .build(), + ); + // Focus + component.blur(); + component.active(); + // Get value + assert_eq!(component.get_state(), Payload::One(Value::U64(1024))); + // Set an invalid color + let props = InputPropsBuilder::from(component.get_props()) + .with_value(String::from("#pippo1")) + .hidden() + .build(); + assert_eq!(component.update(props), Msg::None); + assert_eq!(component.get_state(), Payload::None); + // Reset color + let props = BytesPropsBuilder::from(component.get_props()) + .with_value(111) + .hidden() + .build(); + assert_eq!( + component.update(props), + Msg::OnChange(Payload::One(Value::U64(111))) + ); + // Backspace (invalid) + assert_eq!( + component.on(Event::Key(KeyEvent::from(KeyCode::Backspace))), + Msg::None + ); + // Press '1' + assert_eq!( + component.on(Event::Key(KeyEvent::from(KeyCode::Char('B')))), + Msg::OnChange(Payload::One(Value::U64(111))) + ); + } +} diff --git a/src/ui/components/mod.rs b/src/ui/components/mod.rs index bcb878a..342483d 100644 --- a/src/ui/components/mod.rs +++ b/src/ui/components/mod.rs @@ -27,6 +27,7 @@ */ // exports pub mod bookmark_list; +pub mod bytes; pub mod color_picker; pub mod file_list; pub mod logbox; diff --git a/src/utils/fmt.rs b/src/utils/fmt.rs index 90e0194..1fa714f 100644 --- a/src/utils/fmt.rs +++ b/src/utils/fmt.rs @@ -287,6 +287,25 @@ pub fn shadow_password(s: &str) -> String { (0..s.len()).map(|_| '*').collect() } +/// ### fmt_bytes +/// +/// Format bytes +pub fn fmt_bytes(v: u64) -> String { + if v >= 1125899906842624 { + format!("{} PB", v / 1125899906842624) + } else if v >= 1099511627776 { + format!("{} TB", v / 1099511627776) + } else if v >= 1073741824 { + format!("{} GB", v / 1073741824) + } else if v >= 1048576 { + format!("{} MB", v / 1048576) + } else if v >= 1024 { + format!("{} KB", v / 1024) + } else { + format!("{} B", v) + } +} + #[cfg(test)] mod tests { @@ -599,4 +618,14 @@ mod tests { fn test_utils_fmt_shadow_password() { assert_eq!(shadow_password("foobar"), String::from("******")); } + + #[test] + fn format_bytes() { + assert_eq!(fmt_bytes(110).as_str(), "110 B"); + assert_eq!(fmt_bytes(2048).as_str(), "2 KB"); + assert_eq!(fmt_bytes(2097152).as_str(), "2 MB"); + assert_eq!(fmt_bytes(4294967296).as_str(), "4 GB"); + assert_eq!(fmt_bytes(3298534883328).as_str(), "3 TB"); + assert_eq!(fmt_bytes(3377699720527872).as_str(), "3 PB"); + } } diff --git a/src/utils/parser.rs b/src/utils/parser.rs index 5b3f2ce..b6d8841 100644 --- a/src/utils/parser.rs +++ b/src/utils/parser.rs @@ -36,6 +36,7 @@ use crate::system::config_client::ConfigClient; use crate::system::environment; // Ext +use bytesize::ByteSize; use chrono::format::ParseError; use chrono::prelude::*; use regex::Regex; @@ -95,6 +96,12 @@ lazy_static! { * - group 6: blue */ static ref COLOR_RGB_REGEX: Regex = Regex::new(r"^(rgb)?\(?([01]?\d\d?|2[0-4]\d|25[0-5])(\W+)([01]?\d\d?|2[0-4]\d|25[0-5])\W+(([01]?\d\d?|2[0-4]\d|25[0-5])\)?)").unwrap(); + /** + * Regex matches: + * - group 1: amount (number) + * - group 4: unit (K, M, G, T, P) + */ + static ref BYTESIZE_REGEX: Regex = Regex::new(r"(:?([0-9])+)( )*(:?[KMGTP])?B").unwrap(); } // -- remote opts @@ -549,6 +556,57 @@ fn parse_rgb_color(color: &str) -> Option { }) } +#[derive(Debug, PartialEq)] +enum ByteUnit { + Byte, + Kilobyte, + Megabyte, + Gigabyte, + Terabyte, + Petabyte, +} + +impl FromStr for ByteUnit { + type Err = &'static str; + + fn from_str(s: &str) -> Result { + match s { + "B" => Ok(Self::Byte), + "KB" => Ok(Self::Kilobyte), + "MB" => Ok(Self::Megabyte), + "GB" => Ok(Self::Gigabyte), + "TB" => Ok(Self::Terabyte), + "PB" => Ok(Self::Petabyte), + _ => Err("Invalid unit"), + } + } +} + +/// ### parse_bytesize +/// +/// Parse bytes repr (e.g. `24 MB`) into `ByteSize` +pub fn parse_bytesize>(bytes: S) -> Option { + match BYTESIZE_REGEX.captures(bytes.as_ref()) { + None => None, + Some(groups) => { + let amount = groups + .get(1) + .map(|x| x.as_str().parse::().unwrap_or(0))?; + let unit = groups.get(4).map(|x| x.as_str().to_string()); + let unit = format!("{}B", unit.unwrap_or_default()); + let unit = ByteUnit::from_str(unit.as_str()).unwrap(); + Some(match unit { + ByteUnit::Byte => ByteSize::b(amount), + ByteUnit::Gigabyte => ByteSize::gib(amount), + ByteUnit::Kilobyte => ByteSize::kib(amount), + ByteUnit::Megabyte => ByteSize::mib(amount), + ByteUnit::Petabyte => ByteSize::pib(amount), + ByteUnit::Terabyte => ByteSize::tib(amount), + }) + } + } +} + #[cfg(test)] mod tests { @@ -1055,4 +1113,25 @@ mod tests { ); assert!(parse_color("redd").is_none()); } + + #[test] + fn parse_byteunit() { + assert_eq!(ByteUnit::from_str("B").ok().unwrap(), ByteUnit::Byte); + assert_eq!(ByteUnit::from_str("KB").ok().unwrap(), ByteUnit::Kilobyte); + assert_eq!(ByteUnit::from_str("MB").ok().unwrap(), ByteUnit::Megabyte); + assert_eq!(ByteUnit::from_str("GB").ok().unwrap(), ByteUnit::Gigabyte); + assert_eq!(ByteUnit::from_str("TB").ok().unwrap(), ByteUnit::Terabyte); + assert_eq!(ByteUnit::from_str("PB").ok().unwrap(), ByteUnit::Petabyte); + assert!(ByteUnit::from_str("uB").is_err()); + } + + #[test] + fn parse_str_as_bytesize() { + assert_eq!(parse_bytesize("1024 B").unwrap().as_u64(), 1024); + assert_eq!(parse_bytesize("1024B").unwrap().as_u64(), 1024); + assert_eq!(parse_bytesize("10240 KB").unwrap().as_u64(), 10485760); + assert_eq!(parse_bytesize("2 GB").unwrap().as_u64(), 2147483648); + assert_eq!(parse_bytesize("1 TB").unwrap().as_u64(), 1099511627776); + assert!(parse_bytesize("1 XB").is_none()); + } } From f3e694d3d630bbde2b46d955250db596625d3fd6 Mon Sep 17 00:00:00 2001 From: veeso Date: Tue, 28 Sep 2021 12:59:43 +0200 Subject: [PATCH 19/40] File list can now be rewinded --- CHANGELOG.md | 3 ++- src/ui/components/file_list.rs | 35 +++++++++++++++++++++++----------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64cbef5..cf4fe03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,9 +50,10 @@ Released on ?? - Added a new key in themes: `misc_info_dialog`: if your theme won't load, just reload it. If you're using a customised theme, you can add to it the missing key via a text editor. Just edit the `theme.toml` in your `$CONFIG_DIR/termscp/theme.toml` and add `misc_info_dialog` (Read more in manual at Themes). - Enhancements: - Reuse mounts in UI, in order to reduce executable size + - File list can now be "rewinded", which means that moving with arrows will now allow you to go from top to bottom of the list pressing `` and viceversa pressing ``. - Dependencies: - - Added `rust-s3 0.27-rc4` - Added `notify_rust 4.5.3` + - Added `rust-s3 0.27-rc4` - Added `self_update 0.27.0` - Updated `argh` to `0.1.6` - Updated `dirs` to `4.0.0` diff --git a/src/ui/components/file_list.rs b/src/ui/components/file_list.rs index 9600659..5982973 100644 --- a/src/ui/components/file_list.rs +++ b/src/ui/components/file_list.rs @@ -188,21 +188,27 @@ impl OwnStates { /// ### incr_list_index /// - /// Incremenet list index - pub fn incr_list_index(&mut self) { + /// Incremenet list index. + /// If `can_rewind` is `true` the index rewinds when boundary is reached + pub fn incr_list_index(&mut self, can_rewind: bool) { // Check if index is at last element if self.list_index + 1 < self.list_len() { self.list_index += 1; + } else if can_rewind { + self.list_index = 0; } } /// ### decr_list_index /// /// Decrement list index - pub fn decr_list_index(&mut self) { + /// If `can_rewind` is `true` the index rewinds when boundary is reached + pub fn decr_list_index(&mut self, can_rewind: bool) { // Check if index is bigger than 0 if self.list_index > 0 { self.list_index -= 1; + } else if self.list_len() > 0 && can_rewind { + self.list_index = self.list_len() - 1; } } @@ -388,25 +394,25 @@ impl Component for FileList { match key.code { KeyCode::Down => { // Update states - self.states.incr_list_index(); + self.states.incr_list_index(true); Msg::None } KeyCode::Up => { // Update states - self.states.decr_list_index(); + self.states.decr_list_index(true); Msg::None } KeyCode::PageDown => { // Update states for _ in 0..8 { - self.states.incr_list_index(); + self.states.incr_list_index(false); } Msg::None } KeyCode::PageUp => { // Update states for _ in 0..8 { - self.states.decr_list_index(); + self.states.decr_list_index(false); } Msg::None } @@ -525,14 +531,21 @@ mod tests { assert_eq!(states.selected[0], 4); // Index states.init_list_states(2); - states.incr_list_index(); + // Incr + states.incr_list_index(false); assert_eq!(states.list_index(), 1); - states.incr_list_index(); + states.incr_list_index(false); assert_eq!(states.list_index(), 1); - states.decr_list_index(); + states.incr_list_index(true); assert_eq!(states.list_index(), 0); - states.decr_list_index(); + // Decr + states.list_index = 1; + states.decr_list_index(false); assert_eq!(states.list_index(), 0); + states.decr_list_index(false); + assert_eq!(states.list_index(), 0); + states.decr_list_index(true); + assert_eq!(states.list_index(), 1); // Try fixing index states.init_list_states(5); states.list_index = 4; From 4b9d23cc3a4bcd9910936d6bd453990e558748f0 Mon Sep 17 00:00:00 2001 From: veeso Date: Thu, 30 Sep 2021 09:33:34 +0200 Subject: [PATCH 20/40] Reuse mounts --- src/ui/activities/auth/view.rs | 152 +++++++++++----------- src/ui/activities/setup/view/mod.rs | 156 +++++++++++++++-------- src/ui/activities/setup/view/setup.rs | 140 +++++++------------- src/ui/activities/setup/view/ssh_keys.rs | 21 +-- 4 files changed, 235 insertions(+), 234 deletions(-) diff --git a/src/ui/activities/auth/view.rs b/src/ui/activities/auth/view.rs index d41f933..21c22b4 100644 --- a/src/ui/activities/auth/view.rs +++ b/src/ui/activities/auth/view.rs @@ -99,100 +99,63 @@ impl AuthActivity { // Get default protocol let default_protocol: FileTransferProtocol = self.context().config().get_default_protocol(); // Protocol - self.view.mount( + self.mount_radio( super::COMPONENT_RADIO_PROTOCOL, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(protocol_color) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Rounded, protocol_color) - .with_title("Protocol", Alignment::Left) - .with_options(&["SFTP", "SCP", "FTP", "FTPS", "AWS S3"]) - .with_value(Self::protocol_enum_to_opt(default_protocol)) - .rewind(true) - .build(), - )), + "Protocol", + &["SFTP", "SCP", "FTP", "FTPS", "AWS S3"], + Self::protocol_enum_to_opt(default_protocol), + protocol_color, ); // Address - self.view.mount( + self.mount_input( super::COMPONENT_INPUT_ADDR, - Box::new(Input::new( - InputPropsBuilder::default() - .with_foreground(addr_color) - .with_borders(Borders::ALL, BorderType::Rounded, addr_color) - .with_label("Remote host", Alignment::Left) - .build(), - )), + "Remote host", + addr_color, + InputType::Text, ); // Port - self.view.mount( + self.mount_input_ex( super::COMPONENT_INPUT_PORT, - Box::new(Input::new( - InputPropsBuilder::default() - .with_foreground(port_color) - .with_borders(Borders::ALL, BorderType::Rounded, port_color) - .with_label("Port number", Alignment::Left) - .with_input(InputType::Number) - .with_input_len(5) - .with_value(Self::get_default_port_for_protocol(default_protocol).to_string()) - .build(), - )), + "Port number", + port_color, + InputType::Number, + Some(5), + Some(Self::get_default_port_for_protocol(default_protocol).to_string()), ); // Username - self.view.mount( + self.mount_input( super::COMPONENT_INPUT_USERNAME, - Box::new(Input::new( - InputPropsBuilder::default() - .with_foreground(username_color) - .with_borders(Borders::ALL, BorderType::Rounded, username_color) - .with_label("Username", Alignment::Left) - .build(), - )), + "Username", + username_color, + InputType::Text, ); // Password - self.view.mount( + self.mount_input( super::COMPONENT_INPUT_PASSWORD, - Box::new(Input::new( - InputPropsBuilder::default() - .with_foreground(password_color) - .with_borders(Borders::ALL, BorderType::Rounded, password_color) - .with_label("Password", Alignment::Left) - .with_input(InputType::Password) - .build(), - )), + "Password", + password_color, + InputType::Password, ); // Bucket - self.view.mount( + self.mount_input( super::COMPONENT_INPUT_S3_BUCKET, - Box::new(Input::new( - InputPropsBuilder::default() - .with_foreground(addr_color) - .with_borders(Borders::ALL, BorderType::Rounded, addr_color) - .with_label("Bucket name", Alignment::Left) - .build(), - )), + "Bucket name", + addr_color, + InputType::Text, ); // Region - self.view.mount( + self.mount_input( super::COMPONENT_INPUT_S3_REGION, - Box::new(Input::new( - InputPropsBuilder::default() - .with_foreground(port_color) - .with_borders(Borders::ALL, BorderType::Rounded, port_color) - .with_label("Region", Alignment::Left) - .build(), - )), + "Region", + port_color, + InputType::Text, ); // Profile - self.view.mount( + self.mount_input( super::COMPONENT_INPUT_S3_PROFILE, - Box::new(Input::new( - InputPropsBuilder::default() - .with_foreground(username_color) - .with_borders(Borders::ALL, BorderType::Rounded, username_color) - .with_label("Profile", Alignment::Left) - .build(), - )), + "Profile", + username_color, + InputType::Text, ); // Version notice if let Some(version) = self @@ -995,4 +958,49 @@ impl AuthActivity { // Active self.view.active(id); } + + fn mount_radio(&mut self, id: &str, text: &str, opts: &[&str], default: usize, color: Color) { + self.view.mount( + id, + Box::new(Radio::new( + RadioPropsBuilder::default() + .with_color(color) + .with_inverted_color(Color::Black) + .with_borders(Borders::ALL, BorderType::Rounded, color) + .with_title(text, Alignment::Left) + .with_options(opts) + .with_value(default) + .rewind(true) + .build(), + )), + ); + } + + fn mount_input(&mut self, id: &str, label: &str, fg: Color, typ: InputType) { + self.mount_input_ex(id, label, fg, typ, None, None); + } + + fn mount_input_ex( + &mut self, + id: &str, + label: &str, + fg: Color, + typ: InputType, + len: Option, + value: Option, + ) { + let mut props = InputPropsBuilder::default(); + props + .with_foreground(fg) + .with_borders(Borders::ALL, BorderType::Rounded, fg) + .with_label(label, Alignment::Left) + .with_input(typ); + if let Some(len) = len { + props.with_input_len(len); + } + if let Some(value) = value { + props.with_value(value); + } + self.view.mount(id, Box::new(Input::new(props.build()))); + } } diff --git a/src/ui/activities/setup/view/mod.rs b/src/ui/activities/setup/view/mod.rs index d43eb91..f3452be 100644 --- a/src/ui/activities/setup/view/mod.rs +++ b/src/ui/activities/setup/view/mod.rs @@ -36,10 +36,10 @@ pub use ssh_keys::*; pub use theme::*; // Ext use tui_realm_stdlib::{ - List, ListPropsBuilder, Paragraph, ParagraphPropsBuilder, Radio, RadioPropsBuilder, Span, - SpanPropsBuilder, + Input, InputPropsBuilder, List, ListPropsBuilder, Paragraph, ParagraphPropsBuilder, Radio, + RadioPropsBuilder, Span, SpanPropsBuilder, }; -use tuirealm::props::{Alignment, PropsBuilder, TableBuilder, TextSpan}; +use tuirealm::props::{Alignment, InputType, PropsBuilder, TableBuilder, TextSpan}; use tuirealm::tui::{ style::Color, widgets::{BorderType, Borders}, @@ -74,21 +74,7 @@ impl SetupActivity { /// /// Mount error box pub(super) fn mount_error(&mut self, text: &str) { - // Mount - self.view.mount( - super::COMPONENT_TEXT_ERROR, - Box::new(Paragraph::new( - ParagraphPropsBuilder::default() - .with_foreground(Color::Red) - .bold() - .with_borders(Borders::ALL, BorderType::Rounded, Color::Red) - .with_texts(vec![TextSpan::from(text)]) - .with_text_alignment(Alignment::Center) - .build(), - )), - ); - // Give focus to error - self.view.active(super::COMPONENT_TEXT_ERROR); + self.mount_text_dialog(super::COMPONENT_TEXT_ERROR, text, Color::Red); } /// ### umount_error @@ -102,28 +88,13 @@ impl SetupActivity { /// /// Mount quit popup pub(super) fn mount_quit(&mut self) { - self.view.mount( + self.mount_radio_dialog( super::COMPONENT_RADIO_QUIT, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(Color::LightRed) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Rounded, Color::LightRed) - .with_title( - "There are unsaved changes! Save changes before leaving?", - Alignment::Center, - ) - .with_options(&[ - String::from("Save"), - String::from("Don't save"), - String::from("Cancel"), - ]) - .rewind(true) - .build(), - )), + "There are unsaved changes! Save changes before leaving?", + &["Save", "Don't save", "Cancel"], + 0, + Color::LightRed, ); - // Active - self.view.active(super::COMPONENT_RADIO_QUIT); } /// ### umount_quit @@ -137,21 +108,13 @@ impl SetupActivity { /// /// Mount save popup pub(super) fn mount_save_popup(&mut self) { - self.view.mount( + self.mount_radio_dialog( super::COMPONENT_RADIO_SAVE, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(Color::LightYellow) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Rounded, Color::LightYellow) - .with_title("Save changes?", Alignment::Center) - .with_options(&[String::from("Yes"), String::from("No")]) - .rewind(true) - .build(), - )), + "Save changes?", + &["Yes", "No"], + 0, + Color::LightYellow, ); - // Active - self.view.active(super::COMPONENT_RADIO_SAVE); } /// ### umount_quit @@ -253,4 +216,95 @@ impl SetupActivity { pub(super) fn umount_help(&mut self) { self.view.umount(super::COMPONENT_TEXT_HELP); } + + // -- mount helpers + + fn mount_text_dialog(&mut self, id: &str, text: &str, color: Color) { + // Mount + self.view.mount( + id, + Box::new(Paragraph::new( + ParagraphPropsBuilder::default() + .with_borders(Borders::ALL, BorderType::Thick, color) + .with_foreground(color) + .bold() + .with_text_alignment(Alignment::Center) + .with_texts(vec![TextSpan::from(text)]) + .build(), + )), + ); + // Give focus to error + self.view.active(id); + } + + fn mount_radio_dialog( + &mut self, + id: &str, + text: &str, + opts: &[&str], + default: usize, + color: Color, + ) { + self.view.mount( + id, + Box::new(Radio::new( + RadioPropsBuilder::default() + .with_color(color) + .with_inverted_color(Color::Black) + .with_borders(Borders::ALL, BorderType::Rounded, color) + .with_title(text, Alignment::Center) + .with_options(opts) + .with_value(default) + .rewind(true) + .build(), + )), + ); + // Active + self.view.active(id); + } + + fn mount_radio(&mut self, id: &str, text: &str, opts: &[&str], default: usize, color: Color) { + self.view.mount( + id, + Box::new(Radio::new( + RadioPropsBuilder::default() + .with_color(color) + .with_inverted_color(Color::Black) + .with_borders(Borders::ALL, BorderType::Rounded, color) + .with_title(text, Alignment::Left) + .with_options(opts) + .with_value(default) + .rewind(true) + .build(), + )), + ); + } + + fn mount_input(&mut self, id: &str, label: &str, fg: Color, typ: InputType) { + self.mount_input_ex(id, label, fg, typ, None, None); + } + + fn mount_input_ex( + &mut self, + id: &str, + label: &str, + fg: Color, + typ: InputType, + len: Option, + value: Option, + ) { + let mut props = InputPropsBuilder::default(); + props + .with_foreground(fg) + .with_borders(Borders::ALL, BorderType::Rounded, fg) + .with_label(label, Alignment::Left) + .with_input(typ); + if let Some(len) = len { + props.with_input_len(len); + } + if let Some(value) = value { + props.with_value(value); + } + self.view.mount(id, Box::new(Input::new(props.build()))); + } } diff --git a/src/ui/activities/setup/view/setup.rs b/src/ui/activities/setup/view/setup.rs index 20fb80c..618aab8 100644 --- a/src/ui/activities/setup/view/setup.rs +++ b/src/ui/activities/setup/view/setup.rs @@ -27,14 +27,14 @@ * SOFTWARE. */ // Locals -use super::{Context, SetupActivity}; +use super::{Context, InputType, SetupActivity}; use crate::filetransfer::FileTransferProtocol; use crate::fs::explorer::GroupDirs; use crate::ui::components::bytes::{Bytes, BytesPropsBuilder}; use crate::utils::ui::draw_area_in; // Ext use std::path::PathBuf; -use tui_realm_stdlib::{Input, InputPropsBuilder, Radio, RadioPropsBuilder}; +use tui_realm_stdlib::{InputPropsBuilder, RadioPropsBuilder}; use tuirealm::tui::{ layout::{Constraint, Direction, Layout}, style::Color, @@ -60,118 +60,66 @@ impl SetupActivity { // Footer self.mount_footer(); // Input fields - self.view.mount( + self.mount_input( super::COMPONENT_INPUT_TEXT_EDITOR, - Box::new(Input::new( - InputPropsBuilder::default() - .with_foreground(Color::LightGreen) - .with_borders(Borders::ALL, BorderType::Rounded, Color::LightGreen) - .with_label("Text editor", Alignment::Left) - .build(), - )), + "Text editor", + Color::LightGreen, + InputType::Text, ); self.view.active(super::COMPONENT_INPUT_TEXT_EDITOR); // <-- Focus - self.view.mount( + self.mount_radio( super::COMPONENT_RADIO_DEFAULT_PROTOCOL, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(Color::LightCyan) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Rounded, Color::LightCyan) - .with_title("Default file transfer protocol", Alignment::Left) - .with_options(&["SFTP", "SCP", "FTP", "FTPS", "AWS S3"]) - .rewind(true) - .build(), - )), + "Default protocol", + &["SFTP", "SCP", "FTP", "FTPS", "AWS S3"], + 0, + Color::LightCyan, ); - self.view.mount( + self.mount_radio( super::COMPONENT_RADIO_HIDDEN_FILES, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(Color::LightRed) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Rounded, Color::LightRed) - .with_title("Show hidden files (by default)?", Alignment::Left) - .with_options(&[String::from("Yes"), String::from("No")]) - .rewind(true) - .build(), - )), + "Show hidden files (by default)?", + &["Yes", "No"], + 0, + Color::LightRed, ); - self.view.mount( + self.mount_radio( super::COMPONENT_RADIO_UPDATES, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(Color::LightYellow) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Rounded, Color::LightYellow) - .with_title("Check for updates?", Alignment::Left) - .with_options(&[String::from("Yes"), String::from("No")]) - .rewind(true) - .build(), - )), + "Check for updates?", + &["Yes", "No"], + 0, + Color::LightYellow, ); - self.view.mount( + self.mount_radio( super::COMPONENT_RADIO_PROMPT_ON_FILE_REPLACE, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(Color::LightCyan) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Rounded, Color::LightCyan) - .with_title("Prompt when replacing existing files?", Alignment::Left) - .with_options(&[String::from("Yes"), String::from("No")]) - .rewind(true) - .build(), - )), + "Prompt when replacing existing files?", + &["Yes", "No"], + 0, + Color::LightCyan, ); - self.view.mount( + self.mount_radio( super::COMPONENT_RADIO_GROUP_DIRS, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(Color::LightMagenta) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Rounded, Color::LightMagenta) - .with_title("Group directories", Alignment::Left) - .with_options(&[ - String::from("Display first"), - String::from("Display Last"), - String::from("No"), - ]) - .rewind(true) - .build(), - )), + "Group directories", + &["Display first", "Display last", "No"], + 0, + Color::LightMagenta, ); - self.view.mount( + self.mount_input( super::COMPONENT_INPUT_LOCAL_FILE_FMT, - Box::new(Input::new( - InputPropsBuilder::default() - .with_foreground(Color::LightGreen) - .with_borders(Borders::ALL, BorderType::Rounded, Color::LightGreen) - .with_label("File formatter syntax (local)", Alignment::Left) - .build(), - )), + "File formatter syntax (local)", + Color::LightGreen, + InputType::Text, ); - self.view.mount( + self.mount_input( super::COMPONENT_INPUT_REMOTE_FILE_FMT, - Box::new(Input::new( - InputPropsBuilder::default() - .with_foreground(Color::LightCyan) - .with_borders(Borders::ALL, BorderType::Rounded, Color::LightCyan) - .with_label("File formatter syntax (remote)", Alignment::Left) - .build(), - )), + "File formatter syntax (remote)", + Color::LightCyan, + InputType::Text, ); - self.view.mount( + self.mount_radio( super::COMPONENT_RADIO_NOTIFICATIONS_ENABLED, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(Color::LightRed) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Rounded, Color::LightRed) - .with_title("Enable notifications?", Alignment::Left) - .with_options(&[String::from("Yes"), String::from("No")]) - .rewind(true) - .build(), - )), + "Enable notifications?", + &["Yes", "No"], + 0, + Color::LightRed, ); self.view.mount( super::COMPONENT_INPUT_NOTIFICATIONS_THRESHOLD, diff --git a/src/ui/activities/setup/view/ssh_keys.rs b/src/ui/activities/setup/view/ssh_keys.rs index c99393a..b7ddca9 100644 --- a/src/ui/activities/setup/view/ssh_keys.rs +++ b/src/ui/activities/setup/view/ssh_keys.rs @@ -31,7 +31,7 @@ use super::{Context, SetupActivity}; use crate::ui::components::bookmark_list::{BookmarkList, BookmarkListPropsBuilder}; use crate::utils::ui::draw_area_in; // Ext -use tui_realm_stdlib::{Input, InputPropsBuilder, Radio, RadioPropsBuilder}; +use tui_realm_stdlib::{Input, InputPropsBuilder}; use tuirealm::tui::{ layout::{Constraint, Direction, Layout}, style::Color, @@ -169,22 +169,13 @@ impl SetupActivity { /// /// Mount delete ssh key component pub(crate) fn mount_del_ssh_key(&mut self) { - self.view.mount( + self.mount_radio_dialog( super::COMPONENT_RADIO_DEL_SSH_KEY, - Box::new(Radio::new( - RadioPropsBuilder::default() - .with_color(Color::LightRed) - .with_inverted_color(Color::Black) - .with_borders(Borders::ALL, BorderType::Rounded, Color::LightRed) - .with_title("Delete key?", Alignment::Center) - .with_options(&[String::from("Yes"), String::from("No")]) - .with_value(1) // Default: No - .rewind(true) - .build(), - )), + "Delete key?", + &["Yes", "No"], + 1, + Color::LightRed, ); - // Active - self.view.active(super::COMPONENT_RADIO_DEL_SSH_KEY); } /// ### umount_del_ssh_key From 58d5ea264f49d9b7ad545a3b0a6541f3d5e56c65 Mon Sep 17 00:00:00 2001 From: veeso Date: Thu, 30 Sep 2021 09:56:20 +0200 Subject: [PATCH 21/40] docs --- CHANGELOG.md | 4 ++-- README.md | 29 ++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf4fe03..a16e073 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,9 +23,9 @@ ## 0.7.0 -Released on ?? +Released on 12/10/2021 -> 🍁 Autumn update 🍇 +> 🍁 Autumn update 2021 🍇 - **Aws S3** 🪣 - Added support for the aws-s3 protocol. diff --git a/README.md b/README.md index 0caf4a2..0ed9191 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@

Developed by @veeso

-

Current version: 0.7.0 (FIXME: 31/08/2021)

+

Current version: 0.7.0 (12/10/2021)

[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) @@ -40,17 +40,18 @@ Termscp is a feature rich terminal file transfer and explorer, with support for - 🖥 Explore and operate on the remote and on the local machine file system with a handy UI - Create, remove, rename, search, view and edit files - ⭐ Connect to your favourite hosts through built-in bookmarks and recent connections -- 📝 View and edit text files with your favourite text editor -- 💁 SFTP/SCP authentication through SSH keys and username/password -- 🐧 Compatible with Windows, Linux, BSD and MacOS -- ✏ Customizable +- 📝 View and edit files with your favourite applications +- 💁 SFTP/SCP authentication with SSH keys and username/password +- 🐧 Compatible with Windows, Linux, FreeBSD and MacOS +- 🎨 Make it yours! - Themes - Custom file explorer format - Customizable text editor - Customizable file sorting + - and many other parameters... +- 📫 Get notified via Desktop Notifications when a large file has been transferred - 🔐 Save your password in your operating system key vault - 🦀 Rust-powered -- 🤝 Easy to extend with new file transfers protocols - 👀 Developed keeping an eye on performance - 🦄 Frequent awesome updates @@ -137,11 +138,21 @@ The developer documentation can be found on Rust Docs at Date: Mon, 4 Oct 2021 10:48:56 +0200 Subject: [PATCH 22/40] Flags --- README.md | 56 +++++++++++++++++++++++++++---- assets/images/flags/br.png | Bin 0 -> 11087 bytes assets/images/flags/cn.png | Bin 0 -> 6968 bytes assets/images/flags/de.png | Bin 0 -> 5207 bytes assets/images/flags/dk.png | Bin 0 -> 6075 bytes assets/images/flags/es.png | Bin 0 -> 5339 bytes assets/images/flags/fr.png | Bin 0 -> 5391 bytes assets/images/flags/it.png | Bin 0 -> 5203 bytes assets/images/flags/jp.png | Bin 0 -> 7604 bytes assets/images/flags/kr.png | Bin 0 -> 10285 bytes assets/images/flags/nl.png | Bin 0 -> 5322 bytes assets/images/flags/ru.png | Bin 0 -> 5257 bytes assets/images/flags/us.png | Bin 0 -> 484 bytes docs/{man-en.md => man.md} | 0 docs/zh-CN/README.md | 0 docs/{man-zh.md => zh-CN/man.md} | 0 16 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 assets/images/flags/br.png create mode 100644 assets/images/flags/cn.png create mode 100644 assets/images/flags/de.png create mode 100644 assets/images/flags/dk.png create mode 100644 assets/images/flags/es.png create mode 100644 assets/images/flags/fr.png create mode 100644 assets/images/flags/it.png create mode 100644 assets/images/flags/jp.png create mode 100644 assets/images/flags/kr.png create mode 100644 assets/images/flags/nl.png create mode 100644 assets/images/flags/ru.png create mode 100644 assets/images/flags/us.png rename docs/{man-en.md => man.md} (100%) create mode 100644 docs/zh-CN/README.md rename docs/{man-zh.md => zh-CN/man.md} (100%) diff --git a/README.md b/README.md index 0ed9191..4e19eb9 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,55 @@ User manual

+

+ English +   + Deutsch +   + Español +   + Français +   + Italiano +   + 简体中文 +

+

Developed by @veeso

Current version: 0.7.0 (12/10/2021)

@@ -117,12 +166,7 @@ If you like termscp and you'd love to see the project to grow, please consider a ## User manual and Documentation 📚 -The user manual can be found on the [termscp's website](https://veeso.github.io/termscp/#user-manual) or on Github: - -- [User manual](docs/man-en.md) -- [用户手册](docs/man-zh.md) - -A translation of the user manual in other languages would be really appreciated 😉 +The user manual can be found on the [termscp's website](https://veeso.github.io/termscp/#user-manual) or on [Github](docs/man.md). The developer documentation can be found on Rust Docs at diff --git a/assets/images/flags/br.png b/assets/images/flags/br.png new file mode 100644 index 0000000000000000000000000000000000000000..3d8ebc41bc9a185c4e339473189f31edbb3a4777 GIT binary patch literal 11087 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 L@Ss*MU!U}Elh=`- literal 0 HcmV?d00001 diff --git a/assets/images/flags/es.png b/assets/images/flags/es.png new file mode 100644 index 0000000000000000000000000000000000000000..9a5f8e6d33558b1e1279664594f40771a81e18a6 GIT binary patch literal 5339 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 literal 0 HcmV?d00001 diff --git a/assets/images/flags/fr.png b/assets/images/flags/fr.png new file mode 100644 index 0000000000000000000000000000000000000000..af2c274ba36315704be8d1291dd11389d114c7c0 GIT binary patch literal 5391 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 OkMQyEbFXlVO#2@en^vm; literal 0 HcmV?d00001 diff --git a/assets/images/flags/it.png b/assets/images/flags/it.png new file mode 100644 index 0000000000000000000000000000000000000000..d28e565a31759d2800087556cb51b954c3d8d190 GIT binary patch literal 5203 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 ahXKAi^?saAsirhsfVzs7@>@lVyZ-??g%|(; literal 0 HcmV?d00001 diff --git a/assets/images/flags/kr.png b/assets/images/flags/kr.png new file mode 100644 index 0000000000000000000000000000000000000000..dc1b8f93c7c8be0c0a1d60dc3716ccc1ad5231f9 GIT binary patch literal 10285 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 TlScx?Vg=~y7-?5&+K2rQ06&q> literal 0 HcmV?d00001 diff --git a/assets/images/flags/nl.png b/assets/images/flags/nl.png new file mode 100644 index 0000000000000000000000000000000000000000..1255adf321a2db45b46cb95be671749865352e7a GIT binary patch literal 5322 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 Date: Mon, 4 Oct 2021 16:02:40 +0200 Subject: [PATCH 23/40] It, zh-CN --- README.md | 26 +-- docs/it/README.md | 242 ++++++++++++++++++++++ docs/it/man.md | 484 +++++++++++++++++++++++++++++++++++++++++++ docs/man.md | 15 +- docs/zh-CN/README.md | 243 ++++++++++++++++++++++ docs/zh-CN/man.md | 15 +- 6 files changed, 992 insertions(+), 33 deletions(-) create mode 100644 docs/it/README.md create mode 100644 docs/it/man.md diff --git a/README.md b/README.md index 4e19eb9..bbaaa88 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ English   @@ -25,7 +25,7 @@ href="https://github.com/veeso/termscp/blob/main/docs/de/README.md" >Deutsch   @@ -33,7 +33,7 @@ href="https://github.com/veeso/termscp/blob/main/docs/es/README.md" >Español   @@ -41,7 +41,7 @@ href="https://github.com/veeso/termscp/blob/main/docs/fr/README.md" >Français   @@ -49,7 +49,7 @@ href="https://github.com/veeso/termscp/blob/main/docs/it/README.md" >Italiano   @@ -57,7 +57,7 @@ href="https://github.com/veeso/termscp/blob/main/docs/zh-CN/README.md" >简体中文

@@ -73,7 +73,7 @@ ## About termscp 🖥 -Termscp is a feature rich terminal file transfer and explorer, with support for SCP/SFTP/FTP/S3. So basically is a terminal utility with an TUI to connect to a remote server to retrieve and upload files and to interact with the local file system. It is **Linux**, **MacOS**, **FreeBSD** and **Windows** compatible and supports SFTP, SCP, FTP, FTPS and S3. +Termscp is a feature rich terminal file transfer and explorer, with support for SCP/SFTP/FTP/S3. So basically is a terminal utility with an TUI to connect to a remote server to retrieve and upload files and to interact with the local file system. It is **Linux**, **MacOS**, **FreeBSD** and **Windows** compatible. ![Explorer](assets/images/explorer.gif) @@ -109,7 +109,7 @@ Termscp is a feature rich terminal file transfer and explorer, with support for ## Get started 🚀 If you're considering to install termscp I want to thank you 💜 ! I hope you will enjoy termscp! -If you want to contribute to this project, don't forget to check out our contribute guide. [Read More](CONTRIBUTING.md) +If you want to contribute to this project, don't forget to check out our [contribute guide](CONTRIBUTING.md). If you are a Linux, a FreeBSD or a MacOS user this simple shell script will install termscp on your system with a single command: @@ -133,7 +133,7 @@ For more information or other platforms, please visit [veeso.github.io](https:// - libssh - libdbus-1 - pkg-config -- **BSD** users: +- **FreeBSD** users: - libssh - dbus - pkgconf @@ -142,7 +142,7 @@ For more information or other platforms, please visit [veeso.github.io](https:// These requirements are not forcely required to run termscp, but to enjoy all of its features -- **Linux/BSD** users: +- **Linux/FreeBSD** users: - To **open** files via `V` (at least one of these) - *xdg-open* - *gio* @@ -156,9 +156,9 @@ These requirements are not forcely required to run termscp, but to enjoy all of --- -## Buy me a coffee ☕ +## Support me ☕ -If you like termscp and you'd love to see the project to grow, please consider a little donation 🥳 +If you like termscp and you'd love to see the project to grow and to improve, please consider a little donation to support me on **Buy me a coffee** 🥳 [![Buy-me-a-coffee](https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20coffee&emoji=&slug=veeso&button_colour=404040&font_colour=ffffff&font_family=Comic&outline_colour=ffffff&coffee_colour=FFDD00)](https://www.buymeacoffee.com/veeso) @@ -221,7 +221,7 @@ View termscp's changelog [HERE](CHANGELOG.md) ## Powered by 💪 -termscp is powered by these aweseome projects: +termscp is powered by these awesome projects: - [bytesize](https://github.com/hyunsik/bytesize) - [crossterm](https://github.com/crossterm-rs/crossterm) diff --git a/docs/it/README.md b/docs/it/README.md new file mode 100644 index 0000000..046d5c7 --- /dev/null +++ b/docs/it/README.md @@ -0,0 +1,242 @@ +# termscp + +

+ +

+ +

~ Un file transfer ricco di funzionalità ~

+

+ Sito + · + Installazione + · + Manuale utente +

+ +

+ English +   + Deutsch +   + Español +   + Français +   + Italiano +   + 简体中文 +

+ +

Sviluppato da @veeso

+

Versione corrente: 0.7.0 (12/10/2021)

+ +[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) + +[![Linux](https://github.com/veeso/termscp/workflows/Linux/badge.svg)](https://github.com/veeso/termscp/actions) [![MacOs](https://github.com/veeso/termscp/workflows/MacOS/badge.svg)](https://github.com/veeso/termscp/actions) [![Windows](https://github.com/veeso/termscp/workflows/Windows/badge.svg)](https://github.com/veeso/termscp/actions) [![FreeBSD](https://github.com/veeso/termscp/workflows/FreeBSD/badge.svg)](https://github.com/veeso/termscp/actions) [![Coverage Status](https://coveralls.io/repos/github/veeso/termscp/badge.svg)](https://coveralls.io/github/veeso/termscp) [![Docs](https://docs.rs/termscp/badge.svg)](https://docs.rs/termscp) + +--- + +## Riguardo termscp 🖥 + +Termscp è un file transfer ed explorer ricco di funzionalità, con supporto a SCP/SFTP/FTP/S3. Basicamente è un utility su terminale con una terminal user-interface per connettersi a server remoti per scambiare file ed interagire con il file system sia locale che remoto. È compatibile con **Linux**, **MacOS**, **FreeBSD** e **Windows**. + +![Explorer](/assets/images/explorer.gif) + +--- + +## Funzionalità 🎁 + +- 📁 Diversi protocolli di comunicazione + - **SFTP** + - **SCP** + - **FTP** and **FTPS** + - **Aws S3** +- 🖥 Esplora e opera sia sul file system locale che su quello remoto con una UI di facile utilizzo. + - Crea, rimuove, rinomina, cerca, visualizza e modifica file +- ⭐ Connettiti ai tuoi host preferiti tramite la funzionalità integrata dei segnalibri e delle connessioni recenti. +- 📝 Visualizza e modifica i file tramite le tue applicazioni preferite. +- 💁 Autenticazione su server SFTP/SCP tramite chiavi SSH e/o username/password +- 🐧 Compatibile con Windows, Linux, FreeBSD e MacOS +- 🎨 Customizzalo! + - Temi + - Formattazione dell'explorer + - Impostazione del text editor predefinito + - Imposta l'ordinamento di file e cartelle + - e tanto altro... +- 📫 Ricevi notifiche desktop quando un file di cospicue dimensioni è stato trasferito +- 🔐 Salva le password degli host remoti nel keyring predefinito dal tuo sistema operativo +- 🦀 Rust-powered +- 👀 Progettato tenendo conto delle performance +- 🦄 Aggiornamenti frequenti con nuove funzionalità + +--- + +## Per iniziare 🚀 + +Intanto se stai considerando di installare termscp, ti voglio ringraziare 💜 e spero che termscp ti piacerà! +Se vuoi contribuire al progetto, non dimenticarti di leggere la [contribute guide](../../CONTRIBUTING.md). + +Se sei un utente che utilizza Linux, FreeBSD o MacOS, questo shell script installerà termscp sul tuo sistema con un comando secco: + +```sh +curl --proto '=https' --tlsv1.2 -sSLf "https://git.io/JBhDb" | sh +``` + +mentre se sei un utente Windows, puoi installare termscp con [Chocolatey](https://chocolatey.org/): + +```sh +choco install termscp +``` + +Per ulteriori informazioni sui metodi di installazione su altre piattaforme, visita [veeso.github.io](https://veeso.github.io/termscp/#get-started). + +⚠️ Se stavi cercando come aggiornare la tua versione di termscp, puoi semplicemente lanciare termscp con questi argomenti: `(sudo) termscp --update` ⚠️ + +### Requisiti ❗ + +- Utenti **Linux**: + - libssh + - libdbus-1 + - pkg-config +- Utenti **FreeBSD**: + - libssh + - dbus + - pkgconf + +### Requisiti opzionali ✔️ + +Questi requisiti non sono per forza necessari, ma lo sono per sfruttare tutte le sue funzionalità: + +- Utenti **Linux/FreeBSD**: + - Per **aprire** i file con `V` (almeno uno di questi) + - *xdg-open* + - *gio* + - *gnome-open* + - *kde-open* +- Utenti **Linux**: + - Un keyring manager: Approfondisci nel [Manuale](man.md#linux-keyring) +- Utenti **WSL** + - Per **aprire** i file con `V` (almeno uno di questi) + - [wslu](https://github.com/wslutilities/wslu) + +--- + +## Supportami ☕ + +Se ti piace termscp e ti piacerebbe vedere il progetto crescere e migliorare, considera una piccola donazione su **Buy me a coffee** 🥳. + +[![Buy-me-a-coffee](https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20coffee&emoji=&slug=veeso&button_colour=404040&font_colour=ffffff&font_family=Comic&outline_colour=ffffff&coffee_colour=FFDD00)](https://www.buymeacoffee.com/veeso) + +--- + +## Manuale e documentazione 📚 + +Il manuale utente lo puoi trovare sul [sito di termscp](https://veeso.github.io/termscp/#user-manual) o su [Github](man.md). + +La documentazione per sviluppatori la puoi trovare su Rust Docs . + +--- + +## Problemi noti 🧻 + +- `NoSuchFileOrDirectory` alla connessione (WSL1): Dovrebbe essere sufficiente non installare termscp con Cargo, ma piuttosto con uno dei pacchetti forniti tramite lo script di installazione `install.sh`. Si tratta di un problema legato esclusivamente a WSL1 e non è chiaro cosa accada alla connessione, ma è sicuramente legato al percorso del file. + +--- + +## Contributi e issues 🤝🏻 + +Contributi, report di bug, nuove funzionalità e domande sono i benvenuti! 😉 +Se hai qualche domanda o dubbio o vuoi suggerire una nuova funzionalità, sentiti libero di aprire un issue o una PR. + +Per favore segui le nostre [contributing guidelines](../../CONTRIBUTING.md) + +--- + +## Changelog ⏳ + +Visualizza [Qui](../../CHANGELOG.md) il changelog + +--- + +## Un grazie a questi progetti 💪 + +se termscp esiste, è anche grazie a questi fantastici progetti: + +- [bytesize](https://github.com/hyunsik/bytesize) +- [crossterm](https://github.com/crossterm-rs/crossterm) +- [edit](https://github.com/milkey-mouse/edit) +- [keyring-rs](https://github.com/hwchen/keyring-rs) +- [open-rs](https://github.com/Byron/open-rs) +- [rpassword](https://github.com/conradkleinespel/rpassword) +- [rust-s3](https://github.com/durch/rust-s3) +- [self_update](https://github.com/jaemk/self_update) +- [ssh2-rs](https://github.com/alexcrichton/ssh2-rs) +- [suppaftp](https://github.com/veeso/suppaftp) +- [textwrap](https://github.com/mgeisler/textwrap) +- [tui-rs](https://github.com/fdehau/tui-rs) +- [tui-realm](https://github.com/veeso/tui-realm) +- [whoami](https://github.com/libcala/whoami) +- [wildmatch](https://github.com/becheran/wildmatch) + +--- + +## Galleria 🎬 + +> Termscp Home + +![Auth](/assets/images/auth.gif) + +> Bookmarks + +![Bookmarks](/assets/images/bookmarks.gif) + +> Configurazione + +![Setup](/assets/images/config.gif) + +> Text editor + +![TextEditor](/assets/images/text-editor.gif) + +--- + +## Licenza 📃 + +termscp è fornito sotto licenza MIT. + +Puoi leggere l'intero documento di licenza [Qui](../../LICENSE) diff --git a/docs/it/man.md b/docs/it/man.md new file mode 100644 index 0000000..f964ebc --- /dev/null +++ b/docs/it/man.md @@ -0,0 +1,484 @@ +# Manuale utente 🎓 + +- [Manuale utente 🎓](#manuale-utente-) + - [Argomenti da linea di comando ❓](#argomenti-da-linea-di-comando-) + - [Argomento indirizzo 🌎](#argomento-indirizzo-) + - [Argomento indirizzo per AWS S3](#argomento-indirizzo-per-aws-s3) + - [Come fornire la password 🔐](#come-fornire-la-password-) + - [File explorer 📂](#file-explorer-) + - [Abbinamento tasti ⌨](#abbinamento-tasti-) + - [Lavora su più file 🥷](#lavora-su-più-file-) + - [Synchronized browsing ⏲️](#synchronized-browsing-️) + - [Apri e apri con 🚪](#apri-e-apri-con-) + - [Segnalibri ⭐](#segnalibri-) + - [Le mie password sono al sicuro 😈](#le-mie-password-sono-al-sicuro-) + - [Linux Keyring](#linux-keyring) + - [KeepassXC setup per termscp](#keepassxc-setup-per-termscp) + - [Credenziali Aws S3 🦊](#credenziali-aws-s3-) + - [Configurazione ⚙️](#configurazione-️) + - [SSH Key Storage 🔐](#ssh-key-storage-) + - [File Explorer Format](#file-explorer-format) + - [Temi 🎨](#temi-) + - [Il tema non carica 😱](#il-tema-non-carica-) + - [Stili 💈](#stili-) + - [Pagina autenticazione](#pagina-autenticazione) + - [Pagina explorer e trasferimento](#pagina-explorer-e-trasferimento) + - [Misc](#misc) + - [Editor di testo ✏](#editor-di-testo-) + - [Logging 🩺](#logging-) + - [Notifiche 📫](#notifiche-) + +## Argomenti da linea di comando ❓ + +termscp può essere lanciato con questi argomenti: + +`termscp [options]... [protocol://user@address:port:wrkdir] [local-wrkdir]` + +- `-P, --password ` Se viene fornito l'argomento indirizzo, questa sarà la password utilizzata per autenticarsi +- `-c, --config` Apri la configurazione di termscp +- `-q, --quiet` Disabilita i log +- `-t, --theme ` Importa il tema al percorso fornito +- `-u, --update` Aggiorna termscp all'ultima versione +- `-v, --version` Mostra a video le informazioni sulla versione attualmente installata +- `-h, --help` Mostra la pagina di aiuto. + +termscp può venire lanciato in due modalità diverse. Se nessun argomento posizionale viene fornito, termscp mostrerà il form di autenticazione, dove l'utente potrà fornire i parametri di connessione necessari. +Alternativamente, l'utente può fornire l'argomento posizionale "indirizzo" per connettersi direttamente all'host fornito. +Se viene fornito anche il secondo argomento posizionale, ovvero la directory locale, termscp avvierà l'explorer locale sul percorso fornito. + +### Argomento indirizzo 🌎 + +L'argomento indirizzo ha la sintassi seguente: + +```txt +[protocollo://][username@][:porta][:wrkdir] +``` + +Vediamo qualche esempio per questa sintassi, dal momento che risulta molto comodo connettersi tramite questa modalità: + +- Connessione utilizzando il protocollo di default (definito in configurazione) a 192.168.1.31, la porta sarà quella di default per il protocollo di default. Il nome utente è quello attualmente attivo sulla propria macchina: + + ```sh + termscp 192.168.1.31 + ``` + +- Connessione con protocollo di default a 192.168.1.31, utente è `root`: + + ```sh + termscp root@192.168.1.31 + ``` + +- Connessione usando `scp`, la porta è 4022, l'utente è `omar`: + + ```sh + termscp scp://omar@192.168.1.31:4022 + ``` + +- Connessione via `scp`, porta 4022, utente `omar`, l'explorer si avvierà in `/tmp`: + + ```sh + termscp scp://omar@192.168.1.31:4022:/tmp + ``` + +#### Argomento indirizzo per AWS S3 + +Aws S3 ha una sintassi differente dal classico argomento indirizzo, per ovvie ragioni, in quanto S3 non ha la porta o l'host o l'utente. Ho deciso però di mantenere una sintassi il più simile possibile a quella "tradizionale": + +```txt +s3://@[:profile][:/wrkdir] +``` + +e.g. + +```txt +s3://buckethead@eu-central-1:default:/assets +``` + +#### Come fornire la password 🔐 + +Quando si usa l'argomento indirizzo non è possibile fornire la password direttamente nell'argomento, esistono però altri metodi per farlo: + +- Argomento `-P, --password `: Passa direttamente la password nell'argomento. Non lo consiglio particolarmente questo metodo, in quanto la password rimarrebbe nella history della shell in chiaro. +- Tramite `sshpass`: puoi fornire la password tramite l'applicazione GNU/Linux sshpass `sshpass -f ~/.ssh/topsecret.key termscp cvisintin@192.168.1.31` +- Forniscila quando richiesta: se non la fornisci tramite nessun metodo precedente, alla connessione ti verrà richiesto di fornirla in un prompt che la oscurerà (come avviene con sudo tipo). + +--- + +## File explorer 📂 + +Quando ci riferiamo al file explorer in termscp, intendiamo i pannelli che puoi vedere quando stabilisci una connessione con il server remoto. +Questi pannelli sono 3 (e non 2 come sembra): + +- Pannello locale: viene visualizzato sulla sinistra del tuo schermo e mostra la cartella sul file system locale. +- Pannello remoto: viene visualizzato sulla destra del tuo schermo e mostra la cartella sul file system remoto. +- Pannello di ricerca: viene visualizzato a destra o a sinistra in base a dove stai cercando dei file. Questo pannello mostra i file che matchano al pattern cercato sull'host. + +Per cambiare pannello ti puoi muovere con le frecce, `` per andare sul pannello locale e `` per andare su quello remoto. Attenzione che quando è attivo il pannello ricerca non puoi spostarti sugli altri pannelli e devi prima chiuderlo con ``. + +### Abbinamento tasti ⌨ + +| Key | Command | Reminder | +|---------------|-------------------------------------------------------|-------------| +| `` | Disconnettiti; chiudi popup | | +| `` | Cambia tra explorer e pannello di log | | +| `` | Vai alla directory precedente | | +| `` | Vai al pannello remoto | | +| `` | Vai al pannello locale | | +| `` | Muovi il cursore verso l'alto | | +| `` | Muovi il cursore verso il basso | | +| `` | Muovi il cursore verso l'alto di 8 | | +| `` | Muovi il cursore verso il basso di 8 | | +| `` | Entra nella directory | | +| `` | Upload / download file selezionato/i | | +| `` | Mostra/nascondi file nascosti | All | +| `` | Ordina file per | Bubblesort? | +| `` | Copia file/directory | Copy | +| `` | Crea directory | Directory | +| `` | Elimina file (Come `DEL`) | Erase | +| `` | Cerca file (wild match supportato) | Find | +| `` | Vai al percorso indicato | Go to | +| `` | Mostra help | Help | +| `` | Mostra informazioni per il file selezionato | Info | +| `` | Ricarica posizione corrente / pulisci selezione file | List | +| `` | Seleziona file | Mark | +| `` | Crea nuovo file con il nome fornito | New | +| `` | Modifica file; Vedi text editor | Open | +| `` | Termina termscp | Quit | +| `` | Rinomina file | Rename | +| `` | Salva file con nome | Save | +| `` | Vai alla directory padre | Upper | +| `` | Apri il file con il programma definito dal sistema | View | +| `` | Apri il file con il programma specificato | With | +| `` | Esegui comando shell | eXecute | +| `` | Abilita/disabilita Sync-Browsing | sYnc | +| `` | Rimuovi file | | +| `` | Seleziona tutti i file | | +| `` | Annulla trasferimento file | | + +### Lavora su più file 🥷 + +Puoi lavorare su una selezione di file, marcandoli come selezionati tramite ``, per selezionare il file corrente o con ``; fai lo stesso per disabilitarlo. Mentre abilitato, sull'interfaccia dovrebbe essere visualizzato `Sync Browsing: ON` nella barra di stato. + +> ❗ Al momento, se provi ad accedere ad una cartella non esistente su uno dei due host, mentre il sync browsing è attivo, non ti verrà chiesto di crearla, ma semplicemente fallirà. Questo sarà risolto in un aggiornamento futuro. + +### Apri e apri con 🚪 + +I comandi "apri" e "apri con" sono forniti da [open-rs](https://docs.rs/crate/open/2.1.0). +Quando apri un file (``), l'applicazione predefinita di sistema sarà utilizzata per aprire il file. Per fare ciò, sul tuo sistema dovrà essere usato il servizio di default del sistema. + +- **Windows**: non devi installare niente, è già presente sul sistema. +- **MacOS**: non devi installare niente, è già presente sul sistema. +- **Linux**: uno di questi dev'essere presente (potrebbe già esserlo): + - *xdg-open* + - *gio* + - *gnome-open* + - *kde-open* +- **WSL**: *wslview* è richiesto, lo puoi installare tramite questa suite [wslu](https://github.com/wslutilities/wslu). + +> Q: Posso modificare i file su remoto tramite la funzionalità "apri" / "apri con"? +> A: No, almeno non direttamente dal pannello remoto. Devi prima scaricarlo in locale, modificarlo e poi ricaricarlo. Questo perché il file remoto viene scaricato come file temporaneo in locale, ma non esiste poi un modo per sapere quando è stato modificato e quando l'utente ha effettivamente finito di lavorarci. + +--- + +## Segnalibri ⭐ + +In termscp è possibile salvare i tuoi host preferiti tramite i segnalibri al fine di connettersi velocemente ad essi. +Termscp salverà anche gli ultimi 16 host ai quali ti sei connesso. +Questa funzionalità ti permette di caricare tutti i parametri necessari per connettersi ad un certo host, semplicemente selezioandolo dal tab dei preferiti nel form di autenticazione. + +I preferiti saranno salvati se possibile presso: + +- `$HOME/.config/termscp/` su Linux/BSD +- `$HOME/Library/Application Support/termscp` su MacOs +- `FOLDERID_RoamingAppData\termscp\` su Windows + +Per i segnalibri (ma non per le connessioni recenti), è anche possibile salvare la password. La password non viene salvata di default e deve essere specificato tramite apposita opzione, al momento della creazione del segnalibro stesso. +Se sei preoccupato riguardo alla sicurezza della password per i segnalibri, dai un'occhiata al capitolo qui sotto 👀. + +Per creare un segnalibro, segui questa procedura: + +1. Inserisci i parametri per connetterti all'host che vuoi inserire come segnalibro nell'authentication form. +2. Premi `` +3. Inserisci il nome che vuoi dare al bookmark +4. Seleziona nel radio button se salvare la password +5. Premi `` per salvare + +Quando vuoi caricare un segnalibro, premi `` e naviga nella lista dei segnalibri fino al segnalibro che vuoi caricare, quindi premi ``. + +![Bookmarks](https://github.com/veeso/termscp/blob/main/assets/images/bookmarks.gif?raw=true) + +### Le mie password sono al sicuro 😈 + +Certo 😉. +Come detto in precedenza, i segnalibri sono salvati nella cartella delle configurazioni insieme alle password. Le password però non sono in chiaro, ma bensì sono criptate con **AES-128**. Questo le rende sicure? Sì! Does this make them safe? (salvo che per gli utenti di FreeBSD e WSL 😢) + +In **Windows**, **Linux** and **MacOS** la chiave per criptare le password è salvata, se possibile, rispettivamente nel *Windows Vault*, nel *system keyring* e nel *Keychain*. Questo sistema è super-sicuro, in quanto garantito direttamente dal tuo sistema operativo. + +❗ Attenzione che se sei un utente Linux, dovresti leggere il capitolo qui sotto riguardante il linux keyring 👀, questo perché il keyring potrebbe non essere ancora presente sul tuo sistema. + +Su *FreeBSD* e *WSL*, d'altro canto, la chiave utilizzata per criptare le password è salvata su file presso (at $HOME/.config/termscp). È quindi possibile per un malintenzionato ottenere la chiave. Per fortuna essendo sotto la tua home, non dovrebbe essere possibile accedere al file, se non con il tuo utente, ma comunque per sicurezza ti consiglio di non salvare dati sensibili 😉. + +#### Linux Keyring + +Tutti gli amanti di Linux lo preferiscono per la libertà che questo dà agli utenti nella personalizzazione. Allo stesso tempo però questo spesso comporta degli effetti collaterali, tra cui la mancanza spesso di un'imposizione da parte dei creatori delle distro di standard e applicazioni e questo fatto coinvolge anche la questione del keyring. +Su alcuni sistemi di default, non c'è nessun provider di keyring, perché la distro dà all'utente la possibilità di sceglierne uno. +termscp richiede un servizio D-BUS che fornisce `org.freedesktop.secrets` e purtroppo ci sono ad oggi solo due servizi mantenuti che lo supportano. + +- ❗ Se usi GNOME come Desktop environment (come gli utenti Ubuntu), dovresti già averne uno installato sul sistema, chiamato `gnome-keyring` e quindi dovrebbe già funzionare tutto. +- ❗ Se invece usi un altro DE, dovresti installare [KeepassXC](https://keepassxc.org/), che io per esempio utilizzo sul mio Manjaro Linux (con KDE) e funziona piuttosto bene. L'unico problema è che dovrai fare il setup per farlo funzionare. Per farlo puoi leggere il tutorial [qui](#keepassxc-setup-per-termscp) +- ❗ Se non volessi installare uno di questi servizi, termscp funzionerà come sempre, l'unica differenza sarà che salverà la chiave di crittazione su un file, come fa per FreeBSD e WSL. + +##### KeepassXC setup per termscp + +Questo tutorial spiega come impostare KeepassXC per termscp. + +1. Installa KeepassXC dal sito ufficiale +2. Una volta avviato, vai su "strumenti" > "impostazioni" nella toolbar +3. Seleziona "Secret service integration" e abilita "Enable KeepassXC freedesktop.org secret service integration" +4. Crea un database se non ne hai già uno: dalla toolbar "Database" > "Nuovo database" +5. Dalla toolbar: "Database" > "Impostazioni database" +6. Seleziona "Secret service integration" e abilita "Expose entries under this group" +7. Seleziona il gruppo in cui vuoi salvare le chiavi di termscp. Attenzione che questo gruppo sarà utilizzato da tutte le altre eventuali applicazioni che salvano le password via D-BUS. + +--- + +## Credenziali Aws S3 🦊 + +Per connettersi ad un bucket S3 devi come già saprai fornire le credenziali fornite da AWS. +Ci sono due modi per passare queste credenziali a termscp e come avrai già notato **non puoi** farlo dal form di autenticazione. +Questi sono quindi i due modi per passare le chiavi: + +1. Utilizza il file delle credenziali s3: configurando aws via `aws configure` le tue credenziali dovrebbero già venir salvate in `~/.aws/credentials`. Nel caso tu debba usare un profile diverso da `default`, puoi fornire un profilo diverso nell'authentication form. +2. **Variabili d'ambiente**: nel caso il primo metodo non sia utilizzabile, puoi comunque fornirle come variabili d'ambiente. Considera però che queste variabili sovrascriveranno sempre le credenziali situate nel file credentials. Vediamo come impostarle: + + Queste sono sempre obbligatorie: + + - `AWS_ACCESS_KEY_ID`: aws access key ID (di solito inizia per `AKIA...`) + - `AWS_SECRET_ACCESS_KEY`: la secret access key + + nel caso tu abbia impostato un maggiore livello di sicurezza, potrebbero servirti anche queste: + + - `AWS_SECURITY_TOKEN`: security token + - `AWS_SESSION_TOKEN`: session token + +⚠️ le tue credenziali sono al sicuro: termscp non manipola direttamente questi dati! Le credenziali sono direttamente lette dal crate di **s3**. Nel caso tu abbia dei dubbi sulla sicurezza, puoi contattare l'autore della libreria su [Github](https://github.com/durch/rust-s3) ⚠️ + +--- + +## Configurazione ⚙️ + +termscp supporta diversi parametri definiti dall'utente, che possono essere impostati nella configurazione. +termscp usa un file TOML e altre directory per salvare tutti i parametri, ma non preoccuparti, tutto può essere comodamente configurato da interfaccia grafica. + +Per la configurazione, termscp richiede che i seguenti percorsi siano accessibili (termscp proverà a crearli per te): + +- `$HOME/.config/termscp/` su Linux/BSD +- `$HOME/Library/Application Support/termscp` su MacOs +- `FOLDERID_RoamingAppData\termscp\` su Windows + +Per accedere alla configurazione è sufficiente premere `` dall'authentication form. + +Questi parametri possono essere impostati: + +- **Text Editor**: l'editor di testo da utilizzare per aprire i file. Di default termscp userà quello definito nella variabile `EDITOR` od il primo che troverà installato tra quelli più popolari. Puoi tuttavia definire quello che vuoi (ad esempio `vim`). **Anche gli editor GUI sono supportati**, a meno che loro non partano in `nohup` dal processo padre, quindi se vuoi saperlo: sì puoi utilizzare `notepad.exe`, ma non **Visual Studio Code**. +- **Default Protocol**: il protocollo di default da visualizzare come prima opzione nell'authentication form. Questa opzione sarà anche utilizzata quando si usa l'argomento indirizzo da CLI e non si specifica un protocollo. +- **Show Hidden Files**: seleziona se mostrare di default i file nascosti. A runtime potrai comunque scegliere se visualizzarli o meno premendo ``. +- **Check for updates**: se impostato a `YES` all'avvio termscp controllerà l'eventuale presenza di aggiornamenti. Per farlo utilizzerà una chiamata GET all'API di Github. +- **Prompt when replacing existing files?**: se impostato a `yes`, termscp ti chiederà una conferma prima di sovrascrivere un file a seguito di un download/upload. +- **Group Dirs**: seleziona se e come raggruppare le cartelle negli explorer. Se `Display first` è impostato, le directory verranno ordinate secondo quanto stabilito nel `sort by`, ma verranno messe prima dei file, viceversa se `Display last` è utilizzato. Se invece metti `no`, le cartelle verrano messe in ordine assieme ad i file. +- **Remote File formatter syntax**: La formattazione da usare per formattare i file sull'explorer remoto. Vedi [File explorer format](#file-explorer-format) +- **Local File formatter syntax**: La formattazione da usare per formattare i file sull'explorer locale. Vedi [File explorer format](#file-explorer-format) +- **Enable notifications?**: Se impostato a `yes`, le notifiche desktop saranno abilitate. +- **Notifications: minimum transfer size**: se la dimensione di un trasferimento supera o è uguale al valore impostato, al termine del trasferimento riceverai una notifica desktop (se queste sono abilitate). Il formato del valore dev'essere `{UNSIGNED} B/KB/MB/GB/TB/PB` + +### SSH Key Storage 🔐 + +Assieme alla configurazione termscp supporta anche una feature essenziale per i client **SFTP/SCP**: lo storage di chiavi SSH. + +Puoi accedere allo storage muovendoti nel tab delle chiavi SSH tramite `` dalla configurazione. + +- **Aggiungere chiavi**: premi `` e ti verrà chiesto di creare una nuova chiave. Inserisci l'hostname/indirizzo ed il nome utente, infine una volta che premerai invio, ti si aprirà l'editor di testo: incolla la chiave SSH **PRIVATA**, salva ed esci. +- **Rimuovi una chiave esistente**: premi `` o `` selezionando la chiave da rimuovere. +- **Aggiorna una chiave esistente**: premi `` sulla chiave che vuoi modificare. + +> Q: Se la mia chiave è protetta da password, posso comunque usarla? +> A: Sì, certo. In questo caso dovrai fornire la password come faresti per autenticarti con utente/password, ma in questo caso la password sarà usata per decrittare la chiave. + +### File Explorer Format + +È possibile dalla configurazione impostare la formattazione dei file sull'explorer. È possibile sia farlo per il pannello locale, che per quello remoto; quindi puoi avere due sintassi diverse. Questi campi, con nome `File formatter syntax (local)` and `File formatter syntax (remote)` definiranno come i file devono essere formattati sull'explorer. +La sintassi è la seguente `{KEY1}... {KEY2:LENGTH}... {KEY3:LENGTH:EXTRA} {KEYn}...`. +Ogni chiave sarà rimpiazzata dal formatter con il relativo attributo, mentre tutto ciò che è fuori dalle parentesi graffe rimarrà inviariato (quindi puoi metterci del testo arbitratio). + +- Il nome della chiave è obbligatorio e dev'essere uno di quelli sotto. +- La lunghezza descrive quanto spazio in caratteri riservare al campo. Attributi con dimensione statico (GROUP, PEX, SIZE, USER) non supportano la lunghezza. +- L'extra serve a definire degli attributi in più. Solo alcuni lo supportano. + +These are the keys supported by the formatter: + +- `ATIME`: Last access time (con sintassi di default `%b %d %Y %H:%M`); Extra definisce il formato data (e.g. `{ATIME:8:%H:%M}`) +- `CTIME`: Creation time (con sintassi di default `%b %d %Y %H:%M`); Extra definisce il formato data (e.g. `{CTIME:8:%H:%M}`) +- `GROUP`: Owner group +- `MTIME`: Last change time (con sintassi di default `%b %d %Y %H:%M`); Extra definisce il formato data (e.g. `{MTIME:8:%H:%M}`) +- `NAME`: Nome file (Elided if longer than LENGTH) +- `PEX`: Permessi utente (formato UNIX) +- `SIZE`: Dimensione file (omesso per le directory) +- `SYMLINK`: Link simbolico (se presente `-> {FILE_PATH}`) +- `USER`: Owner user + +Se lasciata vuota, la sintassi di default sarà utilizzata: `{NAME:24} {PEX} {USER} {SIZE} {MTIME:17:%b %d %Y %H:%M}` + +--- + +## Temi 🎨 + +termscp fornisce anche una funzionalità strafiga: la possibilità di impostare i colori per tutta l'interfaccia. +Se vuoi impostare i colori, ci sono due modi per farlo: + +- dal **menù di configurazione** +- importando un **tema** da file + +Per personalizzare i colori dovrai andare nella configurazione temi, partendo dal menù di autenticazione, premendo `` e premendo due volte ``. Dovresti essere quindi in configurazione nel tab `themes`. + +Da qui puoi spostarti con le frecce per cambiare lo stile che vuoi, come mostrato nella GIF qua sotto: + +![Themes](https://github.com/veeso/termscp/blob/main/assets/images/themes.gif?raw=true) + +termscp supporta diverse sintassi per i colori, sia il formato hex (`#rrggbb`) che rgb `rgb(r, g, b)`, ma anche i **[colori CSS](https://www.w3schools.com/cssref/css_colors.asp)** (tipo `crimson`) 😉. C'è anche una chiave speciale `Default`. Default significa che per il colore verrà usato il default in base al tipo di elemento (foreground per i testi e linee, background per gli sfondi e i riempimenti). + +Come detto già in precedenza, puoi anche importare i temi da file. Volendo puoi anche creare un tema prendendo ispirazione da quelli situati nella cartella `themes/` del repository ed importarli su termscp con `termscp -t `. Se l'operazione va a buon fine dovrebbe dirti che l'ha importato con successo. + +### Il tema non carica 😱 + +Probabilmente è dovuto ad un aggiornamento che ha rotto il tema. Se viene aggiunta una nuova chiave nel tema (ma questo accade molto raramente), il tema non verrà più caricato. Ci sono diverse soluzioni veloci per questo problema. + +1. Ricarica il tema: se stai usando un tema "ufficiale" fornito nel repository, basterà ricaricarlo, perché li aggiorno sempre quando modifico i temi: + + ```sh + termscp -t + ``` + +2. Sistema il tuo tema a mano: puoi modificare il tuo tema con un editor di testo tipo `vim` e aggiungere la chiave mancante. Il il tema si trova in `$CONFIG_DIR/termscp/theme.toml` dove `$CONFIG_DIR` è: + + - FreeBSD/GNU-Linux: `$HOME/.config/` + - MacOs: `$HOME/Library/Application Support` + - Windows: `%appdata%` + + ❗ Le chiavi mancanti vengono riportate nel CHANGELOG sotto `BREAKING CHANGES` per la versione installata. + +### Stili 💈 + +Puoi trovare qui sotto la definizione per ogni chiave. +Attenzione che gli stili **non coinvolgono la pagina di configurazione**, per renderla sempre accessibile nel caso gli stili siano inutilizzabili. + +#### Pagina autenticazione + +| Key | Description | +|----------------|------------------------------------| +| auth_address | Colore del campo indirizzo IP | +| auth_bookmarks | Colore del pannello segnalibri | +| auth_password | Colore del campo password | +| auth_port | Colore del campo numero porta | +| auth_protocol | Colore del selettore di protocollo | +| auth_recents | Colore del pannello recenti | +| auth_username | Colore del campo nome utente | + +#### Pagina explorer e trasferimento + +| Key | Description | +|--------------------------------------|---------------------------------------------------------------------------| +| transfer_local_explorer_background | Sfondo explorer locale | +| transfer_local_explorer_foreground | Foreground explorer locale | +| transfer_local_explorer_highlighted | Colore bordo e file selezionato explorer locale | +| transfer_remote_explorer_background | Sfondo explorer remoto | +| transfer_remote_explorer_foreground | Foreground explorer remoto | +| transfer_remote_explorer_highlighted | Colore bordo e file selezionato explorer remoto | +| transfer_log_background | Sfondo pannello di log | +| transfer_log_window | Colore bordi e testo log | +| transfer_progress_bar_partial | Colore barra progresso parziale | +| transfer_progress_bar_total | Colore barra progresso totale | +| transfer_status_hidden | Colore status bar file nascosti | +| transfer_status_sorting | Colore status bar ordinamento file; si applica anche al popup ordinamento | +| transfer_status_sync_browsing | Colore status bar per sync browsing | + +#### Misc + +Questi stili si applicano a varie componenti dell'applicazione. + +| Key | Description | +|-------------------|---------------------------------------------| +| misc_error_dialog | Colore dialoghi errore | +| misc_info_dialog | Colore per dialoghi informazioni | +| misc_input_dialog | Colore per dialoghi input (tipo copia file) | +| misc_keys | Colore per abbinamento tasti | +| misc_quit_dialog | Colore per dialogo quit | +| misc_save_dialog | Colore per dialogo salva | +| misc_warn_dialog | Colore per dialoghi avvertimento | + +--- + +## Editor di testo ✏ + +Con termscp puoi anche modificare i file di testo direttamente da terminale, utilizzando il tuo editor preferito. +Non importa se il file si trova in locale od in remoto, termscp ti consente di modificare e sincronizzare le modifiche per entrambi. +Nel caso il file si trovi su host remoto, il file verrà prima scaricato temporaneamente in locale, modificato e poi nel caso ci siano state modifiche, reinviato in remoto. + +Ricorda: **puoi modificare solo i file testuali**; non puoi modificare i file binari. + +--- + +## Logging 🩺 + +termscp scrive un file di log per ogni sessione, nel percorso seguente: + +- `$HOME/.config/termscp/termscp.log` su Linux/BSD +- `$HOME/Library/Application Support/termscp/termscp.log` su MacOs +- `FOLDERID_RoamingAppData\termscp\termscp.log` su Windows + +Il log non viene ruotato, ma viene troncato ad ogni lancio di termscp, quindi se devi riportare un issue, non avviare termscp fino a che non avrai salvato il file di log. +I log sono sempre riportati a livello di *trace*, quindi sono piuttosto parlanti. +Ho scritto questo FAQ sui log, visto che potresti avere qualche dubbio: + +> Si può ridurre la verbosità? + +No. Il motivo è piuttosto semplice: quando c'è un problema, devi sapere cosa lo sta causando e l'unico modo per farlo e avere il log alla massima verbosità per avere la massima precisione sul controllo del flusso. + +> Se trace è il livello di verbosità, non si raggiungono dimensioni enormi? + +Probabilmente no, a meno che tu tenga sempre termscp acceso. Una lunga sessione potrebbe raggiungere i 10MB di log, ma una sessione media all'incirca 2MB. + +> Non voglio il logging, posso disabilitarlo? + +Sì, puoi. Basta lanciare termscp con `-q or --quiet` come opzione. Puoi mantenerlo persistente salvandolo come alias nella tua shell. Ricorda che i log vengono usati per diagnosticare problemi e considerando che questo è un progetto open-source è anche un modo per contribuire al progetto 😉. Non voglio far sentire in colpa nessuno, ma tanto per dire. + +> Il logging è sicuro? + +Se ti chiedi se il log espone dati sensibili, il log non espone nessuna password o dato sensibile. + +## Notifiche 📫 + +termscp invierà notifiche destkop per i seguenti eventi: + +- a **Transferimento completato**: La notifica verrà inviata a seguito di un trasferimento completato. + - ❗ La notifica verrà mostrata solo se la dimensione totale del trasferimento è uguale o maggiore al parametro `Notifications: minimum transfer size` definito in configurazione. +- a **Transferimento fallito**: La notifica verrà inviata a seguito di un trasferimento fallito. + - ❗ La notifica verrà mostrata solo se la dimensione totale del trasferimento è uguale o maggiore al parametro `Notifications: minimum transfer size` definito in configurazione. +- ad **Aggiornamento disponibile**: Ogni volta che una nuova versione di termscp è disponibile, verrà mostrata una notifica. +- ad **Aggiornamento installato**: Al termine dell'installazione di un aggiornamento, verrà mostrata una notifica. +- ad **Aggiornamento fallito**: Al fallimento dell'installazione di un aggiornamento, verrà mostrata una notifica. + +❗ Se vuoi disabilitare le notifiche, è sufficiente andare in configurazione ed impostare `Enable notifications?` a `No` 😉. +❗ Se vuoi modificare la soglia minima per le notifiche dei trasferimenti, puoi impostare il valore di `Notifications: minimum transfer size` in configurazione 🙂. diff --git a/docs/man.md b/docs/man.md index 0eea5c5..bd130fd 100644 --- a/docs/man.md +++ b/docs/man.md @@ -25,7 +25,6 @@ - [Transfer page](#transfer-page) - [Misc](#misc) - [Text Editor ✏](#text-editor-) - - [How do I configure the text editor 🦥](#how-do-i-configure-the-text-editor-) - [Logging 🩺](#logging-) - [Notifications 📫](#notifications-) @@ -174,7 +173,7 @@ All the actions are available when working with multiple files, but be aware tha ### Synchronized browsing ⏲️ When enabled, synchronized browsing, will allow you to synchronize the navigation between the two panels. -This means that whenever you'll change the working directory on one panel, the same action will be reproduced on the other panel. If you want to enable synchronized browsing just press ``; press twice to disable. While enabled, the synchronized browising state will be reported on the status bar on `ON`. +This means that whenever you'll change the working directory on one panel, the same action will be reproduced on the other panel. If you want to enable synchronized browsing just press ``; press twice to disable. While enabled, the synchronized browsing state will be reported on the status bar on `ON`. > ❗ at the moment, whenever you try to access an unexisting directory, you won't be prompted to create it. This might change in a future update. @@ -229,7 +228,7 @@ whenever you want to use the previously saved connection, just press `` to Sure 😉. As said before, bookmarks are saved in your configuration directory along with passwords. Passwords are obviously not plain text, they are encrypted with **AES-128**. Does this make them safe? Absolutely! (except for BSD and WSL users 😢) -On **Windows**, **Linux** and **MacOS** the passwords are stored, if possible (but should be), respectively in the *Windows Vault*, in the *system keyring* and into the *Keychain*. This is actually super-safe and is directly managed by your operating system. +On **Windows**, **Linux** and **MacOS** the key used to encrypt passwords is stored, if possible (but should be), respectively in the *Windows Vault*, in the *system keyring* and into the *Keychain*. This is actually super-safe and is directly managed by your operating system. ❗ Please, notice that if you're a Linux user, you'd better to read the [chapter below 👀](#linux-keyring), because the keyring might not be enabled or supported on your system! @@ -337,7 +336,7 @@ These are the keys supported by the formatter: - `CTIME`: Creation time (with syntax `%b %d %Y %H:%M`); Extra might be provided as the time syntax (e.g. `{CTIME:8:%H:%M}`) - `GROUP`: Owner group - `MTIME`: Last change time (with syntax `%b %d %Y %H:%M`); Extra might be provided as the time syntax (e.g. `{MTIME:8:%H:%M}`) -- `NAME`: File name (Elided if longer than 24) +- `NAME`: File name (Elided if longer than LENGTH) - `PEX`: File permissions (UNIX format) - `SIZE`: File size (omitted for directories) - `SYMLINK`: Symlink (if any `-> {FILE_PATH}`) @@ -359,7 +358,7 @@ In order to create your own customization from termscp, all you have to do so is Here you can move with `` and `` to change the style you want to change, as shown in the gif below: -![Themes](../assets/images/themes.gif) +![Themes](https://github.com/veeso/termscp/blob/main/assets/images/themes.gif?raw=true) termscp supports both the traditional explicit hex (`#rrggbb`) and rgb `rgb(r, g, b)` syntax to provide colors, but also **[css colors](https://www.w3schools.com/cssref/css_colors.asp)** (such as `crimson`) are accepted 😉. There is also a special keywork which is `Default`. Default means that the color used will be the default foreground or background color based on the situation (foreground for texts and lines, background for well, guess what). @@ -441,10 +440,6 @@ In case the file is located on remote host, the file will be first downloaded in Just a reminder: **you can edit only textual file**; binary files are not supported. -### How do I configure the text editor 🦥 - -Text editor is automatically found using this [awesome crate](https://github.com/milkey-mouse/edit), if you want to change the text editor to use, change it in termscp configuration. [Read more](#configuration-️) - --- ## Logging 🩺 @@ -487,5 +482,5 @@ Termscp will send Desktop notifications for these kind of events: - on **Update installed**: Whenever a new version of termscp has been installed, a notification will be displayed. - on **Update failed**: Whenever the installation of the update fails, a notification will be displayed. -❗ If you prefer to keep notifications turned off, you can just enter setup and set `Enable notifications?` to `No` 😉. +❗ If you prefer to keep notifications turned off, you can just enter setup and set `Enable notifications?` to `No` 😉. ❗ If you want to change the minimum transfer size to display notifications, you can change the value in the configuration with key `Notifications: minimum transfer size` and set it to whatever suits better for you 🙂. diff --git a/docs/zh-CN/README.md b/docs/zh-CN/README.md index e69de29..62889db 100644 --- a/docs/zh-CN/README.md +++ b/docs/zh-CN/README.md @@ -0,0 +1,243 @@ +# termscp + +

+ +

+ +

~ 功能丰富的终端文件传输 ~

+

+ 网站 + · + 安装 + · + 用户手册 +

+ +

+ English +   + Deutsch +   + Español +   + Français +   + Italiano +   + 简体中文 +

+ +

由 @veeso 开发

+

当前版本： 0.7.0 (12/10/2021)

+ +[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) + +[![Linux](https://github.com/veeso/termscp/workflows/Linux/badge.svg)](https://github.com/veeso/termscp/actions) [![MacOs](https://github.com/veeso/termscp/workflows/MacOS/badge.svg)](https://github.com/veeso/termscp/actions) [![Windows](https://github.com/veeso/termscp/workflows/Windows/badge.svg)](https://github.com/veeso/termscp/actions) [![FreeBSD](https://github.com/veeso/termscp/workflows/FreeBSD/badge.svg)](https://github.com/veeso/termscp/actions) [![Coverage Status](https://coveralls.io/repos/github/veeso/termscp/badge.svg)](https://coveralls.io/github/veeso/termscp) [![Docs](https://docs.rs/termscp/badge.svg)](https://docs.rs/termscp) + +--- + +## 关于 termscp 🖥 + +termscp 是一个功能丰富的终端文件传输和浏览器，支持 SCP/SFTP/FTP/S3。 所以基本上是一个带有 TUI 的终端实用程序，用于连接到远程服务器以检索和上传文件并与本地文件系统进行交互。 +它与 **Linux**、**MacOS**、**FreeBSD** 和 **Windows** 兼容。 + +![Explorer](/assets/images/explorer.gif) + +--- + +## Features 🎁 + +- 📁 不同的通讯协议 + - **SFTP** + - **SCP** + - **FTP** and **FTPS** + - **Aws S3** +- 🖥 使用方便的 UI 在远程和本地机器文件系统上探索和操作 + - 创建、删除、重命名、搜索、查看和编辑文件 +- ⭐ 通过内置书签和最近的连接连接到您最喜欢的主机 +- 📝 使用您喜欢的应用程序查看和编辑文件 +- 💁 使用 SSH 密钥和用户名/密码进行 SFTP/SCP 身份验证 +- 🐧 与 Windows、Linux、FreeBSD 和 MacOS 兼容 +- 🎨 让它成为你的！ + - 主题 + - 自定义文件浏览器格式 + - 可定制的文本编辑器 + - 可定制的文件排序 + - 和许多其他参数... +- 📫 传输大文件时通过桌面通知获得通知 +- 🔐 将密码保存在操作系统密钥保管库中 +- 🦀 Rust 动力 +- 👀 开发时注意性能 +- 🦄 频繁的精彩更新 + +--- + +## 开始 🚀 + +如果您正在考虑安装termscp，我要感谢您💜！ 我希望你会喜欢termscp！ +如果您想为此项目做出贡献，请不要忘记查看我们的贡献指南。 [阅读更多](../../CONTRIBUTING.md) + +如果您是 Linux、FreeBSD 或 MacOS 用户，这个简单的 shell 脚本将使用单个命令在您的系统上安装 termscp： + +```sh +curl --proto '=https' --tlsv1.2 -sSLf "https://git.io/JBhDb" | sh +``` + +如果您是 Windows 用户，则可以使用 [Chocolatey](https://chocolatey.org/) 安装 termscp： + +```sh +choco install termscp +``` + +如需更多信息或其他平台，请访问 [veeso.github.io](https://veeso.github.io/termscp/#get-started) 查看所有安装方法。 + +⚠️ 如果您正在寻找如何更新 termscp 只需从 CLI 运行 termscp ： `(sudo) termscp --update` ⚠️ + +### 要求 ❗ + +- **Linux** 用户: + - libssh + - libdbus-1 + - pkg-config +- **FreeBSD** 用户: + - libssh + - dbus + - pkgconf + +### 可选要求 ✔️ + +这些要求不是运行 termscp 的强制要求，而是要享受它的所有功能 + +- **Linux/FreeBSD** 用户: + - 用 `V` **打开** 文件（至少其中之一） + - *xdg-open* + - *gio* + - *gnome-open* + - *kde-open* +- **Linux** 用户: + - keyring manager: [在用户手册中阅读更多内容](man.md#linux-keyring) +- **WSL** 用户 + - 用 `V` **打开** 文件（至少其中之一） + - [wslu](https://github.com/wslutilities/wslu) + +--- + +## 支持我 ☕ + +如果您喜欢 termscp 并且希望看到该项目不断发展和改进，请考虑在**给我买杯咖啡**上捐款以支持我**🥳 + +[![给我买一杯咖啡](https://img.buymeacoffee.com/button-api/?text=%E7%BB%99%E6%88%91%E4%B9%B0%E4%B8%80%E6%9D%AF%E5%92%96%E5%95%A1&emoji=&slug=veeso&button_colour=404040&font_colour=ffffff&font_family=Comic&outline_colour=ffffff&coffee_colour=FFDD00)](https://www.buymeacoffee.com/veeso) + +--- + +## 用户手册和文档 📚 + +用户手册可以在[termscp的网站](https://veeso.github.io/termscp/#user-manual)上找到 或者在[Github](man.md)上。 + +开发者文档可以在 的 Rust Docs 上找到。 + +--- + +## 已知的问题 🧻 + +- `NoSuchFileOrDirectory` 连接时 (WSL1): 我知道这个问题，我猜这是 WSL 的一个小故障。 别担心，只需将 termscp 可执行文件移动到另一个 PATH 位置，例如`/usr/bin`，或者通过适当的包格式（例如 deb）安装它。 + +--- + +## 贡献和问题 🤝🏻 + +欢迎贡献、错误报告、新功能和问题！ 😉 +如果您有任何问题或疑虑，或者您想建议新功能，或者您只想改进termscp，请随时打开问题或 PR。 + +请遵循 [我们的贡献指南](../../CONTRIBUTING.md) + +--- + +## 变更日志 ⏳ + +查看termscp的更新日志 [这里](../../CHANGELOG.md) + +--- + +## Powered by 💪 + +termscp 由这些很棒的项目提供支持： + +- [bytesize](https://github.com/hyunsik/bytesize) +- [crossterm](https://github.com/crossterm-rs/crossterm) +- [edit](https://github.com/milkey-mouse/edit) +- [keyring-rs](https://github.com/hwchen/keyring-rs) +- [open-rs](https://github.com/Byron/open-rs) +- [rpassword](https://github.com/conradkleinespel/rpassword) +- [rust-s3](https://github.com/durch/rust-s3) +- [self_update](https://github.com/jaemk/self_update) +- [ssh2-rs](https://github.com/alexcrichton/ssh2-rs) +- [suppaftp](https://github.com/veeso/suppaftp) +- [textwrap](https://github.com/mgeisler/textwrap) +- [tui-rs](https://github.com/fdehau/tui-rs) +- [tui-realm](https://github.com/veeso/tui-realm) +- [whoami](https://github.com/libcala/whoami) +- [wildmatch](https://github.com/becheran/wildmatch) + +--- + +## 画廊 🎬 + +> 家 + +![Auth](/assets/images/auth.gif) + +> 书签 + +![Bookmarks](/assets/images/bookmarks.gif) + +> 设置 + +![Setup](/assets/images/config.gif) + +> 文本编辑器 + +![TextEditor](/assets/images/text-editor.gif) + +--- + +## 执照 📃 + +“termscp”在 MIT 许可下获得许可。 + +您可以阅读整个许可证 [这里](../../LICENSE) diff --git a/docs/zh-CN/man.md b/docs/zh-CN/man.md index 58c99a9..d468415 100644 --- a/docs/zh-CN/man.md +++ b/docs/zh-CN/man.md @@ -13,7 +13,7 @@ - [书签](#书签) - [我的密码安全吗？](#我的密码安全吗) - [Linux Keyring](#linux-keyring) - - [用于 termcp 的 KeepassXC 设置](#用于-termcp-的-keepassxc-设置) + - [用于 termscp 的 KeepassXC 设置](#用于-termscp-的-keepassxc-设置) - [Aws S3 凭证](#aws-s3-凭证) - [配置](#配置) - [SSH Key Storage](#ssh-key-storage) @@ -25,7 +25,6 @@ - [文件传输页](#文件传输页) - [Misc](#misc) - [文本编辑器](#文本编辑器) - - [如何配置文本编辑器？](#如何配置文本编辑器) - [日志](#日志) - [通知](#通知) @@ -237,7 +236,7 @@ termscp中的文件资源管理器是指你与远程建立连接后可以看到 - ❗对于其他桌面环境的用户，有一个很好的程序，你可以用它来获得钥匙串，这就是[KeepassXC](https://keepassxc.org/)，我在我的Manjaro中使用它（带KDE），一切都很正常。唯一的问题是，你必须设置它与termscp一起使用（但这很简单）。要开始使用KeepassXC，请阅读更多[这里]（#keepassxc-setup-for-termscp）。 - ❗如果你不想安装任何这些服务呢？好吧，这没有问题! **termscp依然能正常工作**，但它会将密钥保存在一个文件中，就像它通常为BSD和WSL做的那样。 -##### 用于 termcp 的 KeepassXC 设置 +##### 用于 termscp 的 KeepassXC 设置 参照以下步骤，为termscp配置keepassXC： @@ -330,7 +329,7 @@ termscp和书签一样，只需要保证这些路径是可访问的： - `CTIME`: 创建时间（语法为`%b %d %Y %H:%M`）；Extra参数可以指定时间显示语法（例如：`{CTIME:8:%H:%M}`） - `GROUP`: 所属组 - `MTIME`: 最后修改时间（语法为`%b %d %Y %H:%M`）；Extra参数可以指定时间显示语法（例如：`{MTIME:8:%H:%M}`） -- `NAME`: 文件名（超过24个字符的部分会被省略） +- `NAME`: 文件名（超过 LENGTH 个字符的部分会被省略） - `PEX`: 文件权限（UNIX格式） - `SIZE`: 文件大小（目录不显示） - `SYMLINK`: 超链接（如果存在的话`-> {FILE_PATH}`）。 @@ -352,7 +351,7 @@ Termscp为你提供了一个很棒的功能：可以为应用程序中的几个 在这里你可以用``和``移动来选择你想改变的样式，如下图所示： -![Themes](../assets/images/themes.gif) +![Themes](https://github.com/veeso/termscp/blob/main/assets/images/themes.gif?raw=true) termscp支持传统的十六进制（`#rrggbb`）和RGB`rgb(r, g, b)`语法来表示颜色，但也接受 **[css颜色](https://www.w3schools.com/cssref/css_colors.asp)**（如`crimson`）😉。还有一个特殊的关键词是`Default`，意味着使用的颜色将是基于情景的默认前景或背景颜色（文本和线条的前景色，以及容器的背景色，你猜是什么）。 @@ -434,10 +433,6 @@ Termscp有很多功能，你可能已经注意到了，其中之一就是可以 多说一句，**你只能编辑文本文件**；二进制文件是不可以的。 -### 如何配置文本编辑器？ - -文本编辑器是通过[awesome crate](https://github.com/milkey-mouse/edit)自动查找的，如果你想改变默认的文本编辑器，请在termscp配置中改变它。[阅读更多](#配置) - --- ## 日志 @@ -478,5 +473,5 @@ termscp 将针对这些类型的事件发送桌面通知： - **更新已安装**：每当安装了新版本的termscp 时，都会显示通知。 - **更新失败**：每当更新安装失败时，都会显示通知。 -❗ 如果您希望保持关闭通知，您只需进入设置并将 `Enable notifications?` 设置为 `No`😉。 +❗ 如果您希望保持关闭通知，您只需进入设置并将 `Enable notifications?` 设置为 `No`😉。 ❗ 如果您想更改最小传输大小以显示通知，您可以使用键 `Notifications: minimum transfer size` 更改配置中的值，并将其设置为更适合您的任何值🙂。 From 463329a0807f16c44ad21c30cd1269ce672d2905 Mon Sep 17 00:00:00 2001 From: veeso Date: Mon, 4 Oct 2021 16:11:45 +0200 Subject: [PATCH 24/40] docs url --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index bbaaa88..2e7b06f 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ />           Date: Mon, 4 Oct 2021 17:50:07 +0200 Subject: [PATCH 25/40] typo --- docs/zh-CN/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh-CN/README.md b/docs/zh-CN/README.md index 62889db..89c6f71 100644 --- a/docs/zh-CN/README.md +++ b/docs/zh-CN/README.md @@ -159,7 +159,7 @@ choco install termscp ## 支持我 ☕ -如果您喜欢 termscp 并且希望看到该项目不断发展和改进，请考虑在**给我买杯咖啡**上捐款以支持我**🥳 +如果您喜欢 termscp 并且希望看到该项目不断发展和改进，请考虑在**给我买杯咖啡**上捐款以支持我🥳 [![给我买一杯咖啡](https://img.buymeacoffee.com/button-api/?text=%E7%BB%99%E6%88%91%E4%B9%B0%E4%B8%80%E6%9D%AF%E5%92%96%E5%95%A1&emoji=&slug=veeso&button_colour=404040&font_colour=ffffff&font_family=Comic&outline_colour=ffffff&coffee_colour=FFDD00)](https://www.buymeacoffee.com/veeso) From 4973bf8cbeed027c1d110e0faefdd43c32f71729 Mon Sep 17 00:00:00 2001 From: veeso Date: Mon, 4 Oct 2021 20:40:24 +0200 Subject: [PATCH 26/40] Fixed issue 70: Unable to type characters with CTRL+ALT --- CHANGELOG.md | 4 +- Cargo.lock | 4 +- Cargo.toml | 2 +- .../activities/filetransfer/actions/edit.rs | 2 - src/ui/activities/setup/actions.rs | 2 - src/ui/activities/setup/config.rs | 2 - src/ui/context.rs | 41 +++++++++++++++---- 7 files changed, 39 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a16e073..fa5284d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,13 +51,15 @@ Released on 12/10/2021 - Enhancements: - Reuse mounts in UI, in order to reduce executable size - File list can now be "rewinded", which means that moving with arrows will now allow you to go from top to bottom of the list pressing `` and viceversa pressing ``. +- Bugfix: + - Fixed [Issue 70](https://github.com/veeso/termscp/issues/70): Unable to type characters with `CTRL+ALT` (e.g. italian layout `CTRL+ALT+ò` => `@`) due to a crossterm issue. Fixed with tui-realm-stdlib `0.6.3`. - Dependencies: - Added `notify_rust 4.5.3` - Added `rust-s3 0.27-rc4` - Added `self_update 0.27.0` - Updated `argh` to `0.1.6` - Updated `dirs` to `4.0.0` - - Updated `tui-realm-stdlib` to `0.6.2` + - Updated `tui-realm-stdlib` to `0.6.3` - Removed `ureq` ## 0.6.1 diff --git a/Cargo.lock b/Cargo.lock index de668e8..321d4d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2390,9 +2390,9 @@ dependencies = [ [[package]] name = "tui-realm-stdlib" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54af02e93599f275c1eb0286235c935f60501d7ae1b554cfb1c9c584ca0193ff" +checksum = "f159d383b40dec75e0541530bc3416318f5e0a8b6999db9df9b5efa6b122380e" dependencies = [ "textwrap", "tuirealm", diff --git a/Cargo.toml b/Cargo.toml index 8543eda..d5c9459 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,7 +55,7 @@ tempfile = "3.1.0" textwrap = "0.14.2" thiserror = "^1.0.0" toml = "0.5.8" -tui-realm-stdlib = "0.6.2" +tui-realm-stdlib = "0.6.3" tuirealm = "0.6.0" whoami = "1.1.1" wildmatch = "2.0.0" diff --git a/src/ui/activities/filetransfer/actions/edit.rs b/src/ui/activities/filetransfer/actions/edit.rs index ba064a6..eacb24b 100644 --- a/src/ui/activities/filetransfer/actions/edit.rs +++ b/src/ui/activities/filetransfer/actions/edit.rs @@ -113,7 +113,6 @@ impl FileTransferActivity { error!("Failed to disable raw mode: {}", err); } // Leave alternate mode - #[cfg(not(target_os = "windows"))] if let Some(ctx) = self.context.as_mut() { ctx.leave_alternate_screen(); } @@ -128,7 +127,6 @@ impl FileTransferActivity { ), Err(err) => return Err(format!("Could not open editor: {}", err)), } - #[cfg(not(target_os = "windows"))] if let Some(ctx) = self.context.as_mut() { // Clear screen ctx.clear_screen(); diff --git a/src/ui/activities/setup/actions.rs b/src/ui/activities/setup/actions.rs index b49753c..6be4711 100644 --- a/src/ui/activities/setup/actions.rs +++ b/src/ui/activities/setup/actions.rs @@ -182,7 +182,6 @@ impl SetupActivity { error!("Failed to disable raw mode: {}", err); } // Leave alternate mode - #[cfg(not(target_os = "windows"))] if let Some(ctx) = self.context.as_mut() { ctx.leave_alternate_screen(); } @@ -215,7 +214,6 @@ impl SetupActivity { } } // Restore terminal - #[cfg(not(target_os = "windows"))] if let Some(ctx) = self.context.as_mut() { // Clear screen ctx.clear_screen(); diff --git a/src/ui/activities/setup/config.rs b/src/ui/activities/setup/config.rs index 1a2e5cd..8e811c5 100644 --- a/src/ui/activities/setup/config.rs +++ b/src/ui/activities/setup/config.rs @@ -98,7 +98,6 @@ impl SetupActivity { error!("Failed to disable raw mode: {}", err); } // Leave alternate mode - #[cfg(not(target_os = "windows"))] ctx.leave_alternate_screen(); // Get result let result: Result<(), String> = match ctx.config().iter_ssh_keys().nth(idx) { @@ -123,7 +122,6 @@ impl SetupActivity { // Clear screen ctx.clear_screen(); // Enter alternate mode - #[cfg(not(target_os = "windows"))] ctx.enter_alternate_screen(); // Re-enable raw mode if let Err(err) = enable_raw_mode() { diff --git a/src/ui/context.rs b/src/ui/context.rs index 5750ef1..37ce545 100644 --- a/src/ui/context.rs +++ b/src/ui/context.rs @@ -33,9 +33,12 @@ use crate::system::config_client::ConfigClient; use crate::system::theme_provider::ThemeProvider; // Includes -use crossterm::event::DisableMouseCapture; -use crossterm::execute; -use crossterm::terminal::{EnterAlternateScreen, LeaveAlternateScreen}; +#[cfg(target_family = "unix")] +use crossterm::{ + event::DisableMouseCapture, + execute, + terminal::{EnterAlternateScreen, LeaveAlternateScreen}, +}; use std::io::{stdout, Stdout}; use tuirealm::tui::backend::CrosstermBackend; use tuirealm::tui::Terminal; @@ -64,15 +67,12 @@ impl Context { theme_provider: ThemeProvider, error: Option, ) -> Context { - // Create terminal - let mut stdout = stdout(); - assert!(execute!(stdout, EnterAlternateScreen).is_ok()); Context { ft_params: None, config_client, store: Store::init(), input_hnd: InputHandler::new(), - terminal: Terminal::new(CrosstermBackend::new(stdout)).unwrap(), + terminal: Terminal::new(CrosstermBackend::new(Self::stdout())).unwrap(), theme_provider, error, } @@ -141,7 +141,7 @@ impl Context { /// ### enter_alternate_screen /// /// Enter alternate screen (gui window) - #[cfg(not(target_os = "windows"))] + #[cfg(target_family = "unix")] pub fn enter_alternate_screen(&mut self) { match execute!( self.terminal.backend_mut(), @@ -153,9 +153,16 @@ impl Context { } } + /// ### enter_alternate_screen + /// + /// Enter alternate screen (gui window) + #[cfg(target_family = "windows")] + pub fn enter_alternate_screen(&self) {} + /// ### leave_alternate_screen /// /// Go back to normal screen (gui window) + #[cfg(target_family = "unix")] pub fn leave_alternate_screen(&mut self) { match execute!( self.terminal.backend_mut(), @@ -167,6 +174,12 @@ impl Context { } } + /// ### leave_alternate_screen + /// + /// Go back to normal screen (gui window) + #[cfg(target_family = "windows")] + pub fn leave_alternate_screen(&self) {} + /// ### clear_screen /// /// Clear terminal screen @@ -176,6 +189,18 @@ impl Context { Ok(_) => info!("Cleared screen"), } } + + #[cfg(target_family = "unix")] + fn stdout() -> Stdout { + let mut stdout = stdout(); + assert!(execute!(stdout, EnterAlternateScreen).is_ok()); + stdout + } + + #[cfg(target_family = "windows")] + fn stdout() -> Stdout { + stdout() + } } impl Drop for Context { From e09682c219624ca11a4042659705fd2da00c4189 Mon Sep 17 00:00:00 2001 From: veeso Date: Wed, 6 Oct 2021 08:45:02 +0200 Subject: [PATCH 27/40] wip --- README.md | 6 +- docs/de/README.md | 242 +++++++++++++++++++++++++++++++++++++++++++ docs/es/README.md | 242 +++++++++++++++++++++++++++++++++++++++++++ docs/fr/README.md | 242 +++++++++++++++++++++++++++++++++++++++++++ docs/it/README.md | 2 +- docs/zh-CN/README.md | 2 +- 6 files changed, 731 insertions(+), 5 deletions(-) create mode 100644 docs/de/README.md create mode 100644 docs/es/README.md create mode 100644 docs/fr/README.md diff --git a/README.md b/README.md index 2e7b06f..8f45da8 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ />

-

Developed by @veeso

+

Developed by @veeso

Current version: 0.7.0 (12/10/2021)

[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) @@ -140,7 +140,7 @@ For more information or other platforms, please visit [veeso.github.io](https:// ### Optional Requirements ✔️ -These requirements are not forcely required to run termscp, but to enjoy all of its features +These requirements are not forced required to run termscp, but to enjoy all of its features - **Linux/FreeBSD** users: - To **open** files via `V` (at least one of these) @@ -149,7 +149,7 @@ These requirements are not forcely required to run termscp, but to enjoy all of - *gnome-open* - *kde-open* - **Linux** users: - - A keyring manager: read more in the [User manual](docs/man_en.md#linux-keyring) + - A keyring manager: read more in the [User manual](docs/man.md#linux-keyring) - **WSL** users - To **open** files via `V` (at least one of these) - [wslu](https://github.com/wslutilities/wslu) diff --git a/docs/de/README.md b/docs/de/README.md new file mode 100644 index 0000000..bed58b2 --- /dev/null +++ b/docs/de/README.md @@ -0,0 +1,242 @@ +# termscp + +

+ +

+ +

~ A feature rich terminal file transfer ~

+

+ Website + · + Installation + · + User manual +

+ +

+ English +   + Deutsch +   + Español +   + Français +   + Italiano +   + 简体中文 +

+ +

Developed by @veeso

+

Current version: 0.7.0 (12/10/2021)

+ +[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) + +[![Linux](https://github.com/veeso/termscp/workflows/Linux/badge.svg)](https://github.com/veeso/termscp/actions) [![MacOs](https://github.com/veeso/termscp/workflows/MacOS/badge.svg)](https://github.com/veeso/termscp/actions) [![Windows](https://github.com/veeso/termscp/workflows/Windows/badge.svg)](https://github.com/veeso/termscp/actions) [![FreeBSD](https://github.com/veeso/termscp/workflows/FreeBSD/badge.svg)](https://github.com/veeso/termscp/actions) [![Coverage Status](https://coveralls.io/repos/github/veeso/termscp/badge.svg)](https://coveralls.io/github/veeso/termscp) [![Docs](https://docs.rs/termscp/badge.svg)](https://docs.rs/termscp) + +--- + +## About termscp 🖥 + +Termscp is a feature rich terminal file transfer and explorer, with support for SCP/SFTP/FTP/S3. So basically is a terminal utility with an TUI to connect to a remote server to retrieve and upload files and to interact with the local file system. It is **Linux**, **MacOS**, **FreeBSD** and **Windows** compatible. + +![Explorer](/assets/images/explorer.gif) + +--- + +## Features 🎁 + +- 📁 Different communication protocols + - **SFTP** + - **SCP** + - **FTP** and **FTPS** + - **Aws S3** +- 🖥 Explore and operate on the remote and on the local machine file system with a handy UI + - Create, remove, rename, search, view and edit files +- ⭐ Connect to your favourite hosts through built-in bookmarks and recent connections +- 📝 View and edit files with your favourite applications +- 💁 SFTP/SCP authentication with SSH keys and username/password +- 🐧 Compatible with Windows, Linux, FreeBSD and MacOS +- 🎨 Make it yours! + - Themes + - Custom file explorer format + - Customizable text editor + - Customizable file sorting + - and many other parameters... +- 📫 Get notified via Desktop Notifications when a large file has been transferred +- 🔐 Save your password in your operating system key vault +- 🦀 Rust-powered +- 👀 Developed keeping an eye on performance +- 🦄 Frequent awesome updates + +--- + +## Get started 🚀 + +If you're considering to install termscp I want to thank you 💜 ! I hope you will enjoy termscp! +If you want to contribute to this project, don't forget to check out our [contribute guide](../../CONTRIBUTING.md). + +If you are a Linux, a FreeBSD or a MacOS user this simple shell script will install termscp on your system with a single command: + +```sh +curl --proto '=https' --tlsv1.2 -sSLf "https://git.io/JBhDb" | sh +``` + +while if you're a Windows user, you can install termscp with [Chocolatey](https://chocolatey.org/): + +```sh +choco install termscp +``` + +For more information or other platforms, please visit [veeso.github.io](https://veeso.github.io/termscp/#get-started) to view all installation methods. + +⚠️ If you're looking on how to update termscp just run termscp from CLI with: `(sudo) termscp --update` ⚠️ + +### Requirements ❗ + +- **Linux** users: + - libssh + - libdbus-1 + - pkg-config +- **FreeBSD** users: + - libssh + - dbus + - pkgconf + +### Optional Requirements ✔️ + +These requirements are not forced required to run termscp, but to enjoy all of its features + +- **Linux/FreeBSD** users: + - To **open** files via `V` (at least one of these) + - *xdg-open* + - *gio* + - *gnome-open* + - *kde-open* +- **Linux** users: + - A keyring manager: read more in the [User manual](man.md#linux-keyring) +- **WSL** users + - To **open** files via `V` (at least one of these) + - [wslu](https://github.com/wslutilities/wslu) + +--- + +## Support me ☕ + +If you like termscp and you'd love to see the project to grow and to improve, please consider a little donation to support me on **Buy me a coffee** 🥳 + +[![Buy-me-a-coffee](https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20coffee&emoji=&slug=veeso&button_colour=404040&font_colour=ffffff&font_family=Comic&outline_colour=ffffff&coffee_colour=FFDD00)](https://www.buymeacoffee.com/veeso) + +--- + +## User manual and Documentation 📚 + +The user manual can be found on the [termscp's website](https://veeso.github.io/termscp/#user-manual) or on [Github](man.md). + +The developer documentation can be found on Rust Docs at + +--- + +## Known issues 🧻 + +- `NoSuchFileOrDirectory` on connect (WSL1): I know about this issue and it's a glitch of WSL I guess. Don't worry about it, just move the termscp executable into another PATH location, such as `/usr/bin`, or install it through the appropriate package format (e.g. deb). + +--- + +## Contributing and issues 🤝🏻 + +Contributions, bug reports, new features and questions are welcome! 😉 +If you have any question or concern, or you want to suggest a new feature, or you want just want to improve termscp, feel free to open an issue or a PR. + +Please follow [our contributing guidelines](../../CONTRIBUTING.md) + +--- + +## Changelog ⏳ + +View termscp's changelog [HERE](../../CHANGELOG.md) + +--- + +## Powered by 💪 + +termscp is powered by these awesome projects: + +- [bytesize](https://github.com/hyunsik/bytesize) +- [crossterm](https://github.com/crossterm-rs/crossterm) +- [edit](https://github.com/milkey-mouse/edit) +- [keyring-rs](https://github.com/hwchen/keyring-rs) +- [open-rs](https://github.com/Byron/open-rs) +- [rpassword](https://github.com/conradkleinespel/rpassword) +- [rust-s3](https://github.com/durch/rust-s3) +- [self_update](https://github.com/jaemk/self_update) +- [ssh2-rs](https://github.com/alexcrichton/ssh2-rs) +- [suppaftp](https://github.com/veeso/suppaftp) +- [textwrap](https://github.com/mgeisler/textwrap) +- [tui-rs](https://github.com/fdehau/tui-rs) +- [tui-realm](https://github.com/veeso/tui-realm) +- [whoami](https://github.com/libcala/whoami) +- [wildmatch](https://github.com/becheran/wildmatch) + +--- + +## Gallery 🎬 + +> Termscp Home + +![Auth](/assets/images/auth.gif) + +> Bookmarks + +![Bookmarks](/assets/images/bookmarks.gif) + +> Setup + +![Setup](/assets/images/config.gif) + +> Text editor + +![TextEditor](/assets/images/text-editor.gif) + +--- + +## License 📃 + +termscp is licensed under the MIT license. + +You can read the entire license [HERE](../../LICENSE) diff --git a/docs/es/README.md b/docs/es/README.md new file mode 100644 index 0000000..bed58b2 --- /dev/null +++ b/docs/es/README.md @@ -0,0 +1,242 @@ +# termscp + +

+ +

+ +

~ A feature rich terminal file transfer ~

+

+ Website + · + Installation + · + User manual +

+ +

+ English +   + Deutsch +   + Español +   + Français +   + Italiano +   + 简体中文 +

+ +

Developed by @veeso

+

Current version: 0.7.0 (12/10/2021)

+ +[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) + +[![Linux](https://github.com/veeso/termscp/workflows/Linux/badge.svg)](https://github.com/veeso/termscp/actions) [![MacOs](https://github.com/veeso/termscp/workflows/MacOS/badge.svg)](https://github.com/veeso/termscp/actions) [![Windows](https://github.com/veeso/termscp/workflows/Windows/badge.svg)](https://github.com/veeso/termscp/actions) [![FreeBSD](https://github.com/veeso/termscp/workflows/FreeBSD/badge.svg)](https://github.com/veeso/termscp/actions) [![Coverage Status](https://coveralls.io/repos/github/veeso/termscp/badge.svg)](https://coveralls.io/github/veeso/termscp) [![Docs](https://docs.rs/termscp/badge.svg)](https://docs.rs/termscp) + +--- + +## About termscp 🖥 + +Termscp is a feature rich terminal file transfer and explorer, with support for SCP/SFTP/FTP/S3. So basically is a terminal utility with an TUI to connect to a remote server to retrieve and upload files and to interact with the local file system. It is **Linux**, **MacOS**, **FreeBSD** and **Windows** compatible. + +![Explorer](/assets/images/explorer.gif) + +--- + +## Features 🎁 + +- 📁 Different communication protocols + - **SFTP** + - **SCP** + - **FTP** and **FTPS** + - **Aws S3** +- 🖥 Explore and operate on the remote and on the local machine file system with a handy UI + - Create, remove, rename, search, view and edit files +- ⭐ Connect to your favourite hosts through built-in bookmarks and recent connections +- 📝 View and edit files with your favourite applications +- 💁 SFTP/SCP authentication with SSH keys and username/password +- 🐧 Compatible with Windows, Linux, FreeBSD and MacOS +- 🎨 Make it yours! + - Themes + - Custom file explorer format + - Customizable text editor + - Customizable file sorting + - and many other parameters... +- 📫 Get notified via Desktop Notifications when a large file has been transferred +- 🔐 Save your password in your operating system key vault +- 🦀 Rust-powered +- 👀 Developed keeping an eye on performance +- 🦄 Frequent awesome updates + +--- + +## Get started 🚀 + +If you're considering to install termscp I want to thank you 💜 ! I hope you will enjoy termscp! +If you want to contribute to this project, don't forget to check out our [contribute guide](../../CONTRIBUTING.md). + +If you are a Linux, a FreeBSD or a MacOS user this simple shell script will install termscp on your system with a single command: + +```sh +curl --proto '=https' --tlsv1.2 -sSLf "https://git.io/JBhDb" | sh +``` + +while if you're a Windows user, you can install termscp with [Chocolatey](https://chocolatey.org/): + +```sh +choco install termscp +``` + +For more information or other platforms, please visit [veeso.github.io](https://veeso.github.io/termscp/#get-started) to view all installation methods. + +⚠️ If you're looking on how to update termscp just run termscp from CLI with: `(sudo) termscp --update` ⚠️ + +### Requirements ❗ + +- **Linux** users: + - libssh + - libdbus-1 + - pkg-config +- **FreeBSD** users: + - libssh + - dbus + - pkgconf + +### Optional Requirements ✔️ + +These requirements are not forced required to run termscp, but to enjoy all of its features + +- **Linux/FreeBSD** users: + - To **open** files via `V` (at least one of these) + - *xdg-open* + - *gio* + - *gnome-open* + - *kde-open* +- **Linux** users: + - A keyring manager: read more in the [User manual](man.md#linux-keyring) +- **WSL** users + - To **open** files via `V` (at least one of these) + - [wslu](https://github.com/wslutilities/wslu) + +--- + +## Support me ☕ + +If you like termscp and you'd love to see the project to grow and to improve, please consider a little donation to support me on **Buy me a coffee** 🥳 + +[![Buy-me-a-coffee](https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20coffee&emoji=&slug=veeso&button_colour=404040&font_colour=ffffff&font_family=Comic&outline_colour=ffffff&coffee_colour=FFDD00)](https://www.buymeacoffee.com/veeso) + +--- + +## User manual and Documentation 📚 + +The user manual can be found on the [termscp's website](https://veeso.github.io/termscp/#user-manual) or on [Github](man.md). + +The developer documentation can be found on Rust Docs at + +--- + +## Known issues 🧻 + +- `NoSuchFileOrDirectory` on connect (WSL1): I know about this issue and it's a glitch of WSL I guess. Don't worry about it, just move the termscp executable into another PATH location, such as `/usr/bin`, or install it through the appropriate package format (e.g. deb). + +--- + +## Contributing and issues 🤝🏻 + +Contributions, bug reports, new features and questions are welcome! 😉 +If you have any question or concern, or you want to suggest a new feature, or you want just want to improve termscp, feel free to open an issue or a PR. + +Please follow [our contributing guidelines](../../CONTRIBUTING.md) + +--- + +## Changelog ⏳ + +View termscp's changelog [HERE](../../CHANGELOG.md) + +--- + +## Powered by 💪 + +termscp is powered by these awesome projects: + +- [bytesize](https://github.com/hyunsik/bytesize) +- [crossterm](https://github.com/crossterm-rs/crossterm) +- [edit](https://github.com/milkey-mouse/edit) +- [keyring-rs](https://github.com/hwchen/keyring-rs) +- [open-rs](https://github.com/Byron/open-rs) +- [rpassword](https://github.com/conradkleinespel/rpassword) +- [rust-s3](https://github.com/durch/rust-s3) +- [self_update](https://github.com/jaemk/self_update) +- [ssh2-rs](https://github.com/alexcrichton/ssh2-rs) +- [suppaftp](https://github.com/veeso/suppaftp) +- [textwrap](https://github.com/mgeisler/textwrap) +- [tui-rs](https://github.com/fdehau/tui-rs) +- [tui-realm](https://github.com/veeso/tui-realm) +- [whoami](https://github.com/libcala/whoami) +- [wildmatch](https://github.com/becheran/wildmatch) + +--- + +## Gallery 🎬 + +> Termscp Home + +![Auth](/assets/images/auth.gif) + +> Bookmarks + +![Bookmarks](/assets/images/bookmarks.gif) + +> Setup + +![Setup](/assets/images/config.gif) + +> Text editor + +![TextEditor](/assets/images/text-editor.gif) + +--- + +## License 📃 + +termscp is licensed under the MIT license. + +You can read the entire license [HERE](../../LICENSE) diff --git a/docs/fr/README.md b/docs/fr/README.md new file mode 100644 index 0000000..453b938 --- /dev/null +++ b/docs/fr/README.md @@ -0,0 +1,242 @@ +# termscp + +

+ +

+ +

~ Un file transfer de terminal riche en fonctionnalités ~

+

+ Site internet + · + Installation + · + Manuel de l'Utilisateur +

+ +

+ English +   + Deutsch +   + Español +   + Français +   + Italiano +   + 简体中文 +

+ +

Développé par @veeso

+

Version actuelle: 0.7.0 (12/10/2021)

+ +[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) + +[![Linux](https://github.com/veeso/termscp/workflows/Linux/badge.svg)](https://github.com/veeso/termscp/actions) [![MacOs](https://github.com/veeso/termscp/workflows/MacOS/badge.svg)](https://github.com/veeso/termscp/actions) [![Windows](https://github.com/veeso/termscp/workflows/Windows/badge.svg)](https://github.com/veeso/termscp/actions) [![FreeBSD](https://github.com/veeso/termscp/workflows/FreeBSD/badge.svg)](https://github.com/veeso/termscp/actions) [![Coverage Status](https://coveralls.io/repos/github/veeso/termscp/badge.svg)](https://coveralls.io/github/veeso/termscp) [![Docs](https://docs.rs/termscp/badge.svg)](https://docs.rs/termscp) + +--- + +## À propos des termscp 🖥 + +Termscp est un file transfer et explorateur de fichiers de terminal riche en fonctionnalités, avec support pour SCP/SFTP/FTP/S3. Essentiellement c'est une utilitaire terminal avec une TUI pour se connecter à un serveur distant pour télécharger de fichiers et interagir avec le système de fichiers local. Il est compatible avec **Linux**, **MacOS**, **FreeBSD** et **Windows**. + +![Explorer](/assets/images/explorer.gif) + +--- + +## Fonctionnalités 🎁 + +- 📁 Différents protocoles de communication + - **SFTP** + - **SCP** + - **FTP** et **FTPS** + - **Aws S3** +- 🖥 Explorer et opérer sur le système de fichiers distant et local avec une interface utilisateur pratique. + - Créer, supprimer, renommer, rechercher, afficher et modifier des fichiers +- ⭐ Connectez-vous à vos hôtes préférés via des signets et des connexions récentes. +- 📝 Affichez et modifiez des fichiers avec vos applications préférées +- 💁 Authentication SFTP/SCP avec des clés SSH et nom/mot de passe +- 🐧 Compatible avec Windows, Linux, FreeBSD et MacOS +- 🎨 Faites en vôtre ! + - thèmes + - format d'explorateur de fichiers personnalisé + - éditeur de texte personnalisable + - tri de fichiers personallisable + - et bien d'autres paramètres... +- 📫 Recevez une notification quande un gros fichier est télécharger. +- 🔐 Enregistre tes mots de passe dans le key vault du systeme. +- 🦀 Rust-powered +- 👀 Développé en gardant un œil sur les performances +- 🦄 Mises à jour fréquentes + +--- + +## Commencer 🚀 + +Si tu envisage d'installer termscp, je veux te remercier 💜 ! J'espère que tu vas apprécier termscp ! +Si tu veux contribuer à ce projet, n'oublié pas de consulter notre [guide de contribution](../../CONTRIBUTING.md). + +Si tu es un utilisateur Linux, FreeBSD ou MacOS ce simple shell script installera termscp sur te système en un seule commande: + +```sh +curl --proto '=https' --tlsv1.2 -sSLf "https://git.io/JBhDb" | sh +``` + +tandis que si tu es un utilisateur Windows, tu peux installer termscp avec [Chocolatey](https://chocolatey.org/): + +```sh +choco install termscp +``` + +Pour plus d'informations sur les autres méthodes d'installation, veuillez visiter [veeso.github.io](https://veeso.github.io/termscp/#get-started). + +⚠️ Si tu cherche comme de mettre à jour termscp, tu dois exécuter cette commande dans le terminal: `(sudo) termscp --update` ⚠️ + +### Requis ❗ + +- utilisateurs **Linux**: + - libssh + - libdbus-1 + - pkg-config +- utilisateurs **FreeBSD**: + - libssh + - dbus + - pkgconf + +### Requis facultatives ✔️ + +Ces requis ne sont pas obligatoires d'exécuter termscp, mais seulement à toutes ses fonctionnalités + +- utilisateurs **Linux/FreeBSD**: + - Pour **ouvrir** les fichiers via `V` (au moins un de ces) + - *xdg-open* + - *gio* + - *gnome-open* + - *kde-open* +- utilisateurs **Linux**: + - Un keyring manager: lire plus dans le [manuel d'utilisateur](man.md#linux-keyring) +- utilisateurs **WSL** + - Pour **ouvrir** les fichiers via `V` (au moins un de ces) + - [wslu](https://github.com/wslutilities/wslu) + +--- + +## Me soutenir ☕ + +Si tu aime termscp et que tu aimerais voir le projet grandir et s'améliorer, voudrais considérer un petit don pour me soutenir sur **Buy me a coffee** 🥳 + +[![Buy-me-a-coffee](https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20coffee&emoji=&slug=veeso&button_colour=404040&font_colour=ffffff&font_family=Comic&outline_colour=ffffff&coffee_colour=FFDD00)](https://www.buymeacoffee.com/veeso) + +--- + +## Manuel d'utilisateur et Documentation 📚 + +Le manuel d'utilisateur peut être trouvé sur le [site de termscp](https://veeso.github.io/termscp/#user-manual) ou sur [Github](man.md). + +La documentation peut être trouvé sur Rust Docs + +--- + +## Problèmes connus 🧻 + +- `NoSuchFileOrDirectory` à la connexion (WSL1): Je connais ce problème et c'est un problème de WSL je suppose. Ne te inquiéte pas, déplace simplement l'exécutable termscp dans un autre emplacement PATH, tel que `/usr/bin`, ou installe-le via le format de package approprié (par exemple, deb). + +--- + +## Contribution et enjeux 🤝🏻 + +Les contributions, les rapports de bugs, les nouvelles fonctionnalités et les questions sont les bienvenus ! 😉 +Si tu ai des questions ou des préoccupations, ou si tu souhaite suggérer une nouvelle fonctionnalité, ou si tu souhaite simplement améliorer les conditions de termscp, n'hésite pas à ouvrir un problème ou un PR. + +Veuillez suivre [nos directives de contribution](../../CONTRIBUTING.md) + +--- + +## Journal des modifications ⏳ + +Afficher le journal des modifications [ICI](../../CHANGELOG.md) + +--- + +## Powered by 💪 + +termscp est soutenu par ces projets impressionnants: + +- [bytesize](https://github.com/hyunsik/bytesize) +- [crossterm](https://github.com/crossterm-rs/crossterm) +- [edit](https://github.com/milkey-mouse/edit) +- [keyring-rs](https://github.com/hwchen/keyring-rs) +- [open-rs](https://github.com/Byron/open-rs) +- [rpassword](https://github.com/conradkleinespel/rpassword) +- [rust-s3](https://github.com/durch/rust-s3) +- [self_update](https://github.com/jaemk/self_update) +- [ssh2-rs](https://github.com/alexcrichton/ssh2-rs) +- [suppaftp](https://github.com/veeso/suppaftp) +- [textwrap](https://github.com/mgeisler/textwrap) +- [tui-rs](https://github.com/fdehau/tui-rs) +- [tui-realm](https://github.com/veeso/tui-realm) +- [whoami](https://github.com/libcala/whoami) +- [wildmatch](https://github.com/becheran/wildmatch) + +--- + +## Gallerie 🎬 + +> Termscp Home + +![Auth](/assets/images/auth.gif) + +> Bookmarks + +![Bookmarks](/assets/images/bookmarks.gif) + +> Setup + +![Setup](/assets/images/config.gif) + +> Text editor + +![TextEditor](/assets/images/text-editor.gif) + +--- + +## Licence 📃 + +termscp est sous licence MIT. + +Vous pouvez lire l'intégralité de la licence [ICI](../../LICENSE) diff --git a/docs/it/README.md b/docs/it/README.md index 046d5c7..e80b2fe 100644 --- a/docs/it/README.md +++ b/docs/it/README.md @@ -62,7 +62,7 @@ />

-

Sviluppato da @veeso

+

Sviluppato da @veeso

Versione corrente: 0.7.0 (12/10/2021)

[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) diff --git a/docs/zh-CN/README.md b/docs/zh-CN/README.md index 89c6f71..6afddd4 100644 --- a/docs/zh-CN/README.md +++ b/docs/zh-CN/README.md @@ -62,7 +62,7 @@ />

-

由 @veeso 开发

+

由 @veeso 开发

当前版本： 0.7.0 (12/10/2021)

[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) From c9e85896895990fd52340708d590769c2bb82321 Mon Sep 17 00:00:00 2001 From: veeso Date: Wed, 6 Oct 2021 10:30:24 +0200 Subject: [PATCH 28/40] readmes --- README.md | 2 +- docs/de/README.md | 112 +++++------ docs/de/man.md | 486 ++++++++++++++++++++++++++++++++++++++++++++++ docs/es/README.md | 122 ++++++------ docs/es/man.md | 486 ++++++++++++++++++++++++++++++++++++++++++++++ docs/fr/man.md | 486 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 1576 insertions(+), 118 deletions(-) create mode 100644 docs/de/man.md create mode 100644 docs/es/man.md create mode 100644 docs/fr/man.md diff --git a/README.md b/README.md index 8f45da8..bc672ff 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@

Developed by @veeso

Current version: 0.7.0 (12/10/2021)

-[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) +[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crate Version](https://img.shields.io/crates/v/termscp.svg)](https://crates.io/crates/termscp) [![Linux](https://github.com/veeso/termscp/workflows/Linux/badge.svg)](https://github.com/veeso/termscp/actions) [![MacOs](https://github.com/veeso/termscp/workflows/MacOS/badge.svg)](https://github.com/veeso/termscp/actions) [![Windows](https://github.com/veeso/termscp/workflows/Windows/badge.svg)](https://github.com/veeso/termscp/actions) [![FreeBSD](https://github.com/veeso/termscp/workflows/FreeBSD/badge.svg)](https://github.com/veeso/termscp/actions) [![Coverage Status](https://coveralls.io/repos/github/veeso/termscp/badge.svg)](https://coveralls.io/github/veeso/termscp) [![Docs](https://docs.rs/termscp/badge.svg)](https://docs.rs/termscp) diff --git a/docs/de/README.md b/docs/de/README.md index bed58b2..68facf8 100644 --- a/docs/de/README.md +++ b/docs/de/README.md @@ -4,13 +4,13 @@

-

~ A feature rich terminal file transfer ~

+

~ Eine funktionsreiche Terminal-Dateiübertragung ~

- Website + Webseite · Installation · - User manual + Benutzerhandbuch

@@ -62,8 +62,8 @@ />

-

Developed by @veeso

-

Current version: 0.7.0 (12/10/2021)

+

Entwickelt von @veeso

+

Aktuelle Version: 0.7.0 (12/10/2021)

[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) @@ -71,9 +71,9 @@ --- -## About termscp 🖥 +## Über termscp 🖥 -Termscp is a feature rich terminal file transfer and explorer, with support for SCP/SFTP/FTP/S3. So basically is a terminal utility with an TUI to connect to a remote server to retrieve and upload files and to interact with the local file system. It is **Linux**, **MacOS**, **FreeBSD** and **Windows** compatible. +Termscp ist ein funktionsreicher Terminal-Dateitransfer und Explorer mit Unterstützung für SCP/SFTP/FTP/S3. Im Grunde handelt es sich also um ein Terminal-Dienstprogramm mit einer TUI, um eine Verbindung zu einem Remote-Server herzustellen, um Dateien abzurufen und hochzuladen und mit dem lokalen Dateisystem zu interagieren. Es ist **Linux**, **MacOS**, **FreeBSD** und **Windows** kompatibel. ![Explorer](/assets/images/explorer.gif) @@ -81,84 +81,84 @@ Termscp is a feature rich terminal file transfer and explorer, with support for ## Features 🎁 -- 📁 Different communication protocols +- 📁 Verschiedene Kommunikationsprotokolle - **SFTP** - **SCP** - - **FTP** and **FTPS** + - **FTP** und **FTPS** - **Aws S3** -- 🖥 Explore and operate on the remote and on the local machine file system with a handy UI - - Create, remove, rename, search, view and edit files -- ⭐ Connect to your favourite hosts through built-in bookmarks and recent connections -- 📝 View and edit files with your favourite applications -- 💁 SFTP/SCP authentication with SSH keys and username/password -- 🐧 Compatible with Windows, Linux, FreeBSD and MacOS -- 🎨 Make it yours! - - Themes - - Custom file explorer format - - Customizable text editor - - Customizable file sorting - - and many other parameters... -- 📫 Get notified via Desktop Notifications when a large file has been transferred -- 🔐 Save your password in your operating system key vault +- 🖥 Erkunden und bedienen Sie das Dateisystem der Fernbedienung und des lokalen Computers mit einer praktischen Benutzeroberfläche + - Erstellen, Entfernen, Umbenennen, Suchen, Anzeigen und Bearbeiten von Dateien +- ⭐ Verbinden Sie sich über integrierte Lesezeichen und aktuelle Verbindungen mit Ihren Lieblingshosts +- 📝 Anzeigen und Bearbeiten von Dateien mit Ihren bevorzugten Anwendungen +- 💁 SFTP/SCP-Authentifizierung mit SSH-Schlüsseln und Benutzername/Passwort +- 🐧 Kompatibel mit Windows, Linux, FreeBSD und MacOS +- 🎨 Mach es zu deinem! + - Themen + - Benutzerdefiniertes Datei-Explorer-Format + - Anpassbarer Texteditor + - Anpassbare Dateisortierung + - und viele andere Parameter... +- 📫 Lassen Sie sich benachrichtigen, wenn eine große Datei übertragen wurde +- 🔐 Speichern Sie Ihr Passwort in Ihrem Betriebssystem-Schlüsseltresor - 🦀 Rust-powered -- 👀 Developed keeping an eye on performance -- 🦄 Frequent awesome updates +- 👀 Entwickelt, um die Leistung im Auge zu behalten +- 🦄 Häufige tolle Updates --- -## Get started 🚀 +## Loslegen 🚀 -If you're considering to install termscp I want to thank you 💜 ! I hope you will enjoy termscp! -If you want to contribute to this project, don't forget to check out our [contribute guide](../../CONTRIBUTING.md). +Wenn Sie überlegen, termscp zu installieren, möchte ich Ihnen danken 💜 ! Ich hoffe, Sie werden Termscp genießen! +Wenn Sie zu diesem Projekt beitragen möchten, vergessen Sie nicht, unseren [Beitragsleitfaden](../../CONTRIBUTING.md) zu lesen. -If you are a Linux, a FreeBSD or a MacOS user this simple shell script will install termscp on your system with a single command: +Wenn Sie ein Linux-, FreeBSD- oder MacOS-Benutzer sind, installiert dieses einfache Shell-Skript termscp mit einem einzigen Befehl auf Ihrem System: ```sh curl --proto '=https' --tlsv1.2 -sSLf "https://git.io/JBhDb" | sh ``` -while if you're a Windows user, you can install termscp with [Chocolatey](https://chocolatey.org/): +Wenn Sie ein Windows-Benutzer sind, können Sie termscp mit [Chocolatey](https://chocolatey.org/) installieren: ```sh choco install termscp ``` -For more information or other platforms, please visit [veeso.github.io](https://veeso.github.io/termscp/#get-started) to view all installation methods. +Für weitere Informationen oder andere Plattformen besuchen Sie bitte [veeso.github.io](https://veeso.github.io/termscp/#get-started), um alle Installationsmethoden anzuzeigen. -⚠️ If you're looking on how to update termscp just run termscp from CLI with: `(sudo) termscp --update` ⚠️ +⚠️ Wenn Sie wissen möchten, wie Sie termscp aktualisieren können, führen Sie einfach termscp über die CLI aus mit: `(sudo) termscp --update` ⚠️ -### Requirements ❗ +### Softwareanforderungen ❗ -- **Linux** users: +- **Linux** Benutzer: - libssh - libdbus-1 - pkg-config -- **FreeBSD** users: +- **FreeBSD** Benutzer: - libssh - dbus - pkgconf -### Optional Requirements ✔️ +### Optionale Softwareanforderungen ✔️ -These requirements are not forced required to run termscp, but to enjoy all of its features +Diese Anforderungen sind nicht zwingend erforderlich, um termscp auszuführen, sondern um alle Funktionen nutzen zu können -- **Linux/FreeBSD** users: - - To **open** files via `V` (at least one of these) +- **Linux/FreeBSD** Benutzer: + - Um Dateien mit `V` zu **öffnen** (mindestens eines davon) - *xdg-open* - *gio* - *gnome-open* - *kde-open* -- **Linux** users: - - A keyring manager: read more in the [User manual](man.md#linux-keyring) -- **WSL** users - - To **open** files via `V` (at least one of these) +- **Linux** Benutzer: + - Ein Keyring-manager: Lesen Sie mehr in der [Bedienungsanleitung](man.md#linux-keyring) +- **WSL** Benutzer + - Um Dateien mit `V` zu **öffnen** (mindestens eines davon) - [wslu](https://github.com/wslutilities/wslu) --- -## Support me ☕ +## Unterstütze mich ☕ -If you like termscp and you'd love to see the project to grow and to improve, please consider a little donation to support me on **Buy me a coffee** 🥳 +Wenn Ihnen termscp gefällt und Sie gerne sehen würden, wie das Projekt wächst und sich verbessert, denken Sie bitte über eine kleine Spende nach, um mich bei **Buy me a coffee** zu unterstützen. 🥳 [![Buy-me-a-coffee](https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20coffee&emoji=&slug=veeso&button_colour=404040&font_colour=ffffff&font_family=Comic&outline_colour=ffffff&coffee_colour=FFDD00)](https://www.buymeacoffee.com/veeso) @@ -166,36 +166,36 @@ If you like termscp and you'd love to see the project to grow and to improve, pl ## User manual and Documentation 📚 -The user manual can be found on the [termscp's website](https://veeso.github.io/termscp/#user-manual) or on [Github](man.md). +Das Benutzerhandbuch finden Sie auf der [termscp-Website](https://veeso.github.io/termscp/#user-manual) oder auf [Github](man.md). -The developer documentation can be found on Rust Docs at +Die Entwicklerdokumentation finden Sie in Rust Docs unter --- ## Known issues 🧻 -- `NoSuchFileOrDirectory` on connect (WSL1): I know about this issue and it's a glitch of WSL I guess. Don't worry about it, just move the termscp executable into another PATH location, such as `/usr/bin`, or install it through the appropriate package format (e.g. deb). +- `NoSuchFileOrDirectory` auf verbinden (WSL1): Ich kenne dieses Problem und es ist ein Fehler von WSL, denke ich. Machen Sie sich keine Sorgen, verschieben Sie einfach die ausführbare Datei von termcp an einen anderen PATH-Speicherort, z. B. `/usr/bin`, oder installieren Sie sie über das entsprechende Paketformat (z. B. deb). --- ## Contributing and issues 🤝🏻 -Contributions, bug reports, new features and questions are welcome! 😉 -If you have any question or concern, or you want to suggest a new feature, or you want just want to improve termscp, feel free to open an issue or a PR. +Beiträge, Fehlerberichte, neue Funktionen und Fragen sind willkommen! 😉 +Wenn Sie Fragen oder Bedenken haben, eine neue Funktion vorschlagen oder einfach nur die Bedingungen verbessern möchten, können Sie ein Problem oder eine PR erstellen. -Please follow [our contributing guidelines](../../CONTRIBUTING.md) +Bitte befolgen Sie [unsere Beitragsrichtlinien](../../CONTRIBUTING.md) --- ## Changelog ⏳ -View termscp's changelog [HERE](../../CHANGELOG.md) +Änderungsprotokoll von termscp ansehen [HIER](../../CHANGELOG.md) --- ## Powered by 💪 -termscp is powered by these awesome projects: +termscp wird von diesen großartigen Projekten unterstützt: - [bytesize](https://github.com/hyunsik/bytesize) - [crossterm](https://github.com/crossterm-rs/crossterm) @@ -215,7 +215,7 @@ termscp is powered by these awesome projects: --- -## Gallery 🎬 +## Galerie 🎬 > Termscp Home @@ -237,6 +237,6 @@ termscp is powered by these awesome projects: ## License 📃 -termscp is licensed under the MIT license. +termscp ist unter der MIT-Lizenz lizenziert. -You can read the entire license [HERE](../../LICENSE) +Du kannst die gesamte Lizenz [HIER](../../LICENSE) lesen diff --git a/docs/de/man.md b/docs/de/man.md new file mode 100644 index 0000000..bd130fd --- /dev/null +++ b/docs/de/man.md @@ -0,0 +1,486 @@ +# User manual 🎓 + +- [User manual 🎓](#user-manual-) + - [Usage ❓](#usage-) + - [Address argument 🌎](#address-argument-) + - [AWS S3 address argument](#aws-s3-address-argument) + - [How Password can be provided 🔐](#how-password-can-be-provided-) + - [File explorer 📂](#file-explorer-) + - [Keybindings ⌨](#keybindings-) + - [Work on multiple files 🥷](#work-on-multiple-files-) + - [Synchronized browsing ⏲️](#synchronized-browsing-️) + - [Open and Open With 🚪](#open-and-open-with-) + - [Bookmarks ⭐](#bookmarks-) + - [Are my passwords Safe 😈](#are-my-passwords-safe-) + - [Linux Keyring](#linux-keyring) + - [KeepassXC setup for termscp](#keepassxc-setup-for-termscp) + - [Aws S3 credentials 🦊](#aws-s3-credentials-) + - [Configuration ⚙️](#configuration-️) + - [SSH Key Storage 🔐](#ssh-key-storage-) + - [File Explorer Format](#file-explorer-format) + - [Themes 🎨](#themes-) + - [My theme won't load 😱](#my-theme-wont-load-) + - [Styles 💈](#styles-) + - [Authentication page](#authentication-page) + - [Transfer page](#transfer-page) + - [Misc](#misc) + - [Text Editor ✏](#text-editor-) + - [Logging 🩺](#logging-) + - [Notifications 📫](#notifications-) + +## Usage ❓ + +termscp can be started with the following options: + +`termscp [options]... [protocol://user@address:port:wrkdir] [local-wrkdir]` + +- `-P, --password ` if address is provided, password will be this argument +- `-c, --config` Open termscp starting from the configuration page +- `-q, --quiet` Disable logging +- `-t, --theme ` Import specified theme +- `-u, --update` Update termscp to latest version +- `-v, --version` Print version info +- `-h, --help` Print help page + +termscp can be started in two different mode, if no extra arguments is provided, termscp will show the authentication form, where the user will be able to provide the parameters required to connect to the remote peer. + +Alternatively, the user can provide an address as argument to skip the authentication form and starting directly the connection to the remote server. + +If address argument is provided you can also provide the start working directory for local host + +### Address argument 🌎 + +The address argument has the following syntax: + +```txt +[protocol://][username@]
[:port][:wrkdir] +``` + +Let's see some example of this particular syntax, since it's very comfortable and you'll probably going to use this instead of the other one... + +- Connect using default protocol (*defined in configuration*) to 192.168.1.31, port if not provided is default for the selected protocol (in this case depends on your configuration); username is current user's name + + ```sh + termscp 192.168.1.31 + ``` + +- Connect using default protocol (*defined in configuration*) to 192.168.1.31; username is `root` + + ```sh + termscp root@192.168.1.31 + ``` + +- Connect using scp to 192.168.1.31, port is 4022; username is `omar` + + ```sh + termscp scp://omar@192.168.1.31:4022 + ``` + +- Connect using scp to 192.168.1.31, port is 4022; username is `omar`. You will start in directory `/tmp` + + ```sh + termscp scp://omar@192.168.1.31:4022:/tmp + ``` + +#### AWS S3 address argument + +Aws S3 has a different syntax for CLI address argument, for obvious reasons, but I managed to keep it the more similar as possible to the generic address argument: + +```txt +s3://@[:profile][:/wrkdir] +``` + +e.g. + +```txt +s3://buckethead@eu-central-1:default:/assets +``` + +#### How Password can be provided 🔐 + +You have probably noticed, that, when providing the address as argument, there's no way to provide the password. +Password can be basically provided through 3 ways when address argument is provided: + +- `-P, --password` option: just use this CLI option providing the password. I strongly unrecommend this method, since it's very unsecure (since you might keep the password in the shell history) +- Via `sshpass`: you can provide password via `sshpass`, e.g. `sshpass -f ~/.ssh/topsecret.key termscp cvisintin@192.168.1.31` +- You will be prompted for it: if you don't use any of the previous methods, you will be prompted for the password, as happens with the more classics tools such as `scp`, `ssh`, etc. + +--- + +## File explorer 📂 + +When we refer to file explorers in termscp, we refer to the panels you can see after establishing a connection with the remote. +These panels are basically 3 (yes, three actually): + +- Local explorer panel: it is displayed on the left of your screen and shows the current directory entries for localhost +- Remote explorer panel: it is displayed on the right of your screen and shows the current directory entries for the remote host. +- Find results panel: depending on where you're searching for files (local/remote) it will replace the local or the explorer panel. This panel shows the entries matching the search query you performed. + +In order to change panel you need to type `` to move the remote explorer panel and `` to move back to the local explorer panel. Whenever you are in the find results panel, you need to press `` to exit panel and go back to the previous panel. + +### Keybindings ⌨ + +| Key | Command | Reminder | +|---------------|-------------------------------------------------------|-------------| +| `` | Disconnect from remote; return to authentication page | | +| `` | Switch between log tab and explorer | | +| `` | Go to previous directory in stack | | +| `` | Move to remote explorer tab | | +| `` | Move to local explorer tab | | +| `` | Move up in selected list | | +| `` | Move down in selected list | | +| `` | Move up in selected list by 8 rows | | +| `` | Move down in selected list by 8 rows | | +| `` | Enter directory | | +| `` | Upload / download selected file | | +| `` | Toggle hidden files | All | +| `` | Sort files by | Bubblesort? | +| `` | Copy file/directory | Copy | +| `` | Make directory | Directory | +| `` | Delete file (Same as `DEL`) | Erase | +| `` | Search for files (wild match is supported) | Find | +| `` | Go to supplied path | Go to | +| `` | Show help | Help | +| `` | Show info about selected file or directory | Info | +| `` | Reload current directory's content / Clear selection | List | +| `` | Select a file | Mark | +| `` | Create new file with provided name | New | +| `` | Edit file; see Text editor | Open | +| `` | Quit termscp | Quit | +| `` | Rename file | Rename | +| `` | Save file as... | Save | +| `` | Go to parent directory | Upper | +| `` | Open file with default program for filetype | View | +| `` | Open file with provided program | With | +| `` | Execute a command | eXecute | +| `` | Toggle synchronized browsing | sYnc | +| `` | Delete file | | +| `` | Select all files | | +| `` | Abort file transfer process | | + +### Work on multiple files 🥷 + +You can opt to work on multiple files, selecting them pressing ``, in order to select the current file, or pressing ``, which will select all the files in the working directory. +Once a file is marked for selection, it will be displayed with a `*` on the left. +When working on selection, only selected file will be processed for actions, while the current highlighted item will be ignored. +It is possible to work on multiple files also when in the find result panel. +All the actions are available when working with multiple files, but be aware that some actions work in a slightly different way. Let's dive in: + +- *Copy*: whenever you copy a file, you'll be prompted to insert the destination name. When working with multiple file, this name refers to the destination directory where all these files will be copied. +- *Rename*: same as copy, but will move files there. +- *Save as*: same as copy, but will write them there. + +### Synchronized browsing ⏲️ + +When enabled, synchronized browsing, will allow you to synchronize the navigation between the two panels. +This means that whenever you'll change the working directory on one panel, the same action will be reproduced on the other panel. If you want to enable synchronized browsing just press ``; press twice to disable. While enabled, the synchronized browsing state will be reported on the status bar on `ON`. + +> ❗ at the moment, whenever you try to access an unexisting directory, you won't be prompted to create it. This might change in a future update. + +### Open and Open With 🚪 + +Open and open with commands are powered by [open-rs](https://docs.rs/crate/open/1.7.0). +When opening files with View command (``), the system default application for the file type will be used. To do so, the default operting system service will be used, so be sure to have at least one of these installed on your system: + +- **Windows** users: you don't have to worry about it, since the crate will use the `start` command. +- **MacOS** users: you don't have to worry either, since the crate will use `open`, which is already installed on your system. +- **Linux** users: one of these should be installed + - *xdg-open* + - *gio* + - *gnome-open* + - *kde-open* +- **WSL** users: *wslview* is required, you must install [wslu](https://github.com/wslutilities/wslu). + +> Q: Can I edit remote files using the view command? +> A: No, at least not directly from the "remote panel". You have to download it to a local directory first, that's due to the fact that when you open a remote file, the file is downloaded into a temporary directory, but there's no way to create a watcher for the file to check when the program you used to open it was closed, so termscp is not able to know when you're done editing the file. + +--- + +## Bookmarks ⭐ + +In termscp it is possible to save favourites hosts, which can be then loaded quickly from the main layout of termscp. +termscp will also save the last 16 hosts you connected to. +This feature allows you to load all the parameters required to connect to a certain remote, simply selecting the bookmark in the tab under the authentication form. + +Bookmarks will be saved, if possible at: + +- `$HOME/.config/termscp/` on Linux/BSD +- `$HOME/Library/Application Support/termscp` on MacOs +- `FOLDERID_RoamingAppData\termscp\` on Windows + +For bookmarks only (this won't apply to recent hosts) it is also possible to save the password used to authenticate. The password is not saved by default and must be specified through the prompt when saving a new Bookmark. +If you're concerned about the security of the password saved for your bookmarks, please read the [chapter below 👀](#are-my-passwords-safe-). + +In order to create a new bookmark, just follow these steps: + +1. Type in the authentication form the parameters to connect to your remote server +2. Press `` +3. Type in the name you want to give to the bookmark +4. Choose whether to remind the password or not +5. Press `` to submit + +whenever you want to use the previously saved connection, just press `` to navigate to the bookmarks list and load the bookmark parameters into the form pressing ``. + +![Bookmarks](https://github.com/veeso/termscp/blob/main/assets/images/bookmarks.gif?raw=true) + +### Are my passwords Safe 😈 + +Sure 😉. +As said before, bookmarks are saved in your configuration directory along with passwords. Passwords are obviously not plain text, they are encrypted with **AES-128**. Does this make them safe? Absolutely! (except for BSD and WSL users 😢) + +On **Windows**, **Linux** and **MacOS** the key used to encrypt passwords is stored, if possible (but should be), respectively in the *Windows Vault*, in the *system keyring* and into the *Keychain*. This is actually super-safe and is directly managed by your operating system. + +❗ Please, notice that if you're a Linux user, you'd better to read the [chapter below 👀](#linux-keyring), because the keyring might not be enabled or supported on your system! + +On *BSD* and *WSL*, on the other hand, the key used to encrypt your passwords is stored on your drive (at $HOME/.config/termscp). It is then, still possible to retrieve the key to decrypt passwords. Luckily, the location of the key guarantees your key can't be read by users different from yours, but yeah, I still wouldn't save the password for a server exposed on the internet 😉. + +#### Linux Keyring + +We all love Linux thanks to the freedom it gives to the users. You can basically do anything you want as a Linux user, but this has also some cons, such as the fact that often there is no standard applications across different distributions. And this involves keyring too. +This means that on Linux there might be no keyring installed on your system. Unfortunately the library we use to work with the key storage requires a service which exposes `org.freedesktop.secrets` on D-BUS and the worst fact is that there only two services exposing it. + +- ❗ If you use GNOME as desktop environment (e.g. ubuntu users), you should already be fine, since keyring is already provided by `gnome-keyring` and everything should already be working. +- ❗ For other desktop environment users there is a nice program you can use to get a keyring which is [KeepassXC](https://keepassxc.org/), which I use on my Manjaro installation (with KDE) and works fine. The only problem is that you have to setup it to be used along with termscp (but it's quite simple). To get started with KeepassXC read more [here](#keepassxc-setup-for-termscp). +- ❗ What about you don't want to install any of these services? Well, there's no problem! **termscp will keep working as usual**, but it will save the key in a file, as it usually does for BSD and WSL. + +##### KeepassXC setup for termscp + +Follow these steps in order to setup keepassXC for termscp: + +1. Install KeepassXC +2. Go to "tools" > "settings" in toolbar +3. Select "Secret service integration" and toggle "Enable KeepassXC freedesktop.org secret service integration" +4. Create a database, if you don't have one yet: from toolbar "Database" > "New database" +5. From toolbar: "Database" > "Database settings" +6. Select "Secret service integration" and toggle "Expose entries under this group" +7. Select the group in the list where you want the termscp secret to be kept. Remember that this group might be used by any other application to store secrets via DBUS. + +--- + +## Aws S3 credentials 🦊 + +In order to connect to an Aws S3 bucket you must obviously provide some credentials. +There are basically two ways to achieve this, and as you've probably already noticed you **can't** do that via the authentication form. +So these are the ways you can provide the credentials for s3: + +1. Use your credentials file: just configure the AWS cli via `aws configure` and your credentials should already be located at `~/.aws/credentials`. In case you're using a profile different from `default`, just provide it in the profile field in the authentication form. +2. **Environment variables**: you can always provide your credentials as environment variables. Keep in mind that these credentials **will always override** the credentials located in the `credentials` file. See how to configure the environment below: + + These should always be mandatory: + + - `AWS_ACCESS_KEY_ID`: aws access key ID (usually starts with `AKIA...`) + - `AWS_SECRET_ACCESS_KEY`: the secret access key + + In case you've configured a stronger security, you *may* require these too: + + - `AWS_SECURITY_TOKEN`: security token + - `AWS_SESSION_TOKEN`: session token + +⚠️ Your credentials are safe: termscp won't manipulate these values directly! Your credentials are directly consumed by the **s3** crate. +In case you've got some concern regarding security, please contact the library author on [Github](https://github.com/durch/rust-s3) ⚠️ + +--- + +## Configuration ⚙️ + +termscp supports some user defined parameters, which can be defined in the configuration. +Underhood termscp has a TOML file and some other directories where all the parameters will be saved, but don't worry, you won't touch any of these files manually, since I made possible to configure termscp from its user interface entirely. + +termscp, like for bookmarks, just requires to have these paths accessible: + +- `$HOME/.config/termscp/` on Linux/BSD +- `$HOME/Library/Application Support/termscp` on MacOs +- `FOLDERID_RoamingAppData\termscp\` on Windows + +To access configuration, you just have to press `` from the home of termscp. + +These parameters can be changed: + +- **Text Editor**: the text editor to use. By default termscp will find the default editor for you; with this option you can force an editor to be used (e.g. `vim`). **Also GUI editors are supported**, unless they `nohup` from the parent process so if you ask: yes, you can use `notepad.exe`, and no: **Visual Studio Code doesn't work**. +- **Default Protocol**: the default protocol is the default value for the file transfer protocol to be used in termscp. This applies for the login page and for the address CLI argument. +- **Show Hidden Files**: select whether hidden files shall be displayed by default. You will be able to decide whether to show or not hidden files at runtime pressing `A` anyway. +- **Check for updates**: if set to `yes`, termscp will fetch the Github API to check if there is a new version of termscp available. +- **Prompt when replacing existing files?**: If set to `yes`, termscp will prompt for confirmation you whenever a file transfer would cause an existing file on target host to be replaced. +- **Group Dirs**: select whether directories should be groupped or not in file explorers. If `Display first` is selected, directories will be sorted using the configured method but displayed before files, viceversa if `Display last` is selected. +- **Remote File formatter syntax**: syntax to display file info for each file in the remote explorer. See [File explorer format](#file-explorer-format) +- **Local File formatter syntax**: syntax to display file info for each file in the local explorer. See [File explorer format](#file-explorer-format) +- **Enable notifications?**: If set to `Yes`, notifications will be displayed. +- **Notifications: minimum transfer size**: if transfer size is greater or equal than the specified value, notifications for transfer will be displayed. The accepted values are in format `{UNSIGNED} B/KB/MB/GB/TB/PB` + +### SSH Key Storage 🔐 + +Along with configuration, termscp provides also an **essential** feature for **SFTP/SCP clients**: the SSH key storage. + +You can access the SSH key storage, from configuration moving to the `SSH Keys` tab, once there you can: + +- **Add a new key**: just press `` and you will be prompted to create a new key. Provide the hostname/ip address and the username associated to the key and finally a text editor will open up: paste the **PRIVATE** ssh key into the text editor, save and quit. +- **Remove an existing key**: just press `` or `` on the key you want to remove, to delete persistently the key from termscp. +- **Edit an existing key**: just press `` on the key you want to edit, to change the private key. + +> Q: Wait, my private key is protected with password, can I use it? +> A: Of course you can. The password provided for authentication in termscp, is valid both for username/password authentication and for RSA key authentication. + +### File Explorer Format + +It is possible through configuration to define a custom format for the file explorer. This is possible both for local and remote host, so you can have two different syntax in use. These fields, with name `File formatter syntax (local)` and `File formatter syntax (remote)` will define how the file entries will be displayed in the file explorer. +The syntax for the formatter is the following `{KEY1}... {KEY2:LENGTH}... {KEY3:LENGTH:EXTRA} {KEYn}...`. +Each key in bracket will be replaced with the related attribute, while everything outside brackets will be left unchanged. + +- The key name is mandatory and must be one of the keys below +- The length describes the length reserved to display the field. Static attributes doesn't support this (GROUP, PEX, SIZE, USER) +- Extra is supported only by some parameters and is an additional options. See keys to check if extra is supported. + +These are the keys supported by the formatter: + +- `ATIME`: Last access time (with default syntax `%b %d %Y %H:%M`); Extra might be provided as the time syntax (e.g. `{ATIME:8:%H:%M}`) +- `CTIME`: Creation time (with syntax `%b %d %Y %H:%M`); Extra might be provided as the time syntax (e.g. `{CTIME:8:%H:%M}`) +- `GROUP`: Owner group +- `MTIME`: Last change time (with syntax `%b %d %Y %H:%M`); Extra might be provided as the time syntax (e.g. `{MTIME:8:%H:%M}`) +- `NAME`: File name (Elided if longer than LENGTH) +- `PEX`: File permissions (UNIX format) +- `SIZE`: File size (omitted for directories) +- `SYMLINK`: Symlink (if any `-> {FILE_PATH}`) +- `USER`: Owner user + +If left empty, the default formatter syntax will be used: `{NAME:24} {PEX} {USER} {SIZE} {MTIME:17:%b %d %Y %H:%M}` + +--- + +## Themes 🎨 + +Termscp provides you with an awesome feature: the possibility to set the colors for several components in the application. +If you want to customize termscp there are two available ways to do so: + +- From the **configuration menu** +- Importing a **theme file** + +In order to create your own customization from termscp, all you have to do so is to enter the configuration from the auth activity, pressing `` and then `` twice. You should have now moved to the `themes` panel. + +Here you can move with `` and `` to change the style you want to change, as shown in the gif below: + +![Themes](https://github.com/veeso/termscp/blob/main/assets/images/themes.gif?raw=true) + +termscp supports both the traditional explicit hex (`#rrggbb`) and rgb `rgb(r, g, b)` syntax to provide colors, but also **[css colors](https://www.w3schools.com/cssref/css_colors.asp)** (such as `crimson`) are accepted 😉. There is also a special keywork which is `Default`. Default means that the color used will be the default foreground or background color based on the situation (foreground for texts and lines, background for well, guess what). + +As said before, you can also import theme files. You can take inspiration from or directly use one of the themes provided along with termscp, located in the `themes/` directory of this repository and import them running termscp as `termscp -t `. If everything was fine, it should tell you the theme has successfully been imported. + +### My theme won't load 😱 + +This is probably due to a recent update which has broken the theme. Whenever I add a new key to themes, the saved theme won't load. To fix this issues there are two really quick-fix solutions: + +1. Reload theme: whenever I release an update I will also patch the "official" themes, so you just have to download it from the repository again and re-import the theme via `-t` option + + ```sh + termscp -t + ``` + +2. Fix your theme: If you're using a custom theme, then you can edit via `vim` and add the missing key. The theme is located at `$CONFIG_DIR/termscp/theme.toml` where `$CONFIG_DIR` is: + + - FreeBSD/GNU-Linux: `$HOME/.config/` + - MacOs: `$HOME/Library/Application Support` + - Windows: `%appdata%` + + ❗ Missing keys are reported in the CHANGELOG under `BREAKING CHANGES` for the version you've just installed. + +### Styles 💈 + +You can find in the table below, the description for each style field. +Please, notice that **styles won't apply to configuration page**, in order to make it always accessible in case you mess everything up + +#### Authentication page + +| Key | Description | +|----------------|------------------------------------------| +| auth_address | Color of the input field for IP address | +| auth_bookmarks | Color of the bookmarks panel | +| auth_password | Color of the input field for password | +| auth_port | Color of the input field for port number | +| auth_protocol | Color of the radio group for protocol | +| auth_recents | Color of the recents panel | +| auth_username | Color of the input field for username | + +#### Transfer page + +| Key | Description | +|--------------------------------------|---------------------------------------------------------------------------| +| transfer_local_explorer_background | Background color of localhost explorer | +| transfer_local_explorer_foreground | Foreground coloor of localhost explorer | +| transfer_local_explorer_highlighted | Border and highlighted color for localhost explorer | +| transfer_remote_explorer_background | Background color of remote explorer | +| transfer_remote_explorer_foreground | Foreground coloor of remote explorer | +| transfer_remote_explorer_highlighted | Border and highlighted color for remote explorer | +| transfer_log_background | Background color for log panel | +| transfer_log_window | Window color for log panel | +| transfer_progress_bar_partial | Partial progress bar color | +| transfer_progress_bar_total | Total progress bar color | +| transfer_status_hidden | Color for status bar "hidden" label | +| transfer_status_sorting | Color for status bar "sorting" label; applies also to file sorting dialog | +| transfer_status_sync_browsing | Color for status bar "sync browsing" label | + +#### Misc + +These styles applie to different part of the application. + +| Key | Description | +|-------------------|---------------------------------------------| +| misc_error_dialog | Color for error messages | +| misc_info_dialog | Color for info dialogs | +| misc_input_dialog | Color for input dialogs (such as copy file) | +| misc_keys | Color of text for key strokes | +| misc_quit_dialog | Color for quit dialogs | +| misc_save_dialog | Color for save dialogs | +| misc_warn_dialog | Color for warn dialogs | + +--- + +## Text Editor ✏ + +termscp has, as you might have noticed, many features, one of these is the possibility to view and edit text file. It doesn't matter if the file is located on the local host or on the remote host, termscp provides the possibility to open a file in your favourite text editor. +In case the file is located on remote host, the file will be first downloaded into your temporary file directory and then, **only** if changes were made to the file, re-uploaded to the remote host. termscp checks if you made changes to the file verifying the last modification time of the file. + +Just a reminder: **you can edit only textual file**; binary files are not supported. + +--- + +## Logging 🩺 + +termscp writes a log file for each session, which is written at + +- `$HOME/.config/termscp/termscp.log` on Linux/BSD +- `$HOME/Library/Application Support/termscp/termscp.log` on MacOs +- `FOLDERID_RoamingAppData\termscp\termscp.log` on Windows + +the log won't be rotated, but will just be truncated after each launch of termscp, so if you want to report an issue and you want to attach your log file, keep in mind to save the log file in a safe place before using termscp again. +The log file always reports in *trace* level, so it is kinda verbose. +I know you might have some questions regarding log files, so I made a kind of a Q/A: + +> Is it possible to reduce verbosity? + +No. The reason is quite simple: when an issue happens, you must be able to know what's causing it and the only way to do that, is to have the log file with the maximum verbosity level set. + +> If trace level is set for logging, is the file going to reach a huge size? + +Probably not, unless you never quit termscp, but I think that's unlikely to happen. A long session may produce up to 10MB of log files (I said a long session), but I think a normal session won't exceed 2MB. + +> I don't want logging, can I turn it off? + +Yes, you can. Just start termscp with `-q or --quiet` option. You can alias termscp to make it persistent. Remember that logging is used to diagnose issues, so since behind every open source project, there should always be this kind of mutual help, keeping log files might be your way to support the project 😉. I don't want you to feel guilty, but just to say. + +> Is logging safe? + +If you're concerned about security, the log file doesn't contain any plain password, so don't worry and exposes the same information the sibling file `bookmarks` reports. + +## Notifications 📫 + +Termscp will send Desktop notifications for these kind of events: + +- on **Transfer completed**: The notification will be sent once a transfer has been successfully completed. + - ❗ The notification will be displayed only if the transfer total size is at least the specified `Notifications: minimum transfer size` in the configuration. +- on **Transfer failed**: The notification will be sent once a transfer has failed due to an error. + - ❗ The notification will be displayed only if the transfer total size is at least the specified `Notifications: minimum transfer size` in the configuration. +- on **Update available**: Whenever a new version of termscp is available, a notification will be displayed. +- on **Update installed**: Whenever a new version of termscp has been installed, a notification will be displayed. +- on **Update failed**: Whenever the installation of the update fails, a notification will be displayed. + +❗ If you prefer to keep notifications turned off, you can just enter setup and set `Enable notifications?` to `No` 😉. +❗ If you want to change the minimum transfer size to display notifications, you can change the value in the configuration with key `Notifications: minimum transfer size` and set it to whatever suits better for you 🙂. diff --git a/docs/es/README.md b/docs/es/README.md index bed58b2..51e631a 100644 --- a/docs/es/README.md +++ b/docs/es/README.md @@ -4,13 +4,13 @@

-

~ A feature rich terminal file transfer ~

+

~ Una transferencia de archivos de terminal rica en funciones ~

@@ -62,8 +62,8 @@ />

-

Developed by @veeso

-

Current version: 0.7.0 (12/10/2021)

+

Desarrollado por @veeso

+

Versión actual: 0.7.0 (12/10/2021)

[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) @@ -71,131 +71,131 @@ --- -## About termscp 🖥 +## Sobre termscp 🖥 -Termscp is a feature rich terminal file transfer and explorer, with support for SCP/SFTP/FTP/S3. So basically is a terminal utility with an TUI to connect to a remote server to retrieve and upload files and to interact with the local file system. It is **Linux**, **MacOS**, **FreeBSD** and **Windows** compatible. +Termscp es un explorador y transferencia de archivos de terminal rico en funciones, con apoyo para SCP/SFTP/FTP/S3. Básicamente, es una utilidad de terminal con una TUI para conectarse a un servidor remoto para recuperar y cargar archivos e interactuar con el sistema de archivos local. Es compatible con **Linux**, **MacOS**, **FreeBSD** y **Windows**. ![Explorer](/assets/images/explorer.gif) --- -## Features 🎁 +## Características 🎁 -- 📁 Different communication protocols +- 📁 Diferentes protocolos de comunicación - **SFTP** - **SCP** - - **FTP** and **FTPS** + - **FTP** y **FTPS** - **Aws S3** -- 🖥 Explore and operate on the remote and on the local machine file system with a handy UI - - Create, remove, rename, search, view and edit files -- ⭐ Connect to your favourite hosts through built-in bookmarks and recent connections -- 📝 View and edit files with your favourite applications -- 💁 SFTP/SCP authentication with SSH keys and username/password -- 🐧 Compatible with Windows, Linux, FreeBSD and MacOS -- 🎨 Make it yours! - - Themes - - Custom file explorer format - - Customizable text editor - - Customizable file sorting - - and many other parameters... -- 📫 Get notified via Desktop Notifications when a large file has been transferred -- 🔐 Save your password in your operating system key vault +- 🖥 Explore y opere en el sistema de archivos de la máquina local y remota con una interfaz de usuario práctica + - Cree, elimine, cambie el nombre, busque, vea y edite archivos +- ⭐ Conéctese a sus hosts favoritos y conexiones recientes +- 📝 Ver y editar archivos con sus aplicaciones favoritas +- 💁 Autenticación SFTP / SCP con claves SSH y nombre de usuario / contraseña +- 🐧 compatible con Linux, MacOS, FreeBSD y Windows +- 🎨 Haz lo tuyo! + - Temas + - Formato de explorador de archivos personalizado + - Editor de texto personalizable + - Clasificación de archivos personalizable + - y muchos otros parámetros ... +- 📫 Reciba una notificación cuando se haya transferido un archivo grande +- 🔐 Guarde su contraseña en el almacén de claves de su sistema operativo - 🦀 Rust-powered -- 👀 Developed keeping an eye on performance -- 🦄 Frequent awesome updates +- 👀 Desarrollado sin perder de vista el rendimiento +- 🦄 Actualizaciones frecuentes --- -## Get started 🚀 +## Para iniciar 🚀 -If you're considering to install termscp I want to thank you 💜 ! I hope you will enjoy termscp! -If you want to contribute to this project, don't forget to check out our [contribute guide](../../CONTRIBUTING.md). +Si estás considerando instalar termscp, ¡quiero darte las gracias 💜! ¡Espero que disfrutes de termscp! +Si desea contribuir a este proyecto, no olvide consultar nuestra [guía de contribución](../../CONTRIBUTING.md). -If you are a Linux, a FreeBSD or a MacOS user this simple shell script will install termscp on your system with a single command: +Si tu eres un usuario de Linux, FreeBSD o MacOS, este sencillo script de shell instalará termscp en tu sistema con un solo comando: ```sh curl --proto '=https' --tlsv1.2 -sSLf "https://git.io/JBhDb" | sh ``` -while if you're a Windows user, you can install termscp with [Chocolatey](https://chocolatey.org/): +mientras que si eres un usuario de Windows, puedes instalar termscp con [Chocolatey](https://chocolatey.org/): ```sh choco install termscp ``` -For more information or other platforms, please visit [veeso.github.io](https://veeso.github.io/termscp/#get-started) to view all installation methods. +Para obtener más información u otras plataformas, visite [veeso.github.io](https://veeso.github.io/termscp/#get-started) para ver todos los métodos de instalación. -⚠️ If you're looking on how to update termscp just run termscp from CLI with: `(sudo) termscp --update` ⚠️ +⚠️ Si estás buscando cómo actualizar termscp, simplemente ejecute termscp desde CLI con:: `(sudo) termscp --update` ⚠️ -### Requirements ❗ +### Requisitos ❗ -- **Linux** users: +- Usuarios **Linux**: - libssh - libdbus-1 - pkg-config -- **FreeBSD** users: +- Usuarios **FreeBSD**: - libssh - dbus - pkgconf -### Optional Requirements ✔️ +### Requisitos opcionales ✔️ These requirements are not forced required to run termscp, but to enjoy all of its features -- **Linux/FreeBSD** users: - - To **open** files via `V` (at least one of these) +- Usuarios **Linux/FreeBSD**: + - Para **abrir** archivos con `V` (al menos uno de estos) - *xdg-open* - *gio* - *gnome-open* - *kde-open* -- **Linux** users: - - A keyring manager: read more in the [User manual](man.md#linux-keyring) -- **WSL** users - - To **open** files via `V` (at least one of these) +- Usuarios **Linux**: + - Un keyring manager: leer más en el [manual de usuario](man.md#linux-keyring) +- Usuarios **WSL** + - Para **abrir** archivos con `V` (al menos uno de estos) - [wslu](https://github.com/wslutilities/wslu) --- -## Support me ☕ +## Apoyame ☕ -If you like termscp and you'd love to see the project to grow and to improve, please consider a little donation to support me on **Buy me a coffee** 🥳 +Si te gusta termscp y te encantaría que el proyecto crezca y mejore, considera una pequeña donación para apoyarme en **Buy me a coffee** 🥳 [![Buy-me-a-coffee](https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20coffee&emoji=&slug=veeso&button_colour=404040&font_colour=ffffff&font_family=Comic&outline_colour=ffffff&coffee_colour=FFDD00)](https://www.buymeacoffee.com/veeso) --- -## User manual and Documentation 📚 +## Manual de usuario y documentación 📚 -The user manual can be found on the [termscp's website](https://veeso.github.io/termscp/#user-manual) or on [Github](man.md). +El manual del usuario se puede encontrar en el [sitio web de termscp](https://veeso.github.io/termscp/#user-manual) o en [Github](man.md). -The developer documentation can be found on Rust Docs at +La documentación para desarrolladores se puede encontrar en Rust Docs en --- -## Known issues 🧻 +## Problemas conocidos 🧻 -- `NoSuchFileOrDirectory` on connect (WSL1): I know about this issue and it's a glitch of WSL I guess. Don't worry about it, just move the termscp executable into another PATH location, such as `/usr/bin`, or install it through the appropriate package format (e.g. deb). +- `NoSuchFileOrDirectory` al conectar (WSL1): Conozco este problema y supongo que es un problema técnico de WSL. No se preocupe, simplemente mueva el ejecutable termscp a otra ubicación en el PATH, como `/usr/bin`, o instálelo a través del formato de paquete apropiado (por ejemplo, deb). --- -## Contributing and issues 🤝🏻 +## Contribuir y problemas 🤝🏻 -Contributions, bug reports, new features and questions are welcome! 😉 -If you have any question or concern, or you want to suggest a new feature, or you want just want to improve termscp, feel free to open an issue or a PR. +¡Las contribuciones, los informes de errores, las nuevas funciones y las preguntas son bienvenidas! 😉 +Si tiene alguna pregunta o inquietud, o si desea sugerir una nueva función, o simplemente desea mejorar termscp, no dude en abrir un problema o un PR. -Please follow [our contributing guidelines](../../CONTRIBUTING.md) +Sigue [nuestras pautas de contribución](../../CONTRIBUTING.md) --- ## Changelog ⏳ -View termscp's changelog [HERE](../../CHANGELOG.md) +Ver registro de cambios de termscp [AQUÍ](../../CHANGELOG.md) --- ## Powered by 💪 -termscp is powered by these awesome projects: +termscp funciona con estos increíbles proyectos: - [bytesize](https://github.com/hyunsik/bytesize) - [crossterm](https://github.com/crossterm-rs/crossterm) @@ -215,7 +215,7 @@ termscp is powered by these awesome projects: --- -## Gallery 🎬 +## Galería 🎬 > Termscp Home @@ -235,8 +235,8 @@ termscp is powered by these awesome projects: --- -## License 📃 +## Licencia 📃 -termscp is licensed under the MIT license. +termscp tiene la licencia MIT. -You can read the entire license [HERE](../../LICENSE) +Puede leer la licencia completa [AQUÍ](../../LICENSE) diff --git a/docs/es/man.md b/docs/es/man.md new file mode 100644 index 0000000..bd130fd --- /dev/null +++ b/docs/es/man.md @@ -0,0 +1,486 @@ +# User manual 🎓 + +- [User manual 🎓](#user-manual-) + - [Usage ❓](#usage-) + - [Address argument 🌎](#address-argument-) + - [AWS S3 address argument](#aws-s3-address-argument) + - [How Password can be provided 🔐](#how-password-can-be-provided-) + - [File explorer 📂](#file-explorer-) + - [Keybindings ⌨](#keybindings-) + - [Work on multiple files 🥷](#work-on-multiple-files-) + - [Synchronized browsing ⏲️](#synchronized-browsing-️) + - [Open and Open With 🚪](#open-and-open-with-) + - [Bookmarks ⭐](#bookmarks-) + - [Are my passwords Safe 😈](#are-my-passwords-safe-) + - [Linux Keyring](#linux-keyring) + - [KeepassXC setup for termscp](#keepassxc-setup-for-termscp) + - [Aws S3 credentials 🦊](#aws-s3-credentials-) + - [Configuration ⚙️](#configuration-️) + - [SSH Key Storage 🔐](#ssh-key-storage-) + - [File Explorer Format](#file-explorer-format) + - [Themes 🎨](#themes-) + - [My theme won't load 😱](#my-theme-wont-load-) + - [Styles 💈](#styles-) + - [Authentication page](#authentication-page) + - [Transfer page](#transfer-page) + - [Misc](#misc) + - [Text Editor ✏](#text-editor-) + - [Logging 🩺](#logging-) + - [Notifications 📫](#notifications-) + +## Usage ❓ + +termscp can be started with the following options: + +`termscp [options]... [protocol://user@address:port:wrkdir] [local-wrkdir]` + +- `-P, --password ` if address is provided, password will be this argument +- `-c, --config` Open termscp starting from the configuration page +- `-q, --quiet` Disable logging +- `-t, --theme ` Import specified theme +- `-u, --update` Update termscp to latest version +- `-v, --version` Print version info +- `-h, --help` Print help page + +termscp can be started in two different mode, if no extra arguments is provided, termscp will show the authentication form, where the user will be able to provide the parameters required to connect to the remote peer. + +Alternatively, the user can provide an address as argument to skip the authentication form and starting directly the connection to the remote server. + +If address argument is provided you can also provide the start working directory for local host + +### Address argument 🌎 + +The address argument has the following syntax: + +```txt +[protocol://][username@]
[:port][:wrkdir] +``` + +Let's see some example of this particular syntax, since it's very comfortable and you'll probably going to use this instead of the other one... + +- Connect using default protocol (*defined in configuration*) to 192.168.1.31, port if not provided is default for the selected protocol (in this case depends on your configuration); username is current user's name + + ```sh + termscp 192.168.1.31 + ``` + +- Connect using default protocol (*defined in configuration*) to 192.168.1.31; username is `root` + + ```sh + termscp root@192.168.1.31 + ``` + +- Connect using scp to 192.168.1.31, port is 4022; username is `omar` + + ```sh + termscp scp://omar@192.168.1.31:4022 + ``` + +- Connect using scp to 192.168.1.31, port is 4022; username is `omar`. You will start in directory `/tmp` + + ```sh + termscp scp://omar@192.168.1.31:4022:/tmp + ``` + +#### AWS S3 address argument + +Aws S3 has a different syntax for CLI address argument, for obvious reasons, but I managed to keep it the more similar as possible to the generic address argument: + +```txt +s3://@[:profile][:/wrkdir] +``` + +e.g. + +```txt +s3://buckethead@eu-central-1:default:/assets +``` + +#### How Password can be provided 🔐 + +You have probably noticed, that, when providing the address as argument, there's no way to provide the password. +Password can be basically provided through 3 ways when address argument is provided: + +- `-P, --password` option: just use this CLI option providing the password. I strongly unrecommend this method, since it's very unsecure (since you might keep the password in the shell history) +- Via `sshpass`: you can provide password via `sshpass`, e.g. `sshpass -f ~/.ssh/topsecret.key termscp cvisintin@192.168.1.31` +- You will be prompted for it: if you don't use any of the previous methods, you will be prompted for the password, as happens with the more classics tools such as `scp`, `ssh`, etc. + +--- + +## File explorer 📂 + +When we refer to file explorers in termscp, we refer to the panels you can see after establishing a connection with the remote. +These panels are basically 3 (yes, three actually): + +- Local explorer panel: it is displayed on the left of your screen and shows the current directory entries for localhost +- Remote explorer panel: it is displayed on the right of your screen and shows the current directory entries for the remote host. +- Find results panel: depending on where you're searching for files (local/remote) it will replace the local or the explorer panel. This panel shows the entries matching the search query you performed. + +In order to change panel you need to type `` to move the remote explorer panel and `` to move back to the local explorer panel. Whenever you are in the find results panel, you need to press `` to exit panel and go back to the previous panel. + +### Keybindings ⌨ + +| Key | Command | Reminder | +|---------------|-------------------------------------------------------|-------------| +| `` | Disconnect from remote; return to authentication page | | +| `` | Switch between log tab and explorer | | +| `` | Go to previous directory in stack | | +| `` | Move to remote explorer tab | | +| `` | Move to local explorer tab | | +| `` | Move up in selected list | | +| `` | Move down in selected list | | +| `` | Move up in selected list by 8 rows | | +| `` | Move down in selected list by 8 rows | | +| `` | Enter directory | | +| `` | Upload / download selected file | | +| `` | Toggle hidden files | All | +| `` | Sort files by | Bubblesort? | +| `` | Copy file/directory | Copy | +| `` | Make directory | Directory | +| `` | Delete file (Same as `DEL`) | Erase | +| `` | Search for files (wild match is supported) | Find | +| `` | Go to supplied path | Go to | +| `` | Show help | Help | +| `` | Show info about selected file or directory | Info | +| `` | Reload current directory's content / Clear selection | List | +| `` | Select a file | Mark | +| `` | Create new file with provided name | New | +| `` | Edit file; see Text editor | Open | +| `` | Quit termscp | Quit | +| `` | Rename file | Rename | +| `` | Save file as... | Save | +| `` | Go to parent directory | Upper | +| `` | Open file with default program for filetype | View | +| `` | Open file with provided program | With | +| `` | Execute a command | eXecute | +| `` | Toggle synchronized browsing | sYnc | +| `` | Delete file | | +| `` | Select all files | | +| `` | Abort file transfer process | | + +### Work on multiple files 🥷 + +You can opt to work on multiple files, selecting them pressing ``, in order to select the current file, or pressing ``, which will select all the files in the working directory. +Once a file is marked for selection, it will be displayed with a `*` on the left. +When working on selection, only selected file will be processed for actions, while the current highlighted item will be ignored. +It is possible to work on multiple files also when in the find result panel. +All the actions are available when working with multiple files, but be aware that some actions work in a slightly different way. Let's dive in: + +- *Copy*: whenever you copy a file, you'll be prompted to insert the destination name. When working with multiple file, this name refers to the destination directory where all these files will be copied. +- *Rename*: same as copy, but will move files there. +- *Save as*: same as copy, but will write them there. + +### Synchronized browsing ⏲️ + +When enabled, synchronized browsing, will allow you to synchronize the navigation between the two panels. +This means that whenever you'll change the working directory on one panel, the same action will be reproduced on the other panel. If you want to enable synchronized browsing just press ``; press twice to disable. While enabled, the synchronized browsing state will be reported on the status bar on `ON`. + +> ❗ at the moment, whenever you try to access an unexisting directory, you won't be prompted to create it. This might change in a future update. + +### Open and Open With 🚪 + +Open and open with commands are powered by [open-rs](https://docs.rs/crate/open/1.7.0). +When opening files with View command (``), the system default application for the file type will be used. To do so, the default operting system service will be used, so be sure to have at least one of these installed on your system: + +- **Windows** users: you don't have to worry about it, since the crate will use the `start` command. +- **MacOS** users: you don't have to worry either, since the crate will use `open`, which is already installed on your system. +- **Linux** users: one of these should be installed + - *xdg-open* + - *gio* + - *gnome-open* + - *kde-open* +- **WSL** users: *wslview* is required, you must install [wslu](https://github.com/wslutilities/wslu). + +> Q: Can I edit remote files using the view command? +> A: No, at least not directly from the "remote panel". You have to download it to a local directory first, that's due to the fact that when you open a remote file, the file is downloaded into a temporary directory, but there's no way to create a watcher for the file to check when the program you used to open it was closed, so termscp is not able to know when you're done editing the file. + +--- + +## Bookmarks ⭐ + +In termscp it is possible to save favourites hosts, which can be then loaded quickly from the main layout of termscp. +termscp will also save the last 16 hosts you connected to. +This feature allows you to load all the parameters required to connect to a certain remote, simply selecting the bookmark in the tab under the authentication form. + +Bookmarks will be saved, if possible at: + +- `$HOME/.config/termscp/` on Linux/BSD +- `$HOME/Library/Application Support/termscp` on MacOs +- `FOLDERID_RoamingAppData\termscp\` on Windows + +For bookmarks only (this won't apply to recent hosts) it is also possible to save the password used to authenticate. The password is not saved by default and must be specified through the prompt when saving a new Bookmark. +If you're concerned about the security of the password saved for your bookmarks, please read the [chapter below 👀](#are-my-passwords-safe-). + +In order to create a new bookmark, just follow these steps: + +1. Type in the authentication form the parameters to connect to your remote server +2. Press `` +3. Type in the name you want to give to the bookmark +4. Choose whether to remind the password or not +5. Press `` to submit + +whenever you want to use the previously saved connection, just press `` to navigate to the bookmarks list and load the bookmark parameters into the form pressing ``. + +![Bookmarks](https://github.com/veeso/termscp/blob/main/assets/images/bookmarks.gif?raw=true) + +### Are my passwords Safe 😈 + +Sure 😉. +As said before, bookmarks are saved in your configuration directory along with passwords. Passwords are obviously not plain text, they are encrypted with **AES-128**. Does this make them safe? Absolutely! (except for BSD and WSL users 😢) + +On **Windows**, **Linux** and **MacOS** the key used to encrypt passwords is stored, if possible (but should be), respectively in the *Windows Vault*, in the *system keyring* and into the *Keychain*. This is actually super-safe and is directly managed by your operating system. + +❗ Please, notice that if you're a Linux user, you'd better to read the [chapter below 👀](#linux-keyring), because the keyring might not be enabled or supported on your system! + +On *BSD* and *WSL*, on the other hand, the key used to encrypt your passwords is stored on your drive (at $HOME/.config/termscp). It is then, still possible to retrieve the key to decrypt passwords. Luckily, the location of the key guarantees your key can't be read by users different from yours, but yeah, I still wouldn't save the password for a server exposed on the internet 😉. + +#### Linux Keyring + +We all love Linux thanks to the freedom it gives to the users. You can basically do anything you want as a Linux user, but this has also some cons, such as the fact that often there is no standard applications across different distributions. And this involves keyring too. +This means that on Linux there might be no keyring installed on your system. Unfortunately the library we use to work with the key storage requires a service which exposes `org.freedesktop.secrets` on D-BUS and the worst fact is that there only two services exposing it. + +- ❗ If you use GNOME as desktop environment (e.g. ubuntu users), you should already be fine, since keyring is already provided by `gnome-keyring` and everything should already be working. +- ❗ For other desktop environment users there is a nice program you can use to get a keyring which is [KeepassXC](https://keepassxc.org/), which I use on my Manjaro installation (with KDE) and works fine. The only problem is that you have to setup it to be used along with termscp (but it's quite simple). To get started with KeepassXC read more [here](#keepassxc-setup-for-termscp). +- ❗ What about you don't want to install any of these services? Well, there's no problem! **termscp will keep working as usual**, but it will save the key in a file, as it usually does for BSD and WSL. + +##### KeepassXC setup for termscp + +Follow these steps in order to setup keepassXC for termscp: + +1. Install KeepassXC +2. Go to "tools" > "settings" in toolbar +3. Select "Secret service integration" and toggle "Enable KeepassXC freedesktop.org secret service integration" +4. Create a database, if you don't have one yet: from toolbar "Database" > "New database" +5. From toolbar: "Database" > "Database settings" +6. Select "Secret service integration" and toggle "Expose entries under this group" +7. Select the group in the list where you want the termscp secret to be kept. Remember that this group might be used by any other application to store secrets via DBUS. + +--- + +## Aws S3 credentials 🦊 + +In order to connect to an Aws S3 bucket you must obviously provide some credentials. +There are basically two ways to achieve this, and as you've probably already noticed you **can't** do that via the authentication form. +So these are the ways you can provide the credentials for s3: + +1. Use your credentials file: just configure the AWS cli via `aws configure` and your credentials should already be located at `~/.aws/credentials`. In case you're using a profile different from `default`, just provide it in the profile field in the authentication form. +2. **Environment variables**: you can always provide your credentials as environment variables. Keep in mind that these credentials **will always override** the credentials located in the `credentials` file. See how to configure the environment below: + + These should always be mandatory: + + - `AWS_ACCESS_KEY_ID`: aws access key ID (usually starts with `AKIA...`) + - `AWS_SECRET_ACCESS_KEY`: the secret access key + + In case you've configured a stronger security, you *may* require these too: + + - `AWS_SECURITY_TOKEN`: security token + - `AWS_SESSION_TOKEN`: session token + +⚠️ Your credentials are safe: termscp won't manipulate these values directly! Your credentials are directly consumed by the **s3** crate. +In case you've got some concern regarding security, please contact the library author on [Github](https://github.com/durch/rust-s3) ⚠️ + +--- + +## Configuration ⚙️ + +termscp supports some user defined parameters, which can be defined in the configuration. +Underhood termscp has a TOML file and some other directories where all the parameters will be saved, but don't worry, you won't touch any of these files manually, since I made possible to configure termscp from its user interface entirely. + +termscp, like for bookmarks, just requires to have these paths accessible: + +- `$HOME/.config/termscp/` on Linux/BSD +- `$HOME/Library/Application Support/termscp` on MacOs +- `FOLDERID_RoamingAppData\termscp\` on Windows + +To access configuration, you just have to press `` from the home of termscp. + +These parameters can be changed: + +- **Text Editor**: the text editor to use. By default termscp will find the default editor for you; with this option you can force an editor to be used (e.g. `vim`). **Also GUI editors are supported**, unless they `nohup` from the parent process so if you ask: yes, you can use `notepad.exe`, and no: **Visual Studio Code doesn't work**. +- **Default Protocol**: the default protocol is the default value for the file transfer protocol to be used in termscp. This applies for the login page and for the address CLI argument. +- **Show Hidden Files**: select whether hidden files shall be displayed by default. You will be able to decide whether to show or not hidden files at runtime pressing `A` anyway. +- **Check for updates**: if set to `yes`, termscp will fetch the Github API to check if there is a new version of termscp available. +- **Prompt when replacing existing files?**: If set to `yes`, termscp will prompt for confirmation you whenever a file transfer would cause an existing file on target host to be replaced. +- **Group Dirs**: select whether directories should be groupped or not in file explorers. If `Display first` is selected, directories will be sorted using the configured method but displayed before files, viceversa if `Display last` is selected. +- **Remote File formatter syntax**: syntax to display file info for each file in the remote explorer. See [File explorer format](#file-explorer-format) +- **Local File formatter syntax**: syntax to display file info for each file in the local explorer. See [File explorer format](#file-explorer-format) +- **Enable notifications?**: If set to `Yes`, notifications will be displayed. +- **Notifications: minimum transfer size**: if transfer size is greater or equal than the specified value, notifications for transfer will be displayed. The accepted values are in format `{UNSIGNED} B/KB/MB/GB/TB/PB` + +### SSH Key Storage 🔐 + +Along with configuration, termscp provides also an **essential** feature for **SFTP/SCP clients**: the SSH key storage. + +You can access the SSH key storage, from configuration moving to the `SSH Keys` tab, once there you can: + +- **Add a new key**: just press `` and you will be prompted to create a new key. Provide the hostname/ip address and the username associated to the key and finally a text editor will open up: paste the **PRIVATE** ssh key into the text editor, save and quit. +- **Remove an existing key**: just press `` or `` on the key you want to remove, to delete persistently the key from termscp. +- **Edit an existing key**: just press `` on the key you want to edit, to change the private key. + +> Q: Wait, my private key is protected with password, can I use it? +> A: Of course you can. The password provided for authentication in termscp, is valid both for username/password authentication and for RSA key authentication. + +### File Explorer Format + +It is possible through configuration to define a custom format for the file explorer. This is possible both for local and remote host, so you can have two different syntax in use. These fields, with name `File formatter syntax (local)` and `File formatter syntax (remote)` will define how the file entries will be displayed in the file explorer. +The syntax for the formatter is the following `{KEY1}... {KEY2:LENGTH}... {KEY3:LENGTH:EXTRA} {KEYn}...`. +Each key in bracket will be replaced with the related attribute, while everything outside brackets will be left unchanged. + +- The key name is mandatory and must be one of the keys below +- The length describes the length reserved to display the field. Static attributes doesn't support this (GROUP, PEX, SIZE, USER) +- Extra is supported only by some parameters and is an additional options. See keys to check if extra is supported. + +These are the keys supported by the formatter: + +- `ATIME`: Last access time (with default syntax `%b %d %Y %H:%M`); Extra might be provided as the time syntax (e.g. `{ATIME:8:%H:%M}`) +- `CTIME`: Creation time (with syntax `%b %d %Y %H:%M`); Extra might be provided as the time syntax (e.g. `{CTIME:8:%H:%M}`) +- `GROUP`: Owner group +- `MTIME`: Last change time (with syntax `%b %d %Y %H:%M`); Extra might be provided as the time syntax (e.g. `{MTIME:8:%H:%M}`) +- `NAME`: File name (Elided if longer than LENGTH) +- `PEX`: File permissions (UNIX format) +- `SIZE`: File size (omitted for directories) +- `SYMLINK`: Symlink (if any `-> {FILE_PATH}`) +- `USER`: Owner user + +If left empty, the default formatter syntax will be used: `{NAME:24} {PEX} {USER} {SIZE} {MTIME:17:%b %d %Y %H:%M}` + +--- + +## Themes 🎨 + +Termscp provides you with an awesome feature: the possibility to set the colors for several components in the application. +If you want to customize termscp there are two available ways to do so: + +- From the **configuration menu** +- Importing a **theme file** + +In order to create your own customization from termscp, all you have to do so is to enter the configuration from the auth activity, pressing `` and then `` twice. You should have now moved to the `themes` panel. + +Here you can move with `` and `` to change the style you want to change, as shown in the gif below: + +![Themes](https://github.com/veeso/termscp/blob/main/assets/images/themes.gif?raw=true) + +termscp supports both the traditional explicit hex (`#rrggbb`) and rgb `rgb(r, g, b)` syntax to provide colors, but also **[css colors](https://www.w3schools.com/cssref/css_colors.asp)** (such as `crimson`) are accepted 😉. There is also a special keywork which is `Default`. Default means that the color used will be the default foreground or background color based on the situation (foreground for texts and lines, background for well, guess what). + +As said before, you can also import theme files. You can take inspiration from or directly use one of the themes provided along with termscp, located in the `themes/` directory of this repository and import them running termscp as `termscp -t `. If everything was fine, it should tell you the theme has successfully been imported. + +### My theme won't load 😱 + +This is probably due to a recent update which has broken the theme. Whenever I add a new key to themes, the saved theme won't load. To fix this issues there are two really quick-fix solutions: + +1. Reload theme: whenever I release an update I will also patch the "official" themes, so you just have to download it from the repository again and re-import the theme via `-t` option + + ```sh + termscp -t + ``` + +2. Fix your theme: If you're using a custom theme, then you can edit via `vim` and add the missing key. The theme is located at `$CONFIG_DIR/termscp/theme.toml` where `$CONFIG_DIR` is: + + - FreeBSD/GNU-Linux: `$HOME/.config/` + - MacOs: `$HOME/Library/Application Support` + - Windows: `%appdata%` + + ❗ Missing keys are reported in the CHANGELOG under `BREAKING CHANGES` for the version you've just installed. + +### Styles 💈 + +You can find in the table below, the description for each style field. +Please, notice that **styles won't apply to configuration page**, in order to make it always accessible in case you mess everything up + +#### Authentication page + +| Key | Description | +|----------------|------------------------------------------| +| auth_address | Color of the input field for IP address | +| auth_bookmarks | Color of the bookmarks panel | +| auth_password | Color of the input field for password | +| auth_port | Color of the input field for port number | +| auth_protocol | Color of the radio group for protocol | +| auth_recents | Color of the recents panel | +| auth_username | Color of the input field for username | + +#### Transfer page + +| Key | Description | +|--------------------------------------|---------------------------------------------------------------------------| +| transfer_local_explorer_background | Background color of localhost explorer | +| transfer_local_explorer_foreground | Foreground coloor of localhost explorer | +| transfer_local_explorer_highlighted | Border and highlighted color for localhost explorer | +| transfer_remote_explorer_background | Background color of remote explorer | +| transfer_remote_explorer_foreground | Foreground coloor of remote explorer | +| transfer_remote_explorer_highlighted | Border and highlighted color for remote explorer | +| transfer_log_background | Background color for log panel | +| transfer_log_window | Window color for log panel | +| transfer_progress_bar_partial | Partial progress bar color | +| transfer_progress_bar_total | Total progress bar color | +| transfer_status_hidden | Color for status bar "hidden" label | +| transfer_status_sorting | Color for status bar "sorting" label; applies also to file sorting dialog | +| transfer_status_sync_browsing | Color for status bar "sync browsing" label | + +#### Misc + +These styles applie to different part of the application. + +| Key | Description | +|-------------------|---------------------------------------------| +| misc_error_dialog | Color for error messages | +| misc_info_dialog | Color for info dialogs | +| misc_input_dialog | Color for input dialogs (such as copy file) | +| misc_keys | Color of text for key strokes | +| misc_quit_dialog | Color for quit dialogs | +| misc_save_dialog | Color for save dialogs | +| misc_warn_dialog | Color for warn dialogs | + +--- + +## Text Editor ✏ + +termscp has, as you might have noticed, many features, one of these is the possibility to view and edit text file. It doesn't matter if the file is located on the local host or on the remote host, termscp provides the possibility to open a file in your favourite text editor. +In case the file is located on remote host, the file will be first downloaded into your temporary file directory and then, **only** if changes were made to the file, re-uploaded to the remote host. termscp checks if you made changes to the file verifying the last modification time of the file. + +Just a reminder: **you can edit only textual file**; binary files are not supported. + +--- + +## Logging 🩺 + +termscp writes a log file for each session, which is written at + +- `$HOME/.config/termscp/termscp.log` on Linux/BSD +- `$HOME/Library/Application Support/termscp/termscp.log` on MacOs +- `FOLDERID_RoamingAppData\termscp\termscp.log` on Windows + +the log won't be rotated, but will just be truncated after each launch of termscp, so if you want to report an issue and you want to attach your log file, keep in mind to save the log file in a safe place before using termscp again. +The log file always reports in *trace* level, so it is kinda verbose. +I know you might have some questions regarding log files, so I made a kind of a Q/A: + +> Is it possible to reduce verbosity? + +No. The reason is quite simple: when an issue happens, you must be able to know what's causing it and the only way to do that, is to have the log file with the maximum verbosity level set. + +> If trace level is set for logging, is the file going to reach a huge size? + +Probably not, unless you never quit termscp, but I think that's unlikely to happen. A long session may produce up to 10MB of log files (I said a long session), but I think a normal session won't exceed 2MB. + +> I don't want logging, can I turn it off? + +Yes, you can. Just start termscp with `-q or --quiet` option. You can alias termscp to make it persistent. Remember that logging is used to diagnose issues, so since behind every open source project, there should always be this kind of mutual help, keeping log files might be your way to support the project 😉. I don't want you to feel guilty, but just to say. + +> Is logging safe? + +If you're concerned about security, the log file doesn't contain any plain password, so don't worry and exposes the same information the sibling file `bookmarks` reports. + +## Notifications 📫 + +Termscp will send Desktop notifications for these kind of events: + +- on **Transfer completed**: The notification will be sent once a transfer has been successfully completed. + - ❗ The notification will be displayed only if the transfer total size is at least the specified `Notifications: minimum transfer size` in the configuration. +- on **Transfer failed**: The notification will be sent once a transfer has failed due to an error. + - ❗ The notification will be displayed only if the transfer total size is at least the specified `Notifications: minimum transfer size` in the configuration. +- on **Update available**: Whenever a new version of termscp is available, a notification will be displayed. +- on **Update installed**: Whenever a new version of termscp has been installed, a notification will be displayed. +- on **Update failed**: Whenever the installation of the update fails, a notification will be displayed. + +❗ If you prefer to keep notifications turned off, you can just enter setup and set `Enable notifications?` to `No` 😉. +❗ If you want to change the minimum transfer size to display notifications, you can change the value in the configuration with key `Notifications: minimum transfer size` and set it to whatever suits better for you 🙂. diff --git a/docs/fr/man.md b/docs/fr/man.md new file mode 100644 index 0000000..bd130fd --- /dev/null +++ b/docs/fr/man.md @@ -0,0 +1,486 @@ +# User manual 🎓 + +- [User manual 🎓](#user-manual-) + - [Usage ❓](#usage-) + - [Address argument 🌎](#address-argument-) + - [AWS S3 address argument](#aws-s3-address-argument) + - [How Password can be provided 🔐](#how-password-can-be-provided-) + - [File explorer 📂](#file-explorer-) + - [Keybindings ⌨](#keybindings-) + - [Work on multiple files 🥷](#work-on-multiple-files-) + - [Synchronized browsing ⏲️](#synchronized-browsing-️) + - [Open and Open With 🚪](#open-and-open-with-) + - [Bookmarks ⭐](#bookmarks-) + - [Are my passwords Safe 😈](#are-my-passwords-safe-) + - [Linux Keyring](#linux-keyring) + - [KeepassXC setup for termscp](#keepassxc-setup-for-termscp) + - [Aws S3 credentials 🦊](#aws-s3-credentials-) + - [Configuration ⚙️](#configuration-️) + - [SSH Key Storage 🔐](#ssh-key-storage-) + - [File Explorer Format](#file-explorer-format) + - [Themes 🎨](#themes-) + - [My theme won't load 😱](#my-theme-wont-load-) + - [Styles 💈](#styles-) + - [Authentication page](#authentication-page) + - [Transfer page](#transfer-page) + - [Misc](#misc) + - [Text Editor ✏](#text-editor-) + - [Logging 🩺](#logging-) + - [Notifications 📫](#notifications-) + +## Usage ❓ + +termscp can be started with the following options: + +`termscp [options]... [protocol://user@address:port:wrkdir] [local-wrkdir]` + +- `-P, --password ` if address is provided, password will be this argument +- `-c, --config` Open termscp starting from the configuration page +- `-q, --quiet` Disable logging +- `-t, --theme ` Import specified theme +- `-u, --update` Update termscp to latest version +- `-v, --version` Print version info +- `-h, --help` Print help page + +termscp can be started in two different mode, if no extra arguments is provided, termscp will show the authentication form, where the user will be able to provide the parameters required to connect to the remote peer. + +Alternatively, the user can provide an address as argument to skip the authentication form and starting directly the connection to the remote server. + +If address argument is provided you can also provide the start working directory for local host + +### Address argument 🌎 + +The address argument has the following syntax: + +```txt +[protocol://][username@]
[:port][:wrkdir] +``` + +Let's see some example of this particular syntax, since it's very comfortable and you'll probably going to use this instead of the other one... + +- Connect using default protocol (*defined in configuration*) to 192.168.1.31, port if not provided is default for the selected protocol (in this case depends on your configuration); username is current user's name + + ```sh + termscp 192.168.1.31 + ``` + +- Connect using default protocol (*defined in configuration*) to 192.168.1.31; username is `root` + + ```sh + termscp root@192.168.1.31 + ``` + +- Connect using scp to 192.168.1.31, port is 4022; username is `omar` + + ```sh + termscp scp://omar@192.168.1.31:4022 + ``` + +- Connect using scp to 192.168.1.31, port is 4022; username is `omar`. You will start in directory `/tmp` + + ```sh + termscp scp://omar@192.168.1.31:4022:/tmp + ``` + +#### AWS S3 address argument + +Aws S3 has a different syntax for CLI address argument, for obvious reasons, but I managed to keep it the more similar as possible to the generic address argument: + +```txt +s3://@[:profile][:/wrkdir] +``` + +e.g. + +```txt +s3://buckethead@eu-central-1:default:/assets +``` + +#### How Password can be provided 🔐 + +You have probably noticed, that, when providing the address as argument, there's no way to provide the password. +Password can be basically provided through 3 ways when address argument is provided: + +- `-P, --password` option: just use this CLI option providing the password. I strongly unrecommend this method, since it's very unsecure (since you might keep the password in the shell history) +- Via `sshpass`: you can provide password via `sshpass`, e.g. `sshpass -f ~/.ssh/topsecret.key termscp cvisintin@192.168.1.31` +- You will be prompted for it: if you don't use any of the previous methods, you will be prompted for the password, as happens with the more classics tools such as `scp`, `ssh`, etc. + +--- + +## File explorer 📂 + +When we refer to file explorers in termscp, we refer to the panels you can see after establishing a connection with the remote. +These panels are basically 3 (yes, three actually): + +- Local explorer panel: it is displayed on the left of your screen and shows the current directory entries for localhost +- Remote explorer panel: it is displayed on the right of your screen and shows the current directory entries for the remote host. +- Find results panel: depending on where you're searching for files (local/remote) it will replace the local or the explorer panel. This panel shows the entries matching the search query you performed. + +In order to change panel you need to type `` to move the remote explorer panel and `` to move back to the local explorer panel. Whenever you are in the find results panel, you need to press `` to exit panel and go back to the previous panel. + +### Keybindings ⌨ + +| Key | Command | Reminder | +|---------------|-------------------------------------------------------|-------------| +| `` | Disconnect from remote; return to authentication page | | +| `` | Switch between log tab and explorer | | +| `` | Go to previous directory in stack | | +| `` | Move to remote explorer tab | | +| `` | Move to local explorer tab | | +| `` | Move up in selected list | | +| `` | Move down in selected list | | +| `` | Move up in selected list by 8 rows | | +| `` | Move down in selected list by 8 rows | | +| `` | Enter directory | | +| `` | Upload / download selected file | | +| `` | Toggle hidden files | All | +| `` | Sort files by | Bubblesort? | +| `` | Copy file/directory | Copy | +| `` | Make directory | Directory | +| `` | Delete file (Same as `DEL`) | Erase | +| `` | Search for files (wild match is supported) | Find | +| `` | Go to supplied path | Go to | +| `` | Show help | Help | +| `` | Show info about selected file or directory | Info | +| `` | Reload current directory's content / Clear selection | List | +| `` | Select a file | Mark | +| `` | Create new file with provided name | New | +| `` | Edit file; see Text editor | Open | +| `` | Quit termscp | Quit | +| `` | Rename file | Rename | +| `` | Save file as... | Save | +| `` | Go to parent directory | Upper | +| `` | Open file with default program for filetype | View | +| `` | Open file with provided program | With | +| `` | Execute a command | eXecute | +| `` | Toggle synchronized browsing | sYnc | +| `` | Delete file | | +| `` | Select all files | | +| `` | Abort file transfer process | | + +### Work on multiple files 🥷 + +You can opt to work on multiple files, selecting them pressing ``, in order to select the current file, or pressing ``, which will select all the files in the working directory. +Once a file is marked for selection, it will be displayed with a `*` on the left. +When working on selection, only selected file will be processed for actions, while the current highlighted item will be ignored. +It is possible to work on multiple files also when in the find result panel. +All the actions are available when working with multiple files, but be aware that some actions work in a slightly different way. Let's dive in: + +- *Copy*: whenever you copy a file, you'll be prompted to insert the destination name. When working with multiple file, this name refers to the destination directory where all these files will be copied. +- *Rename*: same as copy, but will move files there. +- *Save as*: same as copy, but will write them there. + +### Synchronized browsing ⏲️ + +When enabled, synchronized browsing, will allow you to synchronize the navigation between the two panels. +This means that whenever you'll change the working directory on one panel, the same action will be reproduced on the other panel. If you want to enable synchronized browsing just press ``; press twice to disable. While enabled, the synchronized browsing state will be reported on the status bar on `ON`. + +> ❗ at the moment, whenever you try to access an unexisting directory, you won't be prompted to create it. This might change in a future update. + +### Open and Open With 🚪 + +Open and open with commands are powered by [open-rs](https://docs.rs/crate/open/1.7.0). +When opening files with View command (``), the system default application for the file type will be used. To do so, the default operting system service will be used, so be sure to have at least one of these installed on your system: + +- **Windows** users: you don't have to worry about it, since the crate will use the `start` command. +- **MacOS** users: you don't have to worry either, since the crate will use `open`, which is already installed on your system. +- **Linux** users: one of these should be installed + - *xdg-open* + - *gio* + - *gnome-open* + - *kde-open* +- **WSL** users: *wslview* is required, you must install [wslu](https://github.com/wslutilities/wslu). + +> Q: Can I edit remote files using the view command? +> A: No, at least not directly from the "remote panel". You have to download it to a local directory first, that's due to the fact that when you open a remote file, the file is downloaded into a temporary directory, but there's no way to create a watcher for the file to check when the program you used to open it was closed, so termscp is not able to know when you're done editing the file. + +--- + +## Bookmarks ⭐ + +In termscp it is possible to save favourites hosts, which can be then loaded quickly from the main layout of termscp. +termscp will also save the last 16 hosts you connected to. +This feature allows you to load all the parameters required to connect to a certain remote, simply selecting the bookmark in the tab under the authentication form. + +Bookmarks will be saved, if possible at: + +- `$HOME/.config/termscp/` on Linux/BSD +- `$HOME/Library/Application Support/termscp` on MacOs +- `FOLDERID_RoamingAppData\termscp\` on Windows + +For bookmarks only (this won't apply to recent hosts) it is also possible to save the password used to authenticate. The password is not saved by default and must be specified through the prompt when saving a new Bookmark. +If you're concerned about the security of the password saved for your bookmarks, please read the [chapter below 👀](#are-my-passwords-safe-). + +In order to create a new bookmark, just follow these steps: + +1. Type in the authentication form the parameters to connect to your remote server +2. Press `` +3. Type in the name you want to give to the bookmark +4. Choose whether to remind the password or not +5. Press `` to submit + +whenever you want to use the previously saved connection, just press `` to navigate to the bookmarks list and load the bookmark parameters into the form pressing ``. + +![Bookmarks](https://github.com/veeso/termscp/blob/main/assets/images/bookmarks.gif?raw=true) + +### Are my passwords Safe 😈 + +Sure 😉. +As said before, bookmarks are saved in your configuration directory along with passwords. Passwords are obviously not plain text, they are encrypted with **AES-128**. Does this make them safe? Absolutely! (except for BSD and WSL users 😢) + +On **Windows**, **Linux** and **MacOS** the key used to encrypt passwords is stored, if possible (but should be), respectively in the *Windows Vault*, in the *system keyring* and into the *Keychain*. This is actually super-safe and is directly managed by your operating system. + +❗ Please, notice that if you're a Linux user, you'd better to read the [chapter below 👀](#linux-keyring), because the keyring might not be enabled or supported on your system! + +On *BSD* and *WSL*, on the other hand, the key used to encrypt your passwords is stored on your drive (at $HOME/.config/termscp). It is then, still possible to retrieve the key to decrypt passwords. Luckily, the location of the key guarantees your key can't be read by users different from yours, but yeah, I still wouldn't save the password for a server exposed on the internet 😉. + +#### Linux Keyring + +We all love Linux thanks to the freedom it gives to the users. You can basically do anything you want as a Linux user, but this has also some cons, such as the fact that often there is no standard applications across different distributions. And this involves keyring too. +This means that on Linux there might be no keyring installed on your system. Unfortunately the library we use to work with the key storage requires a service which exposes `org.freedesktop.secrets` on D-BUS and the worst fact is that there only two services exposing it. + +- ❗ If you use GNOME as desktop environment (e.g. ubuntu users), you should already be fine, since keyring is already provided by `gnome-keyring` and everything should already be working. +- ❗ For other desktop environment users there is a nice program you can use to get a keyring which is [KeepassXC](https://keepassxc.org/), which I use on my Manjaro installation (with KDE) and works fine. The only problem is that you have to setup it to be used along with termscp (but it's quite simple). To get started with KeepassXC read more [here](#keepassxc-setup-for-termscp). +- ❗ What about you don't want to install any of these services? Well, there's no problem! **termscp will keep working as usual**, but it will save the key in a file, as it usually does for BSD and WSL. + +##### KeepassXC setup for termscp + +Follow these steps in order to setup keepassXC for termscp: + +1. Install KeepassXC +2. Go to "tools" > "settings" in toolbar +3. Select "Secret service integration" and toggle "Enable KeepassXC freedesktop.org secret service integration" +4. Create a database, if you don't have one yet: from toolbar "Database" > "New database" +5. From toolbar: "Database" > "Database settings" +6. Select "Secret service integration" and toggle "Expose entries under this group" +7. Select the group in the list where you want the termscp secret to be kept. Remember that this group might be used by any other application to store secrets via DBUS. + +--- + +## Aws S3 credentials 🦊 + +In order to connect to an Aws S3 bucket you must obviously provide some credentials. +There are basically two ways to achieve this, and as you've probably already noticed you **can't** do that via the authentication form. +So these are the ways you can provide the credentials for s3: + +1. Use your credentials file: just configure the AWS cli via `aws configure` and your credentials should already be located at `~/.aws/credentials`. In case you're using a profile different from `default`, just provide it in the profile field in the authentication form. +2. **Environment variables**: you can always provide your credentials as environment variables. Keep in mind that these credentials **will always override** the credentials located in the `credentials` file. See how to configure the environment below: + + These should always be mandatory: + + - `AWS_ACCESS_KEY_ID`: aws access key ID (usually starts with `AKIA...`) + - `AWS_SECRET_ACCESS_KEY`: the secret access key + + In case you've configured a stronger security, you *may* require these too: + + - `AWS_SECURITY_TOKEN`: security token + - `AWS_SESSION_TOKEN`: session token + +⚠️ Your credentials are safe: termscp won't manipulate these values directly! Your credentials are directly consumed by the **s3** crate. +In case you've got some concern regarding security, please contact the library author on [Github](https://github.com/durch/rust-s3) ⚠️ + +--- + +## Configuration ⚙️ + +termscp supports some user defined parameters, which can be defined in the configuration. +Underhood termscp has a TOML file and some other directories where all the parameters will be saved, but don't worry, you won't touch any of these files manually, since I made possible to configure termscp from its user interface entirely. + +termscp, like for bookmarks, just requires to have these paths accessible: + +- `$HOME/.config/termscp/` on Linux/BSD +- `$HOME/Library/Application Support/termscp` on MacOs +- `FOLDERID_RoamingAppData\termscp\` on Windows + +To access configuration, you just have to press `` from the home of termscp. + +These parameters can be changed: + +- **Text Editor**: the text editor to use. By default termscp will find the default editor for you; with this option you can force an editor to be used (e.g. `vim`). **Also GUI editors are supported**, unless they `nohup` from the parent process so if you ask: yes, you can use `notepad.exe`, and no: **Visual Studio Code doesn't work**. +- **Default Protocol**: the default protocol is the default value for the file transfer protocol to be used in termscp. This applies for the login page and for the address CLI argument. +- **Show Hidden Files**: select whether hidden files shall be displayed by default. You will be able to decide whether to show or not hidden files at runtime pressing `A` anyway. +- **Check for updates**: if set to `yes`, termscp will fetch the Github API to check if there is a new version of termscp available. +- **Prompt when replacing existing files?**: If set to `yes`, termscp will prompt for confirmation you whenever a file transfer would cause an existing file on target host to be replaced. +- **Group Dirs**: select whether directories should be groupped or not in file explorers. If `Display first` is selected, directories will be sorted using the configured method but displayed before files, viceversa if `Display last` is selected. +- **Remote File formatter syntax**: syntax to display file info for each file in the remote explorer. See [File explorer format](#file-explorer-format) +- **Local File formatter syntax**: syntax to display file info for each file in the local explorer. See [File explorer format](#file-explorer-format) +- **Enable notifications?**: If set to `Yes`, notifications will be displayed. +- **Notifications: minimum transfer size**: if transfer size is greater or equal than the specified value, notifications for transfer will be displayed. The accepted values are in format `{UNSIGNED} B/KB/MB/GB/TB/PB` + +### SSH Key Storage 🔐 + +Along with configuration, termscp provides also an **essential** feature for **SFTP/SCP clients**: the SSH key storage. + +You can access the SSH key storage, from configuration moving to the `SSH Keys` tab, once there you can: + +- **Add a new key**: just press `` and you will be prompted to create a new key. Provide the hostname/ip address and the username associated to the key and finally a text editor will open up: paste the **PRIVATE** ssh key into the text editor, save and quit. +- **Remove an existing key**: just press `` or `` on the key you want to remove, to delete persistently the key from termscp. +- **Edit an existing key**: just press `` on the key you want to edit, to change the private key. + +> Q: Wait, my private key is protected with password, can I use it? +> A: Of course you can. The password provided for authentication in termscp, is valid both for username/password authentication and for RSA key authentication. + +### File Explorer Format + +It is possible through configuration to define a custom format for the file explorer. This is possible both for local and remote host, so you can have two different syntax in use. These fields, with name `File formatter syntax (local)` and `File formatter syntax (remote)` will define how the file entries will be displayed in the file explorer. +The syntax for the formatter is the following `{KEY1}... {KEY2:LENGTH}... {KEY3:LENGTH:EXTRA} {KEYn}...`. +Each key in bracket will be replaced with the related attribute, while everything outside brackets will be left unchanged. + +- The key name is mandatory and must be one of the keys below +- The length describes the length reserved to display the field. Static attributes doesn't support this (GROUP, PEX, SIZE, USER) +- Extra is supported only by some parameters and is an additional options. See keys to check if extra is supported. + +These are the keys supported by the formatter: + +- `ATIME`: Last access time (with default syntax `%b %d %Y %H:%M`); Extra might be provided as the time syntax (e.g. `{ATIME:8:%H:%M}`) +- `CTIME`: Creation time (with syntax `%b %d %Y %H:%M`); Extra might be provided as the time syntax (e.g. `{CTIME:8:%H:%M}`) +- `GROUP`: Owner group +- `MTIME`: Last change time (with syntax `%b %d %Y %H:%M`); Extra might be provided as the time syntax (e.g. `{MTIME:8:%H:%M}`) +- `NAME`: File name (Elided if longer than LENGTH) +- `PEX`: File permissions (UNIX format) +- `SIZE`: File size (omitted for directories) +- `SYMLINK`: Symlink (if any `-> {FILE_PATH}`) +- `USER`: Owner user + +If left empty, the default formatter syntax will be used: `{NAME:24} {PEX} {USER} {SIZE} {MTIME:17:%b %d %Y %H:%M}` + +--- + +## Themes 🎨 + +Termscp provides you with an awesome feature: the possibility to set the colors for several components in the application. +If you want to customize termscp there are two available ways to do so: + +- From the **configuration menu** +- Importing a **theme file** + +In order to create your own customization from termscp, all you have to do so is to enter the configuration from the auth activity, pressing `` and then `` twice. You should have now moved to the `themes` panel. + +Here you can move with `` and `` to change the style you want to change, as shown in the gif below: + +![Themes](https://github.com/veeso/termscp/blob/main/assets/images/themes.gif?raw=true) + +termscp supports both the traditional explicit hex (`#rrggbb`) and rgb `rgb(r, g, b)` syntax to provide colors, but also **[css colors](https://www.w3schools.com/cssref/css_colors.asp)** (such as `crimson`) are accepted 😉. There is also a special keywork which is `Default`. Default means that the color used will be the default foreground or background color based on the situation (foreground for texts and lines, background for well, guess what). + +As said before, you can also import theme files. You can take inspiration from or directly use one of the themes provided along with termscp, located in the `themes/` directory of this repository and import them running termscp as `termscp -t `. If everything was fine, it should tell you the theme has successfully been imported. + +### My theme won't load 😱 + +This is probably due to a recent update which has broken the theme. Whenever I add a new key to themes, the saved theme won't load. To fix this issues there are two really quick-fix solutions: + +1. Reload theme: whenever I release an update I will also patch the "official" themes, so you just have to download it from the repository again and re-import the theme via `-t` option + + ```sh + termscp -t + ``` + +2. Fix your theme: If you're using a custom theme, then you can edit via `vim` and add the missing key. The theme is located at `$CONFIG_DIR/termscp/theme.toml` where `$CONFIG_DIR` is: + + - FreeBSD/GNU-Linux: `$HOME/.config/` + - MacOs: `$HOME/Library/Application Support` + - Windows: `%appdata%` + + ❗ Missing keys are reported in the CHANGELOG under `BREAKING CHANGES` for the version you've just installed. + +### Styles 💈 + +You can find in the table below, the description for each style field. +Please, notice that **styles won't apply to configuration page**, in order to make it always accessible in case you mess everything up + +#### Authentication page + +| Key | Description | +|----------------|------------------------------------------| +| auth_address | Color of the input field for IP address | +| auth_bookmarks | Color of the bookmarks panel | +| auth_password | Color of the input field for password | +| auth_port | Color of the input field for port number | +| auth_protocol | Color of the radio group for protocol | +| auth_recents | Color of the recents panel | +| auth_username | Color of the input field for username | + +#### Transfer page + +| Key | Description | +|--------------------------------------|---------------------------------------------------------------------------| +| transfer_local_explorer_background | Background color of localhost explorer | +| transfer_local_explorer_foreground | Foreground coloor of localhost explorer | +| transfer_local_explorer_highlighted | Border and highlighted color for localhost explorer | +| transfer_remote_explorer_background | Background color of remote explorer | +| transfer_remote_explorer_foreground | Foreground coloor of remote explorer | +| transfer_remote_explorer_highlighted | Border and highlighted color for remote explorer | +| transfer_log_background | Background color for log panel | +| transfer_log_window | Window color for log panel | +| transfer_progress_bar_partial | Partial progress bar color | +| transfer_progress_bar_total | Total progress bar color | +| transfer_status_hidden | Color for status bar "hidden" label | +| transfer_status_sorting | Color for status bar "sorting" label; applies also to file sorting dialog | +| transfer_status_sync_browsing | Color for status bar "sync browsing" label | + +#### Misc + +These styles applie to different part of the application. + +| Key | Description | +|-------------------|---------------------------------------------| +| misc_error_dialog | Color for error messages | +| misc_info_dialog | Color for info dialogs | +| misc_input_dialog | Color for input dialogs (such as copy file) | +| misc_keys | Color of text for key strokes | +| misc_quit_dialog | Color for quit dialogs | +| misc_save_dialog | Color for save dialogs | +| misc_warn_dialog | Color for warn dialogs | + +--- + +## Text Editor ✏ + +termscp has, as you might have noticed, many features, one of these is the possibility to view and edit text file. It doesn't matter if the file is located on the local host or on the remote host, termscp provides the possibility to open a file in your favourite text editor. +In case the file is located on remote host, the file will be first downloaded into your temporary file directory and then, **only** if changes were made to the file, re-uploaded to the remote host. termscp checks if you made changes to the file verifying the last modification time of the file. + +Just a reminder: **you can edit only textual file**; binary files are not supported. + +--- + +## Logging 🩺 + +termscp writes a log file for each session, which is written at + +- `$HOME/.config/termscp/termscp.log` on Linux/BSD +- `$HOME/Library/Application Support/termscp/termscp.log` on MacOs +- `FOLDERID_RoamingAppData\termscp\termscp.log` on Windows + +the log won't be rotated, but will just be truncated after each launch of termscp, so if you want to report an issue and you want to attach your log file, keep in mind to save the log file in a safe place before using termscp again. +The log file always reports in *trace* level, so it is kinda verbose. +I know you might have some questions regarding log files, so I made a kind of a Q/A: + +> Is it possible to reduce verbosity? + +No. The reason is quite simple: when an issue happens, you must be able to know what's causing it and the only way to do that, is to have the log file with the maximum verbosity level set. + +> If trace level is set for logging, is the file going to reach a huge size? + +Probably not, unless you never quit termscp, but I think that's unlikely to happen. A long session may produce up to 10MB of log files (I said a long session), but I think a normal session won't exceed 2MB. + +> I don't want logging, can I turn it off? + +Yes, you can. Just start termscp with `-q or --quiet` option. You can alias termscp to make it persistent. Remember that logging is used to diagnose issues, so since behind every open source project, there should always be this kind of mutual help, keeping log files might be your way to support the project 😉. I don't want you to feel guilty, but just to say. + +> Is logging safe? + +If you're concerned about security, the log file doesn't contain any plain password, so don't worry and exposes the same information the sibling file `bookmarks` reports. + +## Notifications 📫 + +Termscp will send Desktop notifications for these kind of events: + +- on **Transfer completed**: The notification will be sent once a transfer has been successfully completed. + - ❗ The notification will be displayed only if the transfer total size is at least the specified `Notifications: minimum transfer size` in the configuration. +- on **Transfer failed**: The notification will be sent once a transfer has failed due to an error. + - ❗ The notification will be displayed only if the transfer total size is at least the specified `Notifications: minimum transfer size` in the configuration. +- on **Update available**: Whenever a new version of termscp is available, a notification will be displayed. +- on **Update installed**: Whenever a new version of termscp has been installed, a notification will be displayed. +- on **Update failed**: Whenever the installation of the update fails, a notification will be displayed. + +❗ If you prefer to keep notifications turned off, you can just enter setup and set `Enable notifications?` to `No` 😉. +❗ If you want to change the minimum transfer size to display notifications, you can change the value in the configuration with key `Notifications: minimum transfer size` and set it to whatever suits better for you 🙂. From e307b6a8ac597f7ce7235b1776dd3fd840d14dd5 Mon Sep 17 00:00:00 2001 From: veeso Date: Wed, 6 Oct 2021 10:37:36 +0200 Subject: [PATCH 29/40] Align badges --- README.md | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bc672ff..84e4bcc 100644 --- a/README.md +++ b/README.md @@ -65,9 +65,69 @@

Current version: 0.7.0 (12/10/2021)

-[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crate Version](https://img.shields.io/crates/v/termscp.svg)](https://crates.io/crates/termscp) - -[![Linux](https://github.com/veeso/termscp/workflows/Linux/badge.svg)](https://github.com/veeso/termscp/actions) [![MacOs](https://github.com/veeso/termscp/workflows/MacOS/badge.svg)](https://github.com/veeso/termscp/actions) [![Windows](https://github.com/veeso/termscp/workflows/Windows/badge.svg)](https://github.com/veeso/termscp/actions) [![FreeBSD](https://github.com/veeso/termscp/workflows/FreeBSD/badge.svg)](https://github.com/veeso/termscp/actions) [![Coverage Status](https://coveralls.io/repos/github/veeso/termscp/badge.svg)](https://coveralls.io/github/veeso/termscp) [![Docs](https://docs.rs/termscp/badge.svg)](https://docs.rs/termscp) +

+ License-MIT +   + Repo stars +   + Downloads counter +   + Latest version +

+

+ Linux CI +   + MacOS CI +   + Windows CI +   + FreeBSD CI +   + Coveralls +   + Docs +   +

--- From bc90fb1038a41076205e7337e180d7ee823097d1 Mon Sep 17 00:00:00 2001 From: veeso Date: Wed, 6 Oct 2021 10:38:03 +0200 Subject: [PATCH 30/40] Align badges --- README.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/README.md b/README.md index 84e4bcc..177ed0f 100644 --- a/README.md +++ b/README.md @@ -71,19 +71,16 @@ src="https://img.shields.io/badge/License-MIT-teal.svg" alt="License-MIT" /> -   Repo stars -   Downloads counter -   Linux CI -   MacOS CI -   Windows CI -   FreeBSD CI -   Coveralls -   Docs -  

--- From a7a116cb33e8a5e990d3d7527b862ad08592e8b8 Mon Sep 17 00:00:00 2001 From: veeso Date: Wed, 6 Oct 2021 10:38:57 +0200 Subject: [PATCH 31/40] Badges aligned --- docs/de/README.md | 57 +++++++++++++++++++++++++++++++++++++++--- docs/es/README.md | 57 +++++++++++++++++++++++++++++++++++++++--- docs/fr/README.md | 57 +++++++++++++++++++++++++++++++++++++++--- docs/it/README.md | 59 +++++++++++++++++++++++++++++++++++++++++--- docs/zh-CN/README.md | 59 +++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 272 insertions(+), 17 deletions(-) diff --git a/docs/de/README.md b/docs/de/README.md index 68facf8..c4a36bc 100644 --- a/docs/de/README.md +++ b/docs/de/README.md @@ -65,9 +65,60 @@

Entwickelt von @veeso

Aktuelle Version: 0.7.0 (12/10/2021)

-[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) - -[![Linux](https://github.com/veeso/termscp/workflows/Linux/badge.svg)](https://github.com/veeso/termscp/actions) [![MacOs](https://github.com/veeso/termscp/workflows/MacOS/badge.svg)](https://github.com/veeso/termscp/actions) [![Windows](https://github.com/veeso/termscp/workflows/Windows/badge.svg)](https://github.com/veeso/termscp/actions) [![FreeBSD](https://github.com/veeso/termscp/workflows/FreeBSD/badge.svg)](https://github.com/veeso/termscp/actions) [![Coverage Status](https://coveralls.io/repos/github/veeso/termscp/badge.svg)](https://coveralls.io/github/veeso/termscp) [![Docs](https://docs.rs/termscp/badge.svg)](https://docs.rs/termscp) +

+ License-MIT + Repo stars + Downloads counter + Latest version +

+

+ Linux CI + MacOS CI + Windows CI + FreeBSD CI + Coveralls + Docs +

--- diff --git a/docs/es/README.md b/docs/es/README.md index 51e631a..0f46bd6 100644 --- a/docs/es/README.md +++ b/docs/es/README.md @@ -65,9 +65,60 @@

Desarrollado por @veeso

Versión actual: 0.7.0 (12/10/2021)

-[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) - -[![Linux](https://github.com/veeso/termscp/workflows/Linux/badge.svg)](https://github.com/veeso/termscp/actions) [![MacOs](https://github.com/veeso/termscp/workflows/MacOS/badge.svg)](https://github.com/veeso/termscp/actions) [![Windows](https://github.com/veeso/termscp/workflows/Windows/badge.svg)](https://github.com/veeso/termscp/actions) [![FreeBSD](https://github.com/veeso/termscp/workflows/FreeBSD/badge.svg)](https://github.com/veeso/termscp/actions) [![Coverage Status](https://coveralls.io/repos/github/veeso/termscp/badge.svg)](https://coveralls.io/github/veeso/termscp) [![Docs](https://docs.rs/termscp/badge.svg)](https://docs.rs/termscp) +

+ License-MIT + Repo stars + Downloads counter + Latest version +

+

+ Linux CI + MacOS CI + Windows CI + FreeBSD CI + Coveralls + Docs +

--- diff --git a/docs/fr/README.md b/docs/fr/README.md index 453b938..c667176 100644 --- a/docs/fr/README.md +++ b/docs/fr/README.md @@ -65,9 +65,60 @@

Développé par @veeso

Version actuelle: 0.7.0 (12/10/2021)

-[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) - -[![Linux](https://github.com/veeso/termscp/workflows/Linux/badge.svg)](https://github.com/veeso/termscp/actions) [![MacOs](https://github.com/veeso/termscp/workflows/MacOS/badge.svg)](https://github.com/veeso/termscp/actions) [![Windows](https://github.com/veeso/termscp/workflows/Windows/badge.svg)](https://github.com/veeso/termscp/actions) [![FreeBSD](https://github.com/veeso/termscp/workflows/FreeBSD/badge.svg)](https://github.com/veeso/termscp/actions) [![Coverage Status](https://coveralls.io/repos/github/veeso/termscp/badge.svg)](https://coveralls.io/github/veeso/termscp) [![Docs](https://docs.rs/termscp/badge.svg)](https://docs.rs/termscp) +

+ License-MIT + Repo stars + Downloads counter + Latest version +

+

+ Linux CI + MacOS CI + Windows CI + FreeBSD CI + Coveralls + Docs +

--- diff --git a/docs/it/README.md b/docs/it/README.md index e80b2fe..99dd230 100644 --- a/docs/it/README.md +++ b/docs/it/README.md @@ -65,13 +65,64 @@

Sviluppato da @veeso

Versione corrente: 0.7.0 (12/10/2021)

-[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) - -[![Linux](https://github.com/veeso/termscp/workflows/Linux/badge.svg)](https://github.com/veeso/termscp/actions) [![MacOs](https://github.com/veeso/termscp/workflows/MacOS/badge.svg)](https://github.com/veeso/termscp/actions) [![Windows](https://github.com/veeso/termscp/workflows/Windows/badge.svg)](https://github.com/veeso/termscp/actions) [![FreeBSD](https://github.com/veeso/termscp/workflows/FreeBSD/badge.svg)](https://github.com/veeso/termscp/actions) [![Coverage Status](https://coveralls.io/repos/github/veeso/termscp/badge.svg)](https://coveralls.io/github/veeso/termscp) [![Docs](https://docs.rs/termscp/badge.svg)](https://docs.rs/termscp) +

+ License-MIT + Repo stars + Downloads counter + Latest version +

+

+ Linux CI + MacOS CI + Windows CI + FreeBSD CI + Coveralls + Docs +

--- -## Riguardo termscp 🖥 +## Riguardo a termscp 🖥 Termscp è un file transfer ed explorer ricco di funzionalità, con supporto a SCP/SFTP/FTP/S3. Basicamente è un utility su terminale con una terminal user-interface per connettersi a server remoti per scambiare file ed interagire con il file system sia locale che remoto. È compatibile con **Linux**, **MacOS**, **FreeBSD** e **Windows**. diff --git a/docs/zh-CN/README.md b/docs/zh-CN/README.md index 6afddd4..b56b2e1 100644 --- a/docs/zh-CN/README.md +++ b/docs/zh-CN/README.md @@ -65,9 +65,60 @@

由 @veeso 开发

当前版本： 0.7.0 (12/10/2021)

-[![License: MIT](https://img.shields.io/badge/License-MIT-teal.svg)](https://opensource.org/licenses/MIT) [![Stars](https://img.shields.io/github/stars/veeso/termscp.svg)](https://github.com/veeso/termscp) [![Downloads](https://img.shields.io/crates/d/termscp.svg)](https://crates.io/crates/termscp) [![Crates.io](https://img.shields.io/badge/crates.io-v0.7.0-orange.svg)](https://crates.io/crates/termscp) - -[![Linux](https://github.com/veeso/termscp/workflows/Linux/badge.svg)](https://github.com/veeso/termscp/actions) [![MacOs](https://github.com/veeso/termscp/workflows/MacOS/badge.svg)](https://github.com/veeso/termscp/actions) [![Windows](https://github.com/veeso/termscp/workflows/Windows/badge.svg)](https://github.com/veeso/termscp/actions) [![FreeBSD](https://github.com/veeso/termscp/workflows/FreeBSD/badge.svg)](https://github.com/veeso/termscp/actions) [![Coverage Status](https://coveralls.io/repos/github/veeso/termscp/badge.svg)](https://coveralls.io/github/veeso/termscp) [![Docs](https://docs.rs/termscp/badge.svg)](https://docs.rs/termscp) +

+ License-MIT + Repo stars + Downloads counter + Latest version +

+

+ Linux CI + MacOS CI + Windows CI + FreeBSD CI + Coveralls + Docs +

--- @@ -159,7 +210,7 @@ choco install termscp ## 支持我 ☕ -如果您喜欢 termscp 并且希望看到该项目不断发展和改进，请考虑在**给我买杯咖啡**上捐款以支持我🥳 +如果您喜欢 termscp 并且希望看到该项目不断发展和改进，请考虑在 **Buy me a coffee** 上捐款以支持我🥳 [![给我买一杯咖啡](https://img.buymeacoffee.com/button-api/?text=%E7%BB%99%E6%88%91%E4%B9%B0%E4%B8%80%E6%9D%AF%E5%92%96%E5%95%A1&emoji=&slug=veeso&button_colour=404040&font_colour=ffffff&font_family=Comic&outline_colour=ffffff&coffee_colour=FFDD00)](https://www.buymeacoffee.com/veeso) From 9a63f5b2cc31ab270ae14ed545c159cc5c60b600 Mon Sep 17 00:00:00 2001 From: veeso Date: Wed, 6 Oct 2021 11:12:15 +0200 Subject: [PATCH 32/40] copy template --- .github/ISSUE_TEMPLATE/copy.md | 35 ++++++++++++++++++++++++++++++++++ CONTRIBUTING.md | 16 ++++++++++++++-- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/copy.md diff --git a/.github/ISSUE_TEMPLATE/copy.md b/.github/ISSUE_TEMPLATE/copy.md new file mode 100644 index 0000000..b26f9de --- /dev/null +++ b/.github/ISSUE_TEMPLATE/copy.md @@ -0,0 +1,35 @@ +--- +name: Copy +about: Report a typo/error in a repository document +title: "[COPY] - ISSUE_TITLE" +labels: documentation +assignees: veeso + +--- + +## Report + +### DOCUMENT NAME + +This sentence at row ROW_NUMBER doesn't seem right: + +> Write down here the wrong sentence + +and I think it should be changed to: + +> Write down here the correct sentence + +`Copy paste the template above for all the sentences to fix` + +--- + +`Copy paste the template above for all the documents to fix` + +## Additional information + +> ❗ Report LANGUAGE checks only if it concerns the documents above +> ❗ If the documents concerns more than one language, copy paste the checks below for each check you want to report +> ❗ The PR mention regards the indicated language. If you check the box, I may add you to a PR where I need to translate a new section of the user manual/README or other documents. I promise I won't stress you anyway. + +- [ ] I am C1/C2 speaker for this language: LANGUAGE + - [ ] You can mention me in a PR in case a review for translations is needed diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 80083a7..93c8c56 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,6 +9,7 @@ Please note we have a [code of conduct](CODE_OF_CONDUCT.md), please follow it in - [Open an issue](#open-an-issue) - [Questions](#questions) - [Bug reports](#bug-reports) + - [Copy error](#copy-error) - [Feature requests](#feature-requests) - [Preferred contributions](#preferred-contributions) - [Pull Request Process](#pull-request-process) @@ -45,6 +46,7 @@ Open an issue when: - You have questions or concerns regarding the project or the application itself. - You have a bug to report. +- You have a copy error to report. (Error in documentation; bad translation or sentence) - You have a feature or a suggestion to improve termscp to submit. ### Questions @@ -71,6 +73,15 @@ Maintainers will may add additional labels to your issue: - **sorcery**: it is not possible to find out what's causing your bug, nor is reproducible on our test environments. - **wontfix**: your bug has a very high ratio between the difficulty to fix it and the probability to encounter it, or it just isn't a bug, but a feature. +### Copy error + +If you want to report a copy error, create an issue using the `copy` template. +The `Documentation` label should already be set and the issue should already be assigned to `veeso`. + +If you want to fix the copy by yourself you can fork the project and open a PR, otherwise I will fix it by myself. +The copy issue is accepted **also if you're not a C1/C2 speaker**, but a speaker of that level in case the language is different from Italian/English is preferred. +Please fullfil the form on the bottom of the template if you want. + ### Feature requests Whenever you have a good idea which chould improve the project, it is a good idea to submit it to the project owner. @@ -97,9 +108,10 @@ Always mind that your suggestion, may be rejected: I'll always provide a feedbac At the moment, these kind of contributions are more appreciated and should be preferred: - Fix for issues described in [Known Issues](./README.md#known-issues-) or [issues reported by the community](https://github.com/veeso/termscp/issues) -- New file transfers: for further details see [Implementing File Transfer](#implementing-file-transfers) -- Code optimizations: any optimization to the code is welcome +- **New file transfers**: for further details see [Implementing File Transfer](#implementing-file-transfers). ⚠️ this is going to be deprecated SOON! We're moving the file transfers into another library. Please see [remotefs-rs](https://github.com/veeso/remotefs-rs). +- **Code optimizations**: any optimization to the code is welcome - See also features described in [Upcoming features](./README.md##upcoming-features-). Open an issue first though. +- README/User manual **translations**: really appreciated atm. Please just add a folder into `docs/` with the language code. Language code with two characters is used in case the language is understandable by all the countries where this language is spoken (e.g. `it-CH`, `it-IT` are not really different, so I just created `it`, but there is a big difference from `zh-CN` and `zh-TW` for instance). Don't worry about flags in README, I will implement that part if it's too complicated. For any other kind of contribution, especially for new features, please submit a new issue first. From 8b2b834818aa735eefabf38f65ef46963a5061c4 Mon Sep 17 00:00:00 2001 From: veeso Date: Thu, 7 Oct 2021 09:37:34 +0200 Subject: [PATCH 33/40] User manuals --- docs/de/man.md | 52 ++-- docs/es/man.md | 523 ++++++++++++++++++------------------- docs/fr/man.md | 647 +++++++++++++++++++++++----------------------- docs/it/man.md | 52 ++-- docs/man.md | 60 ++--- docs/zh-CN/man.md | 52 ++-- 6 files changed, 694 insertions(+), 692 deletions(-) diff --git a/docs/de/man.md b/docs/de/man.md index bd130fd..c0a00a5 100644 --- a/docs/de/man.md +++ b/docs/de/man.md @@ -5,6 +5,7 @@ - [Address argument 🌎](#address-argument-) - [AWS S3 address argument](#aws-s3-address-argument) - [How Password can be provided 🔐](#how-password-can-be-provided-) + - [Aws S3 credentials 🦊](#aws-s3-credentials-) - [File explorer 📂](#file-explorer-) - [Keybindings ⌨](#keybindings-) - [Work on multiple files 🥷](#work-on-multiple-files-) @@ -14,7 +15,6 @@ - [Are my passwords Safe 😈](#are-my-passwords-safe-) - [Linux Keyring](#linux-keyring) - [KeepassXC setup for termscp](#keepassxc-setup-for-termscp) - - [Aws S3 credentials 🦊](#aws-s3-credentials-) - [Configuration ⚙️](#configuration-️) - [SSH Key Storage 🔐](#ssh-key-storage-) - [File Explorer Format](#file-explorer-format) @@ -28,6 +28,8 @@ - [Logging 🩺](#logging-) - [Notifications 📫](#notifications-) +> ❗ I need a help to translate this manual into German. If you want to contribute to the translations, please open a PR 🙏 + ## Usage ❓ termscp can be started with the following options: @@ -107,6 +109,30 @@ Password can be basically provided through 3 ways when address argument is provi --- +## Aws S3 credentials 🦊 + +In order to connect to an Aws S3 bucket you must obviously provide some credentials. +There are basically two ways to achieve this, and as you've probably already noticed you **can't** do that via the authentication form. +So these are the ways you can provide the credentials for s3: + +1. Use your credentials file: just configure the AWS cli via `aws configure` and your credentials should already be located at `~/.aws/credentials`. In case you're using a profile different from `default`, just provide it in the profile field in the authentication form. +2. **Environment variables**: you can always provide your credentials as environment variables. Keep in mind that these credentials **will always override** the credentials located in the `credentials` file. See how to configure the environment below: + + These should always be mandatory: + + - `AWS_ACCESS_KEY_ID`: aws access key ID (usually starts with `AKIA...`) + - `AWS_SECRET_ACCESS_KEY`: the secret access key + + In case you've configured a stronger security, you *may* require these too: + + - `AWS_SECURITY_TOKEN`: security token + - `AWS_SESSION_TOKEN`: session token + +⚠️ Your credentials are safe: termscp won't manipulate these values directly! Your credentials are directly consumed by the **s3** crate. +In case you've got some concern regarding security, please contact the library author on [Github](https://github.com/durch/rust-s3) ⚠️ + +--- + ## File explorer 📂 When we refer to file explorers in termscp, we refer to the panels you can see after establishing a connection with the remote. @@ -257,30 +283,6 @@ Follow these steps in order to setup keepassXC for termscp: --- -## Aws S3 credentials 🦊 - -In order to connect to an Aws S3 bucket you must obviously provide some credentials. -There are basically two ways to achieve this, and as you've probably already noticed you **can't** do that via the authentication form. -So these are the ways you can provide the credentials for s3: - -1. Use your credentials file: just configure the AWS cli via `aws configure` and your credentials should already be located at `~/.aws/credentials`. In case you're using a profile different from `default`, just provide it in the profile field in the authentication form. -2. **Environment variables**: you can always provide your credentials as environment variables. Keep in mind that these credentials **will always override** the credentials located in the `credentials` file. See how to configure the environment below: - - These should always be mandatory: - - - `AWS_ACCESS_KEY_ID`: aws access key ID (usually starts with `AKIA...`) - - `AWS_SECRET_ACCESS_KEY`: the secret access key - - In case you've configured a stronger security, you *may* require these too: - - - `AWS_SECURITY_TOKEN`: security token - - `AWS_SESSION_TOKEN`: session token - -⚠️ Your credentials are safe: termscp won't manipulate these values directly! Your credentials are directly consumed by the **s3** crate. -In case you've got some concern regarding security, please contact the library author on [Github](https://github.com/durch/rust-s3) ⚠️ - ---- - ## Configuration ⚙️ termscp supports some user defined parameters, which can be defined in the configuration. diff --git a/docs/es/man.md b/docs/es/man.md index bd130fd..70cf88c 100644 --- a/docs/es/man.md +++ b/docs/es/man.md @@ -1,391 +1,392 @@ # User manual 🎓 - [User manual 🎓](#user-manual-) - - [Usage ❓](#usage-) - - [Address argument 🌎](#address-argument-) - - [AWS S3 address argument](#aws-s3-address-argument) - - [How Password can be provided 🔐](#how-password-can-be-provided-) - - [File explorer 📂](#file-explorer-) + - [Uso ❓](#uso-) + - [Argumento dirección 🌎](#argumento-dirección-) + - [Argumento dirección por AWS S3](#argumento-dirección-por-aws-s3) + - [Cómo se puede proporcionar la contraseña 🔐](#cómo-se-puede-proporcionar-la-contraseña-) + - [Credenciales de AWS S3 🦊](#credenciales-de-aws-s3-) + - [Explorador de archivos 📂](#explorador-de-archivos-) - [Keybindings ⌨](#keybindings-) - - [Work on multiple files 🥷](#work-on-multiple-files-) - - [Synchronized browsing ⏲️](#synchronized-browsing-️) - - [Open and Open With 🚪](#open-and-open-with-) - - [Bookmarks ⭐](#bookmarks-) - - [Are my passwords Safe 😈](#are-my-passwords-safe-) + - [Trabaja en varios archivos 🥷](#trabaja-en-varios-archivos-) + - [Navegación sincronizada ⏲️](#navegación-sincronizada-️) + - [Abierta y abierta con 🚪](#abierta-y-abierta-con-) + - [Marcadores ⭐](#marcadores-) + - [¿Son seguras mis contraseñas? 😈](#son-seguras-mis-contraseñas-) - [Linux Keyring](#linux-keyring) - - [KeepassXC setup for termscp](#keepassxc-setup-for-termscp) - - [Aws S3 credentials 🦊](#aws-s3-credentials-) - - [Configuration ⚙️](#configuration-️) + - [KeepassXC setup por termscp](#keepassxc-setup-por-termscp) + - [Configuración ⚙️](#configuración--️) - [SSH Key Storage 🔐](#ssh-key-storage-) - - [File Explorer Format](#file-explorer-format) - - [Themes 🎨](#themes-) - - [My theme won't load 😱](#my-theme-wont-load-) - - [Styles 💈](#styles-) + - [Formato del explorador de archivos](#formato-del-explorador-de-archivos) + - [Temas 🎨](#temas-) + - [Mi tema no se carga 😱](#mi-tema-no-se-carga-) + - [Estilos 💈](#estilos-) - [Authentication page](#authentication-page) - [Transfer page](#transfer-page) - [Misc](#misc) - [Text Editor ✏](#text-editor-) - [Logging 🩺](#logging-) - - [Notifications 📫](#notifications-) + - [Notificaciones 📫](#notificaciones-) -## Usage ❓ +> ❗ Este documento ha sido traducido con Google Translator (y luego lo he revisado a grandes rasgos, pero no puedo hablar el idioma muy bien). Si habla l'idioma, abra un [issue](https://github.com/veeso/termscp/issues/new/choose) utilizando la label COPY o abra un PR 🙏 -termscp can be started with the following options: +## Uso ❓ + +termscp se puede iniciar con las siguientes opciones: `termscp [options]... [protocol://user@address:port:wrkdir] [local-wrkdir]` -- `-P, --password ` if address is provided, password will be this argument -- `-c, --config` Open termscp starting from the configuration page -- `-q, --quiet` Disable logging -- `-t, --theme ` Import specified theme -- `-u, --update` Update termscp to latest version -- `-v, --version` Print version info -- `-h, --help` Print help page +- `-P, --password ` si se proporciona la dirección, la contraseña será este argumento +- `-c, --config` Abrir termscp comenzando desde la página de configuración +- `-q, --quiet` Deshabilitar el registro +- `-t, --theme ` Importar tema especificado +- `-u, --update` Actualizar termscp a la última versión +- `-v, --version` Imprimir información de la versión +- `-h, --help` Imprimir página de ayuda -termscp can be started in two different mode, if no extra arguments is provided, termscp will show the authentication form, where the user will be able to provide the parameters required to connect to the remote peer. +termscp se puede iniciar en dos modos diferentes, si no se proporcionan argumentos adicionales, termscp mostrará el formulario de autenticación, donde el usuario podrá proporcionar los parámetros necesarios para conectarse al par remoto. -Alternatively, the user can provide an address as argument to skip the authentication form and starting directly the connection to the remote server. +Alternativamente, el usuario puede proporcionar una dirección como argumento para omitir el formulario de autenticación e iniciar directamente la conexión al servidor remoto. -If address argument is provided you can also provide the start working directory for local host +Si se proporciona un argumento de dirección, también puede proporcionar el directorio de inicio de trabajo para el host local -### Address argument 🌎 +### Argumento dirección 🌎 -The address argument has the following syntax: +El argumento dirección tiene la siguiente sintaxis: ```txt [protocol://][username@]
[:port][:wrkdir] ``` -Let's see some example of this particular syntax, since it's very comfortable and you'll probably going to use this instead of the other one... +Veamos algún ejemplo de esta sintaxis en particular, ya que es muy cómoda y probablemente usarás esta en lugar de la otra ... -- Connect using default protocol (*defined in configuration*) to 192.168.1.31, port if not provided is default for the selected protocol (in this case depends on your configuration); username is current user's name +- Conéctese usando el protocolo predeterminado (*definido en la configuración*) a 192.168.1.31, el puerto, si no se proporciona, es el predeterminado para el protocolo seleccionado (en este caso, depende de su configuración); nombre de usuario es el nombre del usuario actual ```sh termscp 192.168.1.31 ``` -- Connect using default protocol (*defined in configuration*) to 192.168.1.31; username is `root` +- Conéctese usando el protocolo predeterminado (*definido en la configuración*) a 192.168.1.31; el nombre de usuario es `root` ```sh termscp root@192.168.1.31 ``` -- Connect using scp to 192.168.1.31, port is 4022; username is `omar` +- Conéctese usando scp a 192.168.1.31, el puerto es 4022; nombre de usuario es `omar` ```sh termscp scp://omar@192.168.1.31:4022 ``` -- Connect using scp to 192.168.1.31, port is 4022; username is `omar`. You will start in directory `/tmp` +- Conéctese usando scp a 192.168.1.31, el puerto es 4022; El nombre de usuario es `omar`. Comenzará en el directorio `/ tmp` ```sh termscp scp://omar@192.168.1.31:4022:/tmp ``` -#### AWS S3 address argument +#### Argumento dirección por AWS S3 -Aws S3 has a different syntax for CLI address argument, for obvious reasons, but I managed to keep it the more similar as possible to the generic address argument: +Aws S3 tiene una sintaxis diferente para el argumento de la dirección CLI, por razones obvias, pero logré mantenerlo lo más similar posible al argumento de la dirección genérica: ```txt s3://@[:profile][:/wrkdir] ``` -e.g. +por ejemplo ```txt s3://buckethead@eu-central-1:default:/assets ``` -#### How Password can be provided 🔐 +#### Cómo se puede proporcionar la contraseña 🔐 -You have probably noticed, that, when providing the address as argument, there's no way to provide the password. -Password can be basically provided through 3 ways when address argument is provided: +Probablemente haya notado que, al proporcionar la dirección como argumento, no hay forma de proporcionar la contraseña. +La contraseña se puede proporcionar básicamente a través de 3 formas cuando se proporciona un argumento de dirección: -- `-P, --password` option: just use this CLI option providing the password. I strongly unrecommend this method, since it's very unsecure (since you might keep the password in the shell history) -- Via `sshpass`: you can provide password via `sshpass`, e.g. `sshpass -f ~/.ssh/topsecret.key termscp cvisintin@192.168.1.31` -- You will be prompted for it: if you don't use any of the previous methods, you will be prompted for the password, as happens with the more classics tools such as `scp`, `ssh`, etc. +- `-P, --password` opción: simplemente use esta opción CLI proporcionando la contraseña. No recomiendo este método, ya que es muy inseguro (ya que puede mantener la contraseña en el historial de shell) +- Con `sshpass`: puede proporcionar la contraseña a través de `sshpass`, p. ej. `sshpass -f ~/.ssh/topsecret.key termscp cvisintin@192.168.1.31` +- Se te pedirá que ingreses: si no utilizas ninguno de los métodos anteriores, se te pedirá la contraseña, como ocurre con las herramientas más clásicas como `scp`, `ssh`, etc. --- -## File explorer 📂 +## Credenciales de AWS S3 🦊 -When we refer to file explorers in termscp, we refer to the panels you can see after establishing a connection with the remote. -These panels are basically 3 (yes, three actually): +Para conectarse a un bucket de Aws S3, obviamente debe proporcionar algunas credenciales. +Básicamente, hay dos formas de lograr esto, y como probablemente ya hayas notado, **no puedes** hacerlo a través del formulario de autenticación. +Entonces, estas son las formas en que puede proporcionar las credenciales para s3: -- Local explorer panel: it is displayed on the left of your screen and shows the current directory entries for localhost -- Remote explorer panel: it is displayed on the right of your screen and shows the current directory entries for the remote host. -- Find results panel: depending on where you're searching for files (local/remote) it will replace the local or the explorer panel. This panel shows the entries matching the search query you performed. +1. Use su archivo de credenciales: simplemente configure la cli de AWS a través de `aws configure` y sus credenciales ya deberían estar ubicadas en`~/.aws/credentials`. En caso de que esté usando un perfil diferente al "predeterminado", simplemente proporciónelo en el campo de perfil en el formulario de autenticación. +2. **Variables de entorno**: siempre puede proporcionar sus credenciales como variables de entorno. Tenga en cuenta que estas credenciales **siempre anularán** las credenciales ubicadas en el archivo `credentials`. Vea cómo configurar el entorno a continuación: -In order to change panel you need to type `` to move the remote explorer panel and `` to move back to the local explorer panel. Whenever you are in the find results panel, you need to press `` to exit panel and go back to the previous panel. + Estos siempre deben ser obligatorios: + + - `AWS_ACCESS_KEY_ID`: aws access key ID (generalmente comienza con `AKIA...`) + - `AWS_SECRET_ACCESS_KEY`: la secret access key + + En caso de que haya configurado una seguridad más fuerte, *puede* requerir estos también: + + - `AWS_SECURITY_TOKEN`: security token + - `AWS_SESSION_TOKEN`: session token + +⚠️ Sus credenciales están seguras: ¡termscp no manipulará estos valores directamente! Sus credenciales son consumidas directamente por la caja **s3**. +En caso de que tenga alguna inquietud con respecto a la seguridad, comuníquese con el autor de la biblioteca en [Github](https://github.com/durch/rust-s3) ⚠️ + +--- + +## Explorador de archivos 📂 + +Cuando nos referimos a exploradores de archivos en termscp, nos referimos a los paneles que puede ver después de establecer una conexión con el control remoto. +Estos paneles son básicamente 3: + +- Panel del explorador local: se muestra a la izquierda de la pantalla y muestra las entradas del directorio actual para localhost +- Panel del explorador remoto: se muestra a la derecha de la pantalla y muestra las entradas del directorio actual para el host remoto. +- Panel de resultados de búsqueda: dependiendo de dónde esté buscando archivos (local / remoto), reemplazará el panel local o del explorador. Este panel muestra las entradas que coinciden con la consulta de búsqueda que realizó. + +Para cambiar de panel, debe escribir `` para mover el panel del explorador remoto y `` para volver al panel del explorador local. Siempre que se encuentre en el panel de resultados de búsqueda, debe presionar `` para salir del panel y volver al panel anterior. ### Keybindings ⌨ | Key | Command | Reminder | |---------------|-------------------------------------------------------|-------------| -| `` | Disconnect from remote; return to authentication page | | -| `` | Switch between log tab and explorer | | -| `` | Go to previous directory in stack | | -| `` | Move to remote explorer tab | | -| `` | Move to local explorer tab | | -| `` | Move up in selected list | | -| `` | Move down in selected list | | -| `` | Move up in selected list by 8 rows | | -| `` | Move down in selected list by 8 rows | | -| `` | Enter directory | | -| `` | Upload / download selected file | | -| `` | Toggle hidden files | All | -| `` | Sort files by | Bubblesort? | -| `` | Copy file/directory | Copy | -| `` | Make directory | Directory | -| `` | Delete file (Same as `DEL`) | Erase | -| `` | Search for files (wild match is supported) | Find | -| `` | Go to supplied path | Go to | -| `` | Show help | Help | -| `` | Show info about selected file or directory | Info | -| `` | Reload current directory's content / Clear selection | List | -| `` | Select a file | Mark | -| `` | Create new file with provided name | New | -| `` | Edit file; see Text editor | Open | -| `` | Quit termscp | Quit | -| `` | Rename file | Rename | -| `` | Save file as... | Save | -| `` | Go to parent directory | Upper | -| `` | Open file with default program for filetype | View | -| `` | Open file with provided program | With | -| `` | Execute a command | eXecute | -| `` | Toggle synchronized browsing | sYnc | -| `` | Delete file | | -| `` | Select all files | | -| `` | Abort file transfer process | | +| `` | Desconecte; volver a la página de autenticación | | +| `` | Cambiar entre la pestaña de registro y el explorador | | +| `` | Ir al directorio anterior en la pila | | +| `` | Mover a la pestaña del explorador remoto | | +| `` | Mover a la pestaña del explorador local | | +| `` | Subir en la lista seleccionada | | +| `` | Bajar en la lista seleccionada | | +| `` | Subir 8 filas en la lista seleccionada | | +| `` | Bajar 8 filas en la lista seleccionada | | +| `` | Entrar directorio | | +| `` | Cargar / descargar el archivo seleccionado | | +| `` | Alternar archivos ocultos | All | +| `` | Ordenar archivos por | Bubblesort? | +| `` | Copiar archivo / directorio | Copy | +| `` | Hacer directorio | Directory | +| `` | Eliminar archivo (igual que `DEL`) | Erase | +| `` | Búsqueda de archivos | Find | +| `` | Ir a la ruta proporcionada | Go to | +| `` | Mostrar ayuda | Help | +| `` | Mostrar información sobre el archivo | Info | +| `` | Recargar contenido del directorio / Borrar selección | List | +| `` | Seleccione un archivo | Mark | +| `` | Crear un nuevo archivo con el nombre proporcionado | New | +| `` | Editar archivo | Open | +| `` | Salir de termscp | Quit | +| `` | Renombrar archivo | Rename | +| `` | Guardar archivo como... | Save | +| `` | Ir al directorio principal | Upper | +| `` | Abrir archivo con el programa predeterminado | View | +| `` | Abrir archivo con el programa proporcionado | With | +| `` | Ejecutar un comando | eXecute | +| `` | Alternar navegación sincronizada | sYnc | +| `` | Eliminar archivo | | +| `` | Seleccionar todos los archivos | | +| `` | Abortar el proceso de transferencia de archivos | | -### Work on multiple files 🥷 +### Trabaja en varios archivos 🥷 -You can opt to work on multiple files, selecting them pressing ``, in order to select the current file, or pressing ``, which will select all the files in the working directory. -Once a file is marked for selection, it will be displayed with a `*` on the left. -When working on selection, only selected file will be processed for actions, while the current highlighted item will be ignored. -It is possible to work on multiple files also when in the find result panel. -All the actions are available when working with multiple files, but be aware that some actions work in a slightly different way. Let's dive in: +Puede optar por trabajar en varios archivos, seleccionándolos presionando ``, para seleccionar el archivo actual, o presionando ``, que seleccionará todos los archivos en el directorio de trabajo. +Una vez que un archivo está marcado para su selección, se mostrará con un `*` a la izquierda. +Al trabajar en la selección, solo se procesará el archivo seleccionado para las acciones, mientras que el elemento resaltado actual se ignorará. +También es posible trabajar en varios archivos desde el panel de resultados de búsqueda. +Todas las acciones están disponibles cuando se trabaja con varios archivos, pero tenga en cuenta que algunas acciones funcionan de forma ligeramente diferente. Vamos a sumergirnos en: -- *Copy*: whenever you copy a file, you'll be prompted to insert the destination name. When working with multiple file, this name refers to the destination directory where all these files will be copied. -- *Rename*: same as copy, but will move files there. -- *Save as*: same as copy, but will write them there. +- *Copy*: cada vez que copie un archivo, se le pedirá que inserte el nombre de destino. Cuando se trabaja con varios archivos, este nombre se refiere al directorio de destino donde se copiarán todos estos archivos. +- *Rename*: igual que copiar, pero moverá archivos allí. +- *Save as*: igual que copiar, pero los escribirá allí. -### Synchronized browsing ⏲️ +### Navegación sincronizada ⏲️ -When enabled, synchronized browsing, will allow you to synchronize the navigation between the two panels. -This means that whenever you'll change the working directory on one panel, the same action will be reproduced on the other panel. If you want to enable synchronized browsing just press ``; press twice to disable. While enabled, the synchronized browsing state will be reported on the status bar on `ON`. +Cuando está habilitada, la navegación sincronizada le permitirá sincronizar la navegación entre los dos paneles. +Esto significa que siempre que cambie el directorio de trabajo en un panel, la misma acción se reproducirá en el otro panel. Si desea habilitar la navegación sincronizada, simplemente presione ``; presione dos veces para deshabilitar. Mientras está habilitado, el estado de navegación sincronizada se informará en la barra de estado en "ON". -> ❗ at the moment, whenever you try to access an unexisting directory, you won't be prompted to create it. This might change in a future update. +> ❗ Por el momento, cada vez que intente acceder a un directorio que no existe, no se le pedirá que lo cree. Esto podría cambiar en una actualización futura. -### Open and Open With 🚪 +### Abierta y abierta con 🚪 -Open and open with commands are powered by [open-rs](https://docs.rs/crate/open/1.7.0). -When opening files with View command (``), the system default application for the file type will be used. To do so, the default operting system service will be used, so be sure to have at least one of these installed on your system: +Al abrir archivos con el comando Ver (``), se utilizará la aplicación predeterminada del sistema para el tipo de archivo. Para hacerlo, se utilizará el servicio del sistema operativo predeterminado, así que asegúrese de tener al menos uno de estos instalado en su sistema: -- **Windows** users: you don't have to worry about it, since the crate will use the `start` command. -- **MacOS** users: you don't have to worry either, since the crate will use `open`, which is already installed on your system. -- **Linux** users: one of these should be installed +- Usuarios **Windows**: no tiene que preocuparse por eso, ya que la caja usará el comando `start`. +- Usuarios **MacOS**: tampoco tiene que preocuparse, ya que la caja usará `open`, que ya está instalado en su sistema. +- Usuarios **Linux**: uno de estos debe estar instalado - *xdg-open* - *gio* - *gnome-open* - *kde-open* -- **WSL** users: *wslview* is required, you must install [wslu](https://github.com/wslutilities/wslu). +- Usuarios **WSL**: *wslview* es obligatorio, debe instalar [wslu](https://github.com/wslutilities/wslu). -> Q: Can I edit remote files using the view command? -> A: No, at least not directly from the "remote panel". You have to download it to a local directory first, that's due to the fact that when you open a remote file, the file is downloaded into a temporary directory, but there's no way to create a watcher for the file to check when the program you used to open it was closed, so termscp is not able to know when you're done editing the file. +> Q: ¿Puedo editar archivos remotos usando el comando de vista? +> A: No, al menos no directamente desde el "panel remoto". Primero debe descargarlo en un directorio local, eso se debe al hecho de que cuando abre un archivo remoto, el archivo se descarga en un directorio temporal, pero no hay forma de crear un observador para que el archivo verifique cuándo el programa utilizado para abrirlo estaba cerrado, por lo que termscp no puede saber cuándo ha terminado de editar el archivo. --- -## Bookmarks ⭐ +## Marcadores ⭐ -In termscp it is possible to save favourites hosts, which can be then loaded quickly from the main layout of termscp. -termscp will also save the last 16 hosts you connected to. -This feature allows you to load all the parameters required to connect to a certain remote, simply selecting the bookmark in the tab under the authentication form. +En termscp es posible guardar hosts favoritos, que luego se pueden cargar rápidamente desde el diseño principal de termscp. +termscp también guardará los últimos 16 hosts a los que se conectó. +Esta función le permite cargar todos los parámetros necesarios para conectarse a un determinado control remoto, simplemente seleccionando el marcador en la pestaña debajo del formulario de autenticación. -Bookmarks will be saved, if possible at: +Los marcadores se guardarán, si es posible, en: -- `$HOME/.config/termscp/` on Linux/BSD -- `$HOME/Library/Application Support/termscp` on MacOs -- `FOLDERID_RoamingAppData\termscp\` on Windows +- `$HOME/.config/termscp/` en Linux/BSD +- `$HOME/Library/Application Support/termscp` en MacOs +- `FOLDERID_RoamingAppData\termscp\` en Windows -For bookmarks only (this won't apply to recent hosts) it is also possible to save the password used to authenticate. The password is not saved by default and must be specified through the prompt when saving a new Bookmark. -If you're concerned about the security of the password saved for your bookmarks, please read the [chapter below 👀](#are-my-passwords-safe-). +Solo para marcadores (esto no se aplicará a hosts recientes) también es posible guardar la contraseña utilizada para autenticarse. La contraseña no se guarda de forma predeterminada y debe especificarse a través del indicador al guardar un nuevo marcador. +Si le preocupa la seguridad de la contraseña guardada para sus marcadores, lea el [capítulo siguiente 👀](#are-my-passwords-safe-). -In order to create a new bookmark, just follow these steps: +Para crear un nuevo marcador, simplemente siga estos pasos: -1. Type in the authentication form the parameters to connect to your remote server -2. Press `` -3. Type in the name you want to give to the bookmark -4. Choose whether to remind the password or not -5. Press `` to submit +1. Escriba en el formulario de autenticación los parámetros para conectarse a su servidor remoto +2. Presionar `` +3. Escriba el nombre que desea darle al marcador +4. Elija si recordar la contraseña o no +5. Presionar `` -whenever you want to use the previously saved connection, just press `` to navigate to the bookmarks list and load the bookmark parameters into the form pressing ``. +siempre que desee utilizar la conexión previamente guardada, simplemente presione `` para navegar a la lista de marcadores y cargue los parámetros del marcador en el formulario presionando ``. ![Bookmarks](https://github.com/veeso/termscp/blob/main/assets/images/bookmarks.gif?raw=true) -### Are my passwords Safe 😈 +### ¿Son seguras mis contraseñas? 😈 -Sure 😉. -As said before, bookmarks are saved in your configuration directory along with passwords. Passwords are obviously not plain text, they are encrypted with **AES-128**. Does this make them safe? Absolutely! (except for BSD and WSL users 😢) +Seguro 😉. +Como se dijo antes, los marcadores se guardan en su directorio de configuración junto con las contraseñas. Las contraseñas obviamente no son texto sin formato, están encriptadas con **AES-128**. ¿Esto los hace seguros? ¡Absolutamente! (excepto para usuarios de BSD y WSL 😢) -On **Windows**, **Linux** and **MacOS** the key used to encrypt passwords is stored, if possible (but should be), respectively in the *Windows Vault*, in the *system keyring* and into the *Keychain*. This is actually super-safe and is directly managed by your operating system. +En **Windows**, **Linux** y **MacOS**, la clave utilizada para cifrar las contraseñas se almacena, si es posible (pero debería estar), respectivamente, en *Windows Vault*, en el *anillo de claves del sistema* y en el *Llavero*. Esto es realmente muy seguro y lo administra directamente su sistema operativo. -❗ Please, notice that if you're a Linux user, you'd better to read the [chapter below 👀](#linux-keyring), because the keyring might not be enabled or supported on your system! +❗ Por favor, tenga en cuenta que si es un usuario de Linux, es mejor que lea el [capítulo siguiente 👀](#linux-keyring), ¡porque es posible que el llavero no esté habilitado o no sea compatible con su sistema! -On *BSD* and *WSL*, on the other hand, the key used to encrypt your passwords is stored on your drive (at $HOME/.config/termscp). It is then, still possible to retrieve the key to decrypt passwords. Luckily, the location of the key guarantees your key can't be read by users different from yours, but yeah, I still wouldn't save the password for a server exposed on the internet 😉. +En *BSD* y *WSL*, por otro lado, la clave utilizada para cifrar sus contraseñas se almacena en su disco (en `$HOME/.config/ termscp`). Entonces, todavía es posible recuperar la clave para descifrar las contraseñas. Afortunadamente, la ubicación de la clave garantiza que su clave no pueda ser leída por usuarios diferentes al suyo, pero sí, todavía no guardaría la contraseña para un servidor expuesto en Internet 😉. #### Linux Keyring -We all love Linux thanks to the freedom it gives to the users. You can basically do anything you want as a Linux user, but this has also some cons, such as the fact that often there is no standard applications across different distributions. And this involves keyring too. -This means that on Linux there might be no keyring installed on your system. Unfortunately the library we use to work with the key storage requires a service which exposes `org.freedesktop.secrets` on D-BUS and the worst fact is that there only two services exposing it. +A todos nos encanta Linux gracias a la libertad que ofrece a los usuarios. Básicamente, puede hacer lo que quiera como usuario de Linux, pero esto también tiene algunas desventajas, como el hecho de que a menudo no hay aplicaciones estándar en las diferentes distribuciones. Y esto también implica el llavero. +Esto significa que en Linux puede que no haya un llavero instalado en su sistema. Desafortunadamente, la biblioteca que usamos para trabajar con el almacenamiento de claves requiere un servicio que exponga `org.freedesktop.secrets` en D-BUS y el peor hecho es que solo hay dos servicios que lo exponen. -- ❗ If you use GNOME as desktop environment (e.g. ubuntu users), you should already be fine, since keyring is already provided by `gnome-keyring` and everything should already be working. -- ❗ For other desktop environment users there is a nice program you can use to get a keyring which is [KeepassXC](https://keepassxc.org/), which I use on my Manjaro installation (with KDE) and works fine. The only problem is that you have to setup it to be used along with termscp (but it's quite simple). To get started with KeepassXC read more [here](#keepassxc-setup-for-termscp). -- ❗ What about you don't want to install any of these services? Well, there's no problem! **termscp will keep working as usual**, but it will save the key in a file, as it usually does for BSD and WSL. +- ❗ Si usa GNOME como entorno de escritorio (por ejemplo, usuarios de ubuntu), ya debería estar bien, ya que `gnome-keyring` ya proporciona el llavero y todo debería estar funcionando. +- ❗ Para otros usuarios de entornos de escritorio, hay un buen programa que pueden usar para obtener un llavero que es [KeepassXC](https://keepassxc.org/), que utilizo en mi instalación de Manjaro (con KDE) y funciona bien. El único problema es que debe configurarlo para que se use junto con termscp (pero es bastante simple). Para comenzar con KeepassXC, lea más [aquí](#keepassxc-setup-por-termscp). +- ❗ ¿Qué pasa si no desea instalar ninguno de estos servicios? Bueno, ¡no hay problema! **termscp seguirá funcionando como de costumbre**, pero guardará la clave en un archivo, como suele hacer para BSD y WSL. -##### KeepassXC setup for termscp +##### KeepassXC setup por termscp -Follow these steps in order to setup keepassXC for termscp: +Siga estos pasos para configurar keepassXC para termscp: -1. Install KeepassXC -2. Go to "tools" > "settings" in toolbar -3. Select "Secret service integration" and toggle "Enable KeepassXC freedesktop.org secret service integration" -4. Create a database, if you don't have one yet: from toolbar "Database" > "New database" -5. From toolbar: "Database" > "Database settings" -6. Select "Secret service integration" and toggle "Expose entries under this group" -7. Select the group in the list where you want the termscp secret to be kept. Remember that this group might be used by any other application to store secrets via DBUS. +1. Instalar KeepassXC +2. Vaya a "tools" > "settings" en la barra de herramientas +3. Seleccione "Secret service integration" y abilita "Enable KeepassXC freedesktop.org secret service integration" +4. Cree una base de datos, si aún no tiene una: desde la barra de herramientas "Database" > "New database" +5. Desde la barra de herramientas: "Database" > "Database settings" +6. Seleccione "Secret service integration" y abilita "Expose entries under this group" +7. Seleccione el grupo de la lista donde desea que se mantenga el secreto de termscp. Recuerde que este grupo puede ser utilizado por cualquier otra aplicación para almacenar secretos a través de DBUS. --- -## Aws S3 credentials 🦊 +## Configuración ⚙️ -In order to connect to an Aws S3 bucket you must obviously provide some credentials. -There are basically two ways to achieve this, and as you've probably already noticed you **can't** do that via the authentication form. -So these are the ways you can provide the credentials for s3: +termscp admite algunos parámetros definidos por el usuario, que se pueden definir en la configuración. +Underhood termscp tiene un archivo TOML y algunos otros directorios donde se guardarán todos los parámetros, pero no se preocupe, no tocará ninguno de estos archivos manualmente, ya que hice posible configurar termscp desde su interfaz de usuario por completo. -1. Use your credentials file: just configure the AWS cli via `aws configure` and your credentials should already be located at `~/.aws/credentials`. In case you're using a profile different from `default`, just provide it in the profile field in the authentication form. -2. **Environment variables**: you can always provide your credentials as environment variables. Keep in mind that these credentials **will always override** the credentials located in the `credentials` file. See how to configure the environment below: +termscp, al igual que para los marcadores, solo requiere tener estas rutas accesibles: - These should always be mandatory: +- `$HOME/.config/termscp/` en Linux/BSD +- `$HOME/Library/Application Support/termscp` en MacOs +- `FOLDERID_RoamingAppData\termscp\` en Windows - - `AWS_ACCESS_KEY_ID`: aws access key ID (usually starts with `AKIA...`) - - `AWS_SECRET_ACCESS_KEY`: the secret access key +Para acceder a la configuración, solo tiene que presionar `` desde el inicio de termscp. - In case you've configured a stronger security, you *may* require these too: +Estos parámetros se pueden cambiar: - - `AWS_SECURITY_TOKEN`: security token - - `AWS_SESSION_TOKEN`: session token - -⚠️ Your credentials are safe: termscp won't manipulate these values directly! Your credentials are directly consumed by the **s3** crate. -In case you've got some concern regarding security, please contact the library author on [Github](https://github.com/durch/rust-s3) ⚠️ - ---- - -## Configuration ⚙️ - -termscp supports some user defined parameters, which can be defined in the configuration. -Underhood termscp has a TOML file and some other directories where all the parameters will be saved, but don't worry, you won't touch any of these files manually, since I made possible to configure termscp from its user interface entirely. - -termscp, like for bookmarks, just requires to have these paths accessible: - -- `$HOME/.config/termscp/` on Linux/BSD -- `$HOME/Library/Application Support/termscp` on MacOs -- `FOLDERID_RoamingAppData\termscp\` on Windows - -To access configuration, you just have to press `` from the home of termscp. - -These parameters can be changed: - -- **Text Editor**: the text editor to use. By default termscp will find the default editor for you; with this option you can force an editor to be used (e.g. `vim`). **Also GUI editors are supported**, unless they `nohup` from the parent process so if you ask: yes, you can use `notepad.exe`, and no: **Visual Studio Code doesn't work**. -- **Default Protocol**: the default protocol is the default value for the file transfer protocol to be used in termscp. This applies for the login page and for the address CLI argument. -- **Show Hidden Files**: select whether hidden files shall be displayed by default. You will be able to decide whether to show or not hidden files at runtime pressing `A` anyway. -- **Check for updates**: if set to `yes`, termscp will fetch the Github API to check if there is a new version of termscp available. -- **Prompt when replacing existing files?**: If set to `yes`, termscp will prompt for confirmation you whenever a file transfer would cause an existing file on target host to be replaced. -- **Group Dirs**: select whether directories should be groupped or not in file explorers. If `Display first` is selected, directories will be sorted using the configured method but displayed before files, viceversa if `Display last` is selected. -- **Remote File formatter syntax**: syntax to display file info for each file in the remote explorer. See [File explorer format](#file-explorer-format) -- **Local File formatter syntax**: syntax to display file info for each file in the local explorer. See [File explorer format](#file-explorer-format) -- **Enable notifications?**: If set to `Yes`, notifications will be displayed. -- **Notifications: minimum transfer size**: if transfer size is greater or equal than the specified value, notifications for transfer will be displayed. The accepted values are in format `{UNSIGNED} B/KB/MB/GB/TB/PB` +- **Text Editor**: l editor de texto a utilizar. Por defecto, termscp encontrará el editor predeterminado para usted; con esta opción puede forzar el uso de un editor (por ejemplo, `vim`). **También se admiten los editores de GUI**, a menos que hagan "nohup" del proceso principal. +- **Default Protocol**: el protocolo predeterminado es el valor predeterminado para el protocolo de transferencia de archivos que se utilizará en termscp. Esto se aplica a la página de inicio de sesión y al argumento de la CLI de la dirección. +- **Show Hidden Files**: seleccione si los archivos ocultos se mostrarán de forma predeterminada. Podrás decidir si mostrar o no archivos ocultos en tiempo de ejecución presionando "A" de todos modos. +- **Check for updates**: si se establece en `yes`, termscp buscará la API de Github para comprobar si hay una nueva versión de termscp disponible. +- **Prompt when replacing existing files?**: Si se establece en "sí", termscp le pedirá confirmación cada vez que una transferencia de archivo provoque la sustitución de un archivo existente en el host de destino. +- **Group Dirs**: seleccione si los directorios deben agruparse o no en los exploradores de archivos. Si se selecciona `Display first`, los directorios se ordenarán usando el método configurado pero se mostrarán antes de los archivos, y viceversa si se selecciona`Display last`. +- **Remote File formatter syntax**: sintaxis para mostrar información de archivo para cada archivo en el explorador remoto. Consulte [Formato del explorador de archivos](#formato-del-explorador-de-archivos). +- **Local File formatter syntax**: sintaxis para mostrar información de archivo para cada archivo en el explorador local. Consulte [Formato del explorador de archivos](#formato-del-explorador-de-archivos). +- **Enable notifications?**: Si se establece en "Sí", se mostrarán las notificaciones. +- **Notifications: minimum transfer size**: si el tamaño de la transferencia es mayor o igual que el valor especificado, se mostrarán notificaciones de transferencia. Los valores aceptados están en formato `{UNSIGNED} B/KB/MB/GB/TB/PB` ### SSH Key Storage 🔐 -Along with configuration, termscp provides also an **essential** feature for **SFTP/SCP clients**: the SSH key storage. +Junto con la configuración, termscp también proporciona una característica **esencial** para **clientes SFTP / SCP**: el almacenamiento de claves SSH. -You can access the SSH key storage, from configuration moving to the `SSH Keys` tab, once there you can: +Puede acceder al almacenamiento de claves SSH, desde la configuración pasando a la pestaña `Claves SSH`, una vez allí puede: -- **Add a new key**: just press `` and you will be prompted to create a new key. Provide the hostname/ip address and the username associated to the key and finally a text editor will open up: paste the **PRIVATE** ssh key into the text editor, save and quit. -- **Remove an existing key**: just press `` or `` on the key you want to remove, to delete persistently the key from termscp. -- **Edit an existing key**: just press `` on the key you want to edit, to change the private key. +- **Agregar una nueva clave**: simplemente presione `` y se le pedirá que cree una nueva clave. Proporcione el nombre de host / dirección IP y el nombre de usuario asociado a la clave y finalmente se abrirá un editor de texto: pegue la clave ssh **PRIVATE** en el editor de texto, guarde y salga. +- **Eliminar una clave existente**: simplemente presione `` o `` en la clave que desea eliminar, para eliminar persistentemente la clave de termscp. +- **Editar una clave existente**: simplemente presione `` en la clave que desea editar, para cambiar la clave privada. -> Q: Wait, my private key is protected with password, can I use it? -> A: Of course you can. The password provided for authentication in termscp, is valid both for username/password authentication and for RSA key authentication. +> Q: Mi clave privada está protegida con contraseña, ¿puedo usarla? +> A: Por supuesto que puede. La contraseña proporcionada para la autenticación en termscp es válida tanto para la autenticación de nombre de usuario / contraseña como para la autenticación de clave RSA. -### File Explorer Format +### Formato del explorador de archivos -It is possible through configuration to define a custom format for the file explorer. This is possible both for local and remote host, so you can have two different syntax in use. These fields, with name `File formatter syntax (local)` and `File formatter syntax (remote)` will define how the file entries will be displayed in the file explorer. -The syntax for the formatter is the following `{KEY1}... {KEY2:LENGTH}... {KEY3:LENGTH:EXTRA} {KEYn}...`. -Each key in bracket will be replaced with the related attribute, while everything outside brackets will be left unchanged. +Es posible a través de la configuración definir un formato personalizado para el explorador de archivos. Esto es posible tanto para el host local como para el remoto, por lo que puede tener dos sintaxis diferentes en uso. Estos campos, con el nombre `File formatter syntax (local)` y `File formatter syntax (remote)` definirán cómo se mostrarán las entradas del archivo en el explorador de archivos. +La sintaxis del formateador es la siguiente `{KEY1} ... {KEY2:LENGTH} ... {KEY3:LENGTH:EXTRA} {KEYn} ...`. +Cada clave entre corchetes se reemplazará con el atributo relacionado, mientras que todo lo que esté fuera de los corchetes se dejará sin cambios. -- The key name is mandatory and must be one of the keys below -- The length describes the length reserved to display the field. Static attributes doesn't support this (GROUP, PEX, SIZE, USER) -- Extra is supported only by some parameters and is an additional options. See keys to check if extra is supported. +- El nombre de la clave es obligatorio y debe ser una de las claves siguientes +- La longitud describe la longitud reservada para mostrar el campo. Los atributos estáticos no admiten esto (GROUP, PEX, SIZE, USER) +- Extra es compatible solo con algunos parámetros y es una opción adicional. Consulte las claves para comprobar si se admite extra. -These are the keys supported by the formatter: +Estas son las claves admitidas por el formateador: -- `ATIME`: Last access time (with default syntax `%b %d %Y %H:%M`); Extra might be provided as the time syntax (e.g. `{ATIME:8:%H:%M}`) -- `CTIME`: Creation time (with syntax `%b %d %Y %H:%M`); Extra might be provided as the time syntax (e.g. `{CTIME:8:%H:%M}`) -- `GROUP`: Owner group -- `MTIME`: Last change time (with syntax `%b %d %Y %H:%M`); Extra might be provided as the time syntax (e.g. `{MTIME:8:%H:%M}`) -- `NAME`: File name (Elided if longer than LENGTH) -- `PEX`: File permissions (UNIX format) -- `SIZE`: File size (omitted for directories) -- `SYMLINK`: Symlink (if any `-> {FILE_PATH}`) -- `USER`: Owner user +- `ATIME`: Hora del último acceso (con la sintaxis predeterminada`%b %d %Y %H:%M`); Se puede proporcionar un extra como la sintaxis de tiempo (por ejemplo, "{ATIME: 8:% H:% M}") +- `CTIME`: Hora de creación (con sintaxis`%b %d %Y %H:%M`); Se puede proporcionar un extra como sintaxis de tiempo (p. Ej., `{CTIME:8:%H:%M}`) +- `GROUP`: Grupo propietario +- `MTIME`: Hora del último cambio (con sintaxis`%b %d %Y %H:%M`); Se puede proporcionar extra como sintaxis de tiempo (p. Ej., `{MTIME: 8:% H:% M}`) +- `NAME`: nombre de archivo (se omite si es más largo que LENGTH) +- `PEX`: permisos de archivo (formato UNIX) +- `SIZE`: Tamaño del archivo (se omite para directorios) +- `SYMLINK`: Symlink (si existe` -> {FILE_PATH} `) +- `USER`: Usuario propietario -If left empty, the default formatter syntax will be used: `{NAME:24} {PEX} {USER} {SIZE} {MTIME:17:%b %d %Y %H:%M}` +Si se deja vacío, se utilizará la sintaxis del formateador predeterminada: `{NAME:24} {PEX} {USER} {SIZE} {MTIME:17:%b %d %Y %H:%M}` --- -## Themes 🎨 +## Temas 🎨 -Termscp provides you with an awesome feature: the possibility to set the colors for several components in the application. -If you want to customize termscp there are two available ways to do so: +Termscp le ofrece una característica asombrosa: la posibilidad de configurar los colores para varios componentes de la aplicación. +Si desea personalizar termscp, hay dos formas disponibles de hacerlo: -- From the **configuration menu** -- Importing a **theme file** +- Desde el **menú de configuración** +- Importando un **archivo de tema** -In order to create your own customization from termscp, all you have to do so is to enter the configuration from the auth activity, pressing `` and then `` twice. You should have now moved to the `themes` panel. +Para crear su propia personalización desde termscp, todo lo que tiene que hacer es ingresar a la configuración desde la actividad de autenticación, presionando `` y luego `` dos veces. Deberías haberte movido ahora al panel de `temas`. -Here you can move with `` and `` to change the style you want to change, as shown in the gif below: +Aquí puede moverse con `` y `` para cambiar el estilo que desea cambiar, como se muestra en el siguiente gif: ![Themes](https://github.com/veeso/termscp/blob/main/assets/images/themes.gif?raw=true) -termscp supports both the traditional explicit hex (`#rrggbb`) and rgb `rgb(r, g, b)` syntax to provide colors, but also **[css colors](https://www.w3schools.com/cssref/css_colors.asp)** (such as `crimson`) are accepted 😉. There is also a special keywork which is `Default`. Default means that the color used will be the default foreground or background color based on the situation (foreground for texts and lines, background for well, guess what). +termscp admite la sintaxis tradicional hexadecimal explícita (`#rrggbb`) y rgb `rgb(r, g, b)` para proporcionar colores, pero se aceptan también **[colores css](https://www.w3schools.com/cssref/css_colors.asp)** (como `crimson`) 😉. También hay un teclado especial que es `Default`. Predeterminado significa que el color utilizado será el color de primer plano o de fondo predeterminado según la situación (primer plano para textos y líneas, fondo para bien, adivinen qué). -As said before, you can also import theme files. You can take inspiration from or directly use one of the themes provided along with termscp, located in the `themes/` directory of this repository and import them running termscp as `termscp -t `. If everything was fine, it should tell you the theme has successfully been imported. +Como se dijo antes, también puede importar archivos de temas. Puede inspirarse o utilizar directamente uno de los temas proporcionados junto con termscp, ubicado en el directorio `themes/` de este repositorio e importarlos ejecutando termscp como `termscp -t `. Si todo estuvo bien, debería decirle que el tema se ha importado correctamente. -### My theme won't load 😱 +### Mi tema no se carga 😱 -This is probably due to a recent update which has broken the theme. Whenever I add a new key to themes, the saved theme won't load. To fix this issues there are two really quick-fix solutions: +Esto probablemente se deba a una actualización reciente que ha roto el tema. Siempre que agrego una nueva clave a los temas, el tema guardado no se carga. Para solucionar este problema, existen dos soluciones realmente rápidas: -1. Reload theme: whenever I release an update I will also patch the "official" themes, so you just have to download it from the repository again and re-import the theme via `-t` option +1. Recargar tema: cada vez que publique una actualización, también parchearé los temas "oficiales", por lo que solo tiene que descargarlo del repositorio nuevamente y volver a importar el tema a través de la opción `-t` ```sh termscp -t ``` -2. Fix your theme: If you're using a custom theme, then you can edit via `vim` and add the missing key. The theme is located at `$CONFIG_DIR/termscp/theme.toml` where `$CONFIG_DIR` is: +2. Corrija su tema: si está utilizando un tema personalizado, puede editarlo a través de `vim` y agregar la clave que falta. El tema se encuentra en `$CONFIG_DIR/termscp/theme.toml` donde `$CONFIG_DIR` es: - FreeBSD/GNU-Linux: `$HOME/.config/` - MacOs: `$HOME/Library/Application Support` - Windows: `%appdata%` - ❗ Missing keys are reported in the CHANGELOG under `BREAKING CHANGES` for the version you've just installed. + ❗ Las claves que faltan se informan en el CAMBIO en `BREAKING CHANGES` para la versión que acaba de instalar. -### Styles 💈 +### Estilos 💈 -You can find in the table below, the description for each style field. -Please, notice that **styles won't apply to configuration page**, in order to make it always accessible in case you mess everything up +Puede encontrar en la tabla siguiente la descripción de cada campo de estilo. +Tenga en cuenta que **los estilos no se aplicarán a la página de configuración**, para que sea siempre accesible en caso de que lo estropee todo #### Authentication page @@ -435,52 +436,52 @@ These styles applie to different part of the application. ## Text Editor ✏ -termscp has, as you might have noticed, many features, one of these is the possibility to view and edit text file. It doesn't matter if the file is located on the local host or on the remote host, termscp provides the possibility to open a file in your favourite text editor. -In case the file is located on remote host, the file will be first downloaded into your temporary file directory and then, **only** if changes were made to the file, re-uploaded to the remote host. termscp checks if you made changes to the file verifying the last modification time of the file. +termscp tiene, como habrás notado, muchas características, una de ellas es la posibilidad de ver y editar archivos de texto. No importa si el archivo está ubicado en el host local o en el host remoto, termscp brinda la posibilidad de abrir un archivo en su editor de texto favorito. +En caso de que el archivo esté ubicado en un host remoto, el archivo se descargará primero en su directorio de archivos temporales y luego, **solo** si se realizaron cambios en el archivo, se volverá a cargar en el host remoto. termscp comprueba si realizó cambios en el archivo verificando la última hora de modificación del archivo. -Just a reminder: **you can edit only textual file**; binary files are not supported. +> ❗ Just a reminder: **you can edit only textual file**; binary files are not supported. --- ## Logging 🩺 -termscp writes a log file for each session, which is written at +termscp escribe un archivo de registro para cada sesión, que se escribe en -- `$HOME/.config/termscp/termscp.log` on Linux/BSD -- `$HOME/Library/Application Support/termscp/termscp.log` on MacOs -- `FOLDERID_RoamingAppData\termscp\termscp.log` on Windows +- `$HOME/.config/termscp/termscp.log` en Linux/BSD +- `$HOME/Library/Application Support/termscp/termscp.log` en MacOs +- `FOLDERID_RoamingAppData\termscp\termscp.log` en Windows -the log won't be rotated, but will just be truncated after each launch of termscp, so if you want to report an issue and you want to attach your log file, keep in mind to save the log file in a safe place before using termscp again. -The log file always reports in *trace* level, so it is kinda verbose. -I know you might have some questions regarding log files, so I made a kind of a Q/A: +el registro no se rotará, sino que se truncará después de cada lanzamiento de termscp, por lo que si desea informar un problema y desea adjuntar su archivo de registro, recuerde guardar el archivo de registro en un lugar seguro antes de usar termscp de nuevo. +El archivo de registro siempre informa en el nivel de *seguimiento*, por lo que es un poco detallado. +Sé que es posible que tenga algunas preguntas sobre los archivos de registro, así que hice una especie de Q/A: -> Is it possible to reduce verbosity? +> ¿Es posible reducir la verbosidad? -No. The reason is quite simple: when an issue happens, you must be able to know what's causing it and the only way to do that, is to have the log file with the maximum verbosity level set. +No. La razón es bastante simple: cuando ocurre un problema, debe poder saber qué lo está causando y la única forma de hacerlo es tener el archivo de registro con el nivel de verbosidad máximo establecido. -> If trace level is set for logging, is the file going to reach a huge size? +> Si el nivel de seguimiento está configurado para el registro, ¿el archivo alcanzará un tamaño enorme? -Probably not, unless you never quit termscp, but I think that's unlikely to happen. A long session may produce up to 10MB of log files (I said a long session), but I think a normal session won't exceed 2MB. +Probablemente no, a menos que nunca cerra termscp, pero creo que es poco probable que eso suceda. Una sesión larga puede producir hasta 10 MB de archivos de registro (dije una sesión larga), pero creo que una sesión normal no excederá los 2 MB. -> I don't want logging, can I turn it off? +> No quiero el registro, ¿puedo apagarlo? -Yes, you can. Just start termscp with `-q or --quiet` option. You can alias termscp to make it persistent. Remember that logging is used to diagnose issues, so since behind every open source project, there should always be this kind of mutual help, keeping log files might be your way to support the project 😉. I don't want you to feel guilty, but just to say. +Sí tu puedes. Simplemente inicie termscp con la opción `-q o --quiet`. Puede alias termscp para que sea persistente. Recuerde que el registro se usa para diagnosticar problemas, por lo que, dado que detrás de cada proyecto de código abierto, siempre debe haber este tipo de ayuda mutua, mantener los archivos de registro puede ser su forma de respaldar el proyecto 😉. -> Is logging safe? +> ¿Es seguro el registro? -If you're concerned about security, the log file doesn't contain any plain password, so don't worry and exposes the same information the sibling file `bookmarks` reports. +Si le preocupa la seguridad, el archivo de registro no contiene ninguna contraseña simple, así que no se preocupe y expone la misma información que informa el archivo hermano `marcadores`. -## Notifications 📫 +## Notificaciones 📫 -Termscp will send Desktop notifications for these kind of events: +Termscp enviará notificaciones de escritorio para este tipo de eventos: -- on **Transfer completed**: The notification will be sent once a transfer has been successfully completed. - - ❗ The notification will be displayed only if the transfer total size is at least the specified `Notifications: minimum transfer size` in the configuration. -- on **Transfer failed**: The notification will be sent once a transfer has failed due to an error. - - ❗ The notification will be displayed only if the transfer total size is at least the specified `Notifications: minimum transfer size` in the configuration. -- on **Update available**: Whenever a new version of termscp is available, a notification will be displayed. -- on **Update installed**: Whenever a new version of termscp has been installed, a notification will be displayed. -- on **Update failed**: Whenever the installation of the update fails, a notification will be displayed. +- en **Transferencia completada**: la notificación se enviará una vez que la transferencia se haya completado con éxito. + - ❗ La notificación se mostrará solo si el tamaño total de la transferencia es al menos el `Notifications: minimum transfer size` especificado en la configuración. +- en **Transferencia fallida**: la notificación se enviará una vez que la transferencia haya fallado debido a un error. + - ❗ La notificación se mostrará solo si el tamaño total de la transferencia es al menos el `Notifications: minimum transfer size` especificado en la configuración. +- en **Actualización disponible**: siempre que haya una nueva versión de termscp disponible, se mostrará una notificación. +- en **Actualización instalada**: siempre que se haya instalado una nueva versión de termscp, se mostrará una notificación. +- en **Actualización fallida**: siempre que falle la instalación de la actualización, se mostrará una notificación. -❗ If you prefer to keep notifications turned off, you can just enter setup and set `Enable notifications?` to `No` 😉. -❗ If you want to change the minimum transfer size to display notifications, you can change the value in the configuration with key `Notifications: minimum transfer size` and set it to whatever suits better for you 🙂. +❗ Si prefiere mantener las notificaciones desactivadas, puede simplemente ingresar a la configuración y configurar `Enable notifications?` En `No` 😉. +❗ Si desea cambiar el tamaño mínimo de transferencia para mostrar notificaciones, puede cambiar el valor en la configuración con la tecla `Notifications: minimum transfer size` y configurarlo como mejor le convenga 🙂. diff --git a/docs/fr/man.md b/docs/fr/man.md index bd130fd..c77f3ad 100644 --- a/docs/fr/man.md +++ b/docs/fr/man.md @@ -2,89 +2,89 @@ - [User manual 🎓](#user-manual-) - [Usage ❓](#usage-) - - [Address argument 🌎](#address-argument-) - - [AWS S3 address argument](#aws-s3-address-argument) - - [How Password can be provided 🔐](#how-password-can-be-provided-) - - [File explorer 📂](#file-explorer-) - - [Keybindings ⌨](#keybindings-) - - [Work on multiple files 🥷](#work-on-multiple-files-) - - [Synchronized browsing ⏲️](#synchronized-browsing-️) - - [Open and Open With 🚪](#open-and-open-with-) - - [Bookmarks ⭐](#bookmarks-) - - [Are my passwords Safe 😈](#are-my-passwords-safe-) + - [Argument d'adresse 🌎](#argument-dadresse-) + - [Argument d'adresse AWS S3](#argument-dadresse-aws-s3) + - [Comment le mot de passe peut être fourni 🔐](#comment-le-mot-de-passe-peut-être-fourni-) + - [Identifiants AWS S3 🦊](#identifiants-aws-s3-) + - [Explorateur de fichiers 📂](#explorateur-de-fichiers-) + - [Raccourcis clavier ⌨](#raccourcis-clavier-) + - [Travailler sur plusieurs fichiers 🥷](#travailler-sur-plusieurs-fichiers-) + - [Navigation synchronisée ⏲️](#navigation-synchronisée-️) + - [Ouvrir et ouvrir avec 🚪](#ouvrir-et-ouvrir-avec-) + - [Signets ⭐](#signets-) + - [Mes mots de passe sont-ils sûrs 😈](#mes-mots-de-passe-sont-ils-sûrs-) - [Linux Keyring](#linux-keyring) - - [KeepassXC setup for termscp](#keepassxc-setup-for-termscp) - - [Aws S3 credentials 🦊](#aws-s3-credentials-) + - [Configuration de KeepassXC pour termscp](#configuration-de-keepassxc-pour-termscp) - [Configuration ⚙️](#configuration-️) - [SSH Key Storage 🔐](#ssh-key-storage-) - - [File Explorer Format](#file-explorer-format) - - [Themes 🎨](#themes-) - - [My theme won't load 😱](#my-theme-wont-load-) - - [Styles 💈](#styles-) + - [Format de l'explorateur de fichiers](#format-de-lexplorateur-de-fichiers) + - [Thèmes 🎨](#thèmes-) + - [Mon thème ne se charge pas 😱](#mon-thème-ne-se-charge-pas-) + - [Modes 💈](#modes-) - [Authentication page](#authentication-page) - [Transfer page](#transfer-page) - [Misc](#misc) - - [Text Editor ✏](#text-editor-) - - [Logging 🩺](#logging-) + - [Éditeur de texte ✏](#éditeur-de-texte-) + - [Enregistrement 🩺](#enregistrement-) - [Notifications 📫](#notifications-) ## Usage ❓ -termscp can be started with the following options: +termscp peut être démarré avec les options suivantes : `termscp [options]... [protocol://user@address:port:wrkdir] [local-wrkdir]` -- `-P, --password ` if address is provided, password will be this argument -- `-c, --config` Open termscp starting from the configuration page -- `-q, --quiet` Disable logging -- `-t, --theme ` Import specified theme -- `-u, --update` Update termscp to latest version -- `-v, --version` Print version info -- `-h, --help` Print help page +- `-P, --password ` si l'adresse est fournie, le mot de passe sera cet argument +- `-c, --config` Ouvrir termscp à partir de la page de configuration +- `-q, --quiet` Désactiver la journalisation +- `-t, --theme ` Importer le thème spécifié +- `-u, --update` Mettre à jour termscp vers la dernière version +- `-v, --version` Imprimer les informations sur la version +- `-h, --help` Imprimer la page d'aide -termscp can be started in two different mode, if no extra arguments is provided, termscp will show the authentication form, where the user will be able to provide the parameters required to connect to the remote peer. +termscp peut être démarré dans deux modes différents, si aucun argument supplémentaire n'est fourni, termscp affichera le formulaire d'authentification, où l'utilisateur pourra fournir les paramètres requis pour se connecter au pair distant. -Alternatively, the user can provide an address as argument to skip the authentication form and starting directly the connection to the remote server. +Alternativement, l'utilisateur peut fournir une adresse comme argument pour ignorer le formulaire d'authentification et démarrer directement la connexion au serveur distant. -If address argument is provided you can also provide the start working directory for local host +Si l'argument d'adresse est fourni, vous pouvez également fournir le répertoire de démarrage de l'hôte local -### Address argument 🌎 +### Argument d'adresse 🌎 -The address argument has the following syntax: +L'argument adresse a la syntaxe suivante : ```txt -[protocol://][username@]
[:port][:wrkdir] +[protocole://][nom-utilisateur@][:port][:wrkdir] ``` -Let's see some example of this particular syntax, since it's very comfortable and you'll probably going to use this instead of the other one... +Voyons un exemple de cette syntaxe particulière, car elle est très confortable et vous allez probablement l'utiliser à la place de l'autre... -- Connect using default protocol (*defined in configuration*) to 192.168.1.31, port if not provided is default for the selected protocol (in this case depends on your configuration); username is current user's name +- Se connecter en utilisant le protocole par défaut (*défini dans la configuration*) à 192.168.1.31, le port s'il n'est pas fourni est par défaut pour le protocole sélectionné (dans ce cas dépend de votre configuration) ; nom d'utilisateur est le nom de l'utilisateur actuel ```sh termscp 192.168.1.31 ``` -- Connect using default protocol (*defined in configuration*) to 192.168.1.31; username is `root` +- Se connecter en utilisant le protocole par défaut (*défini dans la configuration*) à 192.168.1.31 ; le nom d'utilisateur est "root" ```sh termscp root@192.168.1.31 ``` -- Connect using scp to 192.168.1.31, port is 4022; username is `omar` +- Se connecter en utilisant scp à 192.168.1.31, le port est 4022 ; le nom d'utilisateur est "omar" ```sh termscp scp://omar@192.168.1.31:4022 ``` -- Connect using scp to 192.168.1.31, port is 4022; username is `omar`. You will start in directory `/tmp` +- Se connecter en utilisant scp à 192.168.1.31, le port est 4022 ; le nom d'utilisateur est "omar". Vous commencerez dans le répertoire `/tmp` ```sh termscp scp://omar@192.168.1.31:4022:/tmp ``` -#### AWS S3 address argument +#### Argument d'adresse AWS S3 -Aws S3 has a different syntax for CLI address argument, for obvious reasons, but I managed to keep it the more similar as possible to the generic address argument: +Aws S3 a une syntaxe différente pour l'argument d'adresse CLI, pour des raisons évidentes, mais j'ai réussi à le garder le plus similaire possible à l'argument d'adresse générique : ```txt s3://@[:profile][:/wrkdir] @@ -96,326 +96,325 @@ e.g. s3://buckethead@eu-central-1:default:/assets ``` -#### How Password can be provided 🔐 +#### Comment le mot de passe peut être fourni 🔐 -You have probably noticed, that, when providing the address as argument, there's no way to provide the password. -Password can be basically provided through 3 ways when address argument is provided: +Vous avez probablement remarqué que, lorsque vous fournissez l'adresse comme argument, il n'y a aucun moyen de fournir le mot de passe. +Le mot de passe peut être fourni de 3 manières lorsque l'argument d'adresse est fourni : -- `-P, --password` option: just use this CLI option providing the password. I strongly unrecommend this method, since it's very unsecure (since you might keep the password in the shell history) -- Via `sshpass`: you can provide password via `sshpass`, e.g. `sshpass -f ~/.ssh/topsecret.key termscp cvisintin@192.168.1.31` -- You will be prompted for it: if you don't use any of the previous methods, you will be prompted for the password, as happens with the more classics tools such as `scp`, `ssh`, etc. +- `-P, --password` option : utilisez simplement cette option CLI en fournissant le mot de passe. Je déconseille fortement cette méthode, car elle n'est pas sécurisée (puisque vous pouvez conserver le mot de passe dans l'historique du shell) +- Avec `sshpass`: vous pouvez fournir un mot de passe via `sshpass`, par ex. `sshpass -f ~/.ssh/topsecret.key termscp cvisintin@192.168.1.31` +- Il vous sera demandé : si vous n'utilisez aucune des méthodes précédentes, le mot de passe vous sera demandé, comme c'est le cas avec les outils plus classiques tels que `scp`, `ssh`, etc. --- -## File explorer 📂 +## Identifiants AWS S3 🦊 -When we refer to file explorers in termscp, we refer to the panels you can see after establishing a connection with the remote. -These panels are basically 3 (yes, three actually): +Afin de vous connecter à un compartiment Aws S3, vous devez évidemment fournir des informations d'identification. +Il existe essentiellement deux manières d'y parvenir, et comme vous l'avez probablement déjà remarqué, vous ne pouvez **pas** le faire via le formulaire d'authentification. +Voici donc les moyens de fournir les informations d'identification pour s3 : -- Local explorer panel: it is displayed on the left of your screen and shows the current directory entries for localhost -- Remote explorer panel: it is displayed on the right of your screen and shows the current directory entries for the remote host. -- Find results panel: depending on where you're searching for files (local/remote) it will replace the local or the explorer panel. This panel shows the entries matching the search query you performed. +1. Utilisez votre fichier d'informations d'identification : configurez simplement l'AWS cli via `aws configure` et vos informations d'identification doivent déjà se trouver dans `~/.aws/credentials`. Si vous utilisez un profil différent de "default", fournissez-le simplement dans le champ profile du formulaire d'authentification. +2. **Variables d'environnement** : vous pouvez toujours fournir vos informations d'identification en tant que variables d'environnement. Gardez à l'esprit que ces informations d'identification **remplaceront toujours** les informations d'identification situées dans le fichier « credentials ». Voir comment configurer l'environnement ci-dessous : -In order to change panel you need to type `` to move the remote explorer panel and `` to move back to the local explorer panel. Whenever you are in the find results panel, you need to press `` to exit panel and go back to the previous panel. + Ceux-ci devraient toujours être obligatoires: -### Keybindings ⌨ + - `AWS_ACCESS_KEY_ID`: aws access key ID (commence généralement par `AKIA...`) + - `AWS_SECRET_ACCESS_KEY`: la secret access key -| Key | Command | Reminder | -|---------------|-------------------------------------------------------|-------------| -| `` | Disconnect from remote; return to authentication page | | -| `` | Switch between log tab and explorer | | -| `` | Go to previous directory in stack | | -| `` | Move to remote explorer tab | | -| `` | Move to local explorer tab | | -| `` | Move up in selected list | | -| `` | Move down in selected list | | -| `` | Move up in selected list by 8 rows | | -| `` | Move down in selected list by 8 rows | | -| `` | Enter directory | | -| `` | Upload / download selected file | | -| `` | Toggle hidden files | All | -| `` | Sort files by | Bubblesort? | -| `` | Copy file/directory | Copy | -| `` | Make directory | Directory | -| `` | Delete file (Same as `DEL`) | Erase | -| `` | Search for files (wild match is supported) | Find | -| `` | Go to supplied path | Go to | -| `` | Show help | Help | -| `` | Show info about selected file or directory | Info | -| `` | Reload current directory's content / Clear selection | List | -| `` | Select a file | Mark | -| `` | Create new file with provided name | New | -| `` | Edit file; see Text editor | Open | -| `` | Quit termscp | Quit | -| `` | Rename file | Rename | -| `` | Save file as... | Save | -| `` | Go to parent directory | Upper | -| `` | Open file with default program for filetype | View | -| `` | Open file with provided program | With | -| `` | Execute a command | eXecute | -| `` | Toggle synchronized browsing | sYnc | -| `` | Delete file | | -| `` | Select all files | | -| `` | Abort file transfer process | | - -### Work on multiple files 🥷 - -You can opt to work on multiple files, selecting them pressing ``, in order to select the current file, or pressing ``, which will select all the files in the working directory. -Once a file is marked for selection, it will be displayed with a `*` on the left. -When working on selection, only selected file will be processed for actions, while the current highlighted item will be ignored. -It is possible to work on multiple files also when in the find result panel. -All the actions are available when working with multiple files, but be aware that some actions work in a slightly different way. Let's dive in: - -- *Copy*: whenever you copy a file, you'll be prompted to insert the destination name. When working with multiple file, this name refers to the destination directory where all these files will be copied. -- *Rename*: same as copy, but will move files there. -- *Save as*: same as copy, but will write them there. - -### Synchronized browsing ⏲️ - -When enabled, synchronized browsing, will allow you to synchronize the navigation between the two panels. -This means that whenever you'll change the working directory on one panel, the same action will be reproduced on the other panel. If you want to enable synchronized browsing just press ``; press twice to disable. While enabled, the synchronized browsing state will be reported on the status bar on `ON`. - -> ❗ at the moment, whenever you try to access an unexisting directory, you won't be prompted to create it. This might change in a future update. - -### Open and Open With 🚪 - -Open and open with commands are powered by [open-rs](https://docs.rs/crate/open/1.7.0). -When opening files with View command (``), the system default application for the file type will be used. To do so, the default operting system service will be used, so be sure to have at least one of these installed on your system: - -- **Windows** users: you don't have to worry about it, since the crate will use the `start` command. -- **MacOS** users: you don't have to worry either, since the crate will use `open`, which is already installed on your system. -- **Linux** users: one of these should be installed - - *xdg-open* - - *gio* - - *gnome-open* - - *kde-open* -- **WSL** users: *wslview* is required, you must install [wslu](https://github.com/wslutilities/wslu). - -> Q: Can I edit remote files using the view command? -> A: No, at least not directly from the "remote panel". You have to download it to a local directory first, that's due to the fact that when you open a remote file, the file is downloaded into a temporary directory, but there's no way to create a watcher for the file to check when the program you used to open it was closed, so termscp is not able to know when you're done editing the file. - ---- - -## Bookmarks ⭐ - -In termscp it is possible to save favourites hosts, which can be then loaded quickly from the main layout of termscp. -termscp will also save the last 16 hosts you connected to. -This feature allows you to load all the parameters required to connect to a certain remote, simply selecting the bookmark in the tab under the authentication form. - -Bookmarks will be saved, if possible at: - -- `$HOME/.config/termscp/` on Linux/BSD -- `$HOME/Library/Application Support/termscp` on MacOs -- `FOLDERID_RoamingAppData\termscp\` on Windows - -For bookmarks only (this won't apply to recent hosts) it is also possible to save the password used to authenticate. The password is not saved by default and must be specified through the prompt when saving a new Bookmark. -If you're concerned about the security of the password saved for your bookmarks, please read the [chapter below 👀](#are-my-passwords-safe-). - -In order to create a new bookmark, just follow these steps: - -1. Type in the authentication form the parameters to connect to your remote server -2. Press `` -3. Type in the name you want to give to the bookmark -4. Choose whether to remind the password or not -5. Press `` to submit - -whenever you want to use the previously saved connection, just press `` to navigate to the bookmarks list and load the bookmark parameters into the form pressing ``. - -![Bookmarks](https://github.com/veeso/termscp/blob/main/assets/images/bookmarks.gif?raw=true) - -### Are my passwords Safe 😈 - -Sure 😉. -As said before, bookmarks are saved in your configuration directory along with passwords. Passwords are obviously not plain text, they are encrypted with **AES-128**. Does this make them safe? Absolutely! (except for BSD and WSL users 😢) - -On **Windows**, **Linux** and **MacOS** the key used to encrypt passwords is stored, if possible (but should be), respectively in the *Windows Vault*, in the *system keyring* and into the *Keychain*. This is actually super-safe and is directly managed by your operating system. - -❗ Please, notice that if you're a Linux user, you'd better to read the [chapter below 👀](#linux-keyring), because the keyring might not be enabled or supported on your system! - -On *BSD* and *WSL*, on the other hand, the key used to encrypt your passwords is stored on your drive (at $HOME/.config/termscp). It is then, still possible to retrieve the key to decrypt passwords. Luckily, the location of the key guarantees your key can't be read by users different from yours, but yeah, I still wouldn't save the password for a server exposed on the internet 😉. - -#### Linux Keyring - -We all love Linux thanks to the freedom it gives to the users. You can basically do anything you want as a Linux user, but this has also some cons, such as the fact that often there is no standard applications across different distributions. And this involves keyring too. -This means that on Linux there might be no keyring installed on your system. Unfortunately the library we use to work with the key storage requires a service which exposes `org.freedesktop.secrets` on D-BUS and the worst fact is that there only two services exposing it. - -- ❗ If you use GNOME as desktop environment (e.g. ubuntu users), you should already be fine, since keyring is already provided by `gnome-keyring` and everything should already be working. -- ❗ For other desktop environment users there is a nice program you can use to get a keyring which is [KeepassXC](https://keepassxc.org/), which I use on my Manjaro installation (with KDE) and works fine. The only problem is that you have to setup it to be used along with termscp (but it's quite simple). To get started with KeepassXC read more [here](#keepassxc-setup-for-termscp). -- ❗ What about you don't want to install any of these services? Well, there's no problem! **termscp will keep working as usual**, but it will save the key in a file, as it usually does for BSD and WSL. - -##### KeepassXC setup for termscp - -Follow these steps in order to setup keepassXC for termscp: - -1. Install KeepassXC -2. Go to "tools" > "settings" in toolbar -3. Select "Secret service integration" and toggle "Enable KeepassXC freedesktop.org secret service integration" -4. Create a database, if you don't have one yet: from toolbar "Database" > "New database" -5. From toolbar: "Database" > "Database settings" -6. Select "Secret service integration" and toggle "Expose entries under this group" -7. Select the group in the list where you want the termscp secret to be kept. Remember that this group might be used by any other application to store secrets via DBUS. - ---- - -## Aws S3 credentials 🦊 - -In order to connect to an Aws S3 bucket you must obviously provide some credentials. -There are basically two ways to achieve this, and as you've probably already noticed you **can't** do that via the authentication form. -So these are the ways you can provide the credentials for s3: - -1. Use your credentials file: just configure the AWS cli via `aws configure` and your credentials should already be located at `~/.aws/credentials`. In case you're using a profile different from `default`, just provide it in the profile field in the authentication form. -2. **Environment variables**: you can always provide your credentials as environment variables. Keep in mind that these credentials **will always override** the credentials located in the `credentials` file. See how to configure the environment below: - - These should always be mandatory: - - - `AWS_ACCESS_KEY_ID`: aws access key ID (usually starts with `AKIA...`) - - `AWS_SECRET_ACCESS_KEY`: the secret access key - - In case you've configured a stronger security, you *may* require these too: + Au cas où vous auriez configuré une sécurité renforcée, vous *pourriez* également en avoir besoin : - `AWS_SECURITY_TOKEN`: security token - `AWS_SESSION_TOKEN`: session token -⚠️ Your credentials are safe: termscp won't manipulate these values directly! Your credentials are directly consumed by the **s3** crate. -In case you've got some concern regarding security, please contact the library author on [Github](https://github.com/durch/rust-s3) ⚠️ +⚠️ Vos identifiants sont en sécurité : les termscp ne manipuleront pas ces valeurs directement ! Vos identifiants sont directement consommés par la caisse **s3**. +Si vous avez des inquiétudes concernant la sécurité, veuillez contacter l'auteur de la bibliothèque sur [Github](https://github.com/durch/rust-s3) ⚠️ + +--- + +## Explorateur de fichiers 📂 + +Lorsque nous nous référons aux explorateurs de fichiers en termscp, nous nous référons aux panneaux que vous pouvez voir après avoir établi une connexion avec la télécommande. +Ces panneaux sont essentiellement 3 (oui, trois en fait): + +- Panneau de l'explorateur local : il s'affiche sur la gauche de votre écran et affiche les entrées du répertoire en cours pour localhost +- Panneau de l'explorateur distant : il s'affiche à droite de votre écran et affiche les entrées du répertoire en cours pour l'hôte distant. +- Panneau de résultats de recherche : selon l'endroit où vous recherchez des fichiers (local/distant), il remplacera le panneau local ou l'explorateur. Ce panneau affiche les entrées correspondant à la requête de recherche que vous avez effectuée. + +Pour changer de panneau, vous devez taper `` pour déplacer le panneau de l'explorateur distant et `` pour revenir au panneau de l'explorateur local. Chaque fois que vous êtes dans le panneau des résultats de recherche, vous devez appuyer sur `` pour quitter le panneau et revenir au panneau précédent. + +### Raccourcis clavier ⌨ + +| Key | Command | Reminder | +|---------------|---------------------------------------------------------------------|-------------| +| `` | Se Déconnecter de le serveur; retour à la page d'authentification | | +| `` | Basculer entre l'onglet journal et l'explorateur | | +| `` | Aller au répertoire précédent dans la pile | | +| `` | Déplacer vers l'onglet explorateur distant | | +| `` | Déplacer vers l'onglet explorateur local | | +| `` | Remonter dans la liste sélectionnée | | +| `` | Descendre dans la liste sélectionnée | | +| `` | Remonter dans la liste sélectionnée de 8 lignes | | +| `` | Descendre dans la liste sélectionnée de 8 lignes | | +| `` | Entrer dans le directoire | | +| `` | Télécharger le fichier sélectionné | | +| `` | Basculer les fichiers cachés | All | +| `` | Trier les fichiers par | Bubblesort? | +| `` | Copier le fichier/répertoire | Copy | +| `` | Créer un dossier | Directory | +| `` | Supprimer le fichier (Identique à `DEL`) | Erase | +| `` | Rechercher des fichiers | Find | +| `` | Aller au chemin fourni | Go to | +| `` | Afficher l'aide | Help | +| `` | Afficher les informations sur le fichier ou le dossier sélectionné | Info | +| `` | Recharger le contenu du répertoire actuel / Effacer la sélection | List | +| `` | Sélectionner un fichier | Mark | +| `` | Créer un nouveau fichier avec le nom fourni | New | +| `` | Modifier le fichier | Open | +| `` | Quitter termscp | Quit | +| `` | Renommer le fichier | Rename | +| `` | Enregistrer le fichier sous... | Save | +| `` | Aller dans le répertoire parent | Upper | +| `` | Ouvrir le fichier avec le programme défaut pour le type de fichier | View | +| `` | Ouvrir le fichier avec le programme spécifié | With | +| `` | Exécuter une commande | eXecute | +| `` | Basculer la navigation synchronisée | sYnc | +| `` | Supprimer le fichier | | +| `` | Sélectionner tous les fichiers | | +| `` | Abandonner le processus de transfert de fichiers | | + +### Travailler sur plusieurs fichiers 🥷 + +Vous pouvez choisir de travailler sur plusieurs fichiers, en les sélectionnant en appuyant sur ``, afin de sélectionner le fichier actuel, ou en appuyant sur ``, ce qui sélectionnera tous les fichiers dans le répertoire de travail. +Une fois qu'un fichier est marqué pour la sélection, il sera affiché avec un `*` sur la gauche. +Lorsque vous travaillez sur la sélection, seul le fichier sélectionné sera traité pour les actions, tandis que l'élément en surbrillance actuel sera ignoré. +Il est également possible de travailler sur plusieurs fichiers dans le panneau des résultats de recherche. +Toutes les actions sont disponibles lorsque vous travaillez avec plusieurs fichiers, mais sachez que certaines actions fonctionnent de manière légèrement différente. Plongeons dans: + +- *Copy*: chaque fois que vous copiez un fichier, vous serez invité à insérer le nom de destination. Lorsque vous travaillez avec plusieurs fichiers, ce nom fait référence au répertoire de destination où tous ces fichiers seront copiés. +- *Rename*: identique à la copie, mais y déplacera les fichiers. +- *Save as*: identique à la copie, mais les y écrira. + +### Navigation synchronisée ⏲️ + +Lorsqu'elle est activée, la navigation synchronisée vous permettra de synchroniser la navigation entre les deux panneaux. +Cela signifie que chaque fois que vous changerez de répertoire de travail sur un panneau, la même action sera reproduite sur l'autre panneau. Si vous souhaitez activer la navigation synchronisée, appuyez simplement sur `` ; appuyez deux fois pour désactiver. Lorsqu'il est activé, l'état de navigation synchronisé sera signalé dans la barre d'état sur `ON` + +> ❗ pour le moment, chaque fois que vous essayez d'accéder à un répertoire inexistant, vous ne serez pas invité à le créer. Cela pourrait changer dans une future mise à jour. + +### Ouvrir et ouvrir avec 🚪 + +Lors de l'ouverture de fichiers avec la commande Afficher (``), l'application par défaut du système pour le type de fichier sera utilisée. Pour ce faire, le service du système d'exploitation par défaut sera utilisé, alors assurez-vous d'avoir au moins l'un de ceux-ci installé sur votre système : + +- Utilisateurs **Windows** : vous n'avez pas à vous en soucier, puisque la caisse utilisera la commande `start`. +- Utilisateurs **MacOS** : vous n'avez pas à vous inquiéter non plus, puisque le crate utilisera `open`, qui est déjà installé sur votre système. +- Utilisateurs **Linux** : l'un d'eux doit être installé + - *xdg-open* + - *gio* + - *gnome-open* + - *kde-open* +- Utilisateurs **WSL** : *wslview* est requis, vous devez installer [wslu](https://github.com/wslutilities/wslu). + +> Q: Puis-je modifier des fichiers distants à l'aide de la commande view ? +> A: Non, du moins pas directement depuis le "panneau distant". Vous devez d'abord le télécharger dans un répertoire local, cela est dû au fait que lorsque vous ouvrez un fichier distant, le fichier est téléchargé dans un répertoire temporaire, mais il n'y a aucun moyen de créer un observateur pour que le fichier vérifie quand le programme que vous utilisé pour l'ouvrir était fermé, donc termscp n'est pas en mesure de savoir quand vous avez fini de modifier le fichier. + +--- + +## Signets ⭐ + +Dans termscp, il est possible de sauvegarder les hôtes favoris, qui peuvent ensuite être chargés rapidement à partir de la mise en page principale de termscp. +termscp enregistrera également les 16 derniers hôtes auxquels vous vous êtes connecté. +Cette fonctionnalité vous permet de charger tous les paramètres nécessaires pour vous connecter à une certaine télécommande, en sélectionnant simplement le signet dans l'onglet sous le formulaire d'authentification. + +Les signets seront enregistrés, si possible à l'adresse : + +- `$HOME/.config/termscp/` sous Linux/BSD +- `$HOME/Library/Application Support/termscp` sous MacOs +- `FOLDERID_RoamingAppData\termscp\` sous Windows + +Pour les signets uniquement (cela ne s'appliquera pas aux hôtes récents), il est également possible de sauvegarder le mot de passe utilisé pour s'authentifier. Le mot de passe n'est pas enregistré par défaut et doit être spécifié via l'invite lors de l'enregistrement d'un nouveau signet. +Si vous êtes préoccupé par la sécurité du mot de passe enregistré pour vos favoris, veuillez lire le [chapitre ci-dessous 👀](#mes-mots-de-passe-sont-ils-sûrs-). + +Pour créer un nouveau signet, suivez simplement ces étapes : + +1. Tapez dans le formulaire d'authentification les paramètres pour vous connecter à votre serveur distant +2. Appuyez sur `` +3. Tapez le nom que vous souhaitez donner au signet +4. Choisissez de rappeler ou non le mot de passe +5. Appuyez sur `` pour soumettre + +chaque fois que vous souhaitez utiliser la connexion précédemment enregistrée, appuyez simplement sur `` pour accéder à la liste des signets et chargez les paramètres des signets dans le formulaire en appuyant sur ``. + +![Bookmarks](https://github.com/veeso/termscp/blob/main/assets/images/bookmarks.gif?raw=true) + +### Mes mots de passe sont-ils sûrs 😈 + +Bien sûr 😉. +Comme dit précédemment, les signets sont enregistrés dans votre répertoire de configuration avec les mots de passe. Les mots de passe ne sont évidemment pas en texte brut, ils sont cryptés avec **AES-128**. Est-ce que cela les sécurise ? Absolument! (sauf pour les utilisateurs BSD et WSL 😢) + +Sous **Windows**, **Linux** et **MacOS**, la clé utilisée pour crypter les mots de passe est stockée, si possible (mais devrait l'être), respectivement dans le *Windows Vault*, dans le *porte-clés système* et dans le *Porte-clés*. Ceci est en fait super sûr et est directement géré par votre système d'exploitation. + +❗ Veuillez noter que si vous êtes un utilisateur Linux, vous feriez mieux de lire le [chapitre ci-dessous 👀](#linux-keyring), car le trousseau peut ne pas être activé ou pris en charge sur votre système ! + +Sur *BSD* et *WSL*, en revanche, la clé utilisée pour crypter vos mots de passe est stockée sur votre disque (dans $HOME/.config/termscp). Il est alors, toujours possible de récupérer la clé pour déchiffrer les mots de passe. Heureusement, l'emplacement de la clé garantit que votre clé ne peut pas être lue par des utilisateurs différents du vôtre, mais oui, je n'enregistrerais toujours pas le mot de passe pour un serveur exposé sur Internet 😉. + +#### Linux Keyring + +Nous aimons tous Linux grâce à la liberté qu'il donne aux utilisateurs. En tant qu'utilisateur Linux, vous pouvez essentiellement faire tout ce que vous voulez, mais cela présente également des inconvénients, tels que le fait qu'il n'y a souvent pas d'applications standard dans différentes distributions. Et cela implique aussi un porte-clés. +Cela signifie que sous Linux, aucun trousseau de clés n'est peut-être installé sur votre système. Malheureusement, la bibliothèque que nous utilisons pour travailler avec le stockage des clés nécessite un service qui expose `org.freedesktop.secrets` sur D-BUS et le pire est qu'il n'y a que deux services qui l'exposent. + +- ❗ Si vous utilisez GNOME comme environnement de bureau (par exemple, les utilisateurs d'ubuntu), ça devrait déjà aller, car le trousseau de clés est déjà fourni par `gnome-keyring` et tout devrait déjà fonctionner. +- ❗ Pour les autres utilisateurs d'environnement de bureau, il existe un programme sympa que vous pouvez utiliser pour obtenir un trousseau de clés qui est [KeepassXC](https://keepassxc.org/), que j'utilise sur mon installation Manjaro (avec KDE) et qui fonctionne bien. Le seul problème est que vous devez le configurer pour qu'il soit utilisé avec termscp (mais c'est assez simple). Pour commencer avec KeepassXC, lisez la suite [ici](#configuration-de-keepassxc-pour-termscp). +- ❗ Et si vous ne souhaitez installer aucun de ces services ? Eh bien, il n'y a pas de problème ! **termscp continuera à fonctionner comme d'habitude**, mais il enregistrera la clé dans un fichier, comme il le fait habituellement pour BSD et WSL. + +##### Configuration de KeepassXC pour termscp + +Suivez ces étapes afin de configurer keepassXC pour termscp : + +1. Installer KeepassXC +2. Allez dans "outils" > "paramètres" dans la barre d'outils +3. Selectioner "Secret service integration" et basculer "Enable KeepassXC freedesktop.org secret service integration" +4. Creer une base de données, si vous n'en avez pas encore : à partir de la barre d'outils "Database" > "New database" +5. De la barre d'outils: "Database" > "Database settings" +6. Selectioner "Secret service integration" et basculer "Expose entries under this group" +7. Sélectionnez le groupe dans la liste où vous souhaitez conserver le secret du termscp. N'oubliez pas que ce groupe peut être utilisé par toute autre application pour stocker des secrets via DBUS. --- ## Configuration ⚙️ -termscp supports some user defined parameters, which can be defined in the configuration. -Underhood termscp has a TOML file and some other directories where all the parameters will be saved, but don't worry, you won't touch any of these files manually, since I made possible to configure termscp from its user interface entirely. +termscp prend en charge certains paramètres définis par l'utilisateur, qui peuvent être définis dans la configuration. +Underhood termscp a un fichier TOML et quelques autres répertoires où tous les paramètres seront enregistrés, mais ne vous inquiétez pas, vous ne toucherez à aucun de ces fichiers manuellement, car j'ai rendu possible la configuration complète de termscp à partir de son interface utilisateur. -termscp, like for bookmarks, just requires to have these paths accessible: +termscp, comme pour les signets, nécessite juste d'avoir ces chemins accessibles : -- `$HOME/.config/termscp/` on Linux/BSD -- `$HOME/Library/Application Support/termscp` on MacOs -- `FOLDERID_RoamingAppData\termscp\` on Windows +- `$HOME/.config/termscp/` sous Linux/BSD +- `$HOME/Library/Application Support/termscp` sous MacOs +- `FOLDERID_RoamingAppData\termscp\` sous Windows -To access configuration, you just have to press `` from the home of termscp. +Pour accéder à la configuration, il vous suffit d'appuyer sur `` depuis l'accueil de termscp. -These parameters can be changed: +Ces paramètres peuvent être modifiés : -- **Text Editor**: the text editor to use. By default termscp will find the default editor for you; with this option you can force an editor to be used (e.g. `vim`). **Also GUI editors are supported**, unless they `nohup` from the parent process so if you ask: yes, you can use `notepad.exe`, and no: **Visual Studio Code doesn't work**. -- **Default Protocol**: the default protocol is the default value for the file transfer protocol to be used in termscp. This applies for the login page and for the address CLI argument. -- **Show Hidden Files**: select whether hidden files shall be displayed by default. You will be able to decide whether to show or not hidden files at runtime pressing `A` anyway. -- **Check for updates**: if set to `yes`, termscp will fetch the Github API to check if there is a new version of termscp available. -- **Prompt when replacing existing files?**: If set to `yes`, termscp will prompt for confirmation you whenever a file transfer would cause an existing file on target host to be replaced. -- **Group Dirs**: select whether directories should be groupped or not in file explorers. If `Display first` is selected, directories will be sorted using the configured method but displayed before files, viceversa if `Display last` is selected. -- **Remote File formatter syntax**: syntax to display file info for each file in the remote explorer. See [File explorer format](#file-explorer-format) -- **Local File formatter syntax**: syntax to display file info for each file in the local explorer. See [File explorer format](#file-explorer-format) -- **Enable notifications?**: If set to `Yes`, notifications will be displayed. -- **Notifications: minimum transfer size**: if transfer size is greater or equal than the specified value, notifications for transfer will be displayed. The accepted values are in format `{UNSIGNED} B/KB/MB/GB/TB/PB` +- **Text Editor**: l'éditeur de texte à utiliser. Par défaut, termscp trouvera l'éditeur par défaut pour vous ; avec cette option, vous pouvez forcer l'utilisation d'un éditeur (par exemple `vim`). **Les éditeurs d'interface graphique sont également pris en charge**, à moins qu'ils ne soient `nohup` à partir du processus parent. +- **Default Protocol**: le protocole par défaut est la valeur par défaut du protocole de transfert de fichiers à utiliser dans termscp. Cela s'applique à la page de connexion et à l'argument de l'adresse CLI. +- **Show Hidden Files**: sélectionnez si les fichiers cachés doivent être affichés par défaut. Vous pourrez décider d'afficher ou non les fichiers cachés au moment de l'exécution en appuyant sur `A` de toute façon. +- **Check for updates**: s'il est défini sur `yes`, Termscp récupère l'API Github pour vérifier si une nouvelle version de Termscp est disponible. +- **Prompt when replacing existing files?**: S'il est défini sur `yes`, Termscp vous demandera une confirmation chaque fois qu'un transfert de fichier entraînera le remplacement d'un fichier existant sur l'hôte cible. +- **Group Dirs**: sélectionnez si les répertoires doivent être regroupés ou non dans les explorateurs de fichiers. Si `Display first` est sélectionné, les répertoires seront triés en utilisant la méthode configurée mais affichés avant les fichiers, vice-versa si `Display last` est sélectionné. +- **Remote File formatter syntax**: syntaxe pour afficher les informations de fichier pour chaque fichier dans l'explorateur distant. Voir [File explorer format](#format-de-lexplorateur-de-fichiers) +- **Local File formatter syntax**: syntaxe pour afficher les informations de fichier pour chaque fichier dans l'explorateur local. Voir [File explorer format](#format-de-lexplorateur-de-fichiers) +- **Enable notifications?**: S'il est défini sur `Yes`, les notifications seront affichées. +- **Notifications: minimum transfer size**: si la taille du transfert est supérieure ou égale à la valeur spécifiée, les notifications de transfert seront affichées. Les valeurs acceptées sont au format `{UNSIGNED} B/KB/MB/GB/TB/PB` ### SSH Key Storage 🔐 -Along with configuration, termscp provides also an **essential** feature for **SFTP/SCP clients**: the SSH key storage. +n plus de la configuration, termscp fournit également une fonctionnalité **essentielle** pour les **clients SFTP/SCP** : le stockage de clés SSH. -You can access the SSH key storage, from configuration moving to the `SSH Keys` tab, once there you can: +Vous pouvez accéder au stockage des clés SSH, de la configuration à l'onglet « Clés SSH », une fois là-bas, vous pouvez : -- **Add a new key**: just press `` and you will be prompted to create a new key. Provide the hostname/ip address and the username associated to the key and finally a text editor will open up: paste the **PRIVATE** ssh key into the text editor, save and quit. -- **Remove an existing key**: just press `` or `` on the key you want to remove, to delete persistently the key from termscp. -- **Edit an existing key**: just press `` on the key you want to edit, to change the private key. +- **Ajouter une neuf clé SSH**: appuyez simplement sur `` et vous serez invité à créer une nouvelle clé. Fournissez le nom d'hôte/l'adresse IP et le nom d'utilisateur associé à la clé et enfin un éditeur de texte s'ouvrira : collez la clé ssh **PRIVÉE** dans l'éditeur de texte, enregistrez et quittez. +- **Supprimer une clé existante**: appuyez simplement sur `` ou `` sur la clé que vous souhaitez supprimer, pour supprimer de manière persistante la clé de termscp. +- **Modifier une clé existante**: appuyez simplement sur `` sur la clé que vous souhaitez modifier, pour changer la clé privée. -> Q: Wait, my private key is protected with password, can I use it? -> A: Of course you can. The password provided for authentication in termscp, is valid both for username/password authentication and for RSA key authentication. +> Q: Ma clé privée est protégée par mot de passe, puis-je l'utiliser ? +> A: Bien sûr vous pouvez. Le mot de passe fourni pour l'authentification dans termscp est valide à la fois pour l'authentification par nom d'utilisateur/mot de passe et pour l'authentification par clé RSA. -### File Explorer Format +### Format de l'explorateur de fichiers -It is possible through configuration to define a custom format for the file explorer. This is possible both for local and remote host, so you can have two different syntax in use. These fields, with name `File formatter syntax (local)` and `File formatter syntax (remote)` will define how the file entries will be displayed in the file explorer. -The syntax for the formatter is the following `{KEY1}... {KEY2:LENGTH}... {KEY3:LENGTH:EXTRA} {KEYn}...`. -Each key in bracket will be replaced with the related attribute, while everything outside brackets will be left unchanged. +Il est possible via la configuration de définir un format personnalisé pour l'explorateur de fichiers. Ceci est possible à la fois pour l'hôte local et distant, vous pouvez donc utiliser deux syntaxes différentes. Ces champs, nommés `File formatter syntax (local)` et `File formatter syntax (remote)` définiront comment les entrées de fichier seront affichées dans l'explorateur de fichiers. +La syntaxe du formateur est la suivante `{KEY1}... {KEY2:LENGTH}... {KEY3:LENGTH:EXTRA} {KEYn}...`. +Chaque clé entre crochets sera remplacée par l'attribut associé, tandis que tout ce qui se trouve en dehors des crochets restera inchangé. -- The key name is mandatory and must be one of the keys below -- The length describes the length reserved to display the field. Static attributes doesn't support this (GROUP, PEX, SIZE, USER) -- Extra is supported only by some parameters and is an additional options. See keys to check if extra is supported. +- Le nom de la clé est obligatoire et doit être l'une des clés ci-dessous +- La longueur décrit la longueur réservée pour afficher le champ. Les attributs statiques ne prennent pas en charge cela (GROUP, PEX, SIZE, USER) +- Extra n'est pris en charge que par certains paramètres et constitue une option supplémentaire. Voir les touches pour vérifier si les extras sont pris en charge. -These are the keys supported by the formatter: +Voici les clés prises en charge par le formateur : -- `ATIME`: Last access time (with default syntax `%b %d %Y %H:%M`); Extra might be provided as the time syntax (e.g. `{ATIME:8:%H:%M}`) -- `CTIME`: Creation time (with syntax `%b %d %Y %H:%M`); Extra might be provided as the time syntax (e.g. `{CTIME:8:%H:%M}`) -- `GROUP`: Owner group -- `MTIME`: Last change time (with syntax `%b %d %Y %H:%M`); Extra might be provided as the time syntax (e.g. `{MTIME:8:%H:%M}`) -- `NAME`: File name (Elided if longer than LENGTH) -- `PEX`: File permissions (UNIX format) -- `SIZE`: File size (omitted for directories) -- `SYMLINK`: Symlink (if any `-> {FILE_PATH}`) -- `USER`: Owner user +- `ATIME`: Heure du dernier accès (avec la syntaxe par défaut `%b %d %Y %H:%M`) ; Un supplément peut être fourni comme syntaxe de l'heure (par exemple, `{ATIME:8:%H:%M}`) +- `CTIME`: Heure de création (avec la syntaxe `%b %d %Y %H:%M`); Un supplément peut être fourni comme syntaxe de l'heure (par exemple, `{CTIME:8:%H:%M}`) +- `GROUP`: Groupe de propriétaires +- `MTIME`: Heure du dernier changement (avec la syntaxe `%b %d %Y %H:%M`); Un supplément peut être fourni comme syntaxe de l'heure (par exemple, `{MTIME:8:%H:%M}`) +- `NAME`: Nom du fichier (élidé si plus long que LENGTH) +- `PEX`: Autorisations de fichiers (format UNIX) +- `SIZE`: Taille du fichier (omis pour les répertoires) +- `SYMLINK`: Lien symbolique (le cas échéant `-> {FILE_PATH}`) +- `USER`: Utilisateur propriétaire -If left empty, the default formatter syntax will be used: `{NAME:24} {PEX} {USER} {SIZE} {MTIME:17:%b %d %Y %H:%M}` +Si elle est laissée vide, la syntaxe par défaut du formateur sera utilisée : `{NAME:24} {PEX} {USER} {SIZE} {MTIME:17:%b %d %Y %H:%M}` --- -## Themes 🎨 +## Thèmes 🎨 -Termscp provides you with an awesome feature: the possibility to set the colors for several components in the application. -If you want to customize termscp there are two available ways to do so: +Termscp vous offre une fonctionnalité géniale : la possibilité de définir les couleurs de plusieurs composants de l'application. +Si vous souhaitez personnaliser termscp, il existe deux manières de le faire : -- From the **configuration menu** -- Importing a **theme file** +- Depuis le **menu de configuration** +- Importation d'un **fichier de thème** -In order to create your own customization from termscp, all you have to do so is to enter the configuration from the auth activity, pressing `` and then `` twice. You should have now moved to the `themes` panel. +Afin de créer votre propre personnalisation à partir de termscp, il vous suffit de saisir la configuration à partir de l'activité d'authentification, en appuyant sur `` puis sur `` deux fois. Vous devriez être maintenant passé au panneau `thèmes`. -Here you can move with `` and `` to change the style you want to change, as shown in the gif below: +Ici, vous pouvez vous déplacer avec `` et `` pour changer le style que vous souhaitez modifier, comme indiqué dans le gif ci-dessous : ![Themes](https://github.com/veeso/termscp/blob/main/assets/images/themes.gif?raw=true) -termscp supports both the traditional explicit hex (`#rrggbb`) and rgb `rgb(r, g, b)` syntax to provide colors, but also **[css colors](https://www.w3schools.com/cssref/css_colors.asp)** (such as `crimson`) are accepted 😉. There is also a special keywork which is `Default`. Default means that the color used will be the default foreground or background color based on the situation (foreground for texts and lines, background for well, guess what). +termscp prend en charge à la fois la syntaxe hexadécimale explicite traditionnelle (`#rrggbb`) et rgb `rgb(r, g, b)` pour fournir des couleurs, mais aussi **[couleurs css](https://www.w3schools.com/cssref/css_colors.asp)** (comme `crimson`) sont acceptés 😉. Il y a aussi un keywork spécial qui est `Default`. Par défaut signifie que la couleur utilisée sera la couleur de premier plan ou d'arrière-plan par défaut en fonction de la situation (premier plan pour les textes et les lignes, arrière-plan pour bien, devinez quoi) -As said before, you can also import theme files. You can take inspiration from or directly use one of the themes provided along with termscp, located in the `themes/` directory of this repository and import them running termscp as `termscp -t `. If everything was fine, it should tell you the theme has successfully been imported. +Comme dit précédemment, vous pouvez également importer des fichiers de thème. Vous pouvez vous inspirer de ou utiliser directement l'un des thèmes fournis avec termscp, situé dans le répertoire `themes/` de ce référentiel et les importer en exécutant termscp en tant que `termscp -t `. Si tout allait bien, cela devrait vous dire que le thème a été importé avec succès. -### My theme won't load 😱 +### Mon thème ne se charge pas 😱 -This is probably due to a recent update which has broken the theme. Whenever I add a new key to themes, the saved theme won't load. To fix this issues there are two really quick-fix solutions: +Cela est probablement dû à une mise à jour récente qui a cassé le thème. Chaque fois que j'ajoute une nouvelle clé aux thèmes, le thème enregistré ne se charge pas. Pour résoudre ces problèmes, il existe deux solutions vraiment rapides : -1. Reload theme: whenever I release an update I will also patch the "official" themes, so you just have to download it from the repository again and re-import the theme via `-t` option +1. Recharger le thème : chaque fois que je publie une mise à jour, je corrige également les thèmes "officiels", il vous suffit donc de le télécharger à nouveau depuis le référentiel et de réimporter le thème via l'option `-t` ```sh termscp -t ``` -2. Fix your theme: If you're using a custom theme, then you can edit via `vim` and add the missing key. The theme is located at `$CONFIG_DIR/termscp/theme.toml` where `$CONFIG_DIR` is: +2. Corrigez votre thème : si vous utilisez un thème personnalisé, vous pouvez le modifier via `vim` et ajouter la clé manquante. Le thème est situé dans `$CONFIG_DIR/termscp/theme.toml` où `$CONFIG_DIR` est : - FreeBSD/GNU-Linux: `$HOME/.config/` - MacOs: `$HOME/Library/Application Support` - Windows: `%appdata%` - ❗ Missing keys are reported in the CHANGELOG under `BREAKING CHANGES` for the version you've just installed. + ❗ Les clés manquantes sont signalées dans le CHANGELOG sous `BREAKING CHANGES` pour la version que vous venez d'installer. -### Styles 💈 +### Modes 💈 -You can find in the table below, the description for each style field. -Please, notice that **styles won't apply to configuration page**, in order to make it always accessible in case you mess everything up +Vous pouvez trouver dans le tableau ci-dessous, la description de chaque champ de style. +Veuillez noter que **les styles ne s'appliqueront pas à la page de configuration**, afin de la rendre toujours accessible au cas où vous gâcheriez tout #### Authentication page | Key | Description | |----------------|------------------------------------------| -| auth_address | Color of the input field for IP address | -| auth_bookmarks | Color of the bookmarks panel | -| auth_password | Color of the input field for password | -| auth_port | Color of the input field for port number | -| auth_protocol | Color of the radio group for protocol | -| auth_recents | Color of the recents panel | -| auth_username | Color of the input field for username | +| auth_address | Couleur du champ pour adresse IP | +| auth_bookmarks | Couleur du panneau des signets | +| auth_password | Couleur du champ pour mot de passe | +| auth_port | Couleur du champ pour nombre de port | +| auth_protocol | Couleur du groupe radio pour protocole | +| auth_recents | Couleur du panneau récent | +| auth_username | Couleur du champ pour nom d'utilisateur | #### Transfer page | Key | Description | |--------------------------------------|---------------------------------------------------------------------------| -| transfer_local_explorer_background | Background color of localhost explorer | -| transfer_local_explorer_foreground | Foreground coloor of localhost explorer | -| transfer_local_explorer_highlighted | Border and highlighted color for localhost explorer | -| transfer_remote_explorer_background | Background color of remote explorer | -| transfer_remote_explorer_foreground | Foreground coloor of remote explorer | -| transfer_remote_explorer_highlighted | Border and highlighted color for remote explorer | -| transfer_log_background | Background color for log panel | -| transfer_log_window | Window color for log panel | -| transfer_progress_bar_partial | Partial progress bar color | -| transfer_progress_bar_total | Total progress bar color | -| transfer_status_hidden | Color for status bar "hidden" label | -| transfer_status_sorting | Color for status bar "sorting" label; applies also to file sorting dialog | -| transfer_status_sync_browsing | Color for status bar "sync browsing" label | +| transfer_local_explorer_background | Couleur d'arrière-plan de l'explorateur localhost | +| transfer_local_explorer_foreground | Couleur de premier plan de l'explorateur localhost | +| transfer_local_explorer_highlighted | Bordure et couleur surlignée pour l'explorateur localhost | +| transfer_remote_explorer_background | Couleur d'arrière-plan de l'explorateur distant | +| transfer_remote_explorer_foreground | Couleur de premier plan de l'explorateur distant | +| transfer_remote_explorer_highlighted | Bordure et couleur en surbrillance pour l'explorateur distant | +| transfer_log_background | Couleur d'arrière-plan du panneau de journal | +| transfer_log_window | Couleur de la fenêtre du panneau de journal | +| transfer_progress_bar_partial | Couleur de la barre de progression partielle | +| transfer_progress_bar_total | Couleur de la barre de progression totale | +| transfer_status_hidden | Couleur de l'étiquette "hidden" de la barre d'état | +| transfer_status_sorting | Couleur de l'étiquette "sorting" de la barre d'état | +| transfer_status_sync_browsing | Couleur de l'étiquette "sync browsing" de la barre d'état | #### Misc @@ -423,64 +422,64 @@ These styles applie to different part of the application. | Key | Description | |-------------------|---------------------------------------------| -| misc_error_dialog | Color for error messages | -| misc_info_dialog | Color for info dialogs | -| misc_input_dialog | Color for input dialogs (such as copy file) | -| misc_keys | Color of text for key strokes | -| misc_quit_dialog | Color for quit dialogs | -| misc_save_dialog | Color for save dialogs | -| misc_warn_dialog | Color for warn dialogs | +| misc_error_dialog | Couleur des messages d'erreur | +| misc_info_dialog | Couleur des messages d'info | +| misc_input_dialog | Couleur des messages de input | +| misc_keys | Couleur du texte pour les frappes de touches| +| misc_quit_dialog | Couleur des messages de quit | +| misc_save_dialog | Couleur des messages d'enregistrement | +| misc_warn_dialog | Couleur des messages de attention | --- -## Text Editor ✏ +## Éditeur de texte ✏ -termscp has, as you might have noticed, many features, one of these is the possibility to view and edit text file. It doesn't matter if the file is located on the local host or on the remote host, termscp provides the possibility to open a file in your favourite text editor. -In case the file is located on remote host, the file will be first downloaded into your temporary file directory and then, **only** if changes were made to the file, re-uploaded to the remote host. termscp checks if you made changes to the file verifying the last modification time of the file. +termscp a, comme vous l'avez peut-être remarqué, de nombreuses fonctionnalités, l'une d'entre elles est la possibilité de visualiser et de modifier un fichier texte. Peu importe que le fichier se trouve sur l'hôte local ou sur l'hôte distant, termscp offre la possibilité d'ouvrir un fichier dans votre éditeur de texte préféré. +Si le fichier se trouve sur l'hôte distant, le fichier sera d'abord téléchargé dans votre répertoire de fichiers temporaires, puis **uniquement** si des modifications ont été apportées au fichier, rechargé sur l'hôte distant. termscp vérifie si vous avez apporté des modifications au fichier en vérifiant l'heure de la dernière modification du fichier. -Just a reminder: **you can edit only textual file**; binary files are not supported. +> ❗ Juste un rappel : **vous ne pouvez éditer que des fichiers texte** ; les fichiers binaires ne sont pas pris en charge. --- -## Logging 🩺 +## Enregistrement 🩺 -termscp writes a log file for each session, which is written at +termscp écrit un fichier journal pour chaque session, qui est écrit à -- `$HOME/.config/termscp/termscp.log` on Linux/BSD -- `$HOME/Library/Application Support/termscp/termscp.log` on MacOs -- `FOLDERID_RoamingAppData\termscp\termscp.log` on Windows +- `$HOME/.config/termscp/termscp.log` sous Linux/BSD +- `$HOME/Library/Application Support/termscp/termscp.log` sous MacOs +- `FOLDERID_RoamingAppData\termscp\termscp.log` sous Windows -the log won't be rotated, but will just be truncated after each launch of termscp, so if you want to report an issue and you want to attach your log file, keep in mind to save the log file in a safe place before using termscp again. -The log file always reports in *trace* level, so it is kinda verbose. -I know you might have some questions regarding log files, so I made a kind of a Q/A: +le journal ne sera pas tourné, mais sera simplement tronqué après chaque lancement de termscp, donc si vous souhaitez signaler un problème et que vous souhaitez joindre votre fichier journal, n'oubliez pas de sauvegarder le fichier journal dans un endroit sûr avant de l'utiliser termscp à nouveau. +Le fichier journal rapporte toujours au niveau *trace*, il est donc un peu détaillé. +Je sais que vous pourriez avoir des questions concernant les fichiers journaux, alors j'ai fait une sorte de Q/R : -> Is it possible to reduce verbosity? +> Est-il possible de réduire la verbosité ? -No. The reason is quite simple: when an issue happens, you must be able to know what's causing it and the only way to do that, is to have the log file with the maximum verbosity level set. +Non. La raison est assez simple : lorsqu'un problème survient, vous devez être capable de savoir ce qui en est la cause et la seule façon de le faire est d'avoir le fichier journal avec le niveau de verbosité maximum défini. -> If trace level is set for logging, is the file going to reach a huge size? +> Si le niveau de trace est défini pour la journalisation, le fichier va-t-il atteindre une taille énorme ? -Probably not, unless you never quit termscp, but I think that's unlikely to happen. A long session may produce up to 10MB of log files (I said a long session), but I think a normal session won't exceed 2MB. +Probablement pas, à moins que vous ne quittiez jamais termscp, mais je pense que cela est peu probable. Une longue session peut produire jusqu'à 10 MB de fichiers journaux (j'ai dit une longue session), mais je pense qu'une session normale ne dépassera pas 2 MB. -> I don't want logging, can I turn it off? +> Je ne veux pas me connecter, puis-je le désactiver ? -Yes, you can. Just start termscp with `-q or --quiet` option. You can alias termscp to make it persistent. Remember that logging is used to diagnose issues, so since behind every open source project, there should always be this kind of mutual help, keeping log files might be your way to support the project 😉. I don't want you to feel guilty, but just to say. +Oui, vous pouvez. Démarrez simplement termscp avec l'option `-q ou --quiet`. Vous pouvez créer un alias termcp pour le rendre persistant. N'oubliez pas que la journalisation est utilisée pour diagnostiquer les problèmes, donc puisque derrière chaque projet open source, il devrait toujours y avoir ce genre d'aide mutuelle, la conservation des fichiers journaux peut être votre moyen de soutenir le projet 😉. Je ne veux pas que tu te sentes coupable, mais juste pour dire. -> Is logging safe? +> La journalisation est-elle sûre ? -If you're concerned about security, the log file doesn't contain any plain password, so don't worry and exposes the same information the sibling file `bookmarks` reports. +Si vous êtes préoccupé par la sécurité, le fichier journal ne contient aucun mot de passe simple, alors ne vous inquiétez pas et expose les mêmes informations que le fichier frère "signets". ## Notifications 📫 -Termscp will send Desktop notifications for these kind of events: +Termscp enverra des notifications de bureau pour ce type d'événements : -- on **Transfer completed**: The notification will be sent once a transfer has been successfully completed. - - ❗ The notification will be displayed only if the transfer total size is at least the specified `Notifications: minimum transfer size` in the configuration. -- on **Transfer failed**: The notification will be sent once a transfer has failed due to an error. - - ❗ The notification will be displayed only if the transfer total size is at least the specified `Notifications: minimum transfer size` in the configuration. -- on **Update available**: Whenever a new version of termscp is available, a notification will be displayed. -- on **Update installed**: Whenever a new version of termscp has been installed, a notification will be displayed. -- on **Update failed**: Whenever the installation of the update fails, a notification will be displayed. +- sur **Transfert terminé** : La notification sera envoyée une fois le transfert terminé avec succès. + - ❗ La notification ne s'affichera que si la taille totale du transfert est au moins la `Notifications: minimum transfer size` spécifiée dans la configuration. +- sur **Transfert échoué** : La notification sera envoyée une fois qu'un transfert a échoué en raison d'une erreur. + - ❗ La notification ne s'affichera que si la taille totale du transfert est au moins la `Notifications: minimum transfer size` spécifiée dans la configuration. +- sur **Mise à jour disponible** : chaque fois qu'une nouvelle version de Termscp est disponible, une notification s'affiche. +- sur **Mise à jour installée** : chaque fois qu'une nouvelle version de Termscp est installée, une notification s'affiche. +- sur **Échec de la mise à jour** : chaque fois que l'installation de la mise à jour échoue, une notification s'affiche. -❗ If you prefer to keep notifications turned off, you can just enter setup and set `Enable notifications?` to `No` 😉. -❗ If you want to change the minimum transfer size to display notifications, you can change the value in the configuration with key `Notifications: minimum transfer size` and set it to whatever suits better for you 🙂. +❗ Si vous préférez désactiver les notifications, vous pouvez simplement accéder à la configuration et définir `Enable notifications?` sur `No` 😉. +❗ Si vous souhaitez modifier la taille de transfert minimale pour afficher les notifications, vous pouvez modifier la valeur dans la configuration avec la touche `Notifications: minimum transfer size` et la définir sur ce qui vous convient le mieux 🙂. diff --git a/docs/it/man.md b/docs/it/man.md index f964ebc..1c219c2 100644 --- a/docs/it/man.md +++ b/docs/it/man.md @@ -5,6 +5,7 @@ - [Argomento indirizzo 🌎](#argomento-indirizzo-) - [Argomento indirizzo per AWS S3](#argomento-indirizzo-per-aws-s3) - [Come fornire la password 🔐](#come-fornire-la-password-) + - [Credenziali Aws S3 🦊](#credenziali-aws-s3-) - [File explorer 📂](#file-explorer-) - [Abbinamento tasti ⌨](#abbinamento-tasti-) - [Lavora su più file 🥷](#lavora-su-più-file-) @@ -14,7 +15,6 @@ - [Le mie password sono al sicuro 😈](#le-mie-password-sono-al-sicuro-) - [Linux Keyring](#linux-keyring) - [KeepassXC setup per termscp](#keepassxc-setup-per-termscp) - - [Credenziali Aws S3 🦊](#credenziali-aws-s3-) - [Configurazione ⚙️](#configurazione-️) - [SSH Key Storage 🔐](#ssh-key-storage-) - [File Explorer Format](#file-explorer-format) @@ -104,6 +104,29 @@ Quando si usa l'argomento indirizzo non è possibile fornire la password diretta --- +## Credenziali Aws S3 🦊 + +Per connettersi ad un bucket S3 devi come già saprai fornire le credenziali fornite da AWS. +Ci sono due modi per passare queste credenziali a termscp e come avrai già notato **non puoi** farlo dal form di autenticazione. +Questi sono quindi i due modi per passare le chiavi: + +1. Utilizza il file delle credenziali s3: configurando aws via `aws configure` le tue credenziali dovrebbero già venir salvate in `~/.aws/credentials`. Nel caso tu debba usare un profile diverso da `default`, puoi fornire un profilo diverso nell'authentication form. +2. **Variabili d'ambiente**: nel caso il primo metodo non sia utilizzabile, puoi comunque fornirle come variabili d'ambiente. Considera però che queste variabili sovrascriveranno sempre le credenziali situate nel file credentials. Vediamo come impostarle: + + Queste sono sempre obbligatorie: + + - `AWS_ACCESS_KEY_ID`: aws access key ID (di solito inizia per `AKIA...`) + - `AWS_SECRET_ACCESS_KEY`: la secret access key + + nel caso tu abbia impostato un maggiore livello di sicurezza, potrebbero servirti anche queste: + + - `AWS_SECURITY_TOKEN`: security token + - `AWS_SESSION_TOKEN`: session token + +⚠️ le tue credenziali sono al sicuro: termscp non manipola direttamente questi dati! Le credenziali sono direttamente lette dal crate di **s3**. Nel caso tu abbia dei dubbi sulla sicurezza, puoi contattare l'autore della libreria su [Github](https://github.com/durch/rust-s3) ⚠️ + +--- + ## File explorer 📂 Quando ci riferiamo al file explorer in termscp, intendiamo i pannelli che puoi vedere quando stabilisci una connessione con il server remoto. @@ -255,29 +278,6 @@ Questo tutorial spiega come impostare KeepassXC per termscp. --- -## Credenziali Aws S3 🦊 - -Per connettersi ad un bucket S3 devi come già saprai fornire le credenziali fornite da AWS. -Ci sono due modi per passare queste credenziali a termscp e come avrai già notato **non puoi** farlo dal form di autenticazione. -Questi sono quindi i due modi per passare le chiavi: - -1. Utilizza il file delle credenziali s3: configurando aws via `aws configure` le tue credenziali dovrebbero già venir salvate in `~/.aws/credentials`. Nel caso tu debba usare un profile diverso da `default`, puoi fornire un profilo diverso nell'authentication form. -2. **Variabili d'ambiente**: nel caso il primo metodo non sia utilizzabile, puoi comunque fornirle come variabili d'ambiente. Considera però che queste variabili sovrascriveranno sempre le credenziali situate nel file credentials. Vediamo come impostarle: - - Queste sono sempre obbligatorie: - - - `AWS_ACCESS_KEY_ID`: aws access key ID (di solito inizia per `AKIA...`) - - `AWS_SECRET_ACCESS_KEY`: la secret access key - - nel caso tu abbia impostato un maggiore livello di sicurezza, potrebbero servirti anche queste: - - - `AWS_SECURITY_TOKEN`: security token - - `AWS_SESSION_TOKEN`: session token - -⚠️ le tue credenziali sono al sicuro: termscp non manipola direttamente questi dati! Le credenziali sono direttamente lette dal crate di **s3**. Nel caso tu abbia dei dubbi sulla sicurezza, puoi contattare l'autore della libreria su [Github](https://github.com/durch/rust-s3) ⚠️ - ---- - ## Configurazione ⚙️ termscp supporta diversi parametri definiti dall'utente, che possono essere impostati nella configurazione. @@ -293,7 +293,7 @@ Per accedere alla configurazione è sufficiente premere `` dall'authenti Questi parametri possono essere impostati: -- **Text Editor**: l'editor di testo da utilizzare per aprire i file. Di default termscp userà quello definito nella variabile `EDITOR` od il primo che troverà installato tra quelli più popolari. Puoi tuttavia definire quello che vuoi (ad esempio `vim`). **Anche gli editor GUI sono supportati**, a meno che loro non partano in `nohup` dal processo padre, quindi se vuoi saperlo: sì puoi utilizzare `notepad.exe`, ma non **Visual Studio Code**. +- **Text Editor**: l'editor di testo da utilizzare per aprire i file. Di default termscp userà quello definito nella variabile `EDITOR` od il primo che troverà installato tra quelli più popolari. Puoi tuttavia definire quello che vuoi (ad esempio `vim`). **Anche gli editor GUI sono supportati**, a meno che loro non partano in `nohup` dal processo padre. - **Default Protocol**: il protocollo di default da visualizzare come prima opzione nell'authentication form. Questa opzione sarà anche utilizzata quando si usa l'argomento indirizzo da CLI e non si specifica un protocollo. - **Show Hidden Files**: seleziona se mostrare di default i file nascosti. A runtime potrai comunque scegliere se visualizzarli o meno premendo ``. - **Check for updates**: se impostato a `YES` all'avvio termscp controllerà l'eventuale presenza di aggiornamenti. Per farlo utilizzerà una chiamata GET all'API di Github. @@ -436,7 +436,7 @@ Con termscp puoi anche modificare i file di testo direttamente da terminale, uti Non importa se il file si trova in locale od in remoto, termscp ti consente di modificare e sincronizzare le modifiche per entrambi. Nel caso il file si trovi su host remoto, il file verrà prima scaricato temporaneamente in locale, modificato e poi nel caso ci siano state modifiche, reinviato in remoto. -Ricorda: **puoi modificare solo i file testuali**; non puoi modificare i file binari. +> ❗ Ricorda: **puoi modificare solo i file testuali**; non puoi modificare i file binari. --- diff --git a/docs/man.md b/docs/man.md index bd130fd..ed77ddf 100644 --- a/docs/man.md +++ b/docs/man.md @@ -5,6 +5,7 @@ - [Address argument 🌎](#address-argument-) - [AWS S3 address argument](#aws-s3-address-argument) - [How Password can be provided 🔐](#how-password-can-be-provided-) + - [Aws S3 credentials 🦊](#aws-s3-credentials-) - [File explorer 📂](#file-explorer-) - [Keybindings ⌨](#keybindings-) - [Work on multiple files 🥷](#work-on-multiple-files-) @@ -14,7 +15,6 @@ - [Are my passwords Safe 😈](#are-my-passwords-safe-) - [Linux Keyring](#linux-keyring) - [KeepassXC setup for termscp](#keepassxc-setup-for-termscp) - - [Aws S3 credentials 🦊](#aws-s3-credentials-) - [Configuration ⚙️](#configuration-️) - [SSH Key Storage 🔐](#ssh-key-storage-) - [File Explorer Format](#file-explorer-format) @@ -101,12 +101,36 @@ s3://buckethead@eu-central-1:default:/assets You have probably noticed, that, when providing the address as argument, there's no way to provide the password. Password can be basically provided through 3 ways when address argument is provided: -- `-P, --password` option: just use this CLI option providing the password. I strongly unrecommend this method, since it's very unsecure (since you might keep the password in the shell history) +- `-P, --password` option: just use this CLI option providing the password. I strongly unrecommend this method, since it's very insecure (since you might keep the password in the shell history) - Via `sshpass`: you can provide password via `sshpass`, e.g. `sshpass -f ~/.ssh/topsecret.key termscp cvisintin@192.168.1.31` - You will be prompted for it: if you don't use any of the previous methods, you will be prompted for the password, as happens with the more classics tools such as `scp`, `ssh`, etc. --- +## Aws S3 credentials 🦊 + +In order to connect to an Aws S3 bucket you must obviously provide some credentials. +There are basically two ways to achieve this, and as you've probably already noticed you **can't** do that via the authentication form. +So these are the ways you can provide the credentials for s3: + +1. Use your credentials file: just configure the AWS cli via `aws configure` and your credentials should already be located at `~/.aws/credentials`. In case you're using a profile different from `default`, just provide it in the profile field in the authentication form. +2. **Environment variables**: you can always provide your credentials as environment variables. Keep in mind that these credentials **will always override** the credentials located in the `credentials` file. See how to configure the environment below: + + These should always be mandatory: + + - `AWS_ACCESS_KEY_ID`: aws access key ID (usually starts with `AKIA...`) + - `AWS_SECRET_ACCESS_KEY`: the secret access key + + In case you've configured a stronger security, you *may* require these too: + + - `AWS_SECURITY_TOKEN`: security token + - `AWS_SESSION_TOKEN`: session token + +⚠️ Your credentials are safe: termscp won't manipulate these values directly! Your credentials are directly consumed by the **s3** crate. +In case you've got some concern regarding security, please contact the library author on [Github](https://github.com/durch/rust-s3) ⚠️ + +--- + ## File explorer 📂 When we refer to file explorers in termscp, we refer to the panels you can see after establishing a connection with the remote. @@ -257,30 +281,6 @@ Follow these steps in order to setup keepassXC for termscp: --- -## Aws S3 credentials 🦊 - -In order to connect to an Aws S3 bucket you must obviously provide some credentials. -There are basically two ways to achieve this, and as you've probably already noticed you **can't** do that via the authentication form. -So these are the ways you can provide the credentials for s3: - -1. Use your credentials file: just configure the AWS cli via `aws configure` and your credentials should already be located at `~/.aws/credentials`. In case you're using a profile different from `default`, just provide it in the profile field in the authentication form. -2. **Environment variables**: you can always provide your credentials as environment variables. Keep in mind that these credentials **will always override** the credentials located in the `credentials` file. See how to configure the environment below: - - These should always be mandatory: - - - `AWS_ACCESS_KEY_ID`: aws access key ID (usually starts with `AKIA...`) - - `AWS_SECRET_ACCESS_KEY`: the secret access key - - In case you've configured a stronger security, you *may* require these too: - - - `AWS_SECURITY_TOKEN`: security token - - `AWS_SESSION_TOKEN`: session token - -⚠️ Your credentials are safe: termscp won't manipulate these values directly! Your credentials are directly consumed by the **s3** crate. -In case you've got some concern regarding security, please contact the library author on [Github](https://github.com/durch/rust-s3) ⚠️ - ---- - ## Configuration ⚙️ termscp supports some user defined parameters, which can be defined in the configuration. @@ -296,7 +296,7 @@ To access configuration, you just have to press `` from the home of term These parameters can be changed: -- **Text Editor**: the text editor to use. By default termscp will find the default editor for you; with this option you can force an editor to be used (e.g. `vim`). **Also GUI editors are supported**, unless they `nohup` from the parent process so if you ask: yes, you can use `notepad.exe`, and no: **Visual Studio Code doesn't work**. +- **Text Editor**: the text editor to use. By default termscp will find the default editor for you; with this option you can force an editor to be used (e.g. `vim`). **Also GUI editors are supported**, unless they `nohup` from the parent process. - **Default Protocol**: the default protocol is the default value for the file transfer protocol to be used in termscp. This applies for the login page and for the address CLI argument. - **Show Hidden Files**: select whether hidden files shall be displayed by default. You will be able to decide whether to show or not hidden files at runtime pressing `A` anyway. - **Check for updates**: if set to `yes`, termscp will fetch the Github API to check if there is a new version of termscp available. @@ -404,10 +404,10 @@ Please, notice that **styles won't apply to configuration page**, in order to ma | Key | Description | |--------------------------------------|---------------------------------------------------------------------------| | transfer_local_explorer_background | Background color of localhost explorer | -| transfer_local_explorer_foreground | Foreground coloor of localhost explorer | +| transfer_local_explorer_foreground | Foreground color of localhost explorer | | transfer_local_explorer_highlighted | Border and highlighted color for localhost explorer | | transfer_remote_explorer_background | Background color of remote explorer | -| transfer_remote_explorer_foreground | Foreground coloor of remote explorer | +| transfer_remote_explorer_foreground | Foreground color of remote explorer | | transfer_remote_explorer_highlighted | Border and highlighted color for remote explorer | | transfer_log_background | Background color for log panel | | transfer_log_window | Window color for log panel | @@ -438,7 +438,7 @@ These styles applie to different part of the application. termscp has, as you might have noticed, many features, one of these is the possibility to view and edit text file. It doesn't matter if the file is located on the local host or on the remote host, termscp provides the possibility to open a file in your favourite text editor. In case the file is located on remote host, the file will be first downloaded into your temporary file directory and then, **only** if changes were made to the file, re-uploaded to the remote host. termscp checks if you made changes to the file verifying the last modification time of the file. -Just a reminder: **you can edit only textual file**; binary files are not supported. +> ❗ Just a reminder: **you can edit only textual file**; binary files are not supported. --- diff --git a/docs/zh-CN/man.md b/docs/zh-CN/man.md index d468415..6489fdb 100644 --- a/docs/zh-CN/man.md +++ b/docs/zh-CN/man.md @@ -5,6 +5,7 @@ - [地址参数](#地址参数) - [AWS S3 地址参数](#aws-s3-地址参数) - [如何输入密码](#如何输入密码) + - [Aws S3 凭证](#aws-s3-凭证) - [文件浏览](#文件浏览) - [快捷键](#快捷键) - [处理多个文件](#处理多个文件) @@ -14,7 +15,6 @@ - [我的密码安全吗？](#我的密码安全吗) - [Linux Keyring](#linux-keyring) - [用于 termscp 的 KeepassXC 设置](#用于-termscp-的-keepassxc-设置) - - [Aws S3 凭证](#aws-s3-凭证) - [配置](#配置) - [SSH Key Storage](#ssh-key-storage) - [资源管理器格式](#资源管理器格式) @@ -105,6 +105,30 @@ s3://buckethead@eu-central-1:default:/assets --- +## Aws S3 凭证 + +为了连接到 Aws S3 存储桶，您显然必须提供一些凭据。 +基本上有两种方法可以实现这一点，而且您可能已经注意到您**不能**通过身份验证表单来做到这一点。 +因此，您可以通过以下方式为 s3 提供凭据： + +1. 使用您的凭证文件：只需通过`aws configure` 配置AWS cli，您的凭证应该已经位于`~/.aws/credentials`。 如果您使用的配置文件不同于“默认”，只需在身份验证表单的配置文件字段中提供它。 +2. **环境变量**: 您始终可以将您的凭据作为环境变量提供。 请记住，这些凭据**将始终覆盖**位于 `credentials` 文件中的凭据。 下面看看如何配置环境： + + 这些应该始终是强制性的: + + - `AWS_ACCESS_KEY_ID`: aws 访问密钥 ID（通常以 `AKIA...` 开头） + - `AWS_SECRET_ACCESS_KEY`: 秘密访问密钥 + + 如果您配置了更强的安全性，您*可能*也需要这些： + + - `AWS_SECURITY_TOKEN`: 安全令牌 + - `AWS_SESSION_TOKEN`: 会话令牌 + +⚠️ 您的凭据是安全的：termscp 不会直接操作这些值！ 您的凭据直接由 **s3** crate 使用。 +如果您对安全有一些担忧，请联系 [Github](https://github.com/durch/rust-s3) 上的库作者 ⚠️ + +--- + ## 文件浏览 termscp中的文件资源管理器是指你与远程建立连接后可以看到的面板。 @@ -250,30 +274,6 @@ termscp中的文件资源管理器是指你与远程建立连接后可以看到 --- -## Aws S3 凭证 - -为了连接到 Aws S3 存储桶，您显然必须提供一些凭据。 -基本上有两种方法可以实现这一点，而且您可能已经注意到您**不能**通过身份验证表单来做到这一点。 -因此，您可以通过以下方式为 s3 提供凭据： - -1. 使用您的凭证文件：只需通过`aws configure` 配置AWS cli，您的凭证应该已经位于`~/.aws/credentials`。 如果您使用的配置文件不同于“默认”，只需在身份验证表单的配置文件字段中提供它。 -2. **环境变量**: 您始终可以将您的凭据作为环境变量提供。 请记住，这些凭据**将始终覆盖**位于 `credentials` 文件中的凭据。 下面看看如何配置环境： - - 这些应该始终是强制性的: - - - `AWS_ACCESS_KEY_ID`: aws 访问密钥 ID（通常以 `AKIA...` 开头） - - `AWS_SECRET_ACCESS_KEY`: 秘密访问密钥 - - 如果您配置了更强的安全性，您*可能*也需要这些： - - - `AWS_SECURITY_TOKEN`: 安全令牌 - - `AWS_SESSION_TOKEN`: 会话令牌 - -⚠️ 您的凭据是安全的：termscp 不会直接操作这些值！ 您的凭据直接由 **s3** crate 使用。 -如果您对安全有一些担忧，请联系 [Github](https://github.com/durch/rust-s3) 上的库作者 ⚠️ - ---- - ## 配置 termscp支持一些用户定义参数，这些参数可以通过配置来修改。 @@ -431,7 +431,7 @@ termscp支持传统的十六进制（`#rrggbb`）和RGB`rgb(r, g, b)`语法来 Termscp有很多功能，你可能已经注意到了，其中之一就是可以查看和编辑文本文件。不管文件是在本地主机还是在远程主机上，termscp都提供了在你喜欢的文本编辑器中打开文件的功能。 如果文件位于远程主机上，该文件将首先被下载到你的临时文件目录中，然后，**只有**在对该文件进行了修改的情况下，才会重新上传至远程主机上。 -多说一句，**你只能编辑文本文件**；二进制文件是不可以的。 +> ❗ 多说一句，**你只能编辑文本文件**；二进制文件是不可以的。 --- From fcce9b778bf0a4b5ae4c017aade74f0f2ac6d7e0 Mon Sep 17 00:00:00 2001 From: veeso Date: Sat, 9 Oct 2021 10:47:07 +0200 Subject: [PATCH 34/40] typos --- docs/fr/README.md | 2 +- docs/zh-CN/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/fr/README.md b/docs/fr/README.md index c667176..ac3e227 100644 --- a/docs/fr/README.md +++ b/docs/fr/README.md @@ -157,7 +157,7 @@ Termscp est un file transfer et explorateur de fichiers de terminal riche en fon --- -## Commencer 🚀 +## Pour commencer 🚀 Si tu envisage d'installer termscp, je veux te remercier 💜 ! J'espère que tu vas apprécier termscp ! Si tu veux contribuer à ce projet, n'oublié pas de consulter notre [guide de contribution](../../CONTRIBUTING.md). diff --git a/docs/zh-CN/README.md b/docs/zh-CN/README.md index b56b2e1..7e6f80d 100644 --- a/docs/zh-CN/README.md +++ b/docs/zh-CN/README.md @@ -131,7 +131,7 @@ termscp 是一个功能丰富的终端文件传输和浏览器，支持 SCP/SFTP --- -## Features 🎁 +## 特征 🎁 - 📁 不同的通讯协议 - **SFTP** @@ -245,7 +245,7 @@ choco install termscp --- -## Powered by 💪 +## 供电 💪 termscp 由这些很棒的项目提供支持： From 6c31c1f2d8189361468dc1e32fcb921020f92e67 Mon Sep 17 00:00:00 2001 From: veeso Date: Sat, 9 Oct 2021 10:55:21 +0200 Subject: [PATCH 35/40] deb readme --- Cargo.toml | 5 +++++ docs/misc/README.deb.txt | 29 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 docs/misc/README.deb.txt diff --git a/Cargo.toml b/Cargo.toml index d5c9459..4cf4902 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,6 +22,11 @@ buildflags = ["--release"] [package.metadata.rpm.targets] termscp = { path = "/usr/bin/termscp" } +[package.metadata.deb] +maintainer = "Christian Visintin " +copyright = "2021, Christian Visintin " +extended-description-file = "docs/misc/README.deb.txt" + [[bin]] name = "termscp" path = "src/main.rs" diff --git a/docs/misc/README.deb.txt b/docs/misc/README.deb.txt new file mode 100644 index 0000000..1d35256 --- /dev/null +++ b/docs/misc/README.deb.txt @@ -0,0 +1,29 @@ +Termscp is a feature rich terminal file transfer and explorer, with support for SCP/SFTP/FTP/S3. +Basically is a terminal utility with an TUI to connect to a remote server to retrieve and upload files and +to interact with the local file system. +It is Linux, MacOS, FreeBSD and Windows compatible. + +Features: + +- 📁 Different communication protocols + - SFTP + - SCP + - FTP and FTPS + - Aws S3 +- 🖥 Explore and operate on the remote and on the local machine file system with a handy UI + - Create, remove, rename, search, view and edit files +- ⭐ Connect to your favourite hosts through built-in bookmarks and recent connections +- 📝 View and edit files with your favourite applications +- 💁 SFTP/SCP authentication with SSH keys and username/password +- 🐧 Compatible with Windows, Linux, FreeBSD and MacOS +- 🎨 Make it yours! + - Themes + - Custom file explorer format + - Customizable text editor + - Customizable file sorting + - and many other parameters... +- 📫 Get notified via Desktop Notifications when a large file has been transferred +- 🔐 Save your password in your operating system key vault +- 🦀 Rust-powered +- 👀 Developed keeping an eye on performance +- 🦄 Frequent awesome updates From db73d1e45f9e190bbc9cab1d965c3e9427789208 Mon Sep 17 00:00:00 2001 From: veeso Date: Sat, 9 Oct 2021 10:58:38 +0200 Subject: [PATCH 36/40] gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index ab19753..8e00075 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ dist/pkgs/arch/*.tar.gz # Macos .DS_Store + +dist/pkgs/ From 736dd820a62ff2dadce06e9f8c411db1f4dfc79f Mon Sep 17 00:00:00 2001 From: veeso Date: Sun, 10 Oct 2021 09:52:49 +0200 Subject: [PATCH 37/40] donate links --- README.md | 9 +++++++++ docs/de/README.md | 9 +++++++++ docs/es/README.md | 9 +++++++++ docs/fr/README.md | 9 +++++++++ docs/it/README.md | 9 +++++++++ docs/zh-CN/README.md | 9 +++++++++ 6 files changed, 54 insertions(+) diff --git a/README.md b/README.md index 177ed0f..287fd02 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,11 @@ src="https://img.shields.io/crates/v/termscp.svg" alt="Latest version" /> + Buy me a coffee

+ Buy me a coffee

+ Buy me a coffee

+ Buy me a coffee

+ Buy me a coffee

+ Buy me a coffee

Date: Mon, 11 Oct 2021 09:30:21 +0200 Subject: [PATCH 38/40] freebsd pkg --- dist/build/freebsd.sh | 23 +++++++++++++++++++++++ dist/pkgs/freebsd/manifest | 17 ----------------- 2 files changed, 23 insertions(+), 17 deletions(-) delete mode 100644 dist/pkgs/freebsd/manifest diff --git a/dist/build/freebsd.sh b/dist/build/freebsd.sh index 753b8e9..68aaa4e 100755 --- a/dist/build/freebsd.sh +++ b/dist/build/freebsd.sh @@ -24,7 +24,30 @@ cd target/release/ PKG="termscp-v${VERSION}-x86_64-unknown-freebsd.tar.gz" tar czf $PKG termscp sha256sum $PKG +# Calc sha256 of exec and copy to path +HASH=`sha256sum termscp | cut -d ' ' -f1` +sudo cp termscp /usr/local/bin/termscp mkdir -p ../../dist/pkgs/freebsd/ mv $PKG ../../dist/pkgs/freebsd/$PKG +cd ../../dist/pkgs/freebsd/ +rm manifest +echo -e "name: \"termscp\"" > manifest +echo -e "version: $VERSION" >> manifest +echo -e "origin: veeso/termscp" >> manifest +echo -e "comment: \"A feature rich terminal UI file transfer and explorer with support for SCP/SFTP/FTP/S3\"" >> manifest +echo -e "desc: <> manifest exit $? diff --git a/dist/pkgs/freebsd/manifest b/dist/pkgs/freebsd/manifest deleted file mode 100644 index 9526e26..0000000 --- a/dist/pkgs/freebsd/manifest +++ /dev/null @@ -1,17 +0,0 @@ -name: "termscp" -version: 0.7.0 -origin: veeso/termscp -comment: "A feature rich terminal UI file transfer and explorer with support for SCP/SFTP/FTP" -desc: < Date: Mon, 11 Oct 2021 20:40:20 +0200 Subject: [PATCH 39/40] Fixed bash --- dist/build/docker.sh | 4 ++-- dist/build/x86_64_centos7/Dockerfile | 3 ++- dist/build/x86_64_debian9/Dockerfile | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dist/build/docker.sh b/dist/build/docker.sh index 237c8e2..8c0e37b 100755 --- a/dist/build/docker.sh +++ b/dist/build/docker.sh @@ -20,7 +20,7 @@ docker build --tag termscp-${VERSION}-x86_64_debian9 . cd - mkdir -p ${PKGS_DIR}/deb/ mkdir -p ${PKGS_DIR}/x86_64-unknown-linux-gnu/ -CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_debian9 termscp-${VERSION}-x86_64_debian9) +CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_debian9 /bin/bash) docker cp ${CONTAINER_NAME}:/usr/src/termscp/target/debian/termscp_${VERSION}_amd64.deb ${PKGS_DIR}/deb/ docker cp ${CONTAINER_NAME}:/usr/src/termscp/target/release/termscp ${PKGS_DIR}/x86_64-unknown-linux-gnu/ # Make tar.gz @@ -33,7 +33,7 @@ cd x86_64_centos7/ docker build --tag termscp-${VERSION}-x86_64_centos7 . cd - mkdir -p ${PKGS_DIR}/rpm/ -CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_centos7 termscp-${VERSION}-x86_64_centos7) +CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_centos7 /bin/bash) docker cp ${CONTAINER_NAME}:/usr/src/termscp/target/release/rpmbuild/RPMS/x86_64/termscp-${VERSION}-1.el7.x86_64.rpm ${PKGS_DIR}/rpm/termscp-${VERSION}-1.x86_64.rpm exit $? diff --git a/dist/build/x86_64_centos7/Dockerfile b/dist/build/x86_64_centos7/Dockerfile index 6e63aa8..f11ec5f 100644 --- a/dist/build/x86_64_centos7/Dockerfile +++ b/dist/build/x86_64_centos7/Dockerfile @@ -8,7 +8,8 @@ RUN yum -y install \ openssl \ pkgconfig \ dbus-devel \ - openssl-devel + openssl-devel \ + bash # Install rust RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rust.sh && \ chmod +x /tmp/rust.sh && \ diff --git a/dist/build/x86_64_debian9/Dockerfile b/dist/build/x86_64_debian9/Dockerfile index 1356c64..dbe1ebd 100644 --- a/dist/build/x86_64_debian9/Dockerfile +++ b/dist/build/x86_64_debian9/Dockerfile @@ -9,6 +9,7 @@ RUN apt update && apt install -y \ libssl-dev \ libssh2-1-dev \ libdbus-1-dev \ + bash \ curl # Install rust @@ -26,4 +27,4 @@ RUN . $HOME/.cargo/env && cargo build --release && cargo strip # Build pkgs RUN . $HOME/.cargo/env && cargo deb -CMD ["sh"] +CMD ["bash"] From 0eaa898e15f7a605ba115ffade81c4c1b937a68a Mon Sep 17 00:00:00 2001 From: veeso Date: Tue, 12 Oct 2021 09:09:57 +0200 Subject: [PATCH 40/40] Fixed docker.sh --- dist/build/docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/build/docker.sh b/dist/build/docker.sh index 8c0e37b..330b186 100755 --- a/dist/build/docker.sh +++ b/dist/build/docker.sh @@ -24,7 +24,7 @@ CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_debian9 /bin/bash) docker cp ${CONTAINER_NAME}:/usr/src/termscp/target/debian/termscp_${VERSION}_amd64.deb ${PKGS_DIR}/deb/ docker cp ${CONTAINER_NAME}:/usr/src/termscp/target/release/termscp ${PKGS_DIR}/x86_64-unknown-linux-gnu/ # Make tar.gz -cd ${PKGS_DIR}/x84_64-unknown-linux-gnu/ +cd ${PKGS_DIR}/x86_64-unknown-linux-gnu/ tar cvzf termscp-v${VERSION}-x86_64-unknown-linux-gnu.tar.gz termscp rm termscp cd -

Developed by @veeso

- Website + Sitio Web · - Installation + Instalación · - User manual + Manual de usuario