linter: extend license and x_exec

Author: QaidVoid

sbuild-linter/src/build_config/mod.rs

@@ -8,8 +8,14 @@ use serde::Deserialize;
 use serde_yml::Value;
 
 use crate::{
-    comments::Comments, description::Description, distro_pkg::DistroPkg, get_pkg_id,
-    resource::Resource, xexec::XExec, BuildAsset,
+    comments::Comments,
+    description::Description,
+    distro_pkg::DistroPkg,
+    get_pkg_id,
+    license::{License, LicenseComplex},
+    resource::Resource,
+    xexec::XExec,
+    BuildAsset,
 };
 
 pub mod visitor;
@@ -32,7 +38,7 @@ pub struct BuildConfig {
     pub maintainer: Option<Vec<String>>,
     pub icon: Option<Resource>,
     pub desktop: Option<Resource>,
-    pub license: Option<Vec<String>>,
+    pub license: Option<Vec<License>>,
     pub note: Option<Vec<String>>,
     pub provides: Option<Vec<String>>,
     pub repology: Option<Vec<String>>,
@@ -140,7 +146,33 @@ impl BuildConfig {
             config.desktop = to_resource(val);
         }
         if let Some(val) = values.get("license") {
-            config.license = to_string_vec(val);
+            config.license = val.as_sequence().map(|seq| {
+                seq.iter()
+                    .filter_map(|lc| {
+                        if let Some(lc) = lc.as_str() {
+                            Some(License::Simple(lc.to_string()))
+                        } else {
+                            lc.as_mapping().map(|map| {
+                                License::Complex(LicenseComplex {
+                                    id: map
+                                        .get(Value::String("id".to_string()))
+                                        .and_then(|v| v.as_str())
+                                        .map(String::from)
+                                        .unwrap_or_default(),
+                                    file: map
+                                        .get(Value::String("file".to_string()))
+                                        .and_then(|v| v.as_str())
+                                        .map(String::from),
+                                    url: map
+                                        .get(Value::String("url".to_string()))
+                                        .and_then(|v| v.as_str())
+                                        .map(String::from),
+                                })
+                            })
+                        }
+                    })
+                    .collect()
+            });
         }
         if let Some(val) = values.get("maintainer") {
             config.maintainer = to_string_vec(val);
@@ -279,8 +311,16 @@ impl BuildConfig {
         write_field_comments(writer, "license")?;
         if let Some(ref license) = self.license {
             writeln!(writer, "{}license:", indent_str)?;
-            for l in license {
-                writeln!(writer, "{}  - \"{}\"", indent_str, l)?;
+            for lc in license {
+                lc.write_yaml(writer, indent)?;
+            }
+        }
+
+        if let Some(ref build_asset) = self.build_asset {
+            writeln!(writer, "{}build_asset:", indent_str)?;
+            for asset in build_asset {
+                writeln!(writer, "{}  - url: \"{}\"", indent_str, asset.url)?;
+                writeln!(writer, "{}    out: \"{}\"", indent_str, asset.out)?;
             }
         }
 

sbuild-linter/src/lib.rs

@@ -22,6 +22,7 @@ pub mod comments;
 pub mod description;
 pub mod distro_pkg;
 pub mod error;
+pub mod license;
 pub mod logger;
 pub mod resource;
 pub mod semaphore;
@@ -40,6 +41,8 @@ pub const VALID_PKG_TYPES: [&str; 9] = [
     "static",
 ];
 pub const VALID_CATEGORIES: &str = include_str!("categories");
+pub const VALID_ARCH: [&str; 4] = ["aarch64", "loongarch64", "riscv64", "x86_64"];
+pub const VALID_OS: [&str; 6] = ["freebsd", "illumos", "linux", "netbsd", "openbsd", "redox"];
 
 #[derive(Debug, Deserialize, Clone)]
 pub struct BuildAsset {

sbuild-linter/src/license.rs

@@ -0,0 +1,42 @@
+use std::{
+    fs::File,
+    io::{self, BufWriter, Write},
+};
+
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct LicenseComplex {
+    pub id: String,
+    pub file: Option<String>,
+    pub url: Option<String>,
+}
+
+#[derive(Debug, Deserialize, Clone)]
+pub enum License {
+    Simple(String),
+    Complex(LicenseComplex),
+}
+
+impl License {
+    pub fn write_yaml(&self, writer: &mut BufWriter<File>, indent: usize) -> io::Result<()> {
+        let indent_str = " ".repeat(indent);
+
+        match self {
+            License::Simple(item) => {
+                writeln!(writer, "{}  - \"{}\"", indent_str, item)?;
+            }
+            License::Complex(item) => {
+                writeln!(writer, "{}  - id: \"{}\"", indent_str, item.id)?;
+                if let Some(ref file) = item.file {
+                    writeln!(writer, "{}    file: \"{}\"", indent_str, file)?;
+                }
+                if let Some(ref url) = item.url {
+                    writeln!(writer, "{}    url: \"{}\"", indent_str, url)?;
+                }
+            }
+        }
+
+        Ok(())
+    }
+}