feat(download): simple downloader working without streaming

src/commands/clone.rs

@@ -1,6 +1,13 @@
+use super::init;
 use crate::config::config::Config;
-use crate::services::{service::Service, enumerator::Enumerator};
+use crate::services::{downloader::Downloader, enumerator::Enumerator, service::Service};
+use crate::store::{
+    nsobject::NsObject,
+    structs,
+};
 use regex::Regex;
+use std::fs;
+use std::io::{self, BufRead};
 
 pub struct CloneArgs {
     pub remote: String,
@@ -9,35 +16,61 @@ pub struct CloneArgs {
 }
 
 pub async fn exec(args: CloneArgs, config: Config) {
+    init::init(&config);
+    structs::init(config.get_root_unsafe());
+
     let mut url_props = get_url_props(&args.remote);
 
     if args.force_insecure {
         url_props.is_secure = false;
     }
 
+    // Ask for webdav user
+    if url_props.user == String::new() {
+        println!("Please enter the username of the webdav instance: ");
+        let stdin = io::stdin();
+        url_props.user = stdin.lock().lines().next().unwrap().unwrap();
+    }
+
     let service = Service::from(&url_props);
     let Ok((files, folders)) = Enumerator::new(&service)
-        .set_path(url_props.path.to_string())
+        .set_path(String::new()) // use base_path of the service
         // .set_depth(args.depth)
         .get_properties(vec![])
-        .enumerate().await else { todo!() };
+        .enumerate()
+        .await
+    else {
+        todo!("Enumerator has failed")
+    };
     dbg!(&files);
     dbg!(&folders);
 
     for folder in folders {
-        // create folder
+        if folder.abs_path() == "" {
-        // save folder
+            continue;
+        }
+        fs::create_dir(folder.obj_path()).unwrap();
+        NsObject::from_local_path(&folder.obj_path())
+            .save()
+            .unwrap();
     }
 
-    // let downloader = Downloader::new(&service, config.get_root_unsafe())
+    let downloader = Downloader::new(&service)
-    //     .set_files(files.map(|file| todo!()))
+        .set_files(
-    //     .download();
+            files
+                .into_iter()
+                .map(|file| file.abs_path().to_string())
+                .collect(),
+        )
+        .download()
+        .await;
 }
 
 pub struct UrlProps<'a> {
     pub is_secure: bool,
     pub domain: &'a str,
     pub path: &'a str,
+    pub user: String,
 }
 
 impl UrlProps<'_> {
@@ -46,8 +79,23 @@ impl UrlProps<'_> {
             is_secure: true,
             domain: "",
             path: "",
+            user: String::new(),
         }
     }
+
+    /// Generate the url with all the informations of the instance
+    pub fn full_url(&self) -> String {
+        format!(
+            "{}@{}{}{}",
+            self.user,
+            match self.is_secure {
+                true => "https://",
+                false => "http://",
+            },
+            self.domain,
+            self.path
+        )
+    }
 }
 
 pub fn get_url_props(url: &str) -> UrlProps {

src/commands/init.rs

@@ -18,6 +18,10 @@ pub struct InitArgs {}
 ///
 /// This function will panic if it cannot create the mentioned files or directories.
 pub fn exec(_: InitArgs, config: Config) {
+    init(&config);
+}
+
+pub fn init(config: &Config) {
     let mut path: PathBuf = config.execution_path.clone();
     path.push(".nextsync");
 

src/commands/test.rs

@@ -1,7 +1,7 @@
 use crate::config::config::Config;
-use crate::services::req_props::{Props, ReqProps};
+// use crate::services::req_props::{Props, ReqProps};
-use crate::store::object::Obj;
+// use crate::store::object::Obj;
-use crate::store::{indexer::Indexer, structs};
+// use crate::store::{indexer::Indexer, structs};
 
 pub struct TestArgs {}
 

src/services.rs

@@ -1,4 +1,5 @@
 pub mod downloader;
+pub mod download;
 pub mod enumerator;
 pub mod req_props;
 pub mod service;

src/services/download.rs

@@ -0,0 +1,42 @@
+use crate::services::service::{Request, Service};
+use crate::store::nsobject::NsObject;
+use std::{fs::OpenOptions, io::Write};
+
+pub struct Download<'a> {
+    request: Request<'a>,
+    obj_path: String,
+}
+
+impl<'a> Download<'a> {
+    pub fn new(service: &'a Service) -> Self {
+        Download {
+            request: Request::new(service),
+            obj_path: String::new(),
+        }
+    }
+
+    pub fn set_obj_path(mut self, obj_path: String) -> Self {
+        self.request.get(obj_path.clone());
+        self.obj_path = obj_path
+            .strip_prefix("/")
+            .unwrap_or(&self.obj_path.clone())
+            .to_string();
+        self
+    }
+
+    pub async fn send(&mut self) -> Result<(), reqwest::Error> {
+        let res = self.request.send().await;
+        let body = res.unwrap().bytes().await?;
+        let mut file = OpenOptions::new()
+            .write(true)
+            .create(true)
+            .open(self.obj_path.clone())
+            .unwrap();
+
+        file.write_all(&body.to_vec()).unwrap();
+        NsObject::from_local_path(&self.obj_path.clone().into())
+            .save()
+            .unwrap();
+        Ok(())
+    }
+}

src/services/downloader.rs

@@ -0,0 +1,26 @@
+use super::{download::Download, service::Service};
+
+pub struct Downloader<'a> {
+    service: &'a Service,
+    files: Vec<String>,
+}
+
+impl<'a> Downloader<'a> {
+    pub fn new(service: &'a Service) -> Self {
+        Downloader {
+            service,
+            files: Vec::new(),
+        }
+    }
+
+    pub fn set_files(mut self, files: Vec<String>) -> Self {
+        self.files = files;
+        self
+    }
+
+    pub async fn download(&self) {
+        for file in self.files.clone() {
+            Download::new(self.service).set_obj_path(file).send().await;
+        }
+    }
+}

src/services/req_props.rs

@@ -1,8 +1,9 @@
 use crate::services::service::{Request, Service};
-use crate::store::object::Obj;
+use crate::store::structs::{to_obj_path, ObjPath};
 use crate::utils::path;
 use serde::Deserialize;
 use serde_xml_rs::from_str;
+use std::path::PathBuf;
 
 #[derive(Clone)]
 pub enum Props {
@@ -46,6 +47,7 @@ pub struct Response {
     pub href: String,
     #[serde(rename = "propstat")]
     propstat: Propstat,
+    href_prefix: Option<String>,
 }
 
 impl Response {
@@ -54,9 +56,13 @@ impl Response {
     }
 
     pub fn abs_path(&self) -> &str {
+        dbg!(self.href_prefix.clone());
         let path = self
             .href
-            .strip_prefix("/remote.php/dav/files")
+            .strip_prefix(&format!(
+                "/remote.php/dav/files/{}",
+                self.href_prefix.clone().unwrap_or_default()
+            ))
             .expect(&format!(
                 "Unexpected result when requesting props. Cannot strip from {}",
                 self.href
@@ -69,6 +75,12 @@ impl Response {
         }
     }
 
+    pub fn obj_path(&self) -> ObjPath {
+        let mut path = self.abs_path();
+        path = path.strip_prefix("/").unwrap();
+        to_obj_path(&PathBuf::from(path))
+    }
+
     pub fn path_depth(&self) -> u16 {
         path::get_depth(self.abs_path())
     }
@@ -136,7 +148,13 @@ impl<'a> ReqProps<'a> {
     pub async fn send(&mut self) -> Result<Multistatus, reqwest::Error> {
         let res = self.request.send().await;
         let xml = res.unwrap().text().await?;
-        let multistatus: Multistatus = from_str(&xml).unwrap();
+        dbg!(&xml);
+        let mut multistatus: Multistatus =
+            from_str(&xml).expect("Failed to unwrap xml response from req_props");
+        multistatus
+            .responses
+            .iter_mut()
+            .for_each(|res| res.href_prefix = Some(self.request.service.href_prefix()));
         Ok(multistatus)
     }
 }

src/services/service.rs

@@ -1,5 +1,5 @@
 use crate::commands::clone::UrlProps;
-use reqwest::{header::HeaderMap, Method, Url};
+use reqwest::{header::HeaderMap, Method};
 use reqwest::{Client, ClientBuilder, RequestBuilder};
 
 const USER_AGENT: &str = "Nextsync";
@@ -38,6 +38,8 @@ impl ClientConfig {
 pub struct Service {
     /// http[s]://host.xz/remote.php/dav/files
     url_base: String,
+    base_path: String,
+    user: String,
 }
 
 impl From<&UrlProps<'_>> for Service {
@@ -50,7 +52,11 @@ impl From<&UrlProps<'_>> for Service {
         url_base.push_str(url_props.domain);
         url_base.push_str("/remote.php/dav/files");
 
-        Service { url_base }
+        Service {
+            url_base,
+            base_path: url_props.path.to_string(),
+            user: url_props.user.clone(),
+        }
     }
 }
 
@@ -59,10 +65,27 @@ impl Service {
         request
             .bearer_auth("rK5ud2NmrR8p586Th7v272HRgUcZcEKIEluOGjzQQRj7gWMMAISFTiJcFnnmnNiu2VVlENks")
     }
+
+    fn build_url(&self, url: &str) -> String {
+        let mut final_url = self.url_base.clone();
+        final_url.push_str("/");
+        final_url.push_str(&self.user);
+        final_url.push_str(&self.base_path);
+        final_url.push_str(url);
+        final_url
+    }
+
+    /// Return the prefix of a href
+    /// /user/base_path/path -> /user/base_path
+    pub fn href_prefix(&self) -> String {
+        let mut prefix = self.user.clone();
+        prefix.push_str(&self.base_path);
+        prefix
+    }
 }
 
 pub struct Request<'a> {
-    service: &'a Service,
+    pub service: &'a Service,
     client: ClientConfig,
     method: Option<Method>,
     url: Option<String>,
@@ -88,16 +111,23 @@ impl<'a> Request<'a> {
         self
     }
 
+    pub fn get(&mut self, url: String) -> &mut Self {
+        self.method = Some(Method::GET);
+        self.url = Some(url);
+        self
+    }
+
     pub async fn send(&mut self) -> Result<reqwest::Response, reqwest::Error> {
+        dbg!(self.service.build_url(&self.url.clone().expect("An url must be set")));
         self.service
             .authenticate(
                 self.client
                     .build()
-                    .request(self.method.clone().expect("Method must be set"), {
+                    .request(
-                        let mut url = self.service.url_base.clone();
+                        self.method.clone().expect("Method must be set"),
-                        url.push_str(&self.url.clone().expect("An url must be set"));
+                        self.service
-                        url
+                            .build_url(&self.url.clone().expect("An url must be set")),
-                    })
+                    )
                     .headers(self.headers.clone()),
             )
             .send()

src/store/nsobject.rs

@@ -2,7 +2,10 @@ use crate::store::{
     object::{Obj, ObjMetadata, ObjType},
     structs::{NsObjPath, ObjPath},
 };
+use std::fs::{self, File, OpenOptions};
+use std::io::{self, Write};
 use std::sync::OnceLock;
+use std::time::UNIX_EPOCH;
 
 type NsObjectChilds = Vec<Box<NsObject>>;
 
@@ -81,15 +84,99 @@ impl NsObject {
     /// * if it is a Tree obj after an empty line there will be the definition
     /// of its subobjs (one line by subobj) *
     /// obj_type + hash
-    pub fn save(&self) -> Result<(), ()> {
+    pub fn save(&self) -> io::Result<()> {
         if !self.get_obj_path().exists() {
-            // delete current obj
+            self.delete_nsobj();
-            // delete reference on parent
         } else {
+            dbg!(self.get_nsobj_path());
+            if self.get_nsobj_path().exists() {
+                self.edit_nsobj();
+            } else {
+                self.create_nsobj()?;
+            }
         }
         Ok(())
     }
 
+    fn delete_nsobj(&self) {
+        todo!("Delete nsobj");
+        // delete current obj
+        // delete reference on parent
+    }
+
+    fn create_nsobj(&self) -> io::Result<()> {
+        let nsobj_path = self.get_nsobj_path();
+        let mut file = {
+            let mut nsobj_dir = nsobj_path.clone();
+            nsobj_dir.pop();
+            if !nsobj_dir.exists() {
+                std::fs::create_dir_all(nsobj_dir)?;
+            }
+            File::create(&nsobj_path)?
+        };
+
+        // Write type
+        file.write(&[self.obj_type.clone().into()])?;
+
+        if self.obj_type == ObjType::Blob {
+            if let Some(metadata) = self.get_metadata() {
+                // Write size
+                file.write(&metadata.size.to_le_bytes())?;
+
+                // Write modified
+                file.write(
+                    &metadata
+                        .modified
+                        .expect(&format!(
+                            "Expect 'modified' in metadata of {} to save obj",
+                            self.get_obj_path().as_path().display()
+                        ))
+                        .duration_since(UNIX_EPOCH)
+                        .unwrap()
+                        .as_secs()
+                        .to_le_bytes(),
+                )?;
+            } else {
+                todo!("Cannot load metadata")
+            }
+        }
+
+        file.write_all(b"\n")?;
+        // Write Path
+        file.write_all(self.get_obj_path().to_str().unwrap().as_bytes())?;
+        file.write_all(b"\n")?;
+
+        file.flush()?;
+
+        // Save itself inside its parent
+        let mut parent_path = self.get_obj_path().clone();
+        parent_path.pop();
+        let parent_obj = NsObject::from_local_path(&parent_path);
+        parent_obj.add_child(&self)?;
+        Ok(())
+    }
+
+    fn edit_nsobj(&self) {
+        todo!("Edit nsobj");
+    }
+
+
+    fn add_child(&self, child: &NsObject) -> io::Result<()> {
+        let mut file = OpenOptions::new()
+            .write(true)
+            .create(true)
+            .append(true)
+            .open(self.get_nsobj_path())?;
+
+        let child_type = &[child.obj_type.clone().into()];
+        let child_path = child.get_obj_path().to_str().unwrap().as_bytes();
+        file.write(child_type)?;
+        file.write(child_path)?;
+        file.write(b"\n")?;
+        file.flush()?;
+        Ok(())
+    }
+
     pub fn get_metadata(&self) -> Option<ObjMetadata> {
         todo!()
     }

src/store/object.rs

@@ -3,18 +3,18 @@ use crate::store::{
     structs::{NsObjPath, ObjPath},
 };
 use crate::utils::path;
-use std::env;
+use std::{
-use std::fs::{self, File, OpenOptions};
+    env, fmt, fs, io,
-use std::io::{self, Write};
+    path::PathBuf,
-use std::path::PathBuf;
+    sync::OnceLock,
-use std::sync::OnceLock;
+    time::SystemTime,
-use std::time::{SystemTime, UNIX_EPOCH};
+};
 
 const MAX_SIZE_TO_USE_HASH: u64 = 12 * 1024 * 1024;
 
 pub struct ObjMetadata {
-    size: u64,
+    pub size: u64,
-    modified: Option<SystemTime>,
+    pub modified: Option<SystemTime>,
 }
 
 #[derive(PartialEq, Clone, Debug)]
@@ -25,6 +25,12 @@ pub enum ObjType {
     Tree,
 }
 
+impl fmt::Display for ObjType {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{:?}", self)
+    }
+}
+
 impl From<ObjType> for u8 {
     fn from(variant: ObjType) -> Self {
         variant as u8
@@ -92,10 +98,12 @@ impl Obj {
             if !self.obj_path.exists() {
                 return ObjStatus::Deleted;
             }
-            if *self != nsobj {
+            if self.obj_type != ObjType::Tree && nsobj.obj_type != ObjType::Tree {
-                return ObjStatus::Modified;
+                if *self != nsobj {
+                    return ObjStatus::Modified;
+                }
             }
-            todo!("Read status");
+            ObjStatus::Unchanged
         })
     }
 
@@ -164,75 +172,7 @@ impl Obj {
     }
 
     pub fn save(&self) -> io::Result<()> {
-        let nsobj_path = self.get_nsobj_path();
+        self.get_nsobj().save()?;
-        let mut file = {
-            if nsobj_path.exists() {
-                todo!("Edition of object")
-            } else {
-                let mut nsobj_dir = nsobj_path.clone();
-                nsobj_dir.pop();
-                if !nsobj_dir.exists() {
-                    std::fs::create_dir_all(nsobj_dir)?;
-                }
-                File::create(&nsobj_path)?
-            }
-        };
-
-        // Write type
-        file.write(&[self.obj_type.clone().into()])?;
-
-        if self.obj_type == ObjType::Blob {
-            if let Some(metadata) = self.get_metadata() {
-                // Write size
-                file.write(&metadata.size.to_le_bytes())?;
-
-                // Write modified
-                file.write(
-                    &metadata
-                        .modified
-                        .expect(&format!(
-                            "Expect 'modified' in metadata of {} to save obj",
-                            self.cpy_path()
-                        ))
-                        .duration_since(UNIX_EPOCH)
-                        .unwrap()
-                        .as_secs()
-                        .to_le_bytes(),
-                )?;
-            } else {
-                todo!("Cannot load metadata")
-            }
-        }
-
-        file.write_all(b"\n")?;
-        // Write Path
-        file.write_all(self.obj_path.to_str().unwrap().as_bytes())?;
-        file.write_all(b"\n")?;
-
-        file.flush()?;
-
-        // Save itself inside its parent
-        let mut parent_path = self.obj_path.clone();
-        parent_path.pop();
-        let parent_obj = Obj::from_local_path(&parent_path);
-        parent_obj.add_child(&self)?;
-
-        Ok(())
-    }
-
-    fn add_child(&self, child: &Obj) -> io::Result<()> {
-        let mut file = OpenOptions::new()
-            .write(true)
-            .create(true)
-            .append(true)
-            .open(self.get_nsobj_path())?;
-
-        let child_type = &[child.get_obj_type().clone().into()];
-        let child_path = child.obj_path.to_str().unwrap().as_bytes();
-        file.write(child_type)?;
-        file.write(child_path)?;
-        file.write(b"\n")?;
-        file.flush()?;
         Ok(())
     }
 
@@ -259,7 +199,13 @@ impl Obj {
 impl PartialEq<NsObject> for Obj {
     fn eq(&self, other: &NsObject) -> bool {
         if self.obj_type != other.obj_type {
-            eprintln!("Trying to compare different obj type");
+            eprintln!(
+                "{}",
+                format!(
+                    "Trying to compare different obj type ({} != {})",
+                    self.obj_type, other.obj_type
+                )
+            );
             return false;
         }
 

src/store/structs.rs

@@ -102,7 +102,16 @@ impl Into<ObjPath> for PathBuf {
     }
 }
 
-#[derive(Debug, PartialEq)]
+impl Into<ObjPath> for String {
+    fn into(self) -> ObjPath {
+        ObjPath {
+            path: self.into(),
+            abs: OnceLock::new(),
+        }
+    }
+}
+
+#[derive(Debug, PartialEq, Clone)]
 pub struct NsObjPath {
     path: PathBuf,
 }