feat: phase 2

Newfound motivation

rust/src/model/local.rs

@@ -1,4 +1,5 @@
 use serde::Deserialize;
+use crate::pkg::PkgKeyVersion;
 
 // manifest.json
 
@@ -8,4 +9,5 @@ pub struct PackageManifest {
     pub name: String,
     pub version_number: String,
     pub description: String,
-}
+    pub dependencies: Vec<PkgKeyVersion>
+}

rust/src/model/misc.rs

@@ -1,33 +1,7 @@
-use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+use serde::{Deserialize, Serialize};
 
-#[derive(Clone)]
+#[derive(Clone, Serialize, Deserialize)]
 pub enum Game {
     Ongeki,
     Chunithm,
-}
-
-impl Serialize for Game {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        match self {
-            Game::Ongeki => serializer.serialize_str("ongeki"),
-            Game::Chunithm => serializer.serialize_str("chunithm"),
-        }
-    }
-}
-
-impl<'de> Deserialize<'de> for Game {
-    fn deserialize<D>(deserializer: D) -> Result<Game, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let s = String::deserialize(deserializer)?;
-        match s.as_str() {
-            "chunithm" => Ok(Game::Chunithm),
-            "ongeki" => Ok(Game::Ongeki),
-            _ => Err(de::Error::custom("unknown game")),
-        }
-    }
-}
+}

rust/src/model/mod.rs

@@ -1,23 +1,3 @@
 pub mod local;
 pub mod misc;
-pub mod rainy;
-
-use derive_builder::Builder;
-use serde::{Deserialize, Serialize};
-
-#[derive(Clone, Builder, Default, Serialize, Deserialize)]
-#[allow(dead_code)]
-pub struct Package {
-    pub namespace: String,
-    pub name: String,
-    pub description: String,
-    pub package_url: String,
-    pub download_url: String,
-    pub path: String,
-    pub enabled: bool,
-    pub icon: String,
-    pub version: String,
-    pub version_available: String,
-    pub deprecated: bool,
-    pub dependencies: Vec<Package>,
-}
+pub mod rainy;

rust/src/model/rainy.rs

@@ -1,4 +1,5 @@
 use serde::Deserialize;
+use crate::pkg::PkgKeyVersion;
 
 // /c/{game}/api/v1/package
 
@@ -14,34 +15,10 @@ pub struct V1Package {
 #[derive(Deserialize)]
 #[allow(dead_code)]
 pub struct V1Version {
-    // no namespace
     pub name: String,
     pub description: String,
     pub version_number: String,
     pub icon: String,
-    pub dependencies: Vec<String>,
+    pub dependencies: Vec<PkgKeyVersion>,
     pub download_url: String,
-}
-
-// /api/experimental/{namespace}/{name}
-
-#[derive(Deserialize)]
-#[allow(dead_code)]
-pub struct V0Package {
-    pub owner: String,
-    pub package_url: String,
-    pub is_deprecated: bool,
-    pub latest: V0Version,
-}
-
-#[derive(Deserialize)]
-#[allow(dead_code)]
-pub struct V0Version {
-    pub namespace: String,
-    pub name: String,
-    pub description: String,
-    pub version_number: String,
-    pub icon: String,
-    pub dependencies: Vec<String>,
-    pub download_url: String,
-}
+}