Add .jar file support for custom commands and GitHub executors (#217)

Includes handling of `.jar` files as input URLs for downloads, dependencies, and binary patterns. Enhanced argument customization and introduced a utility to identify `.jar` files in installation paths.
Note that this won't append java as dep if jar is in release files, because it calculates deps beforehand.
I don't know how to get around this, besides using the api to query for files before completing the resolve, but I feel that's simply "too much".

Author: eirikb

src/stage4/src/executor.rs

@@ -322,6 +322,19 @@ pub fn java_deps<'a>() -> Pin<Box<dyn Future<Output = Vec<ExecutorDep>> + 'a>> {
     Box::pin(async move { vec![ExecutorDep::new("java".to_string(), None)] })
 }
 
+pub fn find_jar_file(app_path: &AppPath) -> Option<String> {
+    if let Ok(entries) = std::fs::read_dir(&app_path.install_dir) {
+        for entry in entries.flatten() {
+            if let Some(name) = entry.file_name().to_str() {
+                if name.ends_with(".jar") {
+                    return Some(name.to_string());
+                }
+            }
+        }
+    }
+    None
+}
+
 fn get_executor_app_path(
     _executor: &dyn Executor,
     input: &AppInput,

src/stage4/src/executors/custom_command.rs

@@ -1,16 +1,26 @@
+use std::collections::HashSet;
 use std::future::Future;
 use std::path::PathBuf;
 use std::pin::Pin;
 
 use semver::VersionReq;
 
-use crate::executor::{AppInput, AppPath, BinPattern, Download, ExecutorCmd};
+use crate::executor::{
+    find_jar_file, AppInput, AppPath, BinPattern, Download, ExecutorCmd, ExecutorDep,
+};
+use crate::target::{Arch, Os, Variant};
 use crate::Executor;
 
 pub struct CustomCommand {
     pub executor_cmd: ExecutorCmd,
 }
 
+impl CustomCommand {
+    fn is_jar_url(url: &str) -> bool {
+        (url.starts_with("http://") || url.starts_with("https://")) && url.ends_with(".jar")
+    }
+}
+
 impl Executor for CustomCommand {
     fn get_executor_cmd(&self) -> &ExecutorCmd {
         &self.executor_cmd
@@ -22,26 +32,69 @@ impl Executor for CustomCommand {
 
     fn get_download_urls<'a>(
         &'a self,
-        _input: &'a AppInput,
+        input: &'a AppInput,
     ) -> Pin<Box<dyn Future<Output = Vec<Download>> + 'a>> {
-        Box::pin(async move { vec![] })
+        Box::pin(async move {
+            if let Some(first_arg) = input.app_args.first() {
+                if Self::is_jar_url(first_arg) {
+                    return vec![Download {
+                        download_url: first_arg.clone(),
+                        version: None,
+                        os: Some(Os::Any),
+                        arch: Some(Arch::Any),
+                        variant: Some(Variant::Any),
+                        tags: HashSet::new(),
+                    }];
+                }
+            }
+            vec![]
+        })
     }
 
     fn get_bins(&self, input: &AppInput) -> Vec<BinPattern> {
-        vec![BinPattern::Exact(
-            input.app_args[0].as_str().to_string(),
-        )]
+        if let Some(first_arg) = input.app_args.first() {
+            if Self::is_jar_url(first_arg) {
+                return vec![BinPattern::Exact("java".to_string())];
+            }
+        }
+        vec![BinPattern::Exact(input.app_args[0].as_str().to_string())]
     }
 
     fn get_name(&self) -> &str {
         "custom_command"
     }
 
-    fn customize_args(&self, input: &AppInput, _app_path: &AppPath) -> Vec<String> {
+    fn get_deps<'a>(
+        &'a self,
+        input: &'a AppInput,
+    ) -> Pin<Box<dyn Future<Output = Vec<ExecutorDep>> + 'a>> {
+        Box::pin(async move {
+            if let Some(first_arg) = input.app_args.first() {
+                if Self::is_jar_url(first_arg) {
+                    return vec![ExecutorDep::new("java".to_string(), None)];
+                }
+            }
+            vec![]
+        })
+    }
+
+    fn customize_args(&self, input: &AppInput, app_path: &AppPath) -> Vec<String> {
+        if let Some(jar_name) = find_jar_file(app_path) {
+            if let Some(jar_path) = app_path.install_dir.join(&jar_name).to_str() {
+                let mut args = vec!["-jar".to_string(), jar_path.to_string()];
+                args.extend(input.app_args.iter().skip(1).cloned());
+                return args;
+            }
+        }
         input.app_args.clone().into_iter().skip(1).collect()
     }
 
-    fn custom_prep(&self, _input: &AppInput) -> Option<AppPath> {
+    fn custom_prep(&self, input: &AppInput) -> Option<AppPath> {
+        if let Some(first_arg) = input.app_args.first() {
+            if Self::is_jar_url(first_arg) {
+                return None;
+            }
+        }
         Some(AppPath {
             install_dir: PathBuf::new(),
         })

src/stage4/src/executors/github.rs

@@ -3,7 +3,8 @@ use std::future::Future;
 use std::pin::Pin;
 
 use crate::executor::{
-    AppInput, AppPath, BinPattern, Download, Executor, ExecutorCmd, ExecutorDep, GgVersion,
+    find_jar_file, AppInput, AppPath, BinPattern, Download, Executor, ExecutorCmd, ExecutorDep,
+    GgVersion,
 };
 use crate::github_utils::{create_github_client, detect_arch_from_name, detect_os_from_name};
 use crate::target::Os::Windows;
@@ -74,7 +75,9 @@ impl GitHub {
             return false;
         }
 
-        let binary_extensions = [".exe", ".zip", ".tar.gz", ".tgz", ".tar.bz2", ".7z", ".gem"];
+        let binary_extensions = [
+            ".exe", ".zip", ".tar.gz", ".tgz", ".tar.bz2", ".7z", ".gem", ".jar",
+        ];
 
         for ext in &binary_extensions {
             if name_lower.contains(ext) {
@@ -202,6 +205,7 @@ impl Executor for GitHub {
         }
 
         patterns.push(BinPattern::Regex(r"^[^.]*$".to_string()));
+        patterns.push(BinPattern::Exact("java".to_string()));
 
         patterns
     }
@@ -210,6 +214,17 @@ impl Executor for GitHub {
         &self.repo
     }
 
+    fn customize_args(&self, input: &AppInput, app_path: &AppPath) -> Vec<String> {
+        if let Some(jar_name) = find_jar_file(app_path) {
+            if let Some(jar_path) = app_path.install_dir.join(&jar_name).to_str() {
+                let mut args = vec!["-jar".to_string(), jar_path.to_string()];
+                args.extend_from_slice(&input.app_args);
+                return args;
+            }
+        }
+        input.app_args.clone()
+    }
+
     fn get_deps<'a>(
         &'a self,
         _input: &'a AppInput,