bak

Author: timzaak

Cargo.lock

@@ -22,9 +22,7 @@ delay_timer = "0.11.6"
 duration-str = "0.17"
 futures = "0.3"
 futures-util = { version = "0.3", default-features = false }
-if_chain = "1.0"
 indicatif = "0.18"
-lazy_static = "1.4"
 md-5 = "0.10"
 percent-encoding = "2.1"
 regex = "1.10"

Cargo.toml

@@ -46,5 +46,4 @@ indicatif = { workspace = true }
 md-5 = { workspace = true }
 # util
 anyhow = { workspace = true, features = ["backtrace"] }
-walkdir = { workspace = true }
-if_chain = { workspace = true }
+walkdir = { workspace = true }

client/Cargo.toml

@@ -5,7 +5,6 @@ use entity::request::UpdateUploadingStatusOption;
 use entity::storage::{GetDomainPositionStatus, ShortMetaData, UploadingStatus};
 use futures::StreamExt;
 use futures::future::Either;
-use if_chain::if_chain;
 use md5::{Digest, Md5};
 use std::borrow::Cow;
 use std::collections::HashMap;
@@ -55,27 +54,28 @@ pub async fn upload_files(
         .min_depth(1)
         .into_iter()
         .filter_map(|entity| {
-            if_chain! {
-                if let Some(entity) = entity.ok();
-                if let Some(metadata) = entity.metadata().ok();
-                if metadata.is_file();
-                if let Ok(key) = entity.path().strip_prefix(&parent);
-                then {
-                    let key = key.components().map(|c| c.as_os_str().to_string_lossy())
-                    .collect::<Vec<_>>()
-                    .join("/");
-                    if server_metadata.get(&key).filter(|x|{
-                        let md5 = md5_file(entity.path(), &mut byte_buffer);
-                        x.length == metadata.len() &&
-                        md5.filter(|md5|md5 == &x.md5).is_some()
-                    }).is_none() {
-                        Some((key, entity.path().to_path_buf()))
-                    } else {
-                        None
-                    }
-                }else {
-                    None
-                }
+            let entity = entity.ok()?;
+            let metadata = entity.metadata().ok()?;
+            if !metadata.is_file() {
+                return None;
+            }
+            let key = entity.path().strip_prefix(&parent).ok()?;
+            let key = key
+                .components()
+                .map(|c| c.as_os_str().to_string_lossy())
+                .collect::<Vec<_>>()
+                .join("/");
+            if server_metadata
+                .get(&key)
+                .filter(|x| {
+                    let md5 = md5_file(entity.path(), &mut byte_buffer);
+                    x.length == metadata.len() && md5.filter(|md5| md5 == &x.md5).is_some()
+                })
+                .is_none()
+            {
+                Some((key, entity.path().to_path_buf()))
+            } else {
+                None
             }
         })
         .collect::<Vec<(String, PathBuf)>>();

client/src/upload_files.rs

@@ -55,7 +55,6 @@ dashmap = { workspace = true }
 # util
 md-5 = { workspace = true }
 regex = { workspace = true }
-lazy_static = { workspace = true }
 # solve return  result
 anyhow = { workspace = true, features = ["backtrace"] }
 # solve dir walk without recursion

server/Cargo.toml

@@ -110,7 +110,7 @@ impl AdminServer {
 
 pub mod service {
     use crate::admin_server::bad_resp;
-    use crate::domain_storage::{DomainStorage, URI_REGEX};
+    use crate::domain_storage::{DomainStorage, uri_regex};
     use entity::request::{
         DeleteDomainVersionOption, DomainWithOptVersionOption, DomainWithVersionOption,
         GetDomainOption, GetDomainPositionFormat, GetDomainPositionOption,
@@ -189,7 +189,7 @@ pub mod service {
             if super::AdminServer::check_alias(&option.domain, host_alias.clone(), res) {
                 return;
             }
-            if URI_REGEX.is_match(&option.domain) {
+            if uri_regex().is_match(&option.domain) {
                 match storage.get_upload_position(&option.domain) {
                     Ok(ret) => {
                         if option.format == GetDomainPositionFormat::Json {