From d46391b7a11d4b5f04d9741cce575709a0c5c1d7 Mon Sep 17 00:00:00 2001
From: Max Kofler <max@acacialinux.org>
Date: Thu, 9 Jan 2025 21:43:17 +0100
Subject: [PATCH 1/2] Add model::package

---
 src/model.rs         |  3 +++
 src/model/package.rs | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 src/model/package.rs

diff --git a/src/model.rs b/src/model.rs
index 2f16510..5fa632d 100644
--- a/src/model.rs
+++ b/src/model.rs
@@ -3,6 +3,9 @@
 mod formula;
 pub use formula::*;
 
+mod package;
+pub use package::*;
+
 mod object;
 pub use object::*;
 
diff --git a/src/model/package.rs b/src/model/package.rs
new file mode 100644
index 0000000..8ff4da3
--- /dev/null
+++ b/src/model/package.rs
@@ -0,0 +1,33 @@
+use serde::{Deserialize, Serialize};
+
+use crate::util::architecture::Architecture;
+
+use super::ObjectID;
+
+/// A package in the AcaciaLinux ecosystem
+#[derive(Deserialize, Serialize, Debug)]
+pub struct Package {
+    /// The name of the package
+    pub name: String,
+    /// The version of the package
+    pub version: String,
+    /// A short description of the package's contents
+    pub description: String,
+
+    /// The architecture the package is built for
+    pub arch: Option<Architecture>,
+
+    /// The dependencies of the package
+    pub dependencies: Vec<ObjectID>,
+
+    /// The OID of the formula the package originates from
+    pub formula: ObjectID,
+
+    /// The tree of files that is shipped with this formula
+    pub tree: ObjectID,
+
+    /// Whether the package is tainted or not.
+    /// This tells a consumer if the package had additional
+    /// lower directories when it was built
+    pub tainted: bool,
+}

From 91608550cacffc5b6b429b033dff3a4f232295d7 Mon Sep 17 00:00:00 2001
From: Max Kofler <max@acacialinux.org>
Date: Wed, 29 Jan 2025 18:08:20 +0100
Subject: [PATCH 2/2] Package: Add insert(), json() and toml() methods

---
 src/model/object/objecttype.rs |  3 ++
 src/model/package.rs           | 50 ++++++++++++++++++++++++++++++++--
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/src/model/object/objecttype.rs b/src/model/object/objecttype.rs
index 6c72fc8..4dd276c 100644
--- a/src/model/object/objecttype.rs
+++ b/src/model/object/objecttype.rs
@@ -17,6 +17,9 @@ pub enum ObjectType {
     /// An Acacia specific formula object
     AcaciaFormula = 0x0120,
 
+    /// An Acacia specific package object
+    AcaciaPackage = 0x0130,
+
     /// An Acacia specific index object
     AcaciaIndex = 0x0140,
 
diff --git a/src/model/package.rs b/src/model/package.rs
index 8ff4da3..213b556 100644
--- a/src/model/package.rs
+++ b/src/model/package.rs
@@ -1,8 +1,11 @@
+use std::io::Cursor;
+
+use log::debug;
 use serde::{Deserialize, Serialize};
 
-use crate::util::architecture::Architecture;
+use crate::{error::Error, model::ObjectType, util::architecture::Architecture};
 
-use super::ObjectID;
+use super::{Object, ObjectCompression, ObjectDB, ObjectID};
 
 /// A package in the AcaciaLinux ecosystem
 #[derive(Deserialize, Serialize, Debug)]
@@ -31,3 +34,46 @@ pub struct Package {
     /// lower directories when it was built
     pub tainted: bool,
 }
+
+impl Package {
+    /// Returns the `TOML` string for this package
+    pub fn toml(&self) -> String {
+        toml::to_string_pretty(self).expect("Serialize package file should never fail")
+    }
+
+    /// Returns the `JSON` string for this package
+    pub fn json(&self) -> String {
+        serde_json::to_string(self).expect("Serialize package file should never fail")
+    }
+
+    /// Inserts this package into `object_db`
+    /// # Arguments
+    /// * `object_db` - The objet db to insert the package into
+    /// * `compression` - The compression to apply for inserting
+    pub fn insert(
+        &self,
+        object_db: &mut ObjectDB,
+        compression: ObjectCompression,
+    ) -> Result<Object, Error> {
+        let mut cursor = Cursor::new(self.json());
+
+        let mut dependencies = vec![self.tree.clone()];
+        for d in &self.dependencies {
+            dependencies.push(d.clone());
+        }
+
+        let object = object_db.insert_stream(
+            &mut cursor,
+            ObjectType::AcaciaFormula,
+            compression,
+            dependencies,
+        )?;
+
+        debug!(
+            "Inserted package {}@{} as {}",
+            self.name, self.version, object.oid
+        );
+
+        Ok(object)
+    }
+}