diff options
Diffstat (limited to 'legacy_actions')
5 files changed, 30 insertions, 30 deletions
diff --git a/legacy_actions/src/lib.rs b/legacy_actions/src/lib.rs index c1dda86..f6b0281 100644 --- a/legacy_actions/src/lib.rs +++ b/legacy_actions/src/lib.rs @@ -1,3 +1,9 @@ +#![allow( + clippy::type_complexity, + clippy::question_mark, + clippy::redundant_pattern_matching +)] + pub mod connection; pub mod local_actions; pub mod registry; diff --git a/legacy_actions/src/remote_actions.rs b/legacy_actions/src/remote_actions.rs index d15edc9..64db407 100644 --- a/legacy_actions/src/remote_actions.rs +++ b/legacy_actions/src/remote_actions.rs @@ -108,24 +108,22 @@ pub async fn auth_member( Err(TcpTargetError::Authentication( "Authenticate failed.".to_string(), )) - } else { - if using_host_mode { - if vault.config().vault_host_list().contains(&member_id) { - // Using Host mode authentication, and is indeed an administrator - mut_instance.write(true).await?; - Ok((member_id, true)) - } else { - // Using Host mode authentication, but not an administrator - mut_instance.write(false).await?; - Err(TcpTargetError::Authentication( - "Authenticate failed.".to_string(), - )) - } - } else { - // Not using Host mode authentication + } else if using_host_mode { + if vault.config().vault_host_list().contains(&member_id) { + // Using Host mode authentication, and is indeed an administrator mut_instance.write(true).await?; - Ok((member_id, false)) + Ok((member_id, true)) + } else { + // Using Host mode authentication, but not an administrator + mut_instance.write(false).await?; + Err(TcpTargetError::Authentication( + "Authenticate failed.".to_string(), + )) } + } else { + // Not using Host mode authentication + mut_instance.write(true).await?; + Ok((member_id, false)) } } Err(e) => Err(e), diff --git a/legacy_actions/src/remote_actions/content_manage/track_file.rs b/legacy_actions/src/remote_actions/content_manage/track_file.rs index a59ca76..0beb348 100644 --- a/legacy_actions/src/remote_actions/content_manage/track_file.rs +++ b/legacy_actions/src/remote_actions/content_manage/track_file.rs @@ -437,7 +437,7 @@ async fn proc_create_tasks_local( let mut mut_instance = instance.lock().await; let mut local_sheet = workspace.local_sheet(member_id, sheet_name).await?; - if print_infos && relative_paths.len() > 0 { + if print_infos && !relative_paths.is_empty() { local_println!(local_output, "Creating {} files...", relative_paths.len()); } @@ -585,7 +585,7 @@ async fn proc_update_tasks_local( let mut success = Vec::new(); - if print_infos && relative_paths.len() > 0 { + if print_infos && !relative_paths.is_empty() { local_println!(local_output, "Updating {} files...", relative_paths.len()); } @@ -826,7 +826,7 @@ async fn proc_sync_tasks_local( let mut mut_instance = instance.lock().await; let mut success: Vec<PathBuf> = Vec::new(); - if print_infos && relative_paths.len() > 0 { + if print_infos && !relative_paths.is_empty() { local_println!(local_output, "Syncing {} files...", relative_paths.len()); } @@ -902,7 +902,7 @@ async fn proc_sync_tasks_local( // First download let mut data = LocalMappingMetadata::default(); data.set_mapping_vfid(vfid); - if let Err(_) = local_sheet.add_mapping(&path, data) { + if local_sheet.add_mapping(&path, data).is_err() { continue; } match local_sheet.mapping_data_mut(&path) { diff --git a/legacy_actions/src/remote_actions/mapping_manage/merge_share_mapping.rs b/legacy_actions/src/remote_actions/mapping_manage/merge_share_mapping.rs index df889a1..d3485cb 100644 --- a/legacy_actions/src/remote_actions/mapping_manage/merge_share_mapping.rs +++ b/legacy_actions/src/remote_actions/mapping_manage/merge_share_mapping.rs @@ -104,11 +104,8 @@ pub async fn merge_share_mapping_action( .await .read::<MergeShareMappingActionResult>() .await?; - match result { - MergeShareMappingActionResult::Success => { - sign_vault_modified(true).await; - } - _ => {} + if let MergeShareMappingActionResult::Success = result { + sign_vault_modified(true).await; } return Ok(result); } diff --git a/legacy_actions/src/remote_actions/workspace_manage/update_to_latest_info.rs b/legacy_actions/src/remote_actions/workspace_manage/update_to_latest_info.rs index cd17c32..7ff2c49 100644 --- a/legacy_actions/src/remote_actions/workspace_manage/update_to_latest_info.rs +++ b/legacy_actions/src/remote_actions/workspace_manage/update_to_latest_info.rs @@ -80,8 +80,8 @@ pub async fn update_to_latest_info_action( for sheet in vault.sheets().await? { // Build share parts - if let Some(holder) = sheet.holder() { - if holder == &member_id || holder == VAULT_HOST_NAME { + if let Some(holder) = sheet.holder() + && (holder == &member_id || holder == VAULT_HOST_NAME) { let mut sheet_shares: HashMap<SheetShareId, Share> = HashMap::new(); for share in sheet.get_shares().await? { // Get SharePath @@ -99,11 +99,10 @@ pub async fn update_to_latest_info_action( } shares_in_my_sheets.insert(sheet.name().clone(), sheet_shares); } - } // Build sheet parts let holder_is_host = - sheet.holder().unwrap_or(&String::default()) == &VAULT_HOST_NAME; + sheet.holder().unwrap_or(&String::default()) == VAULT_HOST_NAME; if sheet.holder().is_some() && (sheet.holder().unwrap() == &member_id || holder_is_host) { @@ -129,7 +128,7 @@ pub async fn update_to_latest_info_action( latest_info.ref_sheet_content = ref_sheet_data.clone(); latest_info.ref_sheet_vfs_mapping = ref_sheet_data .mapping() - .into_iter() + .iter() .map(|(path, file)| (file.id.clone(), path.clone())) .collect::<HashMap<VirtualFileId, SheetPathBuf>>(); latest_info.reference_sheets = ref_sheets; |