Make changelog OneToMany

Author: SuperSandro2000

ixx/src/action/index/packages.rs

@@ -161,6 +161,25 @@ pub(crate) async fn index_packages(module: &IndexModule, config: &Config) -> any
   Ok(())
 }
 
+fn one_or_many_to_url(something: Option<OneOrMany<String>>) -> Vec<Url> {
+    match something {
+      None => vec![],
+      Some(OneOrMany::One(homepage)) => Url::parse(&homepage)
+        .with_context(|| format!("Failed to parse URL '{homepage}'"))
+        .ok()
+        .into_iter()
+        .collect(),
+      Some(OneOrMany::Many(homepages)) => homepages
+        .into_iter()
+        .filter_map(|homepage| {
+          Url::parse(&homepage)
+            .with_context(|| format!("Failed to parse URL '{homepage}'"))
+            .ok()
+        })
+        .collect(),
+    }
+}
+
 fn into_package(url_prefix: &Url, package: package::Package) -> anyhow::Result<libixx::Package> {
   static CVE_REGEX: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"CVE-(\d{4})-(\d+)").unwrap());
   static GHSA_REGEX: LazyLock<Regex> =
@@ -169,7 +188,7 @@ fn into_package(url_prefix: &Url, package: package::Package) -> anyhow::Result<l
   Ok(libixx::Package {
     attr_name: package.attr_name,
     broken: package.broken,
-    changelog: package.changelog,
+    changelogs: one_or_many_to_url(package.changelog),
     cpe: package.cpe,
     declaration: package
       .declaration
@@ -181,22 +200,7 @@ fn into_package(url_prefix: &Url, package: package::Package) -> anyhow::Result<l
     disabled: package.disabled,
     download_page: package.download_page,
     eval_error: package.eval_error,
-    homepages: match package.homepage {
-      None => vec![],
-      Some(OneOrMany::One(homepage)) => Url::parse(&homepage)
-        .with_context(|| format!("Failed to parse URL '{homepage}'"))
-        .ok()
-        .into_iter()
-        .collect(),
-      Some(OneOrMany::Many(homepages)) => homepages
-        .into_iter()
-        .filter_map(|homepage| {
-          Url::parse(&homepage)
-            .with_context(|| format!("Failed to parse URL '{homepage}'"))
-            .ok()
-        })
-        .collect(),
-    },
+    homepages: one_or_many_to_url(package.homepage),
     known_vulnerabilities: package
       .known_vulnerabilities
       .unwrap_or_default()

ixx/src/package.rs

@@ -7,7 +7,7 @@ use crate::Declaration;
 pub struct Package {
   pub attr_name: String,
   pub broken: Option<bool>,
-  pub changelog: Option<String>,
+  pub changelog: Option<OneOrMany<String>>,
   pub cpe: Option<String>,
   pub declaration: Option<Declaration>,
   pub description: Option<String>,

libixx/src/package.rs

@@ -7,8 +7,8 @@ pub struct Package {
   pub attr_name: String,
   #[serde(skip_serializing_if = "Option::is_none")]
   pub broken: Option<bool>,
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub changelog: Option<String>,
+  #[serde(skip_serializing_if = "Vec::is_empty")]
+  pub changelogs: Vec<Url>,
   #[serde(skip_serializing_if = "Option::is_none")]
   pub cpe: Option<String>,
   #[serde(skip_serializing_if = "Option::is_none")]