local module install support

Author: DerGoogler

CHANGELOG.md

@@ -3,6 +3,7 @@
 - Improved error handling
 - Improved MMRL app support
 - Added `repo` subcommand
+- Added support to install local modules
 - Removed download progress bar due to deadlock in MMRL
 - Other improvements
 - Added ModConf

README.md

@@ -14,7 +14,7 @@ Install a module with it
 
 ```shell
 # Install aliases are "add" and "get"
-mmrl install app-data-file-exec data_isolation_support
+mmrl install explore app-data-file-exec data_isolation_support
 ```
 
 ## Get informations
@@ -54,15 +54,15 @@ mmrl download mkshrc node_on_android # --version 152
 Maybe simple...
 
 ```shell
-mmrl install mkshrc@1.3.4 node_on_android
+mmrl install explore mkshrc@1.3.4 node_on_android
 ```
 
 ## Install Viper4Android
 
 > Requires version `0.1.1`
 
 ```shell
-mmrl install -y "https://zackptg5.com/downloads/Audio-Modification-Library_v5.1.zip" "https://john-fawkes.com/Downloads/acp.zip" "https://github.com/AndroidAudioMods/ViPER4Android/releases/download/v0.5.0/V4A_Magisk_Module_0.5.0.zip"
+mmrl install explore -y "https://zackptg5.com/downloads/Audio-Modification-Library_v5.1.zip" "https://john-fawkes.com/Downloads/acp.zip" "https://github.com/AndroidAudioMods/ViPER4Android/releases/download/v0.5.0/V4A_Magisk_Module_0.5.0.zip"
 ```
 
 # Dev

src/cmd/install.rs

@@ -12,7 +12,13 @@ use std::process::{exit, Command, Stdio};
 const METHOD_STORED: Option<zip::CompressionMethod> = Some(zip::CompressionMethod::Stored);
 
 #[async_recursion]
-pub async fn install(client: Client, yes: bool, _requires: bool, modules: &Vec<Module>, id: String) {
+pub async fn install(
+    client: Client,
+    yes: bool,
+    _requires: bool,
+    modules: &Vec<Module>,
+    id: String,
+) {
     let _url = &id.to_owned()[..];
     if is_url(_url) {
         let name = get_last(_url);
@@ -97,9 +103,39 @@ pub async fn install(client: Client, yes: bool, _requires: bool, modules: &Vec<M
                     }
                 }
             }
-            exit(0);
         } else {
             exit(0);
         }
     }
 }
+
+pub async fn install_local(yes: bool, id: String) -> () {
+    let success = yes || confirm("Do you want to continue [y/N] ");
+
+    if success {
+        let (bin, args) = get_install_cli(&id);
+
+        let stdout = Command::new(bin)
+            .args(args)
+            .stdout(Stdio::piped())
+            .spawn()
+            .unwrap()
+            .stdout
+            .ok_or_else(|| Error::new(ErrorKind::Other, "Could not capture standard output."))
+            .unwrap();
+
+        let reader = BufReader::new(stdout);
+
+        for line in reader.lines() {
+            match line {
+                Ok(ln) => println!("{}", ln),
+                Err(e) => {
+                    println!("{}", e);
+                    exit(500)
+                }
+            }
+        }
+    } else {
+        exit(0);
+    }
+}

src/main.rs

@@ -11,6 +11,7 @@ use crate::repo::Module;
 
 use android_root::module_state;
 use clap::{Parser, Subcommand};
+use cmd::install::install_local;
 use repo::Repo;
 use std::io::Write;
 use std::{
@@ -43,6 +44,19 @@ enum RepoCommands {
     Add { url: Vec<String> },
 }
 
+#[derive(Debug, Subcommand)]
+enum InstallCommands {
+    /// Install a local module
+    #[command(arg_required_else_help = true,  aliases = &["ll", "lcl"])]
+    Local {
+        /// Skip confirm
+        #[arg(short, long)]
+        yes: bool,
+        /// Module ZIP location
+        path: Vec<String>,
+    },
+}
+
 #[derive(Debug, Subcommand)]
 enum Commands {
     /// Update MMRL CLI
@@ -83,6 +97,8 @@ enum Commands {
     /// Install any module
     #[command(arg_required_else_help = true,  aliases = &["add", "get", "fetch"])]
     Install {
+        #[clap(subcommand)]
+        commands: Option<InstallCommands>,
         /// Skip confirm
         #[arg(short, long)]
         yes: bool,
@@ -180,7 +196,7 @@ async fn main() {
     match args.commands {
         Commands::Repo { commands } => match commands {
             RepoCommands::Add { url } => {
-                add(url);
+                add(url).await;
                 exit(0);
             }
         },
@@ -265,12 +281,25 @@ async fn main() {
                 exit(0);
             }
         },
-        Commands::Install { yes, requires, ids } => {
-            for id in ids {
-                install(client.clone(), yes, requires, &modules, id).await;
+        Commands::Install {
+            yes,
+            requires,
+            ids,
+            commands,
+        } => match commands {
+            Some(InstallCommands::Local { yes, path }) => {
+                for id in path {
+                    install_local(yes, id).await;
+                }
+                exit(0);
             }
-            exit(0);
-        }
+            None => {
+                for id in ids {
+                    install(client.clone(), yes, requires, &modules, id).await;
+                }
+                exit(0);
+            }
+        },
         Commands::Enable { ids } => {
             for id in ids {
                 let base_path = Path::new("/data/adb/modules").join(id);