feat: add support for .discloudignore

Author: coffeeispower

Cargo.lock

@@ -2,7 +2,7 @@
 name = "discloud"
 authors = ["coffee-is-power"]
 repository = "https://github.com/discloud/cli-rust/"
-version = "1.0.5"
+version = "1.1.0"
 edition = "2021"
 description = "Blazingly fast Discloud CLI"
 license = "Apache-2.0"
@@ -16,19 +16,19 @@ clap = { version = "4.0.26", features = ["derive"] }
 colored = "2.0.0"
 dialoguer = "0.10.2"
 directories = "4.0.1"
+ignore = "0.4.18"
 reqwest = { version = "0.11.12", features = ["blocking", "json", "multipart", "rustls-tls"], default-features=false }
 sentry = { version = "0.29.1", default-features = false, features = ["rustls", "reqwest", "tracing", "panic"] }
 serde = { version = "1.0.151", features = ["derive"] }
 serde-enum-str = "0.3.2"
 spinners = "4.1.0"
 tracing = "0.1.36"
 tracing-subscriber = { version = "0.3.15" }
-walkdir = "2.3.2"
 zip = "0.6.3"
 
 [profile.release.package."*"]
 debug = false
 
 [profile.release]
 # Enable debug info
-debug = true
+debug = true

Cargo.toml

@@ -1,20 +1,7 @@
-use colored::Colorize;
 use spinners::Spinner;
-use std::io::prelude::*;
-use std::io::{Seek, Write};
 use std::iter::Iterator;
-use zip::result::ZipError;
-use zip::write::FileOptions;
-
-use std::fs::File;
-use std::path::{Path, PathBuf};
-use walkdir::{DirEntry, WalkDir};
-#[tracing::instrument]
-fn get_zip_file_path() -> PathBuf {
-    let mut dst_file = std::env::temp_dir();
-    dst_file.push("discloud.zip");
-    dst_file
-}
+use crate::zip_directory::commit as commit_zip;
+use crate::zip_directory::{get_zip_file_path, zip_dir_to_file};
 #[tracing::instrument]
 pub fn commit(teams: bool) {
     let token = super::expect_token();
@@ -28,123 +15,14 @@ pub fn commit(teams: bool) {
 
     let src_dir = ".";
     let dst_file = get_zip_file_path();
-    match zip_dir_to_file(src_dir, dst_file.to_str().unwrap(), METHOD_DEFLATED) {
+    match zip_dir_to_file(src_dir, dst_file.to_str().unwrap()) {
         Ok(_) => {}
         Err(e) => super::err(&format!("Failed to zip: {:?}", e)),
     }
     let mut spinner = Spinner::new(spinners::Spinners::Earth, "Committing app...".to_string());
-    let msg = match upload_zip(token, app_id, teams) {
+    let msg = match commit_zip(token, app_id, teams) {
         Ok(()) => if !teams {super::format_log("Your app was updated successfully!")} else {super::format_log("Your buddy's app was updated!")},
         Err(err) => super::format_err(&err),
     };
     spinner.stop_with_message(msg);
 }
-
-const METHOD_DEFLATED: zip::CompressionMethod = zip::CompressionMethod::Deflated;
-
-fn zip_dir<T>(
-    it: &mut dyn Iterator<Item = DirEntry>,
-    prefix: &str,
-    writer: T,
-    method: zip::CompressionMethod,
-) -> zip::result::ZipResult<()>
-where
-    T: Write + Seek,
-{
-    let mut zip = zip::ZipWriter::new(writer);
-    let options = FileOptions::default()
-        .compression_method(method)
-        .unix_permissions(0o755);
-
-    let mut buffer = Vec::new();
-    for entry in it {
-        let path = entry.path();
-        let name = path.strip_prefix(Path::new(prefix)).unwrap();
-        if path.is_file() {
-            print!("⌛ Zipping file: {}\r", name.to_str().unwrap());
-            zip.start_file(name.to_str().unwrap(), options)?;
-            let mut f = File::open(path)?;
-
-            f.read_to_end(&mut buffer)?;
-            zip.write_all(&buffer)?;
-            buffer.clear();
-            println!("{}", "✔".green().bold());
-        } else if !name.as_os_str().is_empty() {
-            zip.add_directory(name.to_str().unwrap(), options)?;
-        }
-    }
-    zip.finish()?;
-    Result::Ok(())
-}
-
-#[tracing::instrument]
-fn zip_dir_to_file(
-    src_dir: &str,
-    dst_file: &str,
-    method: zip::CompressionMethod,
-) -> zip::result::ZipResult<()> {
-    if !Path::new(src_dir).is_dir() {
-        return Err(ZipError::FileNotFound);
-    }
-    let writer = File::create(dst_file).unwrap();
-
-    let walkdir = WalkDir::new(src_dir);
-    let it = walkdir.into_iter();
-
-    zip_dir(
-        &mut it.filter_map(|e| {
-            if let Ok(e) = e {
-                let components = e.path().components().collect::<Vec<_>>();
-                if components.len() < 2 {
-                    Some(e)
-                } else {
-                    match components[1].as_os_str().to_str().unwrap() {
-                        "target" | ".git" | "build" | "out" | "node_modules" | ".gitignore" => None,
-                        _ => Some(e),
-                    }
-                }
-            } else {
-                None
-            }
-        }),
-        src_dir,
-        writer,
-        method,
-    )?;
-
-    Ok(())
-}
-#[tracing::instrument]
-fn upload_zip(token: String, app_id: String, teams: bool) -> Result<(), String> {
-    let file_path = get_zip_file_path();
-    let file_path = file_path.to_str().unwrap();
-    let client = reqwest::blocking::Client::builder()
-        .timeout(None)
-        .build()
-        .unwrap();
-    let form = reqwest::blocking::multipart::Form::new().file("file", file_path);
-    match form {
-        Err(err) => Err(format!("Couldn't open zip file: {}", err)),
-        Ok(form) => {
-            let req = client
-                .put(crate::api_url!(format!("/{}/{}/commit", if teams {"team"} else {"app"}, app_id)))
-                .multipart(form)
-                .header("api-token", token);
-            let res = req.send();
-            match res {
-                Err(err) => Err(err.to_string()),
-                Ok(res) => {
-                    if res.status().is_success() {
-                        Ok(())
-                    } else {
-                        Err(format!(
-                            "Commit failed: API returned {} http code: {}",
-                            res.status().as_u16(),
-                            res.text().unwrap()
-                        ))
-                    }
-                }
-            }
-        }
-    }
-}