From 9a2420c82a3ce9f98cc5c3ded60d392f52cdbf06 Mon Sep 17 00:00:00 2001
From: Sarina <iam54r1n40@proton.me>
Date: Sun, 21 Jul 2024 19:16:45 +0330
Subject: [PATCH] Refactor menu.sh

---
 core/scripts/utils.sh | 12 ++++++
 menu.sh               | 86 ++++++++++++++++++++++++-------------------
 2 files changed, 60 insertions(+), 38 deletions(-)

diff --git a/core/scripts/utils.sh b/core/scripts/utils.sh
index 799109b..3e261d8 100644
--- a/core/scripts/utils.sh
+++ b/core/scripts/utils.sh
@@ -7,4 +7,16 @@ define_colors() {
     yellow='\033[0;33m'
     LPurple='\033[1;35m'
     NC='\033[0m' # No Color
+}
+
+# Function to get system information
+get_system_info() {
+    OS=$(lsb_release -d | awk -F'\t' '{print $2}')
+    ARCH=$(uname -m)
+    # Fetching detailed IP information in JSON format
+    IP_API_DATA=$(curl -s https://ipapi.co/json/ -4)
+    ISP=$(echo "$IP_API_DATA" | jq -r '.org')
+    IP=$(echo "$IP_API_DATA" | jq -r '.ip')
+    CPU=$(top -bn1 | grep "Cpu(s)" | awk '{print $2 + $4 "%"}')
+    RAM=$(free -m | awk 'NR==2{printf "%.2f%%", $3*100/$2 }')
 }
\ No newline at end of file
diff --git a/menu.sh b/menu.sh
index 6b1b9cb..4aa8acd 100644
--- a/menu.sh
+++ b/menu.sh
@@ -2,21 +2,27 @@
 
 source /etc/hysteria/core/scripts/utils.sh
 
-# Function to get system information
-get_system_info() {
-    OS=$(lsb_release -d | awk -F'\t' '{print $2}')
-    ARCH=$(uname -m)
-    # Fetching detailed IP information in JSON format
-    IP_API_DATA=$(curl -s https://ipapi.co/json/ -4)
-    ISP=$(echo "$IP_API_DATA" | jq -r '.org')
-    IP=$(echo "$IP_API_DATA" | jq -r '.ip')
-    CPU=$(top -bn1 | grep "Cpu(s)" | awk '{print $2 + $4 "%"}')
-    RAM=$(free -m | awk 'NR==2{printf "%.2f%%", $3*100/$2 }')
+# OPTION HANDLERS (ONLY NEEDED ONE)
+
+hysteria2_add_user_handler() {
+
+}
+
+hysteria2_remove_user_handler() {
+
+}
+
+hysteria2_show_user_uri_hanndler() {
+
+}
+
+hysteria2_change_port_handler() {
+
 }
 
 
 # Function to modify users
-modify_users() {
+hysteria2_modify_users() {
     modify_script="/etc/hysteria/users/modify.py"
     github_raw_url="https://raw.githubusercontent.com/ReturnFI/Hysteria2/main/modify.py"
 
@@ -25,6 +31,10 @@ modify_users() {
     python3 "$modify_script"
 }
 
+warp_configure_handler() {
+
+}
+
 
 # Function to display the main menu
 display_main_menu() {
@@ -100,34 +110,11 @@ hysteria2_menu() {
         read -r choice
         case $choice in
             1) python3 /etc/hysteria/core/cli.py install-hysteria2 ;;
-            2) add_user ;;
-            3) modify_users ;;
-            4) show_uri ;;
+            2) hysteria2_add_user_handler ;;
+            3) hysteria2_modify_users ;;
+            4) hysteria2_show_user_uri_hanndler ;;
             5) python3 /etc/hysteria2/core/cli.py traffic_status ;;
-            6) remove_user ;;
-            0) return ;;
-            *) echo "Invalid option. Please try again." ;;
-        esac
-        echo
-        read -rp "Press Enter to continue..."
-    done
-}
-
-# Function to handle Advance menu options
-advance_menu() {
-    clear
-    local choice
-    while true; do
-        display_advance_menu
-        read -r choice
-        case $choice in
-            1) install_tcp_brutal ;;
-            2) install_warp ;;
-            3) configure_warp ;;
-            4) uninstall_warp ;;
-            5) change_port ;;
-            6) update_core ;;
-            7) uninstall_hysteria ;;
+            6) hysteria2_remove_user_handler ;;
             0) return ;;
             *) echo "Invalid option. Please try again." ;;
         esac
@@ -154,6 +141,29 @@ display_advance_menu() {
     echo -ne "${yellow}➜ Enter your option: ${NC}"
 }
 
+# Function to handle Advance menu options
+advance_menu() {
+    clear
+    local choice
+    while true; do
+        display_advance_menu
+        read -r choice
+        case $choice in
+            1) python3 /etc/hysteria/core/cli.py install-tcp-brutal ;;
+            2) python3 /etc/hysteria/core/cli.py install-warp ;;
+            3) warp_configure_handler ;;
+            4) python3 /etc/hysteria/core/cli.py uninstall-warp ;;
+            5) hysteria2_change_port_handler ;;
+            6) python3 /etc/hysteria/core/cli.py update-hysteria2 ;;
+            7) python3 /etc/hysteria/core/cli.py uninstall-hysteria2 ;;
+            0) return ;;
+            *) echo "Invalid option. Please try again." ;;
+        esac
+        echo
+        read -rp "Press Enter to continue..."
+    done
+}
+
 # Main function to run the script
 main() {
     main_menu