termscp.deb
- wget -O termscp.rpm https://github.com/veeso/termscp/releases/latest/download/termscp-0.12.3-1.x86_64.rpm
+ wget -O termscp.rpm https://github.com/veeso/termscp/releases/latest/download/termscp-0.13.0-1.x86_64.rpm
sudo rpm -U termscp.rpm
diff --git a/site/html/home.html b/site/html/home.html
index cd9f604..40b8066 100644
--- a/site/html/home.html
+++ b/site/html/home.html
@@ -1,17 +1,18 @@
-
+
termscp
A feature rich terminal UI file transfer and explorer with support for
- SCP/SFTP/FTP/S3/SMB
+ SCP/SFTP/FTP/S3/SMB/WebDAV
Get started →
- termscp 0.12.3 is NOW out! Download it from
+ termscp 0.13.0 is NOW out! Download it from
here!
@@ -66,7 +67,8 @@
diff --git a/site/index.html b/site/index.html
index 8d3f333..a8bfb5b 100644
--- a/site/index.html
+++ b/site/index.html
@@ -3,13 +3,14 @@
- termscp is a terminal file transfer and explorer for SCP/SFTP/FTP/S3/SMB | termscp
+ termscp is a terminal file transfer and explorer for SCP/SFTP/FTP/S3/SMB/WebDAV | termscp
-
+
diff --git a/site/lang/en.json b/site/lang/en.json
index a2f19dd..898ec6f 100644
--- a/site/lang/en.json
+++ b/site/lang/en.json
@@ -12,7 +12,7 @@
"intro": {
"caption": "A feature rich terminal UI file transfer and explorer with support for SCP/SFTP/FTP/S3",
"getStarted": "Get started →",
- "versionAlert": "termscp 0.12.3 is NOW out! Download it from",
+ "versionAlert": "termscp 0.13.0 is NOW out! Download it from",
"here": "here",
"features": {
"handy": {
diff --git a/site/lang/es.json b/site/lang/es.json
index 0d21cd9..aedbda3 100644
--- a/site/lang/es.json
+++ b/site/lang/es.json
@@ -12,7 +12,7 @@
"intro": {
"caption": "Un explorador y transferencia de archivos de terminal rico en funciones, con apoyo para SCP/SFTP/FTP/S3",
"getStarted": "Para iniciar →",
- "versionAlert": "termscp 0.12.3 ya está disponible! Descárgalo desde",
+ "versionAlert": "termscp 0.13.0 ya está disponible! Descárgalo desde",
"here": "aquì",
"features": {
"handy": {
diff --git a/site/lang/fr.json b/site/lang/fr.json
index a6a4416..6a9327e 100644
--- a/site/lang/fr.json
+++ b/site/lang/fr.json
@@ -12,7 +12,7 @@
"intro": {
"caption": "Un file transfer et navigateur de terminal riche en fonctionnalités avec support pour SCP/SFTP/FTP/S3",
"getStarted": "Pour commencer →",
- "versionAlert": "termscp 0.12.3 est maintenant sorti! Télécharge-le depuis",
+ "versionAlert": "termscp 0.13.0 est maintenant sorti! Télécharge-le depuis",
"here": "ici",
"features": {
"handy": {
diff --git a/site/lang/it.json b/site/lang/it.json
index cca9105..d490c2c 100644
--- a/site/lang/it.json
+++ b/site/lang/it.json
@@ -12,7 +12,7 @@
"intro": {
"caption": "Un file transfer ed explorer ricco di funzionalità con supporto per SFTP/SCP/FTP/S3",
"getStarted": "Installa termscp →",
- "versionAlert": "termscp 0.12.3 è ORA disponbile! Scaricalo da",
+ "versionAlert": "termscp 0.13.0 è ORA disponbile! Scaricalo da",
"here": "qui",
"features": {
"handy": {
diff --git a/site/lang/zh-CN.json b/site/lang/zh-CN.json
index 254bd0e..5a1b194 100644
--- a/site/lang/zh-CN.json
+++ b/site/lang/zh-CN.json
@@ -12,7 +12,7 @@
"intro": {
"caption": "功能丰富的终端 UI 文件传输和浏览器，支持 SCP/SFTP/FTP/S3",
"getStarted": "开始 →",
- "versionAlert": "termscp 0.12.3 现已发布！ 从下载",
+ "versionAlert": "termscp 0.13.0 现已发布！ 从下载",
"here": "这里",
"features": {
"handy": {
diff --git a/src/cli_opts.rs b/src/cli_opts.rs
index 44c7f0e..fddba55 100644
--- a/src/cli_opts.rs
+++ b/src/cli_opts.rs
@@ -34,36 +34,25 @@ Address syntax can be:
Please, report issues to
Please, consider supporting the author ")]
pub struct Args {
- #[argh(
- switch,
- short = 'b',
- description = "resolve address argument as a bookmark name"
- )]
+ #[argh(subcommand)]
+ pub nested: Option,
+ /// resolve address argument as a bookmark name
+ #[argh(switch, short = 'b')]
pub address_as_bookmark: bool,
- #[argh(switch, short = 'c', description = "open termscp configuration")]
- pub config: bool,
- #[argh(switch, short = 'D', description = "enable TRACE log level")]
+ /// enable TRACE log level
+ #[argh(switch, short = 'D')]
pub debug: bool,
- #[argh(option, short = 'P', description = "provide password from CLI")]
+ /// provide password from CLI
+ #[argh(option, short = 'P')]
pub password: Option,
- #[argh(switch, short = 'q', description = "disable logging")]
+ /// disable logging
+ #[argh(switch, short = 'q')]
pub quiet: bool,
- #[argh(option, short = 't', description = "import specified theme")]
- pub theme: Option,
- #[argh(
- switch,
- short = 'u',
- description = "update termscp to the latest version"
- )]
- pub update: bool,
- #[argh(
- option,
- short = 'T',
- default = "10",
- description = "set UI ticks; default 10ms"
- )]
+ /// set UI ticks; default 10ms
+ #[argh(option, short = 'T', default = "10")]
pub ticks: u64,
- #[argh(switch, short = 'v', description = "print version")]
+ /// print version
+ #[argh(switch, short = 'v')]
pub version: bool,
// -- positional
#[argh(
@@ -73,6 +62,33 @@ pub struct Args {
pub positional: Vec,
}
+#[derive(FromArgs)]
+#[argh(subcommand)]
+pub enum ArgsSubcommands {
+ Config(ConfigArgs),
+ LoadTheme(LoadThemeArgs),
+ Update(UpdateArgs),
+}
+
+#[derive(FromArgs)]
+/// open termscp configuration
+#[argh(subcommand, name = "config")]
+pub struct ConfigArgs {}
+
+#[derive(FromArgs)]
+/// import the specified theme
+#[argh(subcommand, name = "update")]
+pub struct UpdateArgs {}
+
+#[derive(FromArgs)]
+/// import the specified theme
+#[argh(subcommand, name = "theme")]
+pub struct LoadThemeArgs {
+ #[argh(positional)]
+ /// theme file
+ pub theme: PathBuf,
+}
+
pub struct RunOpts {
pub remote: Remote,
pub ticks: Duration,
@@ -80,6 +96,29 @@ pub struct RunOpts {
pub task: Task,
}
+impl RunOpts {
+ pub fn config() -> Self {
+ Self {
+ task: Task::Activity(NextActivity::SetupActivity),
+ ..Default::default()
+ }
+ }
+
+ pub fn update() -> Self {
+ Self {
+ task: Task::InstallUpdate,
+ ..Default::default()
+ }
+ }
+
+ pub fn import_theme(theme: PathBuf) -> Self {
+ Self {
+ task: Task::ImportTheme(theme),
+ ..Default::default()
+ }
+ }
+}
+
impl Default for RunOpts {
fn default() -> Self {
Self {
diff --git a/src/config/bookmarks.rs b/src/config/bookmarks.rs
index 117c152..4e71e66 100644
--- a/src/config/bookmarks.rs
+++ b/src/config/bookmarks.rs
@@ -11,6 +11,7 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
use crate::filetransfer::params::{
AwsS3Params, GenericProtocolParams, ProtocolParams, SmbParams as TransferSmbParams,
+ WebDAVProtocolParams,
};
use crate::filetransfer::{FileTransferParams, FileTransferProtocol};
@@ -114,6 +115,17 @@ impl From for Bookmark {
local_path,
s3: None,
},
+ ProtocolParams::WebDAV(parms) => Self {
+ protocol,
+ address: Some(parms.uri),
+ port: None,
+ username: Some(parms.username),
+ password: Some(parms.password),
+ remote_path,
+ local_path,
+ s3: None,
+ smb: None,
+ },
}
}
}
@@ -161,6 +173,14 @@ impl From for FileTransferParams {
Self::new(bookmark.protocol, ProtocolParams::Smb(params))
}
+ FileTransferProtocol::WebDAV => Self::new(
+ FileTransferProtocol::WebDAV,
+ ProtocolParams::WebDAV(WebDAVProtocolParams {
+ uri: bookmark.address.unwrap_or_default(),
+ username: bookmark.username.unwrap_or_default(),
+ password: bookmark.password.unwrap_or_default(),
+ }),
+ ),
}
.remote_path(bookmark.remote_path) // Set entry remote_path
.local_path(bookmark.local_path) // Set entry local path
@@ -390,6 +410,35 @@ mod tests {
assert_eq!(gparams.password.as_deref().unwrap(), "password");
}
+ #[test]
+ fn ftparams_from_webdav() {
+ let bookmark: Bookmark = Bookmark {
+ address: Some(String::from("192.168.1.1")),
+ port: None,
+ protocol: FileTransferProtocol::WebDAV,
+ username: Some(String::from("root")),
+ password: Some(String::from("password")),
+ remote_path: Some(PathBuf::from("/tmp")),
+ local_path: Some(PathBuf::from("/usr")),
+ s3: None,
+ smb: None,
+ };
+ let params = FileTransferParams::from(bookmark);
+ assert_eq!(params.protocol, FileTransferProtocol::WebDAV);
+ assert_eq!(
+ params.remote_path.as_deref().unwrap(),
+ std::path::Path::new("/tmp")
+ );
+ assert_eq!(
+ params.local_path.as_deref().unwrap(),
+ std::path::Path::new("/usr")
+ );
+ let gparams = params.params.webdav_params().unwrap();
+ assert_eq!(gparams.uri.as_str(), "192.168.1.1");
+ assert_eq!(gparams.username, "root");
+ assert_eq!(gparams.password, "password");
+ }
+
#[test]
fn ftparams_from_s3_bookmark() {
let bookmark: Bookmark = Bookmark {
diff --git a/src/config/mod.rs b/src/config/mod.rs
index f279682..bbd7a8b 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -3,7 +3,6 @@
//! `config` is the module which provides access to all the termscp configurations
// export
-pub use params::*;
pub mod bookmarks;
pub mod params;
diff --git a/src/filetransfer/builder.rs b/src/filetransfer/builder.rs
index ee0f190..5c04eef 100644
--- a/src/filetransfer/builder.rs
+++ b/src/filetransfer/builder.rs
@@ -12,7 +12,9 @@ use remotefs_smb::SmbOptions;
#[cfg(smb)]
use remotefs_smb::{SmbCredentials, SmbFs};
use remotefs_ssh::{ScpFs, SftpFs, SshConfigParseRule, SshOpts};
+use remotefs_webdav::WebDAVFs;
+use super::params::WebDAVProtocolParams;
#[cfg(not(smb))]
use super::params::{AwsS3Params, GenericProtocolParams};
#[cfg(smb)]
@@ -51,6 +53,9 @@ impl Builder {
(FileTransferProtocol::Smb, ProtocolParams::Smb(params)) => {
Box::new(Self::smb_client(params))
}
+ (FileTransferProtocol::WebDAV, ProtocolParams::WebDAV(params)) => {
+ Box::new(Self::webdav_client(params))
+ }
(protocol, params) => {
error!("Invalid params for protocol '{:?}'", protocol);
panic!("Invalid protocol '{protocol:?}' with parameters of type {params:?}")
@@ -154,6 +159,10 @@ impl Builder {
SmbFs::new(credentials)
}
+ fn webdav_client(params: WebDAVProtocolParams) -> WebDAVFs {
+ WebDAVFs::new(¶ms.username, ¶ms.password, ¶ms.uri)
+ }
+
/// Build ssh options from generic protocol params and client configuration
fn build_ssh_opts(params: GenericProtocolParams, config_client: &ConfigClient) -> SshOpts {
let mut opts = SshOpts::new(params.address.clone())
diff --git a/src/filetransfer/mod.rs b/src/filetransfer/mod.rs
index 28255fc..a9d6cd2 100644
--- a/src/filetransfer/mod.rs
+++ b/src/filetransfer/mod.rs
@@ -18,6 +18,7 @@ pub enum FileTransferProtocol {
Scp,
Sftp,
Smb,
+ WebDAV,
}
// Traits
@@ -33,6 +34,7 @@ impl std::string::ToString for FileTransferProtocol {
FileTransferProtocol::Scp => "SCP",
FileTransferProtocol::Sftp => "SFTP",
FileTransferProtocol::Smb => "SMB",
+ FileTransferProtocol::WebDAV => "WEBDAV",
})
}
}
@@ -47,6 +49,7 @@ impl std::str::FromStr for FileTransferProtocol {
"SCP" => Ok(FileTransferProtocol::Scp),
"SFTP" => Ok(FileTransferProtocol::Sftp),
"SMB" => Ok(FileTransferProtocol::Smb),
+ "WEBDAV" | "HTTP" | "HTTPS" => Ok(FileTransferProtocol::WebDAV),
_ => Err(s.to_string()),
}
}
@@ -134,9 +137,17 @@ mod tests {
FileTransferProtocol::Ftp(false).to_string(),
String::from("FTP")
);
+ assert_eq!(
+ FileTransferProtocol::WebDAV.to_string(),
+ String::from("WEBDAV")
+ );
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"));
assert_eq!(FileTransferProtocol::Smb.to_string(), String::from("SMB"));
+ assert_eq!(
+ FileTransferProtocol::WebDAV.to_string(),
+ String::from("WEBDAV")
+ );
}
}
diff --git a/src/filetransfer/params.rs b/src/filetransfer/params.rs
index 7471ef2..c87f915 100644
--- a/src/filetransfer/params.rs
+++ b/src/filetransfer/params.rs
@@ -21,6 +21,7 @@ pub enum ProtocolParams {
Generic(GenericProtocolParams),
AwsS3(AwsS3Params),
Smb(SmbParams),
+ WebDAV(WebDAVProtocolParams),
}
/// Protocol params used by most common protocols
@@ -89,6 +90,7 @@ impl FileTransferParams {
ProtocolParams::AwsS3(params) => params.password_missing(),
ProtocolParams::Generic(params) => params.password_missing(),
ProtocolParams::Smb(params) => params.password_missing(),
+ ProtocolParams::WebDAV(params) => params.password_missing(),
}
}
@@ -98,10 +100,29 @@ impl FileTransferParams {
ProtocolParams::AwsS3(params) => params.set_default_secret(secret),
ProtocolParams::Generic(params) => params.set_default_secret(secret),
ProtocolParams::Smb(params) => params.set_default_secret(secret),
+ ProtocolParams::WebDAV(params) => params.set_default_secret(secret),
}
}
}
+/// Protocol params used by WebDAV
+#[derive(Debug, Clone)]
+pub struct WebDAVProtocolParams {
+ pub uri: String,
+ pub username: String,
+ pub password: String,
+}
+
+impl WebDAVProtocolParams {
+ fn set_default_secret(&mut self, secret: String) {
+ self.password = secret;
+ }
+
+ fn password_missing(&self) -> bool {
+ self.password.is_empty()
+ }
+}
+
impl Default for FileTransferParams {
fn default() -> Self {
Self::new(FileTransferProtocol::Sftp, ProtocolParams::default())
@@ -149,6 +170,15 @@ impl ProtocolParams {
_ => None,
}
}
+
+ #[cfg(test)]
+ /// Retrieve WebDAV parameters if any
+ pub fn webdav_params(&self) -> Option<&WebDAVProtocolParams> {
+ match self {
+ ProtocolParams::WebDAV(params) => Some(params),
+ _ => None,
+ }
+ }
}
// -- Generic protocol params
@@ -512,6 +542,40 @@ mod test {
);
}
+ #[test]
+ #[cfg(unix)]
+ fn set_default_secret_smb() {
+ let mut params = FileTransferParams::new(
+ FileTransferProtocol::Scp,
+ ProtocolParams::Smb(SmbParams::new("localhost", "temp")),
+ );
+ params.set_default_secret(String::from("secret"));
+ assert_eq!(
+ params
+ .params
+ .smb_params()
+ .unwrap()
+ .password
+ .as_deref()
+ .unwrap(),
+ "secret"
+ );
+ }
+
+ #[test]
+ fn set_default_secret_webdav() {
+ let mut params = FileTransferParams::new(
+ FileTransferProtocol::Scp,
+ ProtocolParams::WebDAV(WebDAVProtocolParams {
+ uri: "http://localhost".to_string(),
+ username: "user".to_string(),
+ password: "pass".to_string(),
+ }),
+ );
+ params.set_default_secret(String::from("secret"));
+ assert_eq!(params.params.webdav_params().unwrap().password, "secret");
+ }
+
#[test]
fn set_default_secret_generic() {
let mut params =
diff --git a/src/host/mod.rs b/src/host/mod.rs
index b0d45f1..4679cd6 100644
--- a/src/host/mod.rs
+++ b/src/host/mod.rs
@@ -1081,10 +1081,7 @@ mod tests {
let tmpdir: tempfile::TempDir = tempfile::TempDir::new().unwrap();
let host: Localhost = Localhost::new(PathBuf::from(tmpdir.path())).ok().unwrap();
// Execute
- #[cfg(unix)]
- assert_eq!(host.exec("echo 5").ok().unwrap().as_str(), "5\n");
- #[cfg(windows)]
- assert_eq!(host.exec("echo 5").ok().unwrap().as_str(), "5\r\n");
+ assert!(host.exec("echo 5").ok().unwrap().as_str().contains("5"));
}
#[test]
diff --git a/src/main.rs b/src/main.rs
index 9b39251..9e1e839 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -32,7 +32,7 @@ mod utils;
// namespaces
use activity_manager::{ActivityManager, NextActivity};
-use cli_opts::{Args, BookmarkParams, HostParams, Remote, RunOpts, Task};
+use cli_opts::{Args, ArgsSubcommands, BookmarkParams, HostParams, Remote, RunOpts, Task};
use filetransfer::FileTransferParams;
use system::logging::{self, LogLevel};
@@ -63,59 +63,57 @@ fn main() {
/// In case of success returns `RunOpts`
/// in case something is wrong returns the error message
fn parse_args(args: Args) -> Result {
- let mut run_opts: RunOpts = RunOpts::default();
- // Version
- if args.version {
- return Err(format!(
- "termscp - {TERMSCP_VERSION} - Developed by {TERMSCP_AUTHORS}",
- ));
- }
- // Setup activity?
- if args.config {
- run_opts.task = Task::Activity(NextActivity::SetupActivity);
- }
- // Logging
- if args.debug {
- run_opts.log_level = LogLevel::Trace;
- } else if args.quiet {
- run_opts.log_level = LogLevel::Off;
- }
- // Match ticks
- run_opts.ticks = Duration::from_millis(args.ticks);
- // @! extra modes
- if let Some(theme) = args.theme.as_deref() {
- run_opts.task = Task::ImportTheme(PathBuf::from(theme));
- }
- if args.update {
- run_opts.task = Task::InstallUpdate;
- }
- // @! Ordinary mode
- // Remote argument
- match parse_address_arg(&args) {
- Err(err) => return Err(err),
- Ok(Remote::None) => {}
- Ok(remote) => {
- // Set params
- run_opts.remote = remote;
- // In this case the first activity will be FileTransfer
- run_opts.task = Task::Activity(NextActivity::FileTransfer);
- }
- }
+ let run_opts = match args.nested {
+ Some(ArgsSubcommands::Update(_)) => RunOpts::update(),
+ Some(ArgsSubcommands::LoadTheme(args)) => RunOpts::import_theme(args.theme),
+ Some(ArgsSubcommands::Config(_)) => RunOpts::config(),
+ None => {
+ let mut run_opts: RunOpts = RunOpts::default();
+ // Version
+ if args.version {
+ return Err(format!(
+ "termscp - {TERMSCP_VERSION} - Developed by {TERMSCP_AUTHORS}",
+ ));
+ }
+ // Logging
+ if args.debug {
+ run_opts.log_level = LogLevel::Trace;
+ } else if args.quiet {
+ run_opts.log_level = LogLevel::Off;
+ }
+ // Match ticks
+ run_opts.ticks = Duration::from_millis(args.ticks);
+ // Remote argument
+ match parse_address_arg(&args) {
+ Err(err) => return Err(err),
+ Ok(Remote::None) => {}
+ Ok(remote) => {
+ // Set params
+ run_opts.remote = remote;
+ // In this case the first activity will be FileTransfer
+ run_opts.task = Task::Activity(NextActivity::FileTransfer);
+ }
+ }
- // Local directory
- if let Some(localdir) = args.positional.get(1) {
- // Change working directory if local dir is set
- let localdir: PathBuf = PathBuf::from(localdir);
- if let Err(err) = env::set_current_dir(localdir.as_path()) {
- return Err(format!("Bad working directory argument: {err}"));
+ // Local directory
+ if let Some(localdir) = args.positional.get(1) {
+ // Change working directory if local dir is set
+ let localdir: PathBuf = PathBuf::from(localdir);
+ if let Err(err) = env::set_current_dir(localdir.as_path()) {
+ return Err(format!("Bad working directory argument: {err}"));
+ }
+ }
+
+ run_opts
}
- }
+ };
+
Ok(run_opts)
}
/// Parse address argument from cli args
fn parse_address_arg(args: &Args) -> Result {
- if let Some(remote) = args.positional.get(0) {
+ if let Some(remote) = args.positional.first() {
if args.address_as_bookmark {
Ok(Remote::Bookmark(BookmarkParams::new(
remote,
@@ -197,5 +195,6 @@ fn run_activity(activity: NextActivity, ticks: Duration, remote: Remote) -> i32
Remote::None => {}
}
manager.run(activity);
+
0
}
diff --git a/src/system/config_client.rs b/src/system/config_client.rs
index 716f91f..7d79999 100644
--- a/src/system/config_client.rs
+++ b/src/system/config_client.rs
@@ -419,7 +419,7 @@ mod tests {
use tempfile::TempDir;
use super::*;
- use crate::config::UserConfig;
+ use crate::config::params::UserConfig;
use crate::utils::random::random_alphanumeric_with_len;
#[test]
diff --git a/src/system/sshkey_storage.rs b/src/system/sshkey_storage.rs
index 60cf63d..477b378 100644
--- a/src/system/sshkey_storage.rs
+++ b/src/system/sshkey_storage.rs
@@ -48,7 +48,7 @@ impl SshKeyStorage {
.query(host)
.identity_file
.as_ref()
- .and_then(|x| x.get(0).cloned());
+ .and_then(|x| x.first().cloned());
key
})
diff --git a/src/ui/activities/auth/bookmarks.rs b/src/ui/activities/auth/bookmarks.rs
index 7cb7e19..e970aa3 100644
--- a/src/ui/activities/auth/bookmarks.rs
+++ b/src/ui/activities/auth/bookmarks.rs
@@ -4,7 +4,9 @@
// Locals
use super::{AuthActivity, FileTransferParams};
-use crate::filetransfer::params::{AwsS3Params, GenericProtocolParams, ProtocolParams, SmbParams};
+use crate::filetransfer::params::{
+ AwsS3Params, GenericProtocolParams, ProtocolParams, SmbParams, WebDAVProtocolParams,
+};
impl AuthActivity {
/// Delete bookmark
@@ -164,6 +166,7 @@ impl AuthActivity {
ProtocolParams::AwsS3(params) => self.load_bookmark_s3_into_gui(params),
ProtocolParams::Generic(params) => self.load_bookmark_generic_into_gui(params),
ProtocolParams::Smb(params) => self.load_bookmark_smb_into_gui(params),
+ ProtocolParams::WebDAV(params) => self.load_bookmark_webdav_into_gui(params),
}
}
@@ -196,4 +199,10 @@ impl AuthActivity {
#[cfg(unix)]
self.mount_smb_workgroup(params.workgroup.as_deref().unwrap_or(""));
}
+
+ fn load_bookmark_webdav_into_gui(&mut self, params: WebDAVProtocolParams) {
+ self.mount_webdav_uri(¶ms.uri);
+ self.mount_username(¶ms.username);
+ self.mount_password(¶ms.password);
+ }
}
diff --git a/src/ui/activities/auth/components/form.rs b/src/ui/activities/auth/components/form.rs
index d5590d5..5ffd349 100644
--- a/src/ui/activities/auth/components/form.rs
+++ b/src/ui/activities/auth/components/form.rs
@@ -11,7 +11,7 @@ use tuirealm::{Component, Event, MockComponent, NoUserEvent, State, StateValue};
use super::{FileTransferProtocol, FormMsg, Msg, UiMsg};
use crate::ui::activities::auth::{
RADIO_PROTOCOL_FTP, RADIO_PROTOCOL_FTPS, RADIO_PROTOCOL_S3, RADIO_PROTOCOL_SCP,
- RADIO_PROTOCOL_SFTP, RADIO_PROTOCOL_SMB,
+ RADIO_PROTOCOL_SFTP, RADIO_PROTOCOL_SMB, RADIO_PROTOCOL_WEBDAV,
};
// -- protocol
@@ -31,9 +31,9 @@ impl ProtocolRadio {
.modifiers(BorderType::Rounded),
)
.choices(if cfg!(smb) {
- &["SFTP", "SCP", "FTP", "FTPS", "S3", "SMB"]
+ &["SFTP", "SCP", "FTP", "FTPS", "S3", "WebDAV", "SMB"]
} else {
- &["SFTP", "SCP", "FTP", "FTPS", "S3"]
+ &["SFTP", "SCP", "FTP", "FTPS", "S3", "WebDAV"]
})
.foreground(color)
.rewind(true)
@@ -50,6 +50,7 @@ impl ProtocolRadio {
RADIO_PROTOCOL_FTPS => FileTransferProtocol::Ftp(true),
RADIO_PROTOCOL_S3 => FileTransferProtocol::AwsS3,
RADIO_PROTOCOL_SMB => FileTransferProtocol::Smb,
+ RADIO_PROTOCOL_WEBDAV => FileTransferProtocol::WebDAV,
_ => FileTransferProtocol::Sftp,
}
}
@@ -63,6 +64,7 @@ impl ProtocolRadio {
FileTransferProtocol::Ftp(true) => RADIO_PROTOCOL_FTPS,
FileTransferProtocol::AwsS3 => RADIO_PROTOCOL_S3,
FileTransferProtocol::Smb => RADIO_PROTOCOL_SMB,
+ FileTransferProtocol::WebDAV => RADIO_PROTOCOL_WEBDAV,
}
}
}
@@ -788,3 +790,40 @@ impl Component for InputSmbWorkgroup {
)
}
}
+
+#[derive(MockComponent)]
+pub struct InputWebDAVUri {
+ component: Input,
+}
+
+impl InputWebDAVUri {
+ pub fn new(host: &str, color: Color) -> Self {
+ Self {
+ component: Input::default()
+ .borders(
+ Borders::default()
+ .color(color)
+ .modifiers(BorderType::Rounded),
+ )
+ .foreground(color)
+ .placeholder(
+ "http://localhost:8080",
+ Style::default().fg(Color::Rgb(128, 128, 128)),
+ )
+ .title("HTTP url", Alignment::Left)
+ .input_type(InputType::Text)
+ .value(host),
+ }
+ }
+}
+
+impl Component for InputWebDAVUri {
+ fn on(&mut self, ev: Event) -> Option {
+ handle_input_ev(
+ self,
+ ev,
+ Msg::Ui(UiMsg::WebDAVUriBlurDown),
+ Msg::Ui(UiMsg::WebDAVUriBlurUp),
+ )
+ }
+}
diff --git a/src/ui/activities/auth/components/mod.rs b/src/ui/activities/auth/components/mod.rs
index 313ae64..37139ca 100644
--- a/src/ui/activities/auth/components/mod.rs
+++ b/src/ui/activities/auth/components/mod.rs
@@ -19,7 +19,7 @@ pub use form::{
InputAddress, InputLocalDirectory, InputPassword, InputPort, InputRemoteDirectory,
InputS3AccessKey, InputS3Bucket, InputS3Endpoint, InputS3Profile, InputS3Region,
InputS3SecretAccessKey, InputS3SecurityToken, InputS3SessionToken, InputSmbShare,
- InputUsername, ProtocolRadio, RadioS3NewPathStyle,
+ InputUsername, InputWebDAVUri, ProtocolRadio, RadioS3NewPathStyle,
};
pub use popup::{
ErrorPopup, InfoPopup, InstallUpdatePopup, Keybindings, QuitPopup, ReleaseNotes, WaitPopup,
diff --git a/src/ui/activities/auth/misc.rs b/src/ui/activities/auth/misc.rs
index e54d706..35e8e5b 100644
--- a/src/ui/activities/auth/misc.rs
+++ b/src/ui/activities/auth/misc.rs
@@ -15,6 +15,7 @@ impl AuthActivity {
FileTransferProtocol::Ftp(_) => 21,
FileTransferProtocol::AwsS3 => 22, // Doesn't matter, since not used
FileTransferProtocol::Smb => 445,
+ FileTransferProtocol::WebDAV => 80, // Doesn't matter, since not used
}
}
@@ -41,6 +42,7 @@ impl AuthActivity {
FileTransferProtocol::Ftp(_)
| FileTransferProtocol::Scp
| FileTransferProtocol::Sftp => self.collect_generic_host_params(self.protocol),
+ FileTransferProtocol::WebDAV => self.collect_webdav_host_params(),
}
}
@@ -98,6 +100,19 @@ impl AuthActivity {
})
}
+ pub(super) fn collect_webdav_host_params(&self) -> Result {
+ let params = self.get_webdav_params_input();
+ if params.uri.is_empty() {
+ return Err("Invalid URI");
+ }
+ Ok(FileTransferParams {
+ protocol: FileTransferProtocol::WebDAV,
+ params: ProtocolParams::WebDAV(params),
+ local_path: self.get_input_local_directory(),
+ remote_path: self.get_input_remote_directory(),
+ })
+ }
+
// -- update install
/// If enabled in configuration, check for updates from Github
diff --git a/src/ui/activities/auth/mod.rs b/src/ui/activities/auth/mod.rs
index 82227a6..7c24e83 100644
--- a/src/ui/activities/auth/mod.rs
+++ b/src/ui/activities/auth/mod.rs
@@ -29,7 +29,8 @@ const RADIO_PROTOCOL_SCP: usize = 1;
const RADIO_PROTOCOL_FTP: usize = 2;
const RADIO_PROTOCOL_FTPS: usize = 3;
const RADIO_PROTOCOL_S3: usize = 4;
-const RADIO_PROTOCOL_SMB: usize = 5;
+const RADIO_PROTOCOL_WEBDAV: usize = 5;
+const RADIO_PROTOCOL_SMB: usize = 6;
// -- components
#[derive(Debug, Eq, PartialEq, Clone, Hash)]
@@ -71,6 +72,7 @@ pub enum Id {
Title,
Username,
WaitPopup,
+ WebDAVUri,
WindowSizeError,
}
@@ -155,6 +157,8 @@ pub enum UiMsg {
ShowSaveBookmarkPopup,
UsernameBlurDown,
UsernameBlurUp,
+ WebDAVUriBlurDown,
+ WebDAVUriBlurUp,
WindowResized,
}
@@ -164,6 +168,7 @@ enum InputMask {
Generic,
AwsS3,
Smb,
+ WebDAV,
}
// Store keys
@@ -240,6 +245,7 @@ impl AuthActivity {
| FileTransferProtocol::Scp
| FileTransferProtocol::Sftp => InputMask::Generic,
FileTransferProtocol::Smb => InputMask::Smb,
+ FileTransferProtocol::WebDAV => InputMask::WebDAV,
}
}
}
diff --git a/src/ui/activities/auth/update.rs b/src/ui/activities/auth/update.rs
index 10dfda3..eb02b0d 100644
--- a/src/ui/activities/auth/update.rs
+++ b/src/ui/activities/auth/update.rs
@@ -70,6 +70,7 @@ impl AuthActivity {
InputMask::Generic => &Id::Password,
InputMask::Smb => &Id::Password,
InputMask::AwsS3 => &Id::S3Bucket,
+ InputMask::WebDAV => &Id::Password,
})
.is_ok());
}
@@ -82,6 +83,7 @@ impl AuthActivity {
InputMask::Generic => &Id::Password,
InputMask::Smb => &Id::Password,
InputMask::AwsS3 => &Id::S3Bucket,
+ InputMask::WebDAV => &Id::Password,
})
.is_ok());
}
@@ -177,6 +179,7 @@ impl AuthActivity {
#[cfg(windows)]
InputMask::Smb => &Id::RemoteDirectory,
InputMask::AwsS3 => panic!("this shouldn't happen (password on s3)"),
+ InputMask::WebDAV => &Id::RemoteDirectory,
})
.is_ok());
}
@@ -189,7 +192,8 @@ impl AuthActivity {
.active(match self.input_mask() {
InputMask::Generic => &Id::Username,
InputMask::Smb => &Id::SmbShare,
- InputMask::AwsS3 => panic!("this shouldn't happen (port on s3)"),
+ InputMask::AwsS3 | InputMask::WebDAV =>
+ panic!("this shouldn't happen (port on s3)"),
})
.is_ok());
}
@@ -203,6 +207,7 @@ impl AuthActivity {
InputMask::Generic => &Id::Address,
InputMask::Smb => &Id::Address,
InputMask::AwsS3 => &Id::S3Bucket,
+ InputMask::WebDAV => &Id::WebDAVUri,
})
.is_ok());
}
@@ -225,6 +230,7 @@ impl AuthActivity {
#[cfg(windows)]
InputMask::Smb => &Id::Password,
InputMask::AwsS3 => &Id::S3NewPathStyle,
+ InputMask::WebDAV => &Id::Password,
})
.is_ok());
}
@@ -332,9 +338,16 @@ impl AuthActivity {
InputMask::Generic => &Id::Port,
InputMask::Smb => &Id::SmbShare,
InputMask::AwsS3 => panic!("this shouldn't happen (username on s3)"),
+ InputMask::WebDAV => &Id::WebDAVUri,
})
.is_ok());
}
+ UiMsg::WebDAVUriBlurDown => {
+ assert!(self.app.active(&Id::Username).is_ok());
+ }
+ UiMsg::WebDAVUriBlurUp => {
+ assert!(self.app.active(&Id::Protocol).is_ok());
+ }
UiMsg::WindowResized => {
self.redraw = true;
}
diff --git a/src/ui/activities/auth/view.rs b/src/ui/activities/auth/view.rs
index 42b0dbd..a680606 100644
--- a/src/ui/activities/auth/view.rs
+++ b/src/ui/activities/auth/view.rs
@@ -12,7 +12,9 @@ use tuirealm::tui::widgets::Clear;
use tuirealm::{State, StateValue, Sub, SubClause, SubEventClause};
use super::{components, AuthActivity, Context, FileTransferProtocol, Id, InputMask};
-use crate::filetransfer::params::{AwsS3Params, GenericProtocolParams, ProtocolParams, SmbParams};
+use crate::filetransfer::params::{
+ AwsS3Params, GenericProtocolParams, ProtocolParams, SmbParams, WebDAVProtocolParams,
+};
use crate::filetransfer::FileTransferParams;
use crate::utils::ui::{Popup, Size};
@@ -61,6 +63,7 @@ impl AuthActivity {
self.mount_smb_share("");
#[cfg(unix)]
self.mount_smb_workgroup("");
+ self.mount_webdav_uri("");
// Version notice
if let Some(version) = self
.context()
@@ -195,6 +198,18 @@ impl AuthActivity {
)
.direction(Direction::Vertical)
.split(auth_chunks[4]),
+ InputMask::WebDAV => Layout::default()
+ .constraints(
+ [
+ Constraint::Length(3), // uri
+ Constraint::Length(3), // username
+ Constraint::Length(3), // password
+ Constraint::Length(3), // dir
+ ]
+ .as_ref(),
+ )
+ .direction(Direction::Vertical)
+ .split(auth_chunks[4]),
};
// Create bookmark chunks
let bookmark_chunks = Layout::default()
@@ -230,6 +245,13 @@ impl AuthActivity {
self.app.view(&view_ids[2], f, input_mask[2]);
self.app.view(&view_ids[3], f, input_mask[3]);
}
+ InputMask::WebDAV => {
+ let view_ids = self.get_webdav_view();
+ self.app.view(&view_ids[0], f, input_mask[0]);
+ self.app.view(&view_ids[1], f, input_mask[1]);
+ self.app.view(&view_ids[2], f, input_mask[2]);
+ self.app.view(&view_ids[3], f, input_mask[3]);
+ }
}
// Bookmark chunks
self.app.view(&Id::BookmarksList, f, bookmark_chunks[0]);
@@ -794,6 +816,18 @@ impl AuthActivity {
.is_ok());
}
+ pub(super) fn mount_webdav_uri(&mut self, uri: &str) {
+ let addr_color = self.theme().auth_address;
+ assert!(self
+ .app
+ .remount(
+ Id::WebDAVUri,
+ Box::new(components::InputWebDAVUri::new(uri, addr_color)),
+ vec![]
+ )
+ .is_ok());
+ }
+
// -- query
/// Collect input values from view
@@ -860,6 +894,18 @@ impl AuthActivity {
.password(password)
}
+ pub(super) fn get_webdav_params_input(&self) -> WebDAVProtocolParams {
+ let uri: String = self.get_webdav_uri();
+ let username = self.get_input_username().unwrap_or_default();
+ let password = self.get_input_password().unwrap_or_default();
+
+ WebDAVProtocolParams {
+ uri,
+ username,
+ password,
+ }
+ }
+
pub(super) fn get_input_remote_directory(&self) -> Option {
match self.app.state(&Id::RemoteDirectory) {
Ok(State::One(StateValue::String(x))) if !x.is_empty() => {
@@ -878,6 +924,13 @@ impl AuthActivity {
}
}
+ pub(super) fn get_webdav_uri(&self) -> String {
+ match self.app.state(&Id::WebDAVUri) {
+ Ok(State::One(StateValue::String(x))) => x,
+ _ => String::new(),
+ }
+ }
+
pub(super) fn get_input_addr(&self) -> String {
match self.app.state(&Id::Address) {
Ok(State::One(StateValue::String(x))) => x,
@@ -1011,6 +1064,7 @@ impl AuthActivity {
InputMask::AwsS3 => 12,
InputMask::Generic => 12,
InputMask::Smb => 12,
+ InputMask::WebDAV => 12,
}
}
@@ -1069,6 +1123,7 @@ impl AuthActivity {
};
format!("\\\\{username}{}\\{}", params.address, params.share)
}
+ ProtocolParams::WebDAV(params) => params.uri,
}
}
@@ -1180,6 +1235,23 @@ impl AuthActivity {
}
}
+ fn get_webdav_view(&self) -> [Id; 4] {
+ match self.app.focus() {
+ Some(&Id::LocalDirectory) => [
+ Id::Username,
+ Id::Password,
+ Id::RemoteDirectory,
+ Id::LocalDirectory,
+ ],
+ _ => [
+ Id::WebDAVUri,
+ Id::Username,
+ Id::Password,
+ Id::RemoteDirectory,
+ ],
+ }
+ }
+
fn init_global_listener(&mut self) {
use tuirealm::event::{Key, KeyEvent, KeyModifiers};
assert!(self
diff --git a/src/ui/activities/filetransfer/components/transfer/file_list.rs b/src/ui/activities/filetransfer/components/transfer/file_list.rs
index d17cc2d..011d9e1 100644
--- a/src/ui/activities/filetransfer/components/transfer/file_list.rs
+++ b/src/ui/activities/filetransfer/components/transfer/file_list.rs
@@ -7,7 +7,7 @@ use tuirealm::props::{
Alignment, AttrValue, Attribute, Borders, Color, Style, Table, TextModifiers,
};
use tuirealm::tui::layout::Corner;
-use tuirealm::tui::text::{Span, Spans};
+use tuirealm::tui::text::{Line, Span};
use tuirealm::tui::widgets::{List as TuiList, ListItem, ListState};
use tuirealm::{MockComponent, Props, State, StateValue};
@@ -211,7 +211,7 @@ impl MockComponent for FileList {
)
})
.collect();
- ListItem::new(Spans::from(columns))
+ ListItem::new(Line::from(columns))
})
.collect(), // Make List item from TextSpan
_ => Vec::new(),
@@ -245,7 +245,7 @@ impl MockComponent for FileList {
if matches!(attr, Attribute::Content) {
self.states.init_list_states(
match self.props.get(Attribute::Content).map(|x| x.unwrap_table()) {
- Some(spans) => spans.len(),
+ Some(line) => line.len(),
_ => 0,
},
);
diff --git a/src/ui/activities/filetransfer/misc.rs b/src/ui/activities/filetransfer/misc.rs
index 2035c8f..8505019 100644
--- a/src/ui/activities/filetransfer/misc.rs
+++ b/src/ui/activities/filetransfer/misc.rs
@@ -112,6 +112,7 @@ impl FileTransferActivity {
ProtocolParams::Generic(params) => params.address.clone(),
ProtocolParams::AwsS3(params) => params.bucket_name.clone(),
ProtocolParams::Smb(params) => params.address.clone(),
+ ProtocolParams::WebDAV(params) => params.uri.clone(),
}
}
@@ -141,6 +142,13 @@ impl FileTransferActivity {
);
format!("Connecting to \\\\{}\\{}…", params.address, params.share)
}
+ ProtocolParams::WebDAV(params) => {
+ info!(
+ "Client is not connected to remote; connecting to {}",
+ params.uri
+ );
+ format!("Connecting to {}…", params.uri)
+ }
}
}
diff --git a/src/ui/activities/setup/components/config.rs b/src/ui/activities/setup/components/config.rs
index afebffc..525f4dc 100644
--- a/src/ui/activities/setup/components/config.rs
+++ b/src/ui/activities/setup/components/config.rs
@@ -13,7 +13,7 @@ use crate::explorer::GroupDirs as GroupDirsEnum;
use crate::filetransfer::FileTransferProtocol;
use crate::ui::activities::setup::{
RADIO_PROTOCOL_FTP, RADIO_PROTOCOL_FTPS, RADIO_PROTOCOL_S3, RADIO_PROTOCOL_SCP,
- RADIO_PROTOCOL_SFTP, RADIO_PROTOCOL_SMB,
+ RADIO_PROTOCOL_SFTP, RADIO_PROTOCOL_SMB, RADIO_PROTOCOL_WEBDAV,
};
use crate::utils::parser::parse_bytesize;
@@ -67,7 +67,7 @@ impl DefaultProtocol {
.color(Color::Cyan)
.modifiers(BorderType::Rounded),
)
- .choices(&["SFTP", "SCP", "FTP", "FTPS", "S3", "SMB"])
+ .choices(&["SFTP", "SCP", "FTP", "FTPS", "S3", "SMB", "WebDAV"])
.foreground(Color::Cyan)
.rewind(true)
.title("Default protocol", Alignment::Left)
@@ -78,6 +78,7 @@ impl DefaultProtocol {
FileTransferProtocol::Ftp(true) => RADIO_PROTOCOL_FTPS,
FileTransferProtocol::AwsS3 => RADIO_PROTOCOL_S3,
FileTransferProtocol::Smb => RADIO_PROTOCOL_SMB,
+ FileTransferProtocol::WebDAV => RADIO_PROTOCOL_WEBDAV,
}),
}
}
diff --git a/src/ui/activities/setup/mod.rs b/src/ui/activities/setup/mod.rs
index 9448070..86c960d 100644
--- a/src/ui/activities/setup/mod.rs
+++ b/src/ui/activities/setup/mod.rs
@@ -31,6 +31,7 @@ const RADIO_PROTOCOL_FTP: usize = 2;
const RADIO_PROTOCOL_FTPS: usize = 3;
const RADIO_PROTOCOL_S3: usize = 4;
const RADIO_PROTOCOL_SMB: usize = 5;
+const RADIO_PROTOCOL_WEBDAV: usize = 6;
// -- components
#[derive(Debug, Eq, PartialEq, Clone, Hash)]
diff --git a/src/ui/activities/setup/view/mod.rs b/src/ui/activities/setup/view/mod.rs
index 1e9b174..2cd56bb 100644
--- a/src/ui/activities/setup/view/mod.rs
+++ b/src/ui/activities/setup/view/mod.rs
@@ -7,9 +7,6 @@ pub mod setup;
pub mod ssh_keys;
pub mod theme;
-pub use setup::*;
-pub use ssh_keys::*;
-pub use theme::*;
use tuirealm::event::{Key, KeyEvent, KeyModifiers};
use tuirealm::tui::widgets::Clear;
use tuirealm::{Frame, Sub, SubClause, SubEventClause};
diff --git a/src/ui/activities/setup/view/setup.rs b/src/ui/activities/setup/view/setup.rs
index f218dd4..a264943 100644
--- a/src/ui/activities/setup/view/setup.rs
+++ b/src/ui/activities/setup/view/setup.rs
@@ -10,7 +10,9 @@ use std::path::PathBuf;
use tuirealm::tui::layout::{Constraint, Direction, Layout};
use tuirealm::{State, StateValue};
-use super::{components, Context, Id, IdCommon, IdConfig, SetupActivity, ViewLayout};
+use super::{
+ components, Context, Id, IdCommon, IdConfig, SetupActivity, ViewLayout, RADIO_PROTOCOL_WEBDAV,
+};
use crate::explorer::GroupDirs;
use crate::filetransfer::FileTransferProtocol;
use crate::ui::activities::setup::{
@@ -277,6 +279,7 @@ impl SetupActivity {
RADIO_PROTOCOL_FTPS => FileTransferProtocol::Ftp(true),
RADIO_PROTOCOL_S3 => FileTransferProtocol::AwsS3,
RADIO_PROTOCOL_SMB => FileTransferProtocol::Smb,
+ RADIO_PROTOCOL_WEBDAV => FileTransferProtocol::WebDAV,
_ => FileTransferProtocol::Sftp,
};
self.config_mut().set_default_protocol(protocol);
diff --git a/src/utils/parser.rs b/src/utils/parser.rs
index e3ec11e..83cbac9 100644
--- a/src/utils/parser.rs
+++ b/src/utils/parser.rs
@@ -14,7 +14,9 @@ use tuirealm::utils::parser as tuirealm_parser;
#[cfg(smb)]
use crate::filetransfer::params::SmbParams;
-use crate::filetransfer::params::{AwsS3Params, GenericProtocolParams, ProtocolParams};
+use crate::filetransfer::params::{
+ AwsS3Params, GenericProtocolParams, ProtocolParams, WebDAVProtocolParams,
+};
use crate::filetransfer::{FileTransferParams, FileTransferProtocol};
#[cfg(not(test))] // NOTE: don't use configuration during tests
use crate::system::config_client::ConfigClient;
@@ -43,6 +45,16 @@ static REMOTE_GENERIC_OPT_REGEX: Lazy = lazy_regex!(
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])))?(?::([^:]+))?"
);
+/**
+ * Regex matches:
+ * - group 1: Username
+ * - group 2: Password
+ * - group 2: Uri
+ * - group 4: Some(path) | None
+ */
+static REMOTE_WEBDAV_OPT_REGEX: Lazy =
+ lazy_regex!(r"(?:([^:]+):)(?:([^@]+)@)(?:([^/]+))(?:/(.+))?");
+
/**
* Regex matches:
* - group 1: Bucket
@@ -145,14 +157,24 @@ pub fn parse_remote_opt(s: &str) -> Result {
#[cfg(test)] // NOTE: during test set protocol just to Sftp
let default_protocol: FileTransferProtocol = FileTransferProtocol::Sftp;
// Get protocol
- let (protocol, s): (FileTransferProtocol, String) =
+ let (protocol, remote): (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()),
+ FileTransferProtocol::AwsS3 => parse_s3_remote_opt(remote.as_str()),
#[cfg(smb)]
- FileTransferProtocol::Smb => parse_smb_remote_opts(s.as_str()),
- protocol => parse_generic_remote_opt(s.as_str(), protocol),
+ FileTransferProtocol::Smb => parse_smb_remote_opts(remote.as_str()),
+ FileTransferProtocol::WebDAV => {
+ // get the differnece between s and remote
+ let prefix = if s.starts_with("https") {
+ "https"
+ } else {
+ "http"
+ };
+
+ parse_webdav_remote_opt(remote.as_str(), prefix)
+ }
+ protocol => parse_generic_remote_opt(remote.as_str(), protocol),
}
}
@@ -232,6 +254,29 @@ fn parse_generic_remote_opt(
}
}
+fn parse_webdav_remote_opt(s: &str, prefix: &str) -> Result {
+ match REMOTE_WEBDAV_OPT_REGEX.captures(s) {
+ Some(groups) => {
+ let username = groups.get(1).map(|x| x.as_str().to_string()).unwrap();
+ let password = groups.get(2).map(|x| x.as_str().to_string()).unwrap();
+ let uri = groups.get(3).map(|x| x.as_str().to_string()).unwrap();
+ let remote_path: Option =
+ groups.get(4).map(|group| PathBuf::from(group.as_str()));
+
+ let params = ProtocolParams::WebDAV(WebDAVProtocolParams {
+ uri: format!("{}://{}", prefix, uri),
+ username,
+ password,
+ });
+ Ok(
+ FileTransferParams::new(FileTransferProtocol::WebDAV, params)
+ .remote_path(remote_path),
+ )
+ }
+ None => Err(String::from("Bad remote host syntax!")),
+ }
+}
+
/// Parse remote options for s3 protocol
fn parse_s3_remote_opt(s: &str) -> Result {
match REMOTE_S3_OPT_REGEX.captures(s) {
@@ -553,6 +598,25 @@ mod tests {
assert!(parse_remote_opt(&String::from("scp://172.26.104.1:650000")).is_err());
}
+ #[test]
+ fn test_should_parse_webdav_opt() {
+ let result =
+ parse_remote_opt("https://omar:password@myserver:4445/myshare/dir/subdir").unwrap();
+
+ let params = result.params.webdav_params().unwrap();
+ assert_eq!(params.uri.as_str(), "https://myserver:4445");
+ assert_eq!(params.username.as_str(), "omar");
+ assert_eq!(params.password.as_str(), "password");
+
+ let result =
+ parse_remote_opt("http://omar:password@myserver:4445/myshare/dir/subdir").unwrap();
+
+ let params = result.params.webdav_params().unwrap();
+ assert_eq!(params.uri.as_str(), "http://myserver:4445");
+ assert_eq!(params.username.as_str(), "omar");
+ assert_eq!(params.password.as_str(), "password");
+ }
+
#[test]
fn parse_aws_s3_opt() {
// Simple
diff --git a/src/utils/path.rs b/src/utils/path.rs
index f121833..ea90e73 100644
--- a/src/utils/path.rs
+++ b/src/utils/path.rs
@@ -60,8 +60,8 @@ where
}
(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(Component::CurDir)) => comps.push(a),
+ (Some(_), Some(Component::ParentDir)) => return None,
(Some(a), Some(_)) => {
comps.push(Component::ParentDir);
for _ in itb {
diff --git a/src/utils/ui.rs b/src/utils/ui.rs
index 3791c8e..f92e43a 100644
--- a/src/utils/ui.rs
+++ b/src/utils/ui.rs
@@ -67,7 +67,7 @@ mod tests {
let child: Rect = Popup(Size::Percentage(75), Size::Percentage(30)).draw_in(area);
assert_eq!(child.x, 43);
assert_eq!(child.y, 63);
- assert_eq!(child.width, 271);
- assert_eq!(child.height, 54);
+ assert_eq!(child.width, 272);
+ assert_eq!(child.height, 55);
}
}
+ 
