@devaloop/devalang 0.0.1-alpha.14 → 0.0.1-alpha.16

package/rust/installer/bank.rs

@@ -1,65 +1,62 @@
-use std::path::{ Path, PathBuf };
-use crate::{
-    config::loader::{ add_bank_to_config, load_config },
-    installer::{
-        addon::{ ask_api_for_signed_url, AddonType },
-        utils::{ download_file, extract_archive },
-    },
-    utils::logger::{ LogLevel, Logger },
-};
-
-pub async fn install_bank(name: &str, target_dir: &Path) -> Result<(), String> {
-    let logger = Logger::new();
-
-    let signed_url = ask_api_for_signed_url(AddonType::Bank, name).await?;
-
-    let bank_dir = target_dir.join("bank");
-    let archive_path = PathBuf::from(format!("./.deva/tmp/{}.devabank", name));
-    let extract_path = bank_dir.join(name);
-
-    download_file(&signed_url, &archive_path).await.map_err(|e|
-        format!("Failed to download: {}", e)
-    )?;
-
-    if extract_path.exists() {
-        logger.log_message(
-            LogLevel::Warning,
-            &format!(
-                "Bank '{}' already exists at '{}'. Skipping install.",
-                name,
-                extract_path.display()
-            )
-        );
-
-        return Ok(());
-    }
-
-    // Add the bank to the config
-    let root_dir = target_dir
-        .parent()
-        .ok_or_else(|| "Failed to determine root directory".to_string())?;
-
-    let config_path = root_dir.join(".devalang");
-    if !config_path.exists() {
-        return Err(
-            format!(
-                "Config file not found at '{}'. Please run 'devalang init' before adding an addon",
-                config_path.display()
-            )
-        );
-    }
-
-    let mut config = load_config(Some(&config_path)).ok_or_else(||
-        format!("Failed to load config from '{}'", config_path.display())
-    )?;
-
-    let dependency_path = &format!("devalang://bank/{}", name);
-
-    extract_archive(&archive_path, &extract_path).await.map_err(|e|
-        format!("Failed to extract: {}", e)
-    )?;
-
-    add_bank_to_config(&mut config, &extract_path, &dependency_path);
-
-    Ok(())
-}
+use crate::{
+    config::loader::{add_bank_to_config, load_config},
+    installer::{
+        addon::{AddonType, ask_api_for_signed_url},
+        utils::{download_file, extract_archive},
+    },
+    utils::logger::{LogLevel, Logger},
+};
+use std::path::{Path, PathBuf};
+
+pub async fn install_bank(name: &str, target_dir: &Path) -> Result<(), String> {
+    let logger = Logger::new();
+
+    let signed_url = ask_api_for_signed_url(AddonType::Bank, name).await?;
+
+    let bank_dir = target_dir.join("bank");
+    let archive_path = PathBuf::from(format!("./.deva/tmp/{}.devabank", name));
+    let extract_path = bank_dir.join(name);
+
+    download_file(&signed_url, &archive_path)
+        .await
+        .map_err(|e| format!("Failed to download: {}", e))?;
+
+    if extract_path.exists() {
+        logger.log_message(
+            LogLevel::Warning,
+            &format!(
+                "Bank '{}' already exists at '{}'. Skipping install.",
+                name,
+                extract_path.display()
+            ),
+        );
+
+        return Ok(());
+    }
+
+    // Add the bank to the config
+    let root_dir = target_dir
+        .parent()
+        .ok_or_else(|| "Failed to determine root directory".to_string())?;
+
+    let config_path = root_dir.join(".devalang");
+    if !config_path.exists() {
+        return Err(format!(
+            "Config file not found at '{}'. Please run 'devalang init' before adding an addon",
+            config_path.display()
+        ));
+    }
+
+    let mut config = load_config(Some(&config_path))
+        .ok_or_else(|| format!("Failed to load config from '{}'", config_path.display()))?;
+
+    let dependency_path = &format!("devalang://bank/{}", name);
+
+    extract_archive(&archive_path, &extract_path)
+        .await
+        .map_err(|e| format!("Failed to extract: {}", e))?;
+
+    add_bank_to_config(&mut config, &extract_path, dependency_path);
+
+    Ok(())
+}

package/rust/installer/mod.rs

@@ -1,5 +1,5 @@
-pub mod bank;
-pub mod plugin;
-
-pub mod utils;
-pub mod addon;
+pub mod bank;
+pub mod plugin;
+
+pub mod addon;
+pub mod utils;

package/rust/installer/plugin.rs

@@ -1,55 +1,54 @@
-use std::path::{ Path, PathBuf };
-use crate::{
-    common::cdn::get_cdn_url,
-    config::loader::{ add_plugin_to_config, load_config },
-    installer::utils::{ download_file, extract_archive },
-};
-
-pub async fn install_plugin(name: &str, target_dir: &Path) -> Result<(), String> {
-    let cdn_url = get_cdn_url();
-    let url = format!("{}/plugin/{}/download", cdn_url, name);
-
-    let plugin_dir = target_dir.join("plugin");
-    let archive_path = PathBuf::from(format!("./.deva/tmp/{}.devaplugin", name));
-    let extract_path = plugin_dir.join(name);
-
-    if extract_path.exists() {
-        println!(
-            "Plugin '{}' already exists at '{}'. Skipping install.",
-            name,
-            extract_path.display()
-        );
-        return Ok(());
-    }
-
-    download_file(&url, &archive_path).await.map_err(|e| format!("Failed to download: {}", e))?;
-
-    extract_archive(&archive_path, &extract_path).await.map_err(|e|
-        format!("Failed to extract: {}", e)
-    )?;
-
-    // Add the plugin to the config
-    let root_dir = target_dir
-        .parent()
-        .ok_or_else(|| "Failed to determine root directory".to_string())?;
-
-    let config_path = root_dir.join(".devalang");
-    if (!config_path.exists()) {
-        return Err(
-            format!(
-                "Config file not found at '{}'. Please run 'devalang init' before adding an addon",
-                config_path.display()
-            )
-        );
-    }
-
-    let mut config = load_config(Some(&config_path)).ok_or_else(||
-        format!("Failed to load config from '{}'", config_path.display())
-    )?;
-
-    let dependency_path = &format!("devalang://plugin/{}", name);
-
-    add_plugin_to_config(&mut config, &extract_path, &dependency_path);
-
-    Ok(())
-}
+use crate::{
+    common::cdn::get_cdn_url,
+    config::loader::{add_plugin_to_config, load_config},
+    installer::utils::{download_file, extract_archive},
+};
+use std::path::{Path, PathBuf};
+
+pub async fn install_plugin(name: &str, target_dir: &Path) -> Result<(), String> {
+    let cdn_url = get_cdn_url();
+    let url = format!("{}/plugin/{}/download", cdn_url, name);
+
+    let plugin_dir = target_dir.join("plugin");
+    let archive_path = PathBuf::from(format!("./.deva/tmp/{}.devaplugin", name));
+    let extract_path = plugin_dir.join(name);
+
+    if extract_path.exists() {
+        println!(
+            "Plugin '{}' already exists at '{}'. Skipping install.",
+            name,
+            extract_path.display()
+        );
+        return Ok(());
+    }
+
+    download_file(&url, &archive_path)
+        .await
+        .map_err(|e| format!("Failed to download: {}", e))?;
+
+    extract_archive(&archive_path, &extract_path)
+        .await
+        .map_err(|e| format!("Failed to extract: {}", e))?;
+
+    // Add the plugin to the config
+    let root_dir = target_dir
+        .parent()
+        .ok_or_else(|| "Failed to determine root directory".to_string())?;
+
+    let config_path = root_dir.join(".devalang");
+    if !config_path.exists() {
+        return Err(format!(
+            "Config file not found at '{}'. Please run 'devalang init' before adding an addon",
+            config_path.display()
+        ));
+    }
+
+    let mut config = load_config(Some(&config_path))
+        .ok_or_else(|| format!("Failed to load config from '{}'", config_path.display()))?;
+
+    let dependency_path = &format!("devalang://plugin/{}", name);
+
+    add_plugin_to_config(&mut config, &extract_path, dependency_path);
+
+    Ok(())
+}

package/rust/installer/utils.rs

@@ -1,56 +1,56 @@
-use std::fs::File;
-use std::path::Path;
-use std::io::BufReader;
-use std::error::Error;
-use std::io::{ copy, Cursor };
-use zip::ZipArchive;
-
-pub async fn download_file(url: &str, destination: &Path) -> Result<(), Box<dyn Error>> {
-    let response = reqwest::get(url).await?;
-
-    if !response.status().is_success() {
-        return Err(format!("Failed to download file: HTTP {}", response.status()).into());
-    }
-
-    if let Some(parent) = destination.parent() {
-        std::fs::create_dir_all(parent)?;
-    }
-
-    let bytes = response.bytes().await?;
-    let mut content = Cursor::new(bytes);
-    let mut file = File::create(destination)?;
-    copy(&mut content, &mut file)?;
-
-    Ok(())
-}
-
-pub async fn extract_archive(
-    zip_path: &Path,
-    destination: &Path
-) -> Result<(), Box<dyn std::error::Error>> {
-    let file = File::open(zip_path)?;
-    let mut archive = ZipArchive::new(BufReader::new(file))?;
-
-    for i in 0..archive.len() {
-        let mut file = archive.by_index(i)?;
-        let outpath = destination.join(file.mangled_name());
-
-        if file.name().ends_with('/') {
-            std::fs::create_dir_all(&outpath)?;
-        } else {
-            if let Some(p) = outpath.parent() {
-                std::fs::create_dir_all(p)?;
-            }
-
-            let mut outfile = File::create(&outpath)?;
-            std::io::copy(&mut file, &mut outfile)?;
-        }
-    }
-
-    // Clear the temporary folder after extraction
-    if zip_path.exists() {
-        std::fs::remove_file(zip_path)?;
-    }
-
-    Ok(())
-}
+use std::error::Error;
+use std::fs::File;
+use std::io::BufReader;
+use std::io::{Cursor, copy};
+use std::path::Path;
+use zip::ZipArchive;
+
+pub async fn download_file(url: &str, destination: &Path) -> Result<(), Box<dyn Error>> {
+    let response = reqwest::get(url).await?;
+
+    if !response.status().is_success() {
+        return Err(format!("Failed to download file: HTTP {}", response.status()).into());
+    }
+
+    if let Some(parent) = destination.parent() {
+        std::fs::create_dir_all(parent)?;
+    }
+
+    let bytes = response.bytes().await?;
+    let mut content = Cursor::new(bytes);
+    let mut file = File::create(destination)?;
+    copy(&mut content, &mut file)?;
+
+    Ok(())
+}
+
+pub async fn extract_archive(
+    zip_path: &Path,
+    destination: &Path,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let file = File::open(zip_path)?;
+    let mut archive = ZipArchive::new(BufReader::new(file))?;
+
+    for i in 0..archive.len() {
+        let mut file = archive.by_index(i)?;
+        let outpath = destination.join(file.mangled_name());
+
+        if file.name().ends_with('/') {
+            std::fs::create_dir_all(&outpath)?;
+        } else {
+            if let Some(p) = outpath.parent() {
+                std::fs::create_dir_all(p)?;
+            }
+
+            let mut outfile = File::create(&outpath)?;
+            std::io::copy(&mut file, &mut outfile)?;
+        }
+    }
+
+    // Clear the temporary folder after extraction
+    if zip_path.exists() {
+        std::fs::remove_file(zip_path)?;
+    }
+
+    Ok(())
+}