update types

Author: ahqsoftwares

src-ahqstore-types/Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "ahqstore-types"
 description = "Standard types used by AHQ Store"
-version = "3.12.1"
+version = "3.14.0"
 edition = "2021"
 license-file = "../LICENSE.md"
 repository = "https://github.com/ahqstore/client"

src-ahqstore-types/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kfghdfghdfkgh_js_macros"
-version = "1.0.1"
+version = "1.0.2"
 edition = "2021"
 description = "This is an internal crate"
 license = "MIT"

src-ahqstore-types/js_macros/Cargo.lock

@@ -17,6 +17,7 @@ pub static FDROID_APP_ASSET_URL: LazyLock<String> =
   LazyLock::new(|| format!("{FDROID_BASE_URL}/db/res/{{APP_ID}}/{{ASSET}}"));
 
 pub static FDROID_TOTAL: LazyLock<String> = LazyLock::new(|| format!("{FDROID_BASE_URL}/db/total"));
+pub static FDROID_HOME: LazyLock<String> = LazyLock::new(|| format!("{FDROID_BASE_URL}/db/home.json"));
 
 pub static FDROID_SEARCH: LazyLock<String> =
   LazyLock::new(|| format!("{FDROID_BASE_URL}/db/search/{{ID}}.json"));

src-ahqstore-types/js_macros/Cargo.toml

@@ -16,17 +16,14 @@ use super::{
     AHQSTORE_MAP, AHQSTORE_SEARCH, AHQSTORE_TOTAL,
   },
   fdroid::{
-    FDROID_APPS_DEV, FDROID_APP_ASSET_URL, FDROID_APP_URL, FDROID_DEV_DATA, FDROID_MAP,
-    FDROID_SEARCH, FDROID_TOTAL,
+    FDROID_APPS_DEV, FDROID_APP_ASSET_URL, FDROID_APP_URL, FDROID_DEV_DATA, FDROID_HOME, FDROID_MAP, FDROID_SEARCH, FDROID_TOTAL
   },
   linux::{
-    self, LINUX_APPS_DEV, LINUX_APP_ASSET_URL, LINUX_APP_URL, LINUX_DEV_DATA, LINUX_MAP,
-    LINUX_SEARCH, LINUX_TOTAL,
+    self, LINUX_APPS_DEV, LINUX_APP_ASSET_URL, LINUX_APP_URL, LINUX_DEV_DATA, LINUX_HOME, LINUX_MAP, LINUX_SEARCH, LINUX_TOTAL
   },
   methods::{self, OfficialManifestSource, Store},
   winget::{
-    WINGET_APPS_DEV, WINGET_APP_ASSET_URL, WINGET_APP_URL, WINGET_DEV_DATA, WINGET_MAP,
-    WINGET_SEARCH, WINGET_TOTAL,
+    WINGET_APPS_DEV, WINGET_APP_ASSET_URL, WINGET_APP_URL, WINGET_DEV_DATA, WINGET_HOME, WINGET_MAP, WINGET_SEARCH, WINGET_TOTAL
   },
   SearchEntry,
 };
@@ -89,10 +86,19 @@ pub async fn get_total_maps_by_source(
   methods::get_total_maps(total, commit).await.context("")
 }
 
-pub async fn get_home(ahqstore_repo_commit: &str) -> Result<Vec<(String, Vec<String>)>> {
-  let home = &*AHQSTORE_HOME;
+#[allow(unreachable_patterns)]
+pub async fn get_home(source: OfficialManifestSource, commit: &str) -> Result<Vec<(String, Vec<String>)>> {
+  let home = match source {
+    OfficialManifestSource::AHQStore => &*AHQSTORE_HOME,
+    OfficialManifestSource::WinGet => &*WINGET_HOME,
+    OfficialManifestSource::FDroid => &*FDROID_HOME,
+    OfficialManifestSource::Linux => &*LINUX_HOME,
+    _ => {
+      return Err(anyhow!("source not supported"));
+    }
+  };
 
-  methods::get_home(home, ahqstore_repo_commit)
+  methods::get_home(home, commit)
     .await
     .context("")
 }

src-ahqstore-types/src/api/fdroid.rs

@@ -17,6 +17,7 @@ pub static WINGET_APP_ASSET_URL: LazyLock<String> =
   LazyLock::new(|| format!("{WINGET_BASE_URL}/db/res/{{APP_ID}}/{{ASSET}}"));
 
 pub static WINGET_TOTAL: LazyLock<String> = LazyLock::new(|| format!("{WINGET_BASE_URL}/db/total"));
+pub static WINGET_HOME: LazyLock<String> = LazyLock::new(|| format!("{WINGET_BASE_URL}/db/home.json"));
 
 pub static WINGET_SEARCH: LazyLock<String> =
   LazyLock::new(|| format!("{WINGET_BASE_URL}/db/search/{{ID}}.json"));

src-ahqstore-types/src/api/internet.rs

@@ -55,7 +55,7 @@ pub struct InstallerOptionsWindows {
 
 #[allow(non_snake_case)]
 #[derive(Serialize, Deserialize, Debug, Clone)]
-#[doc = "🔬 Planned\n\n"]
+#[doc = "🔬 Under Development\n\n"]
 #[cfg_attr(feature = "js", wasm_bindgen)]
 pub enum AndroidAbi {
   Aarch64,
@@ -75,9 +75,19 @@ impl AndroidAbi {
   }
 }
 
+fn android_abi() -> &'static str {
+  match ARCH {
+    "x86" => "android-x86",
+    "x86_64" => "android-x86_64",
+    "arm" => "android-armv7",
+    "aarch64" => "android-aarch64",
+    _ => "none"
+  }
+}
+
 #[allow(non_snake_case)]
 #[derive(Serialize, Deserialize, Debug, Clone)]
-#[doc = "🔬 Planned\n\n"]
+#[doc = "🔬 Under Development\n\n"]
 #[cfg_attr(feature = "js", wasm_bindgen(getter_with_clone))]
 pub struct InstallerOptionsAndroid {
   #[doc = "🎯 Introduced in v2\n\n"]
@@ -137,12 +147,27 @@ impl InstallerOptions {
   pub fn is_supported(&self) -> bool {
     let os = self.list_os_arch();
     if OS == "android" {
-      return os.contains(&"android");
+      return os.contains(&android_abi());
     }
 
     os.contains(&format!("{}-{}", OS, ARCH).as_str())
   }
 
+  #[doc = "🎯 Introduced in v3"]
+  pub fn is_supported_android(&self, sdk: u32) -> bool {
+    let os = self.list_os_arch();
+
+    let Some(x) = &self.android else {
+      return false;
+    };
+
+    if OS == "android" {
+      return os.contains(&android_abi()) && x.min_sdk == sdk;
+    }
+
+    false
+  }
+
   #[doc = "🎯 Introduced in v2"]
   pub fn has_platform(&self) -> bool {
     self.is_supported()

src-ahqstore-types/src/api/winget.rs

@@ -50,7 +50,7 @@ pub struct AHQStoreApplication {
   /// App description
   pub description: String,
 
-  /// Your Github Repo associated
+  /// The Github Repo associated
   pub repo: AppRepo,
 
   /// Will be generated by the cli, it is the unique-version-hash of your app
@@ -269,6 +269,11 @@ impl AHQStoreApplication {
     }
   }
 
+  #[doc = "🎯 Introduced in v3"]
+  pub fn is_supported_android(&self, sdk: u32) -> bool {
+    self.install.is_supported_android(sdk)
+  }
+
   #[doc = "🎯 Introduced in v2"]
   pub fn get_android_download(&self) -> Option<&DownloadUrl> {
     let Some(android) = &self.install.android else {