Merge pull request #12 from tweag/spec-compliancy

Spec compliancy

Author: Erin van der Veen

src/model.rs

@@ -1,5 +1,7 @@
 //! This module contains Genealogos' internal representation of incomming data.
 //! Since the initial target of Genealogos is CycloneDX, this model is largely based on their representation.
+use std::collections::HashSet;
+
 use serde_cyclonedx::cyclonedx::v_1_5 as cyclonedx;
 
 #[derive(Debug)]
@@ -51,7 +53,7 @@ pub(crate) struct ModelLicense {
 #[derive(Debug)]
 pub(crate) struct ModelDependency {
     pub(crate) r#ref: String,
-    pub(crate) depends_on: Vec<String>,
+    pub(crate) depends_on: HashSet<String>,
 }
 
 impl From<ModelType> for String {

src/nixtract.rs

@@ -133,9 +133,12 @@ impl From<Nixtract> for Model {
 
 impl From<&NixtractLicense> for ModelLicense {
     fn from(nixtract_license: &NixtractLicense) -> Self {
-        ModelLicense {
-            id: nixtract_license.spdx_id.clone(),
-            name: Some(nixtract_license.full_name.clone()),
-        }
+        let id = nixtract_license.spdx_id.clone();
+        let name = if id.is_some() {
+            None
+        } else {
+            Some(nixtract_license.full_name.clone())
+        };
+        ModelLicense { id, name }
     }
 }