@ahqstore/cli 0.7.0 → 0.10.0

package/src/app/build/macros.rs

@@ -1,98 +0,0 @@
-macro_rules! f {
-    ($($x:tt)*) => {
-        format!($($x)*)
-    };
-}
-
-macro_rules! s {
-    ($($x:tt)*) => {
-        stringify!($($x)*)
-    };
-}
-
-#[macro_export]
-macro_rules! windowsPlatform {
-  ($num: ident, $win: ident, $config: ident, $gh_r: ident, $final_config: ident, $platform: ident, $options: ident, $finder: ident) => {
-    $num += 1;
-    if let Some(platform) = $config.platform.$platform {
-      if matches!(&platform, &InstallerFormat::LinuxAppImage | &InstallerFormat::AndroidApkZip) {
-        ERR.println(&"Invalid File Format, expected a valid windows format");
-        process::exit(1);
-      } 
-
-      let Some(options) = $config.platform.$options else {
-        ERR.println(&f!("{} Options not found!", s!($win)));
-        process::exit(1);
-      };
-      let Some(finder) = $config.finder.$finder else {
-        ERR.println(&f!("{} Finder config not found!", s!($win)));
-        process::exit(1);
-      };
-  
-      let assets = crate::app::build::find_assets(&$gh_r, &finder);
-  
-      if assets.len() > 1 {
-        ERR.println(&f!("Multiple assets found while parsing {}", s!($win)));
-        process::exit(1);
-      }
-      if assets.len() == 0 {
-        ERR.println(&f!("No assets found while parsing {}", s!($win)));
-        process::exit(1);
-      }
-  
-      $final_config.downloadUrls.insert(
-        $num,
-        DownloadUrl {
-          installerType: platform,
-          asset: assets[0].name.clone(),
-          url: "".into(),
-        },
-      );
-  
-      $final_config.install.$win = Some(InstallerOptionsWindows {
-        assetId: $num,
-        exec: options.zip_file_exec.map_or(None, |a| Some(a.to_string())),
-        installerArgs: options
-          .exe_installer_args
-          .map_or(None, |a| Some(a.iter().map(|x| x.to_string()).collect())),
-      });
-    }
-  };
-}
-
-#[macro_export]
-macro_rules! linuxPlatform {
-    ($num: ident, $linux: ident, $config: ident, $gh_r: ident, $final_config: ident, $platform: ident, $finder: ident) => {
-      $num += 1;
-      if let Some(platform) = $config.platform.$platform {
-        if !matches!(&platform, &InstallerFormat::LinuxAppImage) {
-          ERR.println(&"Invalid File Format, expected LinuxAppImage");
-        }
-
-        let Some(finder) = $config.finder.$finder else {
-          ERR.println(&f!("{} Finder Config not found!", s!($linux)));
-          process::exit(1);
-        };
-    
-        let assets = find_assets(&$gh_r, &finder);
-    
-        if assets.len() > 1 {
-          ERR.println(&f!("Multiple assets found while parsing {}", s!($linux)));
-          process::exit(1);
-        }
-    
-        $final_config.downloadUrls.insert(
-          $num,
-          DownloadUrl {
-            installerType: platform,
-            asset: assets[0].name.clone(),
-            url: "".into()
-          },
-        );
-    
-        $final_config.install.$linux = Some(InstallerOptionsLinux {
-          assetId: $num
-        });
-      }
-    };  
-}

package/src/app/build/mod.rs

@@ -1,219 +0,0 @@
-use ahqstore_types::{
-  AHQStoreApplication, DownloadUrl, InstallerFormat, InstallerOptions, InstallerOptionsAndroid, InstallerOptionsLinux, InstallerOptionsWindows, Str
-};
-use lazy_static::lazy_static;
-use reqwest::blocking::{Client, ClientBuilder};
-use serde::{Deserialize, Serialize};
-use serde_json::{from_str, to_string};
-use std::{collections::HashMap, env, fs, process};
-
-use crate::app::ERR;
-
-use super::INFO;
-
-mod config;
-mod icon;
-mod release;
-use config::*;
-use icon::*;
-use release::*;
-
-#[macro_use]
-mod macros;
-
-lazy_static! {
-  pub static ref CLIENT: Client = ClientBuilder::new()
-    .user_agent("AHQ Store / App Builder")
-    .build()
-    .unwrap();
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-struct GHRelease {
-  pub tag_name: String,
-  pub upload_url: String,
-  pub assets: Vec<GHAsset>,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-struct GHAsset {
-  pub name: String,
-  pub browser_download_url: String,
-}
-pub fn build_config(upload: bool, gh_action: bool) {
-  let Some(_) = fs::read_dir("./.ahqstore").ok() else {
-    ERR.println(&".ahqstore dir couldn't be accessed!");
-    process::exit(1);
-  };
-  if !gh_action {
-    INFO.print(&"INFO ");
-    println!("Checking .ahqstore");
-  }
-
-  let config = get_config();
-
-  let repo = env::var("GITHUB_REPOSITORY").unwrap_or("%NUL".into());
-
-  if &repo == "%NUL" {
-    ERR.println(&"GITHUB_REPOSITORY not set");
-    process::exit(1);
-  }
-
-  let r_id = env::var("RELEASE_ID").unwrap_or("latest".into());
-
-  if &r_id == "latest" && upload {
-    ERR.println(&"RELEASE_ID variable not present");
-    process::exit(1);
-  };
-  if &r_id == "latest" {
-    INFO.print(&"INFO ");
-    println!("Getting latest release");
-  }
-
-  let gh_token = env::var("GH_TOKEN").unwrap_or("".into());
-
-  if &gh_token == "" && upload {
-    ERR.println(&"GH_TOKEN variable not present");
-    process::exit(1);
-  };
-
-  let (version, gh_r) = fetch_release(&repo, &r_id, &gh_token);
-
-  let icon = get_icon(&config.appId);
-  let dspl_images = get_images(&config.appId);
-
-  let mut resources = HashMap::new();
-  resources.insert(0, icon);
-
-  #[allow(non_snake_case)]
-  let displayImages = dspl_images.into_iter().enumerate().map(|(uid, icon)| {
-    resources.insert(uid as u8 + 1u8, icon);
-
-    uid as u8
-  }).collect();
-
-  let app_id = config.appId.clone();
-
-  let mut final_config: AHQStoreApplication = AHQStoreApplication {
-    releaseTagName: gh_r.tag_name.clone(),
-    appDisplayName: config.appDisplayName,
-    appId: config.appId,
-    appShortcutName: config.appShortcutName,
-    authorId: config.authorId,
-    description: config.description,
-    downloadUrls: HashMap::default(),
-    displayImages,
-    resources: Some(resources),
-    license_or_tos: config.license_or_tos,
-    install: InstallerOptions {
-      linux: None,
-      android: None,
-      linuxArm64: None,
-      linuxArm7: None,
-      winarm: None,
-      win32: None,
-    },
-    repo: config.repo,
-    version,
-    site: config.site,
-    source: config.redistributed,
-    verified: false
-  };
-
-  let mut num = 0;
-  // Win x86_64
-  windowsPlatform!(num, win32, config, gh_r, final_config, winAmd64Platform, winAmd64Options, windowsAmd64Finder);
-
-  // Win Arm64
-  windowsPlatform!(num, winarm, config, gh_r, final_config, winArm64Platform, winArm64Options, windowsArm64Finder);
-
-  // Linux x86_64
-  linuxPlatform!(num, linux, config, gh_r, final_config, linuxAmd64Platform, linuxAmd64Finder);
-
-  // Linux Arm64
-  linuxPlatform!(num, linuxArm64, config, gh_r, final_config, linuxArm64Platform, linuxArm64Finder);
-
-  // Linux Armv7
-  linuxPlatform!(num, linuxArm7, config, gh_r, final_config, linuxArm32Platform, linuxArm32Finder);
-
-  num += 1;
-
-  // Android Universal
-  if let Some(platform) = config.platform.androidUniversal {
-    if !matches!(platform, InstallerFormat::AndroidApkZip) {
-      ERR.println(&"Invalid File Format, expected AndroidApkZip");
-    }
-
-    let Some(finder) = config.finder.androidUniversalFinder else {
-      ERR.println(&"Android Finder Config not found!");
-      process::exit(1);
-    };
-
-    let assets = find_assets(&gh_r, &finder);
-    
-    if assets.len() > 1 {
-      ERR.println(&"Multiple assets found while parsing android");
-      process::exit(1);
-    }
-
-    final_config.downloadUrls.insert(
-      num,
-      DownloadUrl {
-        installerType: platform,
-        asset: assets[0].name.clone(),
-        url: "".into()
-      },
-    );
-
-    final_config.install.android = Some(InstallerOptionsAndroid {
-      assetId: num
-    });
-  }
-
-  INFO.println(&"Validating config");
-  match final_config.validate() {
-    Ok(x) => {
-      println!("{x}");
-    },
-    Err(x) => {
-      ERR.println(&"An error occured!");
-      println!("{x}");
-
-      panic!("👆🏼 Please fix the above issues!");
-    }
-  }
-
-  let config_file = to_string(&final_config).unwrap();
-
-  if !gh_action {
-    println!("{} {}.json", &*INFO, &app_id);
-    println!("{}", &config_file);
-  }
-
-  if upload {
-    let uup = gh_r
-      .upload_url
-      .replace("{?name,label}", &format!("?name={app_id}.json"));
-
-    let resp = CLIENT
-      .post(uup)
-      .header("Content-Length", config_file.len())
-      .header("Content-Type", "text/plain")
-      .header("Accept", "application/json")
-      .body(config_file)
-      .bearer_auth(&gh_token)
-      .send()
-      .unwrap()
-      .text()
-      .unwrap();
-
-    if gh_action {
-      let val: GHAsset = from_str(&resp).unwrap();
-
-      println!("AHQ_STORE_FILE_URL={}", &val.browser_download_url);
-    } else {
-      INFO.println(&"GitHub Response");
-      println!("{resp}");
-    }
-  }
-}

package/src/app/build/release.rs

@@ -1,50 +0,0 @@
-use std::process;
-
-use serde_json::{from_str, to_string};
-use sha2::{Digest, Sha256};
-
-use crate::app::{
-  build::{GHRelease, Str},
-  ERR, WARN,
-};
-
-use super::CLIENT;
-
-pub fn fetch_release(repo: &str, r_id: &str, gh_token: &str) -> (Str, GHRelease) {
-  let Ok(resp) = ({
-    let mut resp = CLIENT.get(format!(
-      "https://api.github.com/repos/{repo}/releases/{r_id}"
-    ));
-
-    if gh_token != "" {
-      resp = resp.bearer_auth(gh_token);
-    } else {
-      WARN.println(&"You may set GH_TOKEN environment variable to load private repos");
-    }
-
-    resp.send()
-  }) else {
-    ERR.println(&"Unable to fetch release");
-    process::exit(1)
-  };
-
-  let Ok(release) = resp.text() else {
-    ERR.println(&"Unable to read release");
-    process::exit(1);
-  };
-
-  let Ok(resp) = from_str::<GHRelease>(&release) else {
-    ERR.println(&"Unable to parse release");
-    process::exit(1);
-  };
-
-  let mut hasher = Sha256::new();
-
-  hasher.update(release.as_bytes());
-
-  let hashed = hasher.finalize();
-  let hashed = hashed.to_vec();
-  let version = to_string(&hashed).unwrap_or("**UNKNOWN**".to_string());
-
-  (version, resp)
-}

package/src/app/create/inquire.rs

@@ -1,114 +0,0 @@
-use std::process;
-
-use ahqstore_types::AppRepo;
-use inquire::{
-  validator::{ErrorMessage, Validation},
-  Editor, Text,
-};
-use serde::{Deserialize, Serialize};
-
-use crate::app::{
-  shared::{Config, IMetadata, IPlatform},
-  ERR, INFO,
-};
-
-#[derive(Serialize, Deserialize)]
-struct ServerUserResp {
-  pub linked_acc: Vec<String>,
-}
-
-pub fn inquire<'a>() -> (String, Config<'a>) {
-  INFO.println(&"Generating a random Application ID");
-  let Ok(app_id) = Text::new("Application ID:")
-    .with_default(&gen_appid())
-    .prompt()
-  else {
-    ERR.println(&"Must Enter an ID");
-    process::exit(1);
-  };
-
-  let Ok(app_name) = Text::new("Start menu entry name:")
-    .with_default("Application")
-    .prompt()
-  else {
-    ERR.println(&"Must Enter a name");
-    process::exit(1);
-  };
-
-  let Ok(display_name) = Text::new("Application Display Name:")
-    .with_default("My Cool App")
-    .prompt()
-  else {
-    ERR.println(&"Must Enter a name");
-    process::exit(1);
-  };
-
-  let Ok(user_id) = Text::new("Your AHQ Store Author ID:").prompt() else {
-    ERR.println(&"Must Enter an ID");
-    process::exit(1);
-  };
-
-  let Ok(desc) = Editor::new("Enter your app description").prompt() else {
-    ERR.println(&"Must Enter a description");
-    process::exit(1);
-  };
-
-  let Ok(repo) = Text::new("Enter your app repository:")
-    .with_default("owner/repoName")
-    .with_validator(|string: &str| {
-      if string.split("/").collect::<Vec<_>>().len() == 2 {
-        Ok(Validation::Valid)
-      } else {
-        Ok(Validation::Invalid(ErrorMessage::Custom(
-          "Must be in the format owner/repoName".into(),
-        )))
-      }
-    })
-    .prompt()
-  else {
-    ERR.println(&"Must Enter a repository");
-    process::exit(1);
-  };
-
-  let [owner, repo] = repo.split("/").collect::<Vec<_>>()[..] else {
-    panic!("Repo Parsing Failed")
-  };
-
-  INFO.println(&"Validating author id & repo");
-  
-  (
-    app_id.clone(),
-    IMetadata::new(
-      app_id,
-      app_name,
-      display_name,
-      user_id,
-      desc,
-      AppRepo {
-        author: owner.into(),
-        repo: repo.into(),
-      },
-      IPlatform::new()
-    ),
-  )
-}
-
-fn gen_appid() -> String {
-  let mut string = String::new();
-
-  use rand::seq::SliceRandom;
-
-  let val = vec![
-    "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s",
-    "t", "u", "v", "w", "s", "y", "z", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L",
-    "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "S", "Y", "Z", "0", "1", "2", "3", "4",
-    "5", "6", "7", "8", "9"
-  ];
-
-  for _ in 0..40 {
-    let val = val.choose(&mut rand::thread_rng()).unwrap();
-    string.push_str(val);
-  }
-
-  string
-}

package/src/app/create/mod.rs

@@ -1,74 +0,0 @@
-mod inquire;
-use std::{fs, process};
-
-use inquire::*;
-use serde_json::to_string_pretty;
-
-use super::{ERR, INFO, WARN};
-
-pub fn create(force: bool) {
-  let (id, config) = inquire();
-
-  create_dir(force);
-
-  let succ = (|| {
-    let config_file = to_string_pretty(&config).ok()?;
-    fs::write("./.ahqstore/config.json", config_file).ok()?;
-
-    let base_img = format!("./.ahqstore/images/{}", &id);
-
-    fs::create_dir_all(&base_img).ok()?;
-
-    let icon = include_bytes!("./icon.png");
-    fs::write(format!("{}/icon.png", &base_img), icon).ok()?;
-
-    let readme = include_str!("./readme.md");
-    fs::write("./.ahqstore/README.md", readme).ok()
-  })()
-  .is_some();
-
-  if !succ {
-    ERR.println(&"Failed to populate .ahqstore");
-    process::exit(1);
-  } else {
-    println!("🇩​​​​​🇴​​​​​🇳​​​​​🇪​​​​​");
-    println!(
-      r#"████████████████████████████████████████████████████████████████▀█
-█─█─██▀▄─██▄─▄▄─█▄─▄▄─█▄─█─▄███─▄▄▄─█─▄▄─█▄─▄▄▀█▄─▄█▄─▀█▄─▄█─▄▄▄▄█
-█─▄─██─▀─███─▄▄▄██─▄▄▄██▄─▄████─███▀█─██─██─██─██─███─█▄▀─██─██▄─█
-▀▄▀▄▀▄▄▀▄▄▀▄▄▄▀▀▀▄▄▄▀▀▀▀▄▄▄▀▀▀▀▄▄▄▄▄▀▄▄▄▄▀▄▄▄▄▀▀▄▄▄▀▄▄▄▀▀▄▄▀▄▄▄▄▄▀
-"#
-    );
-    INFO.println(&"Do not forget to edit config.json and finder.json\nMore details about all the files is present in README.md");
-  }
-}
-
-pub fn create_dir(force: bool) {
-  if let Err(_) = fs::create_dir("./.ahqstore") {
-    if force {
-      WARN.println(&"--force detected\nRemoving dir .ahqstore");
-
-      let succ = (|| {
-        fs::remove_dir_all("./.ahqstore").ok()?;
-        fs::create_dir_all("./.ahqstore").ok()?;
-
-        Some(())
-      })()
-      .is_some();
-
-      if succ {
-        INFO.println(&".ahqstore directory created, initializing data...");
-      } else {
-        ERR.println(&"Failed to create .ahqstore directory");
-        process::exit(1);
-      }
-    } else {
-      ERR.println(
-        &"Failed to create .ahqstore directory\nHint: Use --force option to ignore this error",
-      );
-      process::exit(1);
-    }
-  } else {
-    INFO.println(&"Created .ahqstore directory, initializing data...");
-  }
-}

package/src/app/create/readme.md

@@ -1,13 +0,0 @@
-# AHQ Store Cli
-
-## config.json
-
-Follows the schema as presented [here](https://docs.rs/ahqstore_cli_rs/latest/ahqstore_cli_rs/shared/struct.IMetadata.html)
-
-## images/<app-id>/icon.png
-
-Your application icon that'll be bundled in the app metadata file
-
-## images/<app-id>/\*
-
-Place any image(s) [upto 10] that will be placed in the app modal in AHQ Store

package/src/app/help.rs

@@ -1,77 +0,0 @@
-use chalk_rs::Chalk;
-
-pub fn main_help() -> String {
-  let mut chalk = Chalk::new();
-
-  let cli = chalk.blue().bold().string(&"AHQ Store CLI");
-
-  let usage = chalk.green().bold().string(&"Usage:");
-
-  let cmds = chalk.green().bold().string(&"Commands:");
-  let help = chalk.cyan().bold().string(&"help");
-  let create = chalk.cyan().bold().string(&"create");
-  let build = chalk.cyan().bold().string(&"build");
-  let upload = chalk.cyan().bold().string(&"build");
-
-  let opt = chalk.yellow().bold().string(&"Options:");
-  let force = chalk.cyan().bold().string(&"--force, -f");
-
-  let env = chalk.yellow().bold().string(&"Required ENV:");
-  let app_id = chalk.cyan().bold().string(&"APP_ID");
-  let gh_token = chalk.cyan().bold().string(&"GH_TOKEN");
-  let gh_repo = chalk.cyan().bold().string(&"GITHUB_REPOSITORY");
-  let gh_action = chalk.cyan().bold().string(&"GITHUB_ACTION");
-  let r_id = chalk.cyan().bold().string(&"RELEASE_ID");
-
-  let optional = chalk.yellow().bold().string(&"(Optional)");
-
-  format!(
-    r#"{cli}
-Ship your apps to the ahq store quickly and efficiently
-
-{usage}
-  ahqstore (command) [options]
-{cmds}
-  {help}
-    Shows the help menu
-  {create}
-    Generates AHQ Store config files required to ship your apps
-    {opt}
-      {force} Override Existing contents if .ahqstore dir isn't empty
-  {upload}
-    Build & Upload ahqstore config file
-    {env}
-    {app_id} {optional} Application Id (required if your config has more than 1 appIds)
-    {r_id} GitHub Release Id
-    {gh_token} GitHub Token
-    {gh_repo} GitHub owner & repo name, eg ahqstore/app
-                      (Equivalent to GITHUB_REPOSITORY variable in GitHub actions)
-    {gh_action} {optional} Set this env to anything to specify that it is running in an GitHub Action
-                      (Outputs AHQ_STORE_FILE_URL=<url>)
-  {build}
-    Build the ahqstore config file
-    {env}
-      {app_id} {optional} Application Id (required if your config has more than 1 appIds)
-      {r_id} GitHub Release Id
-      {gh_token} GitHub Token
-      {gh_repo} GitHub owner & repo name, eg ahqstore/app
-                        (Equivalent to GITHUB_REPOSITORY variable in GitHub actions)
-      {gh_action} {optional} Set this env to anything to specify that it is running in an GitHub Action
-                        (Outputs AHQ_STORE_FILE_URL=<url>)"#
-  )
-}
-
-pub fn not_found(name: &str) -> String {
-  let mut chalk = Chalk::new();
-
-  let cmd = chalk.red().bold().string(&"Command not found:");
-  let tip = chalk.green().bold().string(&"Tip:");
-  let astore = chalk.cyan().bold().string(&"ahqstore");
-
-  format!(
-    r#"{cmd} {name}
-
-{tip}
-  Write {astore} to view the help menu"#
-  )
-}

package/src/app/mod.rs

@@ -1,39 +0,0 @@
-use chalk_rs::Chalk;
-use lazy_static::lazy_static;
-
-mod build;
-mod create;
-mod help;
-pub mod shared;
-
-lazy_static! {
-  static ref INFO: Chalk = {
-    let mut chalk = Chalk::new();
-    chalk.blue().bold();
-    chalk
-  };
-  static ref WARN: Chalk = {
-    let mut chalk = Chalk::new();
-    chalk.yellow().bold();
-    chalk
-  };
-  static ref ERR: Chalk = {
-    let mut chalk = Chalk::new();
-    chalk.red().bold();
-    chalk
-  };
-}
-
-pub fn start(args: Vec<String>, gh: bool) {
-  if args.len() >= 1 {
-    match args[0].as_str() {
-      "create" => create::create(args.len() > 1 && (&args[1] == "--force" || &args[1] == "-f")),
-      "build" => build::build_config(false, false),
-      "upload" => build::build_config(true, gh),
-      "help" => println!("{}", help::main_help()),
-      a => println!("{}", help::not_found(a)),
-    }
-  } else {
-    println!("{}", help::main_help());
-  }
-}