Skip to content

refactor(core): Large refactor of output functions, creating main() and separating text and ASCII #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 19, 2021
Merged

refactor(core): Large refactor of output functions, creating main() and separating text and ASCII #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f2a05e3
flag(ASCII): Added flags -L/-T; "logo only" or "text only" output modes.
KittyKatt Mar 19, 2021
bf61473
Fix formatting
KittyKatt Mar 19, 2021
52ff548
Attempting to fix tests
KittyKatt Mar 19, 2021
c99f38b
Debugging Ubuntu tests
KittyKatt Mar 19, 2021
400d1aa
Fixing tests.yaml for new flag
KittyKatt Mar 19, 2021
a23d8e1
Adding back a function that got deleted, fixed logo padding
KittyKatt Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/tests/ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,24 @@ errorOut () {
}


if [[ $(bash fetch --config sample.config.conf -v -L .) ]]; then
if [[ $(bash fetch --config sample.config.conf -v -C .) ]]; then
successOut 'Fetched current output:'
bash fetch --config sample.config.conf -v
bash fetch --config sample.config.conf -C . -v
else
errorOut 'fetch failed output:'
bash fetch --config sample.config.conf -v
bash fetch --config sample.config.conf -C . -v
exit 1
fi

# shellcheck disable=SC1094
source ./ascii/ubuntu.sh

n=0
IFS=$'\n'
while read -r line; do
_output[${n}]="${line}"
((n++))
done <<< "$(bash fetch --config sample.config.conf -v -L .)"
done <<< "$(bash fetch --config sample.config.conf -v -C .)"

if [[ ! ${_output[0]} =~ ^(.*)'Finding kernel...found as'(.*)'Linux '[[:digit:]]+'.'[[:digit:]]+'.'[[:digit:]]+'-'[[:digit:]]+'-azure' ]]; then
errorOut "!! Failed on kernel."
Expand Down
182 changes: 99 additions & 83 deletions fetch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,14 +431,14 @@ detect_distro() {
done
if [ -n "${distrib_id}" ]; then
if [ "${BASH_VERSINFO[0]}" -ge 4 ]; then
distrib_id=$(for i in ${distrib_id}; do printf '%s' "${i^} "; done)
distrib_id=$(for d in ${distrib_id}; do printf '%s' "${d^} "; done)
my_distro=${distrib_id% }
unset distrib_id
else
distrib_id=$(
for i in ${distrib_id}; do
FIRST_LETTER=$(printf '%s' "${i:0:1}" | tr "[:lower:]" "[:upper:]")
printf '%s' "${FIRST_LETTER}${i:1} "
for d in ${distrib_id}; do
FIRST_LETTER=$(printf '%s' "${d:0:1}" | tr "[:lower:]" "[:upper:]")
printf '%s' "${FIRST_LETTER}${d:1} "
done
)
my_distro=${distrib_id% }
Expand Down Expand Up @@ -1395,120 +1395,145 @@ detect_memory() {

###############################
# functions: output
info() {
local _info="${1}"
local _info_disp="my_${_info}"

if [ -n "${!_info_disp}" ]; then
_info_subtitle="config_${_info}[subtitle]"
print_info() {
local _info="my_${1}"
local _infodisplay="my_${1}"
until [ -n "${!_info}" ]; do
((${#_display} < 1)) && break
_display=("${_display[@]:1}")
_info="my_${1}}"
done

if [ -n "${!_info}" ]; then
_info_subtitle="config_${1}[subtitle]"
if [ -n "${!_info_subtitle}" ]; then
# shellcheck disable=SC2154
printf '%b\n' "${!_info_subtitle}${config_text[info_separator]} ${!_info_disp}"
printf '%b\n' "${!_info_subtitle}${config_text[info_separator]} ${!_info}"
else
printf '%b\n' "${!_info_disp}"
printf '%b\n' "${!_info}"
fi
else
:
fi
}

format_ascii() {
local _logo="${1}"

_display=("${_display[@]:1}")
}
print_ascii() {
local logo="${1}"
# shellcheck disable=SC2154
gap=${config_ascii[gap]}
# Calculate: (max detected logo width - length of current line)
_tmp="${_logo//\$\{??\}/}"
_tmp="${logo//\$\{??\}/}"
_tmp=${_tmp//\\\\/\\}
_tmp=${_tmp//█/ }
# shellcheck disable=SC2154
if ((${#_tmp} < ascii_len)); then
logo_padding=$((ascii_len - ${#_tmp}))
else
logo_padding=0
fi

# Random coloring support
if [ "${config_ascii['colors']}" == "random" ]; then
declare _randc
local n=1
while [[ ${_logo} =~ \$\{[c][1-6]\} ]]; do
while [[ ${logo} =~ \$\{[c][1-6]\} ]]; do
_randc="$(getColor 'rand')"
_logo="${_logo//\$\{c${n}\}/${_randc}}"
logo="${logo//\$\{c${n}\}/${_randc}}"
((n++))
done
fi

# Expand color variables
_logo="${_logo//\$\{c1\}/$c1}"
_logo="${_logo//\$\{c2\}/$c2}"
_logo="${_logo//\$\{c3\}/$c3}"
_logo="${_logo//\$\{c4\}/$c4}"
_logo="${_logo//\$\{c5\}/$c5}"
_logo="${_logo//\$\{c6\}/$c6}"

((text_padding = logo_padding + gap))
printf "%b \e[%sC" "${_logo}" "${text_padding}"
}

print_ascii() {
# shellcheck disable=SC2154
while IFS=$'\n' read -r line; do
line=${line//\\\\/\\}
line=${line//█/ }
((++lines, ${#line} > ascii_len)) && ascii_len="${#line}"
done <<< "${asciiLogo//\$\{??\}/}"

n=0
# shellcheck disable=SC2154
read -r -a _display <<< "${config_global[info]}"
while IFS=$'\n' read -r line; do
# shellcheck disable=SC2154
gap=${config_ascii[gap]}

# call format_ascii to prepare for info display
line=$(format_ascii "${line}")
logo="${logo//\$\{c1\}/$c1}"
logo="${logo//\$\{c2\}/$c2}"
logo="${logo//\$\{c3\}/$c3}"
logo="${logo//\$\{c4\}/$c4}"
logo="${logo//\$\{c5\}/$c5}"
logo="${logo//\$\{c6\}/$c6}"

# Let's output!
if [ "${config_text[display]}" == "on" ]; then
# Format line with gap after ASCII for info display
((text_padding = logo_padding + gap))
logo="$(printf "%b \e[%sC" "${logo}" "${text_padding}")"

# Display ASCII art and detected info
# shellcheck disable=SC2154
if [ ${n} -lt "${startline}" ]; then
printf '%b\n' "${line}${reset}"
elif [ ${n} -ge "${startline}" ]; then
if [ "${i}" -lt "${startline}" ]; then
printf '%b\n' "${logo}${reset}"
elif [ "${i}" -ge "${startline}" ]; then
if ((${#_display} > 0)); then
_info_display="my_${_display[0]}"
until [ -n "${!_info_display}" ]; do
((${#_display} <= 0)) && break
_display=("${_display[@]:1}")
_info_display="my_${_display[0]}"
done
_info_display=$(info "${_display[0]}")
if [ -n "${_info_display}" ]; then
printf '%b\n' "${line}${reset}${_info_display}"
else
continue
fi
_infodisplay="$(print_info "${_display[0]}")"
printf '%b\n' "${logo}${reset}${_infodisplay}"
_display=("${_display[@]:1}")
else
printf '%b\n' "${line}${reset}"
printf '%b\n' "${logo}${reset}"
fi
fi

# Cleanup
((n++))
# shellcheck disable=SC2031
unset _tmp
unset _padding
done <<< "${asciiLogo}"
unset text_padding
else
printf '%b\n' "${logo}${reset}"
fi

# Cleanup
unset n
}

#############################
# functions: information
# function: Usage
usage() {
printf "Help!\n"
}

##############################
# function: Version
versioninfo() {
printf 'fetch %s\n' "${FETCH_VERSION}"
}

main() {
detect_kernel
detect_os

# filter {config_global[info]} into a new variable, minus kernel because
# that is already detected above. keep old variable intact for output purposes.
GLOBAL_INFO="${config_global[info]//kernel /}"

for g in ${GLOBAL_INFO}; do
eval "detect_${g}"
done

# shellcheck disable=SC2154
read -r -a _display <<< "${config_global[info]}"

if [ "${config_ascii[display]}" == "on" ]; then
i=0
# Get logo max width
# shellcheck disable=SC2154
while IFS=$'\n' read -r line; do
line=${line//\\\\/\\}
line=${line//█/ }
((++lines, ${#line} > ascii_len)) && ascii_len="${#line}"
done <<< "${asciiLogo//\$\{??\}/}"
# Loop over logo and output
# shellcheck disable=SC2154
while IFS=$'\n' read -r line; do
print_ascii "${line}"
((i++))
done <<< "${asciiLogo}"
unset i
else
while ((${#_display} > 0)); do
print_info "${_display[0]}"
done
fi
}

# Catch configuration flag
[[ $* != *--config* ]] && fetchConfig "${FETCH_DATA_USER_DIR}/${FETCH_CONFIG_FILENAME}"

Expand All @@ -1530,7 +1555,7 @@ case ${1} in
*) : ;;
esac

while getopts ":hvVNRD:A:L:" flags; do
while getopts ":hvVNRTLD:A:C:" flags; do
# shellcheck disable=SC2154
case ${flags} in
h)
Expand All @@ -1541,11 +1566,13 @@ while getopts ":hvVNRD:A:L:" flags; do
versioninfo
exit 0
;;
v) declare config_global[verbose]="on" ;;
v) config_global[verbose]="on" ;;
D) my_distro="${OPTARG}" ;;
A) ascii_distro="${OPTARG}" ;;
N) declare config_text[color]="off" ;;
L) FETCH_DATA_DIR="${OPTARG}" ;;
N) config_text[color]="off" ;;
C) FETCH_DATA_DIR="${OPTARG}" ;;
T) config_ascii[display]="off" ;;
L) config_text[display]="off" ;;
R) config_ascii['colors']="random" ;;
:)
errorOut "Error: You're missing an argument somewhere. Exiting."
Expand All @@ -1562,17 +1589,6 @@ while getopts ":hvVNRD:A:L:" flags; do
esac
done

detect_kernel
detect_os

# filter {config_global[info]} into a new variable, minus kernel because
# that is already detected above. keep old variable intact for output purposes.
GLOBAL_INFO="${config_global[info]//kernel /}"

for i in ${GLOBAL_INFO}; do
eval "detect_${i}"
done

print_ascii
main

((extglob_set)) && shopt -u extglob