nicer error when not connect to the internet

oneElectron · Nov 22, 2023 · 3acd5f8 · 3acd5f8
1 parent f394f3e
commit 3acd5f8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/macros.rs b/src/macros.rs
@@ -27,7 +27,7 @@ macro_rules! unwrap_option {
                 let log_message = format!($($log_message),+);
                 let log_message = format!("{} | {}:{}", log_message, file!(), line!());
                 log::error!("{}", log_message);
-                println!("{}", style($error_message).red().bold());
+                println!("{}", console::style($error_message).red().bold());
                 exit!(1);
             }
 
@@ -40,7 +40,7 @@ macro_rules! unwrap_option {
             if $input.is_none() {
                 let log_message = format!("{} | {}:{}", $error_message.clone(), file!(), line!());
                 log::error!("{}", log_message.clone());
-                println!("{}", style($error_message).red().bold());
+                println!("{}", console::style($error_message).red().bold());
                 exit!(1);
             }
 
@@ -57,7 +57,7 @@ macro_rules! unwrap_result {
                 let log_message = format!($($log_message),+);
                 let log_message = format!("{} | {}:{}", log_message.clone(), file!(), line!());
                 log::error!("{}", log_message);
-                println!("{}", style($error_message).red().bold());
+                println!("{}", console::style($error_message).red().bold());
                 exit!(1);
             }
 
@@ -70,7 +70,7 @@ macro_rules! unwrap_result {
             if $input.is_err() {
                 let log_message = format!("{} | {}:{}", $error_message, file!(), line!());
                 log::error!("{}", log_message);
-                println!("{}", style($error_message).red().bold());
+                println!("{}", console::style($error_message).red().bold());
                 exit!(1);
             }
 

diff --git a/src/path.rs b/src/path.rs
@@ -1,7 +1,6 @@
 //! Contains utilities for working with paths
 
 use crate::prelude::*;
-use console::style;
 use std::path::{Path, PathBuf};
 
 /// Takes an optional path to change to, otherwise change to the closest parent directory with an itex-build.toml

diff --git a/src/updater/template_url.rs b/src/updater/template_url.rs
@@ -1,3 +1,4 @@
+use crate::prelude::*;
 use reqwest::Url;
 use serde::Deserialize;
 
@@ -13,7 +14,11 @@ pub fn get_template_url() -> Url {
         .get("https://api.github.com/repos/oneelectron/itex/releases/latest")
         .header("User-Agent", "reqwest");
 
-    let version_json = version_json.send().expect("Could not connect to GitHub").text().unwrap();
+    let version_json = version_json.send();
+
+    let version_json = unwrap_result!(version_json, "Could not connect to the GitHub. Are you connected to the internet?");
+
+    let version_json = version_json.text().unwrap();
 
     let version_data: VersionData = serde_json::from_str(version_json.as_str()).unwrap();