fix: fix version with target_platform

cathaysia · cathaysia · commit 711ffec4c304 · 2024-03-03T16:14:51.000+08:00
close #18 Signed-off-by: DragonBillow <DragonBillow@outlook.com>
diff --git a/src/data_struct/extensions.rs b/src/data_struct/extensions.rs
@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 // https://github.com/microsoft/vscode/blob/d187d50a482ff80dcf74c35affb09dda1a7cd2fe/src/vs/platform/extensions/common/extensions.ts
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, Clone, Copy)]
 #[serde(rename_all = "kebab-case")]
 pub enum TargetPlatform {
     Win32X64,
diff --git a/src/data_struct/gallery_extension/extension_version.rs b/src/data_struct/gallery_extension/extension_version.rs
@@ -14,7 +14,7 @@ pub struct IRawGalleryExtensionVersion {
     pub fallback_asset_uri: String,
     pub files: Vec<IRawGalleryExtensionFile>,
     pub properties: Vec<IRawGalleryExtensionProperty>,
-    pub target_platform: String,
+    pub target_platform: Option<String>,
 }
 
 impl Display for IRawGalleryExtensionVersion {
diff --git a/src/dump.rs b/src/dump.rs
@@ -69,6 +69,7 @@ pub async fn dump<'a>(
                         .into_iter()
                         .flat_map(|item| item.extensions.into_iter())
                         .map(|item| async move {
+                            let mut res = vec![];
                             for version in &item.versions {
                                 match version.get_engine() {
                                     Ok(ver) => {
@@ -121,30 +122,35 @@ pub async fn dump<'a>(
                                     Ok(sha256) => sha256,
                                     Err(err) => {
                                         error!("{err}");
-                                        return None;
+                                        return vec![];
                                     }
                                 };
 
-                                return Some(NixContext {
-                                    extension_name: item.extension_name.clone(),
-                                    publisher_name: item.publisher.publisher_name.clone(),
-                                    extension_version: version.version.clone(),
-                                    asset_url: if has_asset_url {
-                                        Some(asset_url.clone())
-                                    } else {
-                                        None
-                                    },
-                                    sha256,
-                                    target_platform: client
-                                        .get_extension_target_platform(
-                                            item.publisher.publisher_name,
-                                            item.extension_name,
-                                        )
-                                        .await,
-                                });
+                                let v: Vec<_> = client
+                                    .get_extension_target_platform(
+                                        item.publisher.publisher_name.clone(),
+                                        item.extension_name.clone(),
+                                    )
+                                    .await
+                                    .into_iter()
+                                    .map(|target_platform| NixContext {
+                                        extension_name: item.extension_name.clone(),
+                                        publisher_name: item.publisher.publisher_name.clone(),
+                                        extension_version: version.version.clone(),
+                                        asset_url: if has_asset_url {
+                                            Some(asset_url.clone())
+                                        } else {
+                                            None
+                                        },
+                                        sha256: sha256.clone(),
+                                        target_platform,
+                                    })
+                                    .collect();
+
+                                res.extend(v);
                             }
 
-                            None
+                            res
                         }),
                 );
             }
diff --git a/src/jinja.rs b/src/jinja.rs
@@ -22,6 +22,18 @@ impl Generator<'_> {
         ("codelldb", include_str!("./jinja/template/codelldb.j2"));
 }
 
+macro_rules! add_filter {
+    ($jinja:ident, $ty:expr) => {
+        $jinja.add_filter(stringify!($ty), $ty);
+    };
+}
+
+macro_rules! add_function {
+    ($jinja:ident, $ty:expr) => {
+        $jinja.add_function(stringify!($ty), $ty);
+    };
+}
+
 impl<'a> Generator<'a> {
     pub fn new() -> Self {
         let mut engine = Environment::new();
@@ -30,8 +42,13 @@ impl<'a> Generator<'a> {
             .add_template(Self::NIX_EXPRESSION.0, Self::NIX_EXPRESSION.1)
             .unwrap();
 
-        engine.add_filter("nixfmt", nixfmt);
-        engine.add_filter("to_string", to_string);
+        add_filter!(engine, nixfmt);
+        add_filter!(engine, to_string);
+        add_function!(engine, is_universal);
+        add_function!(engine, is_linux_x86);
+        add_function!(engine, is_linux_arm);
+        add_function!(engine, is_darwin_x86);
+        add_function!(engine, is_darwin_arm);
 
         Self { engine }
     }
diff --git a/src/jinja/context.rs b/src/jinja/context.rs
@@ -21,5 +21,5 @@ pub struct NixContext {
     pub extension_version: String,
     pub asset_url: Option<String>,
     pub sha256: String,
-    pub target_platform: Vec<TargetPlatform>,
+    pub target_platform: TargetPlatform,
 }
diff --git a/src/jinja/filters.rs b/src/jinja/filters.rs
@@ -1,10 +1,36 @@
 use minijinja::Value;
 use nixpkgs_fmt::reformat_string;
 
+use crate::data_struct::TargetPlatform;
+
 pub fn nixfmt(value: &str) -> String {
     reformat_string(value)
 }
 
 pub fn to_string(value: Value) -> String {
     format!(r#""{value}""#)
 }
+
+pub fn is_universal(target_platform: String) -> bool {
+    let target_platform: TargetPlatform = target_platform.as_str().into();
+    matches!(target_platform, TargetPlatform::Universal)
+}
+
+pub fn is_linux_x86(target_platform: String) -> bool {
+    let target_platform: TargetPlatform = target_platform.as_str().into();
+    matches!(target_platform, TargetPlatform::LinuxX64)
+}
+
+pub fn is_linux_arm(target_platform: String) -> bool {
+    let target_platform: TargetPlatform = target_platform.as_str().into();
+    matches!(target_platform, TargetPlatform::LinuxArm64)
+}
+pub fn is_darwin_x86(target_platform: String) -> bool {
+    let target_platform: TargetPlatform = target_platform.as_str().into();
+    matches!(target_platform, TargetPlatform::DarwinX64)
+}
+
+pub fn is_darwin_arm(target_platform: String) -> bool {
+    let target_platform: TargetPlatform = target_platform.as_str().into();
+    matches!(target_platform, TargetPlatform::DarwinArm64)
+}
diff --git a/src/jinja/template/nix_expression.nix.j2 b/src/jinja/template/nix_expression.nix.j2
@@ -5,6 +5,7 @@
 { pkgs, lib }:
 
 let
+  inherit (pkgs.stdenv) isDarwin isLinux isi686 isx86_64 isAarch32 isAarch64;
   vscode-utils = pkgs.vscode-utils;
 in
 {
@@ -30,12 +31,82 @@ in
     {%- for item in extensions %}
     {%- if item.asset_url == None %}
     {%- with uniqueId = [ item.publisher_name | to_string, '.', item.extension_name | to_string ] | join %}
+        {%- if is_universal(item.target_platform) %}
         {{ uniqueId }} = vscode-utils.extensionFromVscodeMarketplace {
           name = "{{ item.extension_name }}";
           publisher = "{{ item.publisher_name }}";
           version = "{{ item.extension_version }}";
           sha256 = "{{ item.sha256 }}";
         };
+        {%- endif %}
+    {%- endwith %}
+    {%- endif %}
+    {%- endfor %}
+}//
+lib.attrsets.optionalAttrs(isLinux && (isi686 || isx86_64) ){
+    {%- for item in extensions %}
+    {%- if item.asset_url == None %}
+    {%- with uniqueId = [ item.publisher_name | to_string, '.', item.extension_name | to_string ] | join %}
+        {%- if is_linux_x86(item.target_platform) %}
+        {{ uniqueId }} = vscode-utils.extensionFromVscodeMarketplace {
+          name = "{{ item.extension_name }}";
+          publisher = "{{ item.publisher_name }}";
+          version = "{{ item.extension_version }}";
+          sha256 = "{{ item.sha256 }}";
+          arch = "linux-x64";
+        };
+        {%- endif %}
+    {%- endwith %}
+    {%- endif %}
+    {%- endfor %}
+}//
+lib.attrsets.optionalAttrs(isLinux && (isAarch32 || isAarch64) ){
+    {%- for item in extensions %}
+    {%- if item.asset_url == None %}
+    {%- with uniqueId = [ item.publisher_name | to_string, '.', item.extension_name | to_string ] | join %}
+        {%- if is_linux_arm(item.target_platform) %}
+        {{ uniqueId }} = vscode-utils.extensionFromVscodeMarketplace {
+          name = "{{ item.extension_name }}";
+          publisher = "{{ item.publisher_name }}";
+          version = "{{ item.extension_version }}";
+          sha256 = "{{ item.sha256 }}";
+          arch = "linux-arm64";
+        };
+        {%- endif %}
+    {%- endwith %}
+    {%- endif %}
+    {%- endfor %}
+}//
+lib.attrsets.optionalAttrs(isDarwin && (isi686 || isx86_64) ){
+    {%- for item in extensions %}
+    {%- if item.asset_url == None %}
+    {%- with uniqueId = [ item.publisher_name | to_string, '.', item.extension_name | to_string ] | join %}
+        {%- if is_darwin_x86(item.target_platform) %}
+        {{ uniqueId }} = vscode-utils.extensionFromVscodeMarketplace {
+          name = "{{ item.extension_name }}";
+          publisher = "{{ item.publisher_name }}";
+          version = "{{ item.extension_version }}";
+          sha256 = "{{ item.sha256 }}";
+          arch = "darwin-x64";
+        };
+        {%- endif %}
+    {%- endwith %}
+    {%- endif %}
+    {%- endfor %}
+}//
+lib.attrsets.optionalAttrs(isDarwin && (isAarch32 || isAarch64) ){
+    {%- for item in extensions %}
+    {%- if item.asset_url == None %}
+    {%- with uniqueId = [ item.publisher_name | to_string, '.', item.extension_name | to_string ] | join %}
+        {%- if is_darwin_arm(item.target_platform) %}
+        {{ uniqueId }} = vscode-utils.extensionFromVscodeMarketplace {
+          name = "{{ item.extension_name }}";
+          publisher = "{{ item.publisher_name }}";
+          version = "{{ item.extension_version }}";
+          sha256 = "{{ item.sha256 }}";
+          arch = "darwin-arm64";
+        };
+        {%- endif %}
     {%- endwith %}
     {%- endif %}
     {%- endfor %}
diff --git a/src/main.rs b/src/main.rs
diff --git a/src/request/http_client.rs b/src/request/http_client.rs

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ pub struct IRawGalleryExtensionVersion {`
`14`	`14`	`pub fallback_asset_uri: String,`
`15`	`15`	`pub files: Vec<IRawGalleryExtensionFile>,`
`16`	`16`	`pub properties: Vec<IRawGalleryExtensionProperty>,`
`17`		`- pub target_platform: String,`
	`17`	`+ pub target_platform: Option<String>,`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`impl Display for IRawGalleryExtensionVersion {`
Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,5 @@ pub struct NixContext {`
`21`	`21`	`pub extension_version: String,`
`22`	`22`	`pub asset_url: Option<String>,`
`23`	`23`	`pub sha256: String,`
`24`		`- pub target_platform: Vec<TargetPlatform>,`
	`24`	`+ pub target_platform: TargetPlatform,`
`25`	`25`	`}`