add trait ApiCall

src/services/copy.rs

@@ -1,20 +1,27 @@
-use reqwest::{Method, Response, Error, header::HeaderValue};
+use reqwest::{Method, header::HeaderValue};
 use crate::services::api::{ApiBuilder, ApiError};
 use crate::clone::get_url_props;
 use crate::commands::config;
+use crate::services::api_call::ApiCall;
 
 pub struct Copy {
     api_builder: ApiBuilder,
 }
 
-impl Copy {
-    pub fn new() -> Self {
+impl ApiCall for Copy {
+    fn new() -> Self {
         Copy {
             api_builder: ApiBuilder::new(),
         }
     }
 
-    pub fn set_url(&mut self, url: &str, destination: &str) -> &mut Copy {
+    fn send(&mut self) -> Result<Option<String>, ApiError> {
+        self.api_builder.send(true)
+    }
+}
+
+impl Copy {
+    pub fn set_url_copy(&mut self, url: &str, destination: &str) -> &mut Copy {
         self.api_builder.build_request(Method::from_bytes(b"COPY").unwrap(), url);
         
         let remote = match config::get("remote") {
@@ -37,25 +44,10 @@ impl Copy {
         self
     }
 
-    pub async fn send(&mut self) -> Result<Response, Error> {
-        self.api_builder.send().await
-    }
-
     pub fn _overwrite(&mut self, overwrite: bool) -> &mut Copy {
         self.api_builder.set_header("Overwrite", HeaderValue::from_str({
             if overwrite { "T" } else { "F" }
         }).unwrap());
         self
     }
-    
-    pub fn send_with_err(&mut self) -> Result<(), ApiError> {
-        let res = tokio::runtime::Runtime::new().unwrap().block_on(async {
-            self.send().await
-        }).map_err(ApiError::RequestError)?;
-        if res.status().is_success() {
-            Ok(())
-        } else {
-            Err(ApiError::IncorrectRequest(res))
-        }
-    }
 }