bivashy/Blitz-Proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor menu.sh

Browse Source
This commit is contained in:
Sarina
2024-07-23 17:59:20 +03:30
parent 6c2d6c0aaa
commit a1f58212a1
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
menu.sh
View File

@ -23,7 +23,7 @@ hysteria2_add_user_handler() {
if [[ "$username" =~ ^[a-z0-9]+$ ]]; then if [[ "$username" =~ ^[a-z0-9]+$ ]]; then
break break
else else
echo -e "\033[0;31mError:\033[0m Username can only contain lowercase letters and numbers." echo -e "${red}Error:${NC} Username can only contain lowercase letters and numbers."
fi fi
done done
@ -53,7 +53,7 @@ hysteria2_edit_user() {
eval "$input_variable_name='$input'" eval "$input_variable_name='$input'"
break break
else else
echo -e "\033[0;31mError:\033[0m Invalid input. Please try again." echo -e "${red}Error:${NC} Invalid input. Please try again."
fi fi
done done
} }
@ -63,7 +63,7 @@ hysteria2_edit_user() {
# Check if user exists # Check if user exists
if ! python3 $CLI_PATH get-user --username "$username" > /dev/null 2>&1; then if ! python3 $CLI_PATH get-user --username "$username" > /dev/null 2>&1; then
echo -e "\033[0;31mError:\033[0m User '$username' not found." echo -e "${red}Error:${NC} User '$username' not found."
return 1 return 1
fi fi
@ -82,7 +82,7 @@ hysteria2_edit_user() {
case "$renew_password" in case "$renew_password" in
y|Y) renew_password=true; break ;; y|Y) renew_password=true; break ;;
n|N) renew_password=false; break ;; n|N) renew_password=false; break ;;
*) echo -e "\033[0;31mError:\033[0m Please answer 'y' or 'n'." ;; *) echo -e "${red}Error:${NC} Please answer 'y' or 'n'." ;;
esac esac
done done
@ -92,7 +92,7 @@ hysteria2_edit_user() {
case "$renew_creation_date" in case "$renew_creation_date" in
y|Y) renew_creation_date=true; break ;; y|Y) renew_creation_date=true; break ;;
n|N) renew_creation_date=false; break ;; n|N) renew_creation_date=false; break ;;
*) echo -e "\033[0;31mError:\033[0m Please answer 'y' or 'n'." ;; *) echo -e "${red}Error:${NC} Please answer 'y' or 'n'." ;;
esac esac
done done
@ -102,7 +102,7 @@ hysteria2_edit_user() {
case "$block_user" in case "$block_user" in
y|Y) blocked=true; break ;; y|Y) blocked=true; break ;;
n|N) blocked=false; break ;; n|N) blocked=false; break ;;
*) echo -e "\033[0;31mError:\033[0m Please answer 'y' or 'n'." ;; *) echo -e "${red}Error:${NC} Please answer 'y' or 'n'." ;;
esac esac
done done
@ -124,7 +124,7 @@ hysteria2_remove_user_handler() {
if [[ "$username" =~ ^[a-z0-9]+$ ]]; then if [[ "$username" =~ ^[a-z0-9]+$ ]]; then
break break
else else
echo -e "\033[0;31mError:\033[0m Username can only contain lowercase letters and numbers." echo -e "${red}Error:${NC} Username can only contain lowercase letters and numbers."
fi fi
done done
python3 $CLI_PATH remove-user --username "$username" python3 $CLI_PATH remove-user --username "$username"
@ -136,7 +136,7 @@ hysteria2_get_user_handler() {
if [[ "$username" =~ ^[a-z0-9]+$ ]]; then if [[ "$username" =~ ^[a-z0-9]+$ ]]; then
break break
else else
echo -e "\033[0;31mError:\033[0m Username can only contain lowercase letters and numbers." echo -e "${red}Error:${NC} Username can only contain lowercase letters and numbers."
fi fi
done done
python3 $CLI_PATH get-user --username "$username" python3 $CLI_PATH get-user --username "$username"
@ -145,7 +145,7 @@ hysteria2_get_user_handler() {
hysteria2_list_users_handler() { hysteria2_list_users_handler() {
users_json=$(python3 $CLI_PATH list-users 2>/dev/null) users_json=$(python3 $CLI_PATH list-users 2>/dev/null)
if [ $? -ne 0 ] || [ -z "$users_json" ]; then if [ $? -ne 0 ] || [ -z "$users_json" ]; then
echo -e "\033[0;31mError:\033[0m Failed to list users." echo -e "${red}Error:${NC} Failed to list users."
return 1 return 1
fi fi
@ -153,12 +153,11 @@ hysteria2_list_users_handler() {
users_keys=$(echo "$users_json" | jq -r 'keys[]') users_keys=$(echo "$users_json" | jq -r 'keys[]')
if [ -z "$users_keys" ]; then if [ -z "$users_keys" ]; then
echo -e "\033[0;31mError:\033[0m No users found." echo -e "${red}Error:${NC} No users found."
return 1 return 1
fi fi
# Print headers # Print headers
echo -e "\033[0;32mUsers:\033[0m"
printf "%-20s %-20s %-15s %-20s %-30s %-10s\n" "Username" "Traffic Limit (GB)" "Expiration (Days)" "Creation Date" "Password" "Blocked" printf "%-20s %-20s %-15s %-20s %-30s %-10s\n" "Username" "Traffic Limit (GB)" "Expiration (Days)" "Creation Date" "Password" "Blocked"
# Print user details # Print user details
@ -180,7 +179,7 @@ hysteria2_show_user_uri_handler() {
if [[ "$username" =~ ^[a-z0-9]+$ ]]; then if [[ "$username" =~ ^[a-z0-9]+$ ]]; then
break break
else else
echo -e "\033[0;31mError:\033[0m Username can only contain lowercase letters and numbers." echo -e "${red}Error:${NC} Username can only contain lowercase letters and numbers."
fi fi
done done
python3 $CLI_PATH show-user-uri --username "$username" python3 $CLI_PATH show-user-uri --username "$username"