luisgulo/neofetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Image: Added error about missing imagemagick

Browse source
This commit is contained in:
Dylan Araps 2017-01-15 08:43:22 +11:00
parent 87cc686070
commit 845dc830ba
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
neofetch
View file

@ -1942,9 +1942,11 @@ get_cols() {
# IMAGES # IMAGES
image_backend() { image_backend() {
if [[ ! "${image_backend}" =~ (off|ascii) ]]; then if [[ ! "$image_backend" =~ (off|ascii) ]]; then
# Fallback to ascii mode if imagemagick isn't installed. if ! type -p convert >/dev/null 2>&1; then
type -p convert >/dev/null 2>&1 || image_backend="ascii" image_backend="ascii"
err "Image: Imagemagick not found, falling back to ascii mode."
fi
# If X isn't running force ascii mode here. # If X isn't running force ascii mode here.
[[ -z "$DISPLAY" ]] && image_backend="ascii" [[ -z "$DISPLAY" ]] && image_backend="ascii"
@ -1981,7 +1983,7 @@ image_backend() {
*) *)
err "Image: Unknown image backend specified '$image_backend'." err "Image: Unknown image backend specified '$image_backend'."
err "Image: Valid backends are: 'iterm2', 'w3m'. 'tycat', 'ascii', 'off'" err "Image: Valid backends are: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'tycat', 'w3m')"
err "Image: Falling back to ascii mode." err "Image: Falling back to ascii mode."
get_ascii get_ascii
;; ;;
@ -2339,17 +2341,17 @@ make_thumbnail() {
display_image() { display_image() {
case "$image_backend" in case "$image_backend" in
"caca") "caca")
img2txt -W "$((width / font_width)))" -H "$((height / font_height))" --gamma=0.6 "$image" || to_off "Images: catimg failed to display the image." img2txt -W "$((width / font_width)))" -H "$((height / font_height))" --gamma=0.6 "$image" || to_off "Image: catimg failed to display the image."
zws= zws=
;; ;;
"catimg") "catimg")
catimg -w "$((columns + gap))" "$image" || to_off "Images: catimg failed to display the image." catimg -w "$((columns + gap))" "$image" || to_off "Image: catimg failed to display the image."
zws= zws=
;; ;;
"jp2a") "jp2a")
jp2a --width="$((width / font_width))" --colors "$image" || to_off "Images: jp2a failed to display the image." jp2a --width="$((width / font_width))" --colors "$image" || to_off "Image: jp2a failed to display the image."
zws= zws=
;; ;;
@ -2358,7 +2360,7 @@ display_image() {
;; ;;
"tycat") "tycat")
tycat "$image" || to_off "Images: tycat failed to display the image." tycat "$image" || to_off "Image: tycat failed to display the image."
;; ;;
"w3m") "w3m")
@ -2368,7 +2370,7 @@ display_image() {
# appearing in specific terminal emulators. # appearing in specific terminal emulators.
sleep 0.05 sleep 0.05
printf "%b\n" "0;1;$xoffset;$yoffset;$width;$height;;;;;$image\n4;\n3;" |\ printf "%b\n" "0;1;$xoffset;$yoffset;$width;$height;;;;;$image\n4;\n3;" |\
"${w3m_img_path:-false}" -bg "$background_color" >/dev/null & 2>&1 || to_off "Images: w3m-img failed to display the image." "${w3m_img_path:-false}" -bg "$background_color" >/dev/null & 2>&1 || to_off "Image: w3m-img failed to display the image."
;; ;;
esac esac
} }