Mirrors
/
fluxion
mirror of https://github.com/FluxionNetwork/fluxion.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a couple of issues (outdated) with FormatUtils.

This commit is contained in:
Matias Barcenas 2017-08-14 20:28:37 -05:00
parent aabe322633
commit 2687ecaea6
2 changed files with 69 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fluxion.sh
View File

@ -249,12 +249,12 @@ fi
####################################### < Start > ###################################### ####################################### < Start > ######################################
if [ ! $FLUXIONDebug ]; then if [ ! $FLUXIONDebug ]; then
FLUXIONBanner=() FLUXIONBanner=()
format_center_static " ⌠▓▒▓▒ ⌠▓╗ ⌠█┐ ┌█ ┌▓\ /▓┐ ⌠▓╖ ⌠◙▒▓▒◙ ⌠█\ ☒┐"; FLUXIONBanner[${#FLUXIONBanner[@]}]="$FormatCenterStatic"; format_center_literals " ⌠▓▒▓▒ ⌠▓╗ ⌠█┐ ┌█ ┌▓\ /▓┐ ⌠▓╖ ⌠◙▒▓▒◙ ⌠█\ ☒┐"; FLUXIONBanner[${#FLUXIONBanner[@]}]="$FormatCenterLiterals";
format_center_static " ║▒_ │▒║ │▒║ ║▒ \▒\/▒/ │☢╫ │▒┌╤┐▒ ║▓▒\ ▓║"; FLUXIONBanner[${#FLUXIONBanner[@]}]="$FormatCenterStatic"; format_center_literals " ║▒_ │▒║ │▒║ ║▒ \▒\/▒/ │☢╫ │▒┌╤┐▒ ║▓▒\ ▓║"; FLUXIONBanner[${#FLUXIONBanner[@]}]="$FormatCenterLiterals";
format_center_static " ≡◙◙ ║◙║ ║◙║ ║◙ ◙◙ ║¤▒ ║▓║☯║▓ ♜◙\✪\◙♜"; FLUXIONBanner[${#FLUXIONBanner[@]}]="$FormatCenterStatic"; format_center_literals " ≡◙◙ ║◙║ ║◙║ ║◙ ◙◙ ║¤▒ ║▓║☯║▓ ♜◙\✪\◙♜"; FLUXIONBanner[${#FLUXIONBanner[@]}]="$FormatCenterLiterals";
format_center_static " ║▒ │▒║__ │▒└_┘▒ /▒/\▒\ │☢╫ │▒└╧┘▒ ║█ \▒█║"; FLUXIONBanner[${#FLUXIONBanner[@]}]="$FormatCenterStatic"; format_center_literals " ║▒ │▒║__ │▒└_┘▒ /▒/\▒\ │☢╫ │▒└╧┘▒ ║█ \▒█║"; FLUXIONBanner[${#FLUXIONBanner[@]}]="$FormatCenterLiterals";
format_center_static " ⌡▓ ⌡◘▒▓▒ ⌡◘▒▓▒◘ └▓/ \▓┘ ⌡▓╝ ⌡◙▒▓▒◙ ⌡▓ \▓┘"; FLUXIONBanner[${#FLUXIONBanner[@]}]="$FormatCenterStatic"; format_center_literals " ⌡▓ ⌡◘▒▓▒ ⌡◘▒▓▒◘ └▓/ \▓┘ ⌡▓╝ ⌡◙▒▓▒◙ ⌡▓ \▓┘"; FLUXIONBanner[${#FLUXIONBanner[@]}]="$FormatCenterLiterals";
format_center_static "¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯¯ ¯¯¯ ¯¯¯ ¯¯¯¯ ¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯"; FLUXIONBanner[${#FLUXIONBanner[@]}]="$FormatCenterStatic"; format_center_literals "¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯¯ ¯¯¯ ¯¯¯ ¯¯¯¯ ¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯"; FLUXIONBanner[${#FLUXIONBanner[@]}]="$FormatCenterLiterals";
clear; echo -e "$CRed" clear; echo -e "$CRed"
for line in "${FLUXIONBanner[@]}"; do for line in "${FLUXIONBanner[@]}"; do
@ -264,10 +264,10 @@ if [ ! $FLUXIONDebug ]; then
echo echo
sleep 0.1 sleep 0.1
format_center_static "${CGrn}Site: ${CRed}https://github.com/FluxionNetwork/fluxion$CClr"; echo -e "$FormatCenterStatic" format_center_literals "${CGrn}Site: ${CRed}https://github.com/FluxionNetwork/fluxion$CClr"; echo -e "$FormatCenterLiterals"
sleep 0.1 sleep 0.1
format_center_static "${CRed}FLUXION $CWht$FLUXIONVersion (rev. $CGrn$FLUXIONRevision$CWht)$CYel by$CWht ghost"; echo -e "$FormatCenterStatic" format_center_literals "${CRed}FLUXION $CWht$FLUXIONVersion (rev. $CGrn$FLUXIONRevision$CWht)$CYel by$CWht ghost"; echo -e "$FormatCenterLiterals"
sleep 0.1 sleep 0.1
FLUXIONVNotice="Online Version" FLUXIONVNotice="Online Version"
@ -331,13 +331,13 @@ function check_dependencies() {
local toolIdentifier=$(printf "%-44s" "$CLITool" | sed 's/ /./g') local toolIdentifier=$(printf "%-44s" "$CLITool" | sed 's/ /./g')
local toolState=$(! hash $CLITool 2>/dev/null && echo "$CRed Missing!$CClr" || echo ".....$CGrn OK.$CClr") local toolState=$(! hash $CLITool 2>/dev/null && echo "$CRed Missing!$CClr" || echo ".....$CGrn OK.$CClr")
CLIToolsMissing=$([[ "$toolState" = *"Missing"* ]] && echo true) CLIToolsMissing=$([[ "$toolState" = *"Missing"* ]] && echo true)
format_center_static "$FLUXIONVLine $toolIdentifier$toolState" format_center_literals "$FLUXIONVLine $toolIdentifier$toolState"
echo -e "$FormatCenterStatic" echo -e "$FormatCenterLiterals"
done done
if [ "$CLIToolsMissing" ]; then if [ "$CLIToolsMissing" ]; then
echo echo
format_center_static "${CRed}Stopping due to a lack of dependencies!"; echo -e "$FormatCenterStatic" format_center_literals "${CRed}Stopping due to a lack of dependencies!"; echo -e "$FormatCenterLiterals"
echo echo
exit 1 exit 1
fi fi
@ -743,8 +743,8 @@ function set_target_ap() {
fi fi
done done
local headerTitle=$(format_center_static "WIFI LIST"; echo -n "$FormatCenterStatic\n\n") local headerTitle=$(format_center_literals "WIFI LIST"; echo -n "$FormatCenterLiterals\n\n")
calcualtes
format_apply_autosize "$CRed[$CYel ** $CRed]$CClr %-*.*s %4s %3s %3s %2s %8.8s %18s\n" format_apply_autosize "$CRed[$CYel ** $CRed]$CClr %-*.*s %4s %3s %3s %2s %8.8s %18s\n"
local headerFields=$(printf "$FormatApplyAutosize" "ESSID" "QLTY" "PWR" "STA" "CH" "SECURITY" "BSSID") local headerFields=$(printf "$FormatApplyAutosize" "ESSID" "QLTY" "PWR" "STA" "CH" "SECURITY" "BSSID")

65
lib/FormatUtils.sh
View File

@ -6,26 +6,33 @@ FormatValidSpecifiers='%([+-]?([0-9]+|\*)?(\.([0-9]+|\*))?)?[bqdiouxXfeEgGcsnaA]
# This should be relocated (here temporarily) # This should be relocated (here temporarily)
tabs -$FormatTabLength # Set tab width to var tabs -$FormatTabLength # Set tab width to var
#format_strip_specifiers() { # This function strips (some) invisible characters.
# FormatStripSpecifiers=$(echo "$1" | sed -r "s/$FormatValidSpecifiers//g") # It only strips those needed by fluxion, currently.
#}= # Parameters: $1 - format
function format_strip_invisibles() { function format_strip_invisibles() {
# This function currently only strips the following: # This function currently only strips the following:
# Color escape sequences, & control characters # Color escape sequences, & control characters
FormatStripInvisibles=$(echo "$1" | sed -r 's/\\(e\[([0-9]*;?[0-9]+)m|(t|n))//g') FormatStripInvisibles=$(echo "$1" | sed -r 's/\\(e\[([0-9]*;?[0-9]+)m|(t|n))//g')
} }
# This function replaces all invisible characters
# with a specifier of their corresponding length.
# Parameters: $1 - format
function format_expand_invisibles() { function format_expand_invisibles() {
FormatExpandInvisibles=$(echo "$1" | sed -r 's/\\(e\[([0-9]*;?[0-9]+)m|n)/%0s/g; s/\\t/%'"$FormatTabLength"'s/g') FormatExpandInvisibles=$(echo "$1" | sed -r 's/\\(e\[([0-9]*;?[0-9]+)m|n)/%0s/g; s/\\t/%'"$FormatTabLength"'s/g')
} }
# This function lists all operators in format.
# Parameters: $1 - format
function format_list_specifiers() { function format_list_specifiers() {
# Special specifier also included (with length value as '*'). # Special specifier also included (with length value as '*').
FormatListSpecifiers=($(echo "$1" | grep -oP "$FormatValidSpecifiers")) FormatListSpecifiers=($(echo "$1" | grep -oP "$FormatValidSpecifiers"))
} }
# Statics are all specifiers with a fixed size
# This function calculates total length of statics in format.
# Statics are all specifiers in format with a fixed size.
# Parameters: $1 - format [$2 - specifier array]
function format_calculate_statics_length() { function format_calculate_statics_length() {
local __format_calculate_statics_length__specifiers=("${!2}") local __format_calculate_statics_length__specifiers=("${!2}")
@ -37,6 +44,9 @@ function format_calculate_statics_length() {
FormatCalculateStaticsLength=$(echo "${__format_calculate_statics_length__specifiers[@]}" | sed -r 's/\.[0-9]+s/s/g' | grep -oP '\d+' | awk 'BEGIN {s=0} {s+=$0} END {print s}') FormatCalculateStaticsLength=$(echo "${__format_calculate_statics_length__specifiers[@]}" | sed -r 's/\.[0-9]+s/s/g' | grep -oP '\d+' | awk 'BEGIN {s=0} {s+=$0} END {print s}')
} }
# This function calculates total length of literals in format.
# Literals are all characters in format printed literally.
# Parameters: $1 - format [$2 - processed format [$3 - specifier array]]
function format_calculate_literals_length() { function format_calculate_literals_length() {
local __format_calculate_literals_length__normalizedFormat="`echo "$2" | sed -r 's/%%|\*\*/X/g'`" local __format_calculate_literals_length__normalizedFormat="`echo "$2" | sed -r 's/%%|\*\*/X/g'`"
local __format_calculate_literals_length__specifiers=("${!3}") local __format_calculate_literals_length__specifiers=("${!3}")
@ -56,6 +66,9 @@ function format_calculate_literals_length() {
FormatCalculateLiteralsLength=$((${#__format_calculate_literals_length__normalizedFormat} - ($(echo "${__format_calculate_literals_length__specifiers[@]}" | wc -m) - ${#__format_calculate_literals_length__specifiers[@]}))) FormatCalculateLiteralsLength=$((${#__format_calculate_literals_length__normalizedFormat} - ($(echo "${__format_calculate_literals_length__specifiers[@]}" | wc -m) - ${#__format_calculate_literals_length__specifiers[@]})))
} }
# This function calculates total length of dynamics in format.
# Dynamics are all asterisk-containing specifiers in format.
# Parameters: $1 - format [$2 - statics length [$3 - literals length]]
function format_calculate_dynamics_length() { function format_calculate_dynamics_length() {
local __format_calculate_dynamics_length__staticsLength=$2 local __format_calculate_dynamics_length__staticsLength=$2
local __format_calculate_dynamics_length__literalsLength=$3 local __format_calculate_dynamics_length__literalsLength=$3
@ -81,6 +94,33 @@ function format_calculate_dynamics_length() {
FormatCalculateDynamicsLength=$(( $(tput cols) - (__format_calculate_dynamics_length__staticsLength + __format_calculate_dynamics_length__literalsLength) )) FormatCalculateDynamicsLength=$(( $(tput cols) - (__format_calculate_dynamics_length__staticsLength + __format_calculate_dynamics_length__literalsLength) ))
} }
function format_calculate_length() {
local __format_calculate_length__staticsLength=$2
local __format_calculate_length__literalsLength=$3
if [ ! "$2" ]; then
echo "format_calculate_dynamics_length missing \$2"
format_expand_invisibles "$1"
format_list_specifiers "$FormatExpandInvisibles"
format_calculate_statics_length X FormatListSpecifiers[@]
__format_calculate_length__staticsLength=$FormatCalculateStaticsLength
fi
if [ ! "$3" ]; then
if [ "$2" ]; then
format_expand_invisibles "$1"
format_list_specifiers "$FormatExpandInvisibles"
fi
echo "format_calculate_dynamics_length missing \$3"
format_calculate_literals_length X "$FormatExpandInvisibles" FormatListSpecifiers[@]
__format_calculate_length__literalsLength=$FormatCalculateLiteralsLength
fi
FormatCalculateLength=$(( __format_calculate_length__staticsLength + __format_calculate_length__literalsLength ))
}
# This function calculates the size of individual dynamics in format.
# Parameters: $1 - format [$2 - dynamics length [$3 - dynamics count]]
function format_calculate_autosize_length() { function format_calculate_autosize_length() {
local __format_calculate_autosize_length__dynamicsLength=$2 local __format_calculate_autosize_length__dynamicsLength=$2
local __format_calculate_autosize_length__dynamicsCount=$3 local __format_calculate_autosize_length__dynamicsCount=$3
@ -115,19 +155,26 @@ function format_calculate_autosize_length() {
fi fi
} }
# This function replaces dynamics' asterisks with their length, in format.
# Parameters: $1 - format
# Note that this does not yet support multiple lines (multiple \n). # Note that this does not yet support multiple lines (multiple \n).
function format_apply_autosize() { function format_apply_autosize() {
format_calculate_autosize_length "$1" format_calculate_autosize_length "$1"
FormatApplyAutosize=$(echo "$1" | sed -r 's/\*\.\*/'"$FormatCalculateAutosizeLength"'.'"$FormatCalculateAutosizeLength"'/g; s/(^|[^*])\*([^*]|$)/\1'"$FormatCalculateAutosizeLength"'\2/g; s/\*\*/*/g') FormatApplyAutosize=$(echo "$1" | sed -r 's/\*\.\*/'"$FormatCalculateAutosizeLength"'.'"$FormatCalculateAutosizeLength"'/g; s/(^|[^*])\*([^*]|$)/\1'"$FormatCalculateAutosizeLength"'\2/g; s/\*\*/*/g')
} }
function format_center_static() { # This function centers literal text.
# Parameters: $1 - literals
function format_center_literals() {
format_strip_invisibles "$1" format_strip_invisibles "$1"
local __format_center_static__text_length=${#FormatStripInvisibles} local __format_center_literals__text_length=${#FormatStripInvisibles}
format_apply_autosize "%*s%${__format_center_static__text_length}s%*s" format_apply_autosize "%*s%${__format_center_literals__text_length}s%*s"
FormatCenterStatic=$(printf "$FormatApplyAutosize" "" "$1" "") FormatCenterLiterals=$(printf "$FormatApplyAutosize" "" "$1" "")
} }
# This function centers statics in format.
# Parameters: $1 - format
function format_center_dynamic() { function format_center_dynamic() {
format_calculate_length "$1" format_calculate_length "$1"
format_apply_autosize "%*s%${FormatCalculateLength}s%*s" format_apply_autosize "%*s%${FormatCalculateLength}s%*s"