initialize sbuilder

Author: QaidVoid

Cargo.lock

@@ -1,6 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
+  "sbuilder",
   "sbuild-linter"
 ]
 

Cargo.toml

@@ -15,7 +15,7 @@ pub mod visitor;
 pub struct BuildConfig {
     pub _disabled: bool,
     pub pkg: String,
-    pub pkg_id: Option<String>,
+    pub pkg_id: String,
     pub pkg_type: Option<String>,
     pub pkgver: Option<String>,
     pub app_id: Option<String>,
@@ -52,11 +52,9 @@ impl BuildConfig {
         config._disabled = values.get("_disabled").unwrap().as_bool().unwrap();
         config.pkg = values.get("pkg").unwrap().as_str().unwrap().to_string();
         if let Some(val) = values.get("pkg_id") {
-            config.pkg_id = val.as_str().map(String::from);
+            config.pkg_id = val.as_str().unwrap().to_string();
         } else {
-            config.pkg_id = Some(get_pkg_id(
-                &to_string_vec(values.get("src_url").unwrap()).unwrap()[0],
-            ));
+            config.pkg_id = get_pkg_id(&to_string_vec(values.get("src_url").unwrap()).unwrap()[0]);
         }
         if let Some(val) = values.get("pkg_type") {
             config.pkg_type = val.as_str().map(String::from);
@@ -166,9 +164,7 @@ impl BuildConfig {
         writeln!(writer, "{}pkg: \"{}\"", indent_str, self.pkg)?;
 
         write_field_comments(writer, "pkg_id")?;
-        if let Some(ref pkg_id) = self.pkg_id {
-            writeln!(writer, "{}pkg_id: \"{}\"", indent_str, pkg_id)?;
-        }
+        writeln!(writer, "{}pkg_id: \"{}\"", indent_str, self.pkg_id)?;
 
         write_field_comments(writer, "pkg_type")?;
         if let Some(ref pkg_type) = self.pkg_type {

sbuild-linter/src/build_config/mod.rs

@@ -41,8 +41,8 @@ pub const VALID_CATEGORIES: &str = include_str!("categories");
 
 #[derive(Debug, Deserialize, Clone)]
 pub struct BuildAsset {
-    url: String,
-    out: String,
+    pub url: String,
+    pub out: String,
 }
 
 pub struct Linter {
@@ -179,7 +179,7 @@ impl Linter {
     pub fn generate_pkgver(&self, config: &BuildConfig, pkgver_path: &str) -> bool {
         let logger = &self.logger;
         let x_exec = &config.x_exec;
-        let mut success = true;
+        let mut success = false;
 
         match config.pkgver {
             Some(ref pkgver) => {
@@ -193,6 +193,7 @@ impl Linter {
                     pkgver,
                     pkgver_path.bright_cyan()
                 ));
+                success = true;
             }
             None => {
                 if let Some(ref pkgver) = x_exec.pkgver {
@@ -214,7 +215,6 @@ impl Linter {
                                         if !cmd.stderr.is_empty() {
                                             logger.error("x.exec.pkgver script produced error.");
                                             logger.error(&String::from_utf8_lossy(&cmd.stderr));
-                                            success = false;
                                         } else {
                                             let out = cmd.stdout;
                                             let output_str = String::from_utf8_lossy(&out);
@@ -228,18 +228,17 @@ impl Linter {
                                                 output_str.lines().for_each(|line| {
                                                     logger.info(&format!("-> {}", line.trim()));
                                                 });
-                                                success = false;
                                             } else {
                                                 let file = File::create(pkgver_path).unwrap();
                                                 let mut writer = BufWriter::new(file);
                                                 let _ = writer.write_all(output_str.as_bytes());
 
                                                 logger.success(&format!("Fetched version ({}) using x_exec.pkgver written to {}", &output_str, pkgver_path.bright_cyan()));
+                                                success = true;
                                             }
                                         }
                                     } else {
                                         logger.error(&format!("{} -> Failed to read output from pkgver script. Please make sure the script is valid.", "x_exec.pkgver".bold()));
-                                        success = false;
                                         if !cmd.stderr.is_empty() {
                                             logger.error(&String::from_utf8_lossy(&cmd.stderr));
                                         }
@@ -251,7 +250,6 @@ impl Linter {
                                         "x_exec.pkgver".bold(),
                                         err
                                     ));
-                                    success = false;
                                 }
                             }
                         }
@@ -260,11 +258,13 @@ impl Linter {
                                 "{} -> pkgver script timed out after 15 seconds",
                                 "x_exec.pkgver".bold()
                             ));
-                            success = false;
                         }
                     }
 
                     fs::remove_file(tmp).expect("Failed to delete temporary script file");
+                } else {
+                    // we don't care if the pkgver is not set
+                    success = true;
                 }
             }
         }

sbuild-linter/src/lib.rs

@@ -0,0 +1,25 @@
+[package]
+name = "sbuilder"
+version = "0.1.0"
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+description.workspace = true
+repository.workspace = true
+keywords.workspace = true
+
+[dependencies]
+blake3 = "1.5.5"
+colored = "2.1.0"
+futures = "0.3.31"
+goblin = { version = "0.9.2", features = ["elf64", "elf32", "endian_fd", "std"] }
+indexmap = "2.6.0"
+nanoid = "0.4.0"
+reqwest = { version = "0.12.9", features = ["blocking", "http2", "rustls-tls", "stream"], default-features = false }
+sbuild-linter = { version = "0.3.0", path = "../sbuild-linter" }
+serde = { version = "1.0.215", features = ["derive"] }
+serde_json = { version = "1.0.133", features = ["indexmap"] }
+serde_yml = "0.0.12"
+squishy = { version = "0.3.0", features = ["appimage", "rayon"] }
+tokio = { version = "1.41.1", features = ["macros", "rt-multi-thread"] }
+which = "7.0.0"