Merge pull request #112 into 007/docker-multiarch from Vitus213/fk_merge

feat(version)：把版本号后延，减少重复代码

Author: Samuka007

Cargo.lock

@@ -42,9 +42,9 @@ impl TestContext for DadkConfigTestContext {
         // 设置workdir
         std::env::set_current_dir(&test_base_path).expect("Failed to setup test base path");
 
-        let r = DadkConfigTestContext { test_base_path };
+        
 
-        r
+        DadkConfigTestContext { test_base_path }
     }
 }
 

crates/test_base/src/dadk_config.rs

@@ -1,6 +1,6 @@
 [package]
 name = "dadk-config"
-version = "0.2.0"
+version = "0.3.1"
 edition = "2021"
 authors = [
     "longjin <[email protected]>",

dadk-config/Cargo.toml

@@ -9,11 +9,12 @@ pub enum TargetArch {
     X86_64,
     RiscV64,
     AArch64,
+    LoongArch64,
 }
 
 impl TargetArch {
     /// 期望的目标处理器架构（如果修改了枚举，那一定要修改这里）
-    pub const EXPECTED: [&'static str; 3] = ["x86_64", "riscv64", "aarch64"];
+    pub const EXPECTED: [&'static str; 4] = ["x86_64", "riscv64", "aarch64", "loongarch64"];
 }
 
 impl TryFrom<&str> for TargetArch {
@@ -24,6 +25,7 @@ impl TryFrom<&str> for TargetArch {
             "x86_64" => Ok(TargetArch::X86_64),
             "riscv64" => Ok(TargetArch::RiscV64),
             "aarch64" => Ok(TargetArch::AArch64),
+            "loongarch64" => Ok(TargetArch::LoongArch64),
             _ => Err(format!("Unknown target arch: {}", value)),
         }
     }
@@ -35,6 +37,7 @@ impl From<TargetArch> for &str {
             TargetArch::X86_64 => "x86_64",
             TargetArch::RiscV64 => "riscv64",
             TargetArch::AArch64 => "aarch64",
+            TargetArch::LoongArch64 => "loongarch64",
         }
     }
 }
@@ -80,6 +83,7 @@ impl Display for TargetArch {
             TargetArch::X86_64 => write!(f, "x86_64"),
             TargetArch::RiscV64 => write!(f, "riscv64"),
             TargetArch::AArch64 => write!(f, "aarch64"),
+            TargetArch::LoongArch64 => write!(f, "loongarch64"),    
         }
     }
 }
@@ -105,6 +109,9 @@ mod tests {
 
         let aarch64 = TargetArch::try_from("aarch64").unwrap();
         assert_eq!(aarch64, TargetArch::AArch64);
+
+        let loongarch64 = TargetArch::try_from("loongarch64").unwrap();
+        assert_eq!(loongarch64, TargetArch::LoongArch64);
     }
 
     #[test]
@@ -121,6 +128,12 @@ mod tests {
 
         let riscv64: &str = TargetArch::RiscV64.into();
         assert_eq!(riscv64, "riscv64");
+
+        let aarch64: &str = TargetArch::AArch64.into();
+        assert_eq!(aarch64, "aarch64");
+
+        let loongarch64: &str = TargetArch::LoongArch64.into();
+        assert_eq!(loongarch64, "loongarch64");
     }
 
     #[test]
@@ -141,6 +154,15 @@ mod tests {
         let json_riscv64 = r#""riscv64""#;
         let riscv64: TargetArch = serde_json::from_str(json_riscv64).unwrap();
         assert_eq!(riscv64, TargetArch::RiscV64);
+
+        let json_aarch64 = r#""aarch64""#;
+        let aarch64: TargetArch = serde_json::from_str(json_aarch64).unwrap();
+
+        assert_eq!(aarch64, TargetArch::AArch64);
+
+        let json_loongarch64 = r#""loongarch64""#;
+        let loongarch64: TargetArch = serde_json::from_str(json_loongarch64).unwrap();
+        assert_eq!(loongarch64, TargetArch::LoongArch64);
     }
 
     #[test]

dadk-config/src/common/target_arch.rs

@@ -69,7 +69,7 @@ impl BuildConfig {
     }
 
     pub fn validate(&self) -> Result<()> {
-        return Ok(());
+        Ok(())
     }
 
     pub fn trim(&mut self) {
@@ -101,7 +101,7 @@ impl InstallConfig {
                 "InstallConfig: in_dragonos_path should be an Absolute path",
             ));
         }
-        return Ok(());
+        Ok(())
     }
 
     pub fn trim(&mut self) {}
@@ -121,7 +121,7 @@ impl CleanConfig {
     }
 
     pub fn validate(&self) -> Result<()> {
-        return Ok(());
+        Ok(())
     }
 
     pub fn trim(&mut self) {
@@ -153,7 +153,7 @@ impl Dependency {
         if self.version.is_empty() {
             return Err(Error::msg("version is empty"));
         }
-        return Ok(());
+        Ok(())
     }
 
     pub fn trim(&mut self) {
@@ -162,7 +162,7 @@ impl Dependency {
     }
 
     pub fn name_version(&self) -> String {
-        return format!("{}-{}", self.name, self.version);
+        format!("{}-{}", self.name, self.version)
     }
 }
 
@@ -200,7 +200,7 @@ impl TaskEnv {
         if self.key.is_empty() {
             return Err(Error::msg("Env: key is empty"));
         }
-        return Ok(());
+        Ok(())
     }
 }
 

dadk-config/src/common/task.rs

@@ -87,8 +87,8 @@ pub struct Metadata {
     pub cache_root_dir: PathBuf,
 
     /// User configuration directory path
-    /// 这个字段只是临时用于兼容旧版本，v0.2版本重构完成后会删除
-    #[deprecated(note = "This field is deprecated and will be removed in DADK 0.2")]
+    /// 这个字段只是临时用于兼容旧版本，v1.0版本重构完成后会删除
+    #[deprecated(note = "This field is deprecated and will be removed in DADK 1.0")]
     #[serde(default = "default_user_config_dir", rename = "user-config-dir")]
     pub user_config_dir: PathBuf,
 }
@@ -256,7 +256,7 @@ mod tests {
         temp_file.write_all(toml_content.as_bytes())?;
         let path = temp_file.path().to_path_buf();
         let manifest = DadkManifestFile::load(&path)?;
-        assert_eq!(manifest.used_default, true);
+        assert!(manifest.used_default);
         assert_eq!(
             manifest.metadata.rootfs_config,
             PathBuf::from("config/rootfs.toml")

dadk-config/src/manifest.rs

@@ -33,15 +33,15 @@ mod tests {
     #[test]
     fn test_deserialize_fat32_lowercase() {
         let r = deserialize_fs_type("fat32");
-        assert_eq!(r.is_ok(), true);
+        assert!(r.is_ok());
         let fs_type = r.unwrap();
         assert_eq!(fs_type, FsType::Fat32);
     }
 
     #[test]
     fn test_deserialize_fat32_mixed_case() {
         let r = deserialize_fs_type("FAT32");
-        assert_eq!(r.is_ok(), true);
+        assert!(r.is_ok());
         let fs_type = r.unwrap();
         assert_eq!(fs_type, FsType::Fat32);
     }

dadk-config/src/rootfs/fstype.rs

@@ -90,12 +90,10 @@ pub fn apply_kv_array(
 
             key_strings.insert(key, arg.to_owned());
             continue;
+        } else if single_value_keys.contains(&arg.as_str()) || multi_value_keys.contains(arg) {
+            return Err(anyhow!("Invalid argument: {}", arg));
         } else {
-            if single_value_keys.contains(&arg.as_str()) || multi_value_keys.contains(arg) {
-                return Err(anyhow!("Invalid argument: {}", arg));
-            } else {
-                key_strings.insert(arg.to_owned(), arg.to_owned());
-            }
+            key_strings.insert(arg.to_owned(), arg.to_owned());
         }
     }
 

dadk-config/src/utils.rs

@@ -14,7 +14,7 @@ build-once = false
 install-once = false
 
 # 目标架构
-# 可选值："x86_64", "aarch64", "riscv64"
+# 可选值："x86_64", "aarch64", "riscv64", "loongarch64"
 target-arch = ["x86_64"]
 
 # 任务源

dadk-config/templates/config/userapp_config.toml

@@ -11,8 +11,8 @@ const BOOT_CONFIG_FILE_NAME: &str = "config/boot.toml";
 #[test]
 fn test_load_boot_config_template(ctx: &DadkConfigTestContext) {
     let boot_config_path = ctx.templates_dir().join(BOOT_CONFIG_FILE_NAME);
-    assert_eq!(boot_config_path.exists(), true);
-    assert_eq!(boot_config_path.is_file(), true);
+    assert!(boot_config_path.exists());
+    assert!(boot_config_path.is_file());
     let _manifest = BootConfigFile::load(&boot_config_path).expect("Failed to load boot config");
     // TODO 校验 manifest 中的字段是否齐全
 }