vh/termscp
1
0
Fork 0
mirror of https://github.com/veeso/termscp.git synced 2025-12-07 09:36:00 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

added cfg smb-windows to be able to disable SMB on windows (#210)

Browse Source 
* added cfg smb-windows to be able to disable SMB on windows

* lint
This commit is contained in:
Christian Visintin
2023-08-20 10:24:34 +02:00
committed by GitHub
parent 2f48c765e3
commit 9de171fb83
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build.rs
View File

@@ -10,6 +10,7 @@ fn main() {
windows: { target_family = "windows" }, windows: { target_family = "windows" },
// exclusive features // exclusive features
smb: { all(feature = "smb", not( macos )) }, smb: { all(feature = "smb", not( macos )) },
smb_unix: { all(unix, feature = "smb", not(macos)) } smb_unix: { all(unix, feature = "smb", not(macos)) },
smb_windows: { all(windows, feature = "smb") }
} }
} }

2
src/filetransfer/builder.rs
View File

@@ -140,7 +140,7 @@ impl Builder {
} }
} }
#[cfg(windows)] #[cfg(smb_windows)]
fn smb_client(params: SmbParams) -> SmbFs { fn smb_client(params: SmbParams) -> SmbFs {
let mut credentials = SmbCredentials::new(params.address, params.share); let mut credentials = SmbCredentials::new(params.address, params.share);

2
src/ui/activities/setup/actions.rs
View File

@@ -366,7 +366,7 @@ impl SetupActivity {
.get_color(&Id::Theme(IdTheme::StatusSync)) .get_color(&Id::Theme(IdTheme::StatusSync))
.map_err(|_| Id::Theme(IdTheme::StatusSync))?; .map_err(|_| Id::Theme(IdTheme::StatusSync))?;
// Update theme // Update theme
let mut theme: &mut Theme = self.theme_mut(); let theme = self.theme_mut();
theme.auth_address = auth_address; theme.auth_address = auth_address;
theme.auth_bookmarks = auth_bookmarks; theme.auth_bookmarks = auth_bookmarks;
theme.auth_password = auth_password; theme.auth_password = auth_password;

10
src/utils/parser.rs
View File

@@ -73,7 +73,7 @@ static REMOTE_SMB_OPT_REGEX: Lazy<Regex> = lazy_regex!(
* - group 3: share * - group 3: share
* - group 4: remote-dir? * - group 4: remote-dir?
*/ */
#[cfg(windows)] #[cfg(smb_windows)]
static REMOTE_SMB_OPT_REGEX: Lazy<Regex> = static REMOTE_SMB_OPT_REGEX: Lazy<Regex> =
lazy_regex!(r"(?:([^@]+)@)?(?:([^:\\]+))(?:\\([^\\]+))?(?:(\\.+))?"); lazy_regex!(r"(?:([^@]+)@)?(?:([^:\\]+))(?:\\([^\\]+))?(?:(\\.+))?");
@@ -171,7 +171,7 @@ fn parse_remote_opt_protocol(
let protocol = match protocol { let protocol = match protocol {
Some(Ok(protocol)) => protocol, Some(Ok(protocol)) => protocol,
Some(Err(err)) => return Err(err), Some(Err(err)) => return Err(err),
#[cfg(windows)] #[cfg(smb_windows)]
None if groups.get(2).is_some() => FileTransferProtocol::Smb, None if groups.get(2).is_some() => FileTransferProtocol::Smb,
None => default, None => default,
}; };
@@ -295,7 +295,7 @@ fn parse_smb_remote_opts(s: &str) -> Result<FileTransferParams, String> {
} }
} }
#[cfg(windows)] #[cfg(smb_windows)]
fn parse_smb_remote_opts(s: &str) -> Result<FileTransferParams, String> { fn parse_smb_remote_opts(s: &str) -> Result<FileTransferParams, String> {
match REMOTE_SMB_OPT_REGEX.captures(s) { match REMOTE_SMB_OPT_REGEX.captures(s) {
Some(groups) => { Some(groups) => {
@@ -639,7 +639,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(windows)] #[cfg(smb_windows)]
fn should_parse_smb_address() { fn should_parse_smb_address() {
let result = parse_remote_opt(&String::from("\\\\myserver\\myshare")) let result = parse_remote_opt(&String::from("\\\\myserver\\myshare"))
.ok() .ok()
@@ -652,7 +652,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(windows)] #[cfg(smb_windows)]
fn should_parse_smb_address_with_opts() { fn should_parse_smb_address_with_opts() {
let result = parse_remote_opt(&String::from("\\\\omar@myserver\\myshare\\path")) let result = parse_remote_opt(&String::from("\\\\omar@myserver\\myshare\\path"))
.ok() .ok()