refactor: Remove not needed types in icloud (#4021)

* Save work Signed-off-by: Xuanwo <[email protected]> * refactor: Remove not needed types in icloud Signed-off-by: Xuanwo <[email protected]> * Remove not needed clients Signed-off-by: Xuanwo <[email protected]> --------- Signed-off-by: Xuanwo <[email protected]>
apache · Jan 19, 2024 · 6c8b049 · 6c8b049
1 parent 60dcec9
commit 6c8b049
Show file tree

Hide file tree

Showing 5 changed files with 348 additions and 392 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -75,6 +75,7 @@ native-tls-vendored = ["reqwest/native-tls-vendored"]
 # Enable path cache.
 # This is an internal feature, and should not be used by users.
 internal-path-cache = ["dep:moka"]
+internal-http-cookies = ["reqwest/cookies"]
 
 # Enable all layers.
 layers-all = [
@@ -154,7 +155,7 @@ services-http = []
 services-huggingface = []
 services-ipfs = ["dep:prost"]
 services-ipmfs = []
-services-icloud = ["internal-path-cache"]
+services-icloud = ["internal-path-cache", "internal-http-cookies"]
 services-koofr = []
 services-libsql = ["dep:hrana-client-proto"]
 services-memcached = ["dep:bb8"]

diff --git a/core/src/raw/http_util/client.rs b/core/src/raw/http_util/client.rs
@@ -69,6 +69,8 @@ impl HttpClient {
 
         #[cfg(feature = "trust-dns")]
         let builder = builder.trust_dns(true);
+        #[cfg(feature = "internal-http-cookies")]
+        let builder = builder.cookie_store(true);
 
         Ok(Self {
             client: builder.build().map_err(|err| {

diff --git a/core/src/services/icloud/backend.rs b/core/src/services/icloud/backend.rs
@@ -23,11 +23,9 @@ use std::fmt::{Debug, Formatter};
 use std::sync::Arc;
 use tokio::sync::Mutex;
 
+use super::core::*;
 use crate::raw::*;
 use crate::*;
-use crate::{Capability, Scheme};
-
-use super::core::{parse_error, IcloudCore, IcloudPathQuery, IcloudSigner, SessionData};
 
 /// Config for icloud services support.
 #[derive(Default, Deserialize)]
@@ -146,6 +144,7 @@ impl IcloudBuilder {
 
         self
     }
+
     /// ds_web_auth_token must be set in Session
     ///
     /// Avoid Two Factor Authentication
@@ -158,9 +157,11 @@ impl IcloudBuilder {
 
         self
     }
-    /// Enable the china origin
-    /// For China, use "https://www.icloud.com.cn"
-    /// For Other region, use "https://www.icloud.com"
+
+    /// Set if your apple id in China mainland.
+    ///
+    /// If in china mainland, we will connect to `https://www.icloud.com.cn`.
+    /// Otherwise, we will connect to `https://www.icloud.com`.
     pub fn is_china_mainland(&mut self, is_china_mainland: bool) -> &mut Self {
         self.config.is_china_mainland = is_china_mainland;
         self
@@ -243,14 +244,15 @@ impl Builder for IcloudBuilder {
             trust_token: Some(trust_token),
             ds_web_auth_token: Some(ds_web_auth_token),
             is_china_mainland: self.config.is_china_mainland,
+            initiated: false,
         };
 
         let signer = Arc::new(Mutex::new(signer));
         Ok(IcloudBackend {
             core: Arc::new(IcloudCore {
                 signer: signer.clone(),
                 root,
-                path_cache: PathCacher::new(IcloudPathQuery::new(client, signer.clone())),
+                path_cache: PathCacher::new(IcloudPathQuery::new(signer.clone())),
             }),
         })
     }