remote diff with new opti remote enumerater

src/commands/clone.rs

@@ -6,7 +6,7 @@ use clap::Values;
 use regex::Regex;
 use crate::services::downloader::Downloader;
 use crate::utils::api::ApiProps;
-use crate::utils::remote::enumerate_remote;
+use crate::utils::remote::{enumerate_remote, EnumerateOptions};
 use crate::global::global::{DIR_PATH, set_dir_path};
 use crate::services::api::ApiError;
 use crate::services::req_props::{ReqProps, ObjProps};
@@ -67,11 +67,13 @@ pub fn clone(args: CloneArgs) {
     }
 
     let depth = &args.depth.clone().unwrap_or(DEPTH.to_string());
-    let (folders, files) = enumerate_remote(|a| req(
-            &api_props,
-            depth,
-            a
-            ), Some(depth));
+    let (folders, files) = enumerate_remote(
+        |a| req(&api_props, depth, a),
+        &should_skip,
+        EnumerateOptions {
+            depth: Some(depth.to_owned()),
+            relative_s: None
+        });
 
     for folder in folders {
         // create folder
@@ -104,6 +106,10 @@ fn save_blob(obj: ObjProps) {
     }
 }
 
+fn should_skip(_: ObjProps) -> bool {
+    return false;
+}
+
 fn req(api_props: &ApiProps, depth: &str, relative_s: &str) -> Result<Vec<ObjProps>, ApiError> {
     ReqProps::new()
         .set_request(relative_s, &api_props)

src/commands/remote_diff.rs

@@ -1,7 +1,9 @@
 use crate::services::api::ApiError;
 use crate::services::req_props::{ReqProps, ObjProps};
-use crate::store::object::Object;
+use crate::store::object::{Object, self};
+use crate::utils::api::{ApiProps, get_api_props};
 use crate::utils::path;
+use crate::utils::remote::{enumerate_remote, EnumerateOptions};
 use std::fs::canonicalize;
 use std::path::PathBuf;
 
@@ -16,9 +18,11 @@ pub fn remote_diff(args: RemoteDiffArgs) {
             cur.push(path);
             let canonic = canonicalize(cur).ok().unwrap();
             dbg!(&canonic);
+            dbg!(path::repo_root());
             let ok = canonic.strip_prefix(path::repo_root());
                 dbg!(&ok);
             
+                // todo
             PathBuf::from("/")
         } else {
             PathBuf::from("/")
@@ -33,62 +37,46 @@ pub fn remote_diff(args: RemoteDiffArgs) {
     }];
     let mut files: Vec<ObjProps> = vec![];
 
-    while folders.len() > 0 {
-        let folder = folders.pop().unwrap();
-
-        let res = ReqProps::new()
-            .set_url(&folder.relative_s.unwrap())
-            .gethref()
-            .getlastmodified()
-            .send_req_multiple();
-
-        let objs = match res {
-            Ok(o) => o,
-            Err(ApiError::IncorrectRequest(err)) => {
-                eprintln!("fatal: {}", err.status());
-                std::process::exit(1);
-            },
-            Err(ApiError::EmptyError(_)) => {
-                eprintln!("Failed to get body");
-                vec![]
-            }
-            Err(ApiError::RequestError(err)) => {
-                eprintln!("fatal: {}", err);
-                std::process::exit(1);
-            },
-            Err(ApiError::Unexpected(_)) => todo!()
-        };
-
-
-
-        let mut iter = objs.iter();
-        // todo opti store date of root
-        let root = iter.next();
-
-        for obj in iter {
-            let mut o = Object::new(&obj.clone().relative_s.unwrap());
-            let exist = o.exists();
-
-            let should_pull = {
-                if exist {
-                    o.read()
-                        .is_older(obj.lastmodified.unwrap().timestamp())
-                } else {
-                    true
-                }
-            };
-            
-            if should_pull {
-                println!("should pull {}", obj.clone().relative_s.unwrap());
-                if obj.href.clone().unwrap().chars().last().unwrap() == '/' {
-                    folders.push(obj.clone());
-                } else {
-                    files.push(obj.clone());
-                }
-            }
-
-        }
+    let depth = "2"; // todo
+                     // todo origin
+    let api_props = get_api_props();
+    let (folders, files) = enumerate_remote(
+        |a| req(&api_props, depth, a),
+        &should_skip,
+        EnumerateOptions {
+            depth: Some(depth.to_owned()),
+            relative_s: Some(path.to_str().unwrap().to_owned())
+        });
 
+    for folder in folders {
+            println!("should pull {}", folder.clone().relative_s.unwrap());
     }
+    for file in files {
+            println!("should pull {}", file.clone().relative_s.unwrap());
+    }
+
+}
+
+fn should_skip(obj: ObjProps) -> bool {
+    let mut o = Object::new(&obj.clone().relative_s.unwrap());
+    let exist = o.exists();
+
+    // if doesn't exist locally when cannot skip it as we need to pull it
+    if !exist {
+        return false;
+    }
+
+    // if local directory is older there is changes on the remote we cannot
+    // skip this folder
+    !o.read().is_older(obj.lastmodified.unwrap().timestamp())
+}
+
+fn req(api_props: &ApiProps, depth: &str, relative_s: &str) -> Result<Vec<ObjProps>, ApiError> {
+    ReqProps::new()
+        .set_request(relative_s, &api_props)
+        .set_depth(depth)
+        .gethref()
+        .getlastmodified()
+        .send_req_multiple()
 }