handle invalid repos

Author: DerGoogler

Cargo.lock

@@ -23,7 +23,8 @@ zip = "0.6.6"
 serde_ini = "0.2.0"
 regex = "1.10.2"
 async-recursion = "1.0.5"
-openssl = { version = "0.10.45", features = ["vendored"] }
+# openssl = { version = "0.10.45", features = ["vendored"] }
+openssl = "0.10.45"
 url = "2.2"
 walkdir = "2.4.0"
 

Cargo.toml

@@ -20,8 +20,8 @@ pub fn get_downloads_dir() -> String {
 
 pub fn is_mmrl() -> bool {
     return match env::var("MMRL_INTR") {
-        Ok(val) => true,
-        Err(e) => false,
+        Ok(_val) => true,
+        Err(_e) => false,
     };
 }
 

src/android_root.rs

@@ -32,7 +32,7 @@ fn add_repos_to_json(file_path: &str, new_repos: Vec<String>) -> io::Result<()>
             if !repos.contains(&repo_value) {
                 repos.push(repo_value);
             } else {
-                println!("\"{}\" has been already added", repo)
+                println!("- \"{}\" has been already added", repo)
             }
         }
     } else {
@@ -53,11 +53,11 @@ pub async fn add(url: Vec<String>) -> () {
     let file_path = "/data/adb/mmrl/repos.json";
     match add_repos_to_json(file_path, url) {
         Ok(_) => {
-            println!("Repositories added successfully.");
+            println!("- Repositories added successfully.");
             exit(0)
         }
         Err(e) => {
-            eprintln!("Error adding repositories: {}", e);
+            eprintln!("! Error adding repositories: {}", e);
             exit(500)
         }
     }

src/cmd/repo.rs

@@ -13,6 +13,7 @@ use android_root::module_state;
 use clap::{Parser, Subcommand};
 use cmd::install::install_local;
 use repo::Repo;
+use serde_json::json;
 use std::io::Write;
 use std::{
     fs::{self, File},
@@ -181,16 +182,23 @@ async fn main() {
     let file = File::open(REPOS_SOURCE).expect("file should open read only");
     let contents: Vec<String> = serde_json::from_reader(file).unwrap();
 
-    let mut tasks = vec![];
+    let mut repos = vec![];
 
     for url in contents {
-        let task = tokio::spawn(fetch_repos(url));
-        tasks.push(task);
+        let repo = tokio::spawn(fetch_repos(url.clone()));
+        let result = repo.await.unwrap();
+
+        let _repo = match result {
+            Ok(data) => repos.push(data),
+            Err(_e) => {
+                repos.push(serde_json::from_str(r#"{ "name": "", "metadata": { "version": 666, "timestamp": 666 }, "modules": [] }"#).unwrap());
+                println!("! Unable to fetch \"{}\", pushed empty data", url);
+            }
+        };
     }
 
-    for task in tasks {
-        let result = task.await.unwrap();
-        modules.append(&mut result.unwrap().modules);
+    for mut repo in repos {
+        modules.append(&mut repo.modules);
     }
 
     match args.commands {

src/main.rs

@@ -58,7 +58,7 @@ pub struct Version {
 pub(crate) fn find_module(modules: &Vec<Module>, id: String) -> Module {
     let module_exists = modules.iter().any(|m| m.id == id);
     if !module_exists {
-        eprintln!("Unable to find {}", id);
+        eprintln!("! Unable to find {}", id);
         exit(1);
     }
     let module_pos = modules.iter().position(|m| m.id == id).unwrap();
@@ -71,7 +71,7 @@ pub(crate) fn find_version(versions: Vec<Version>, version_name: String) -> Vers
     } else {
         let version_exists = versions.iter().any(|v| v.version == version_name);
         if !version_exists {
-            println!("Unable to find {}", version_name);
+            println!("! Unable to find {}", version_name);
             exit(1);
         }
         let version_pos = versions