chore: 软件下载源添加meta字段

EdgelessPE · Dec 15, 2024 · c84fb5b · c84fb5b
1 parent 7cb4515
commit c84fb5b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/src/types/meta.rs b/src/types/meta.rs
@@ -2,7 +2,7 @@ use super::{package::GlobalPackage, permissions::Permission};
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
-#[derive(Serialize, Deserialize, Clone, Debug, TS)]
+#[derive(Serialize, Deserialize, Clone, PartialEq, Debug, TS)]
 #[ts(export)]
 pub struct MetaResult {
     pub temp_dir: Option<String>,

diff --git a/src/types/mirror.rs b/src/types/mirror.rs
@@ -8,7 +8,9 @@ use anyhow::Result;
 use regex::Regex;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
-use super::{extended_semver::ExSemVer, mixed_fs::MixedFS, verifiable::Verifiable};
+use super::{
+    extended_semver::ExSemVer, meta::MetaResult, mixed_fs::MixedFS, verifiable::Verifiable,
+};
 
 lazy_static! {
     static ref FLAGS_RE: Regex = Regex::new(r"\.([A-Z]+)\.nep$").unwrap();
@@ -150,6 +152,7 @@ impl MirrorPkgSoftware {
                     size: 94245376,
                     timestamp: 1704554724,
                     integrity: None,
+                    meta: None,
                 }],
             }],
         );
@@ -163,6 +166,7 @@ impl MirrorPkgSoftware {
                     size: 94245376,
                     timestamp: 1704554724,
                     integrity: None,
+                    meta: None,
                 }],
             }],
         );
@@ -176,6 +180,7 @@ impl MirrorPkgSoftware {
                     size: 133763072,
                     timestamp: 1704554608,
                     integrity: None,
+                    meta: None,
                 }],
             }],
         );
@@ -189,6 +194,7 @@ impl MirrorPkgSoftware {
                     size: 192179712,
                     timestamp: 1704554110,
                     integrity: None,
+                    meta: None,
                 }],
             }],
         );
@@ -218,6 +224,7 @@ pub struct MirrorPkgSoftwareRelease {
     pub size: u64,
     pub timestamp: u64,
     pub integrity: Option<String>,
+    pub meta: Option<MetaResult>,
 }
 
 impl MirrorPkgSoftwareRelease {
@@ -254,6 +261,7 @@ fn test_get_flags() {
         size: 114514,
         timestamp: 114514,
         integrity: None,
+        meta: None,
     };
     assert_eq!(r.get_flags(), None);
 
@@ -263,6 +271,7 @@ fn test_get_flags() {
         size: 114514,
         timestamp: 114514,
         integrity: None,
+        meta: None,
     };
     assert_eq!(r.get_flags(), Some("P".to_string()));
 
@@ -272,6 +281,7 @@ fn test_get_flags() {
         size: 114514,
         timestamp: 114514,
         integrity: None,
+        meta: None,
     };
     assert_eq!(r.get_flags(), Some("EI".to_string()));
 
@@ -281,6 +291,7 @@ fn test_get_flags() {
         size: 114514,
         timestamp: 114514,
         integrity: None,
+        meta: None,
     };
     assert_eq!(r.get_flags(), Some("EI".to_string()));
 
@@ -290,6 +301,7 @@ fn test_get_flags() {
         size: 114514,
         timestamp: 114514,
         integrity: None,
+        meta: None,
     };
     assert_eq!(r.get_flags(), None);
 }

diff --git a/src/utils/mirror.rs b/src/utils/mirror.rs
@@ -299,20 +299,23 @@ fn test_filter_release() {
             size: 94245376,
             timestamp: 1704554724,
             integrity: None,
+            meta: None,
         },
         MirrorPkgSoftwareRelease {
             file_name: "VSCode_1.86.1.0_Cno.nep".to_string(),
             version: ExSemVer::parse(&"1.86.1.0".to_string()).unwrap(),
             size: 94245376,
             timestamp: 1704554724,
             integrity: None,
+            meta: None,
         },
         MirrorPkgSoftwareRelease {
             file_name: "VSCode_1.85.2.0_Cno.nep".to_string(),
             version: ExSemVer::parse(&"1.85.2.0".to_string()).unwrap(),
             size: 94245376,
             timestamp: 1704554724,
             integrity: None,
+            meta: None,
         },
     ];
     let res = filter_release(arr, None, false).unwrap();
@@ -326,20 +329,23 @@ fn test_filter_release() {
             size: 133763072,
             timestamp: 1704554608,
             integrity: None,
+            meta: None,
         },
         MirrorPkgSoftwareRelease {
             file_name: "Chrome_121.0.6099.200_Cno.nep".to_string(),
             version: ExSemVer::parse(&"121.0.6099.200".to_string()).unwrap(),
             size: 133763072,
             timestamp: 1704554608,
             integrity: None,
+            meta: None,
         },
         MirrorPkgSoftwareRelease {
             file_name: "Chrome_122.0.6099.200_Cno.nep".to_string(),
             version: ExSemVer::parse(&"122.0.6099.200".to_string()).unwrap(),
             size: 133763072,
             timestamp: 1704554608,
             integrity: None,
+            meta: None,
         },
     ];
     let res = filter_release(arr, Some(VersionReq::parse("121").unwrap()), false).unwrap();
@@ -363,27 +369,31 @@ fn test_filter_release_with_flags() {
             size: 94245376,
             timestamp: 1704554724,
             integrity: None,
+            meta: None,
         },
         MirrorPkgSoftwareRelease {
             file_name: "Firefox_127.0.0.1_Cno.IE.nep".to_string(),
             version: ExSemVer::from_str("127.0.0.1").unwrap(),
             size: 94245376,
             timestamp: 1704554724,
             integrity: None,
+            meta: None,
         },
         MirrorPkgSoftwareRelease {
             file_name: "Firefox_127.0.0.1_Cno.P.nep".to_string(),
             version: ExSemVer::from_str("127.0.0.1").unwrap(),
             size: 94245376,
             timestamp: 1704554724,
             integrity: None,
+            meta: None,
         },
         MirrorPkgSoftwareRelease {
             file_name: "Firefox_127.0.0.1_Cno.PE.nep".to_string(),
             version: ExSemVer::from_str("127.0.0.1").unwrap(),
             size: 94245376,
             timestamp: 1704554724,
             integrity: None,
+            meta: None,
         },
     ];