EvolutionOS
/
neofetch
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove shuffledir in favor of '--image path/to/dir/'

This commit is contained in:
Dylan 2016-03-25 21:22:58 +11:00
parent d7df2378df
commit 5d03e007af
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/config
View File

@ -274,7 +274,7 @@ disk_display="off"
# Image Source # Image Source
# --image wall, shuffle, ascii, /path/to/img, off # --image wall, ascii, /path/to/img, /path/to/dir/, off
image="wall" image="wall"
# Thumbnail directory # Thumbnail directory
@ -294,9 +294,6 @@ w3m_img_path="/usr/lib/w3m/w3mimgdisplay"
# --image_position left/right # --image_position left/right
image_position="left" image_position="left"
# Shuffle dir
shuffle_dir="$HOME/Pictures/wallpapers/wash"
# Crop mode # Crop mode
# --crop_mode normal/fit/fill # --crop_mode normal/fit/fill
crop_mode="normal" crop_mode="normal"

20
neofetch
View File

@ -295,7 +295,7 @@ disk_display="off"
# Image Source # Image Source
# --image wall, shuffle, ascii, /path/to/img, off # --image wall, ascii, /path/to/img, /path/to/dir/, off
image="wall" image="wall"
# Thumbnail directory # Thumbnail directory
@ -315,9 +315,6 @@ w3m_img_path="/usr/lib/w3m/w3mimgdisplay"
# --image_position left/right # --image_position left/right
image_position="left" image_position="left"
# Shuffle dir
shuffle_dir="$HOME/Pictures/wallpapers/wash"
# Crop mode # Crop mode
# --crop_mode normal/fit/fill # --crop_mode normal/fit/fill
crop_mode="normal" crop_mode="normal"
@ -1923,9 +1920,14 @@ getimage () {
case "$image" in case "$image" in
"wall") getwallpaper ;; "wall") getwallpaper ;;
"shuffle") img="$(find "$shuffle_dir" -type f \( -name '*.jpg' -o -name '*.png' \) -print0 | shuf -n1 -z)" ;;
"ascii") getascii; return ;; "ascii") getascii; return ;;
*) img="$image" ;; *)
if [ "${image: -1}" == "/" ]; then
img="$(find "$image" -type f \( -name '*.jpg' -o -name '*.png' \) -print0 | shuf -n1 -z)"
else
img="$image"
fi
;;
esac esac
# Get terminal width and height # Get terminal width and height
@ -2553,11 +2555,10 @@ usage () { cat << EOF
Image: Image:
--image type Image source. Where and what image we display. --image type Image source. Where and what image we display.
Possible values: wall, shuffle, ascii, Possible values: wall, ascii,
/path/to/img, off /path/to/img, /path/to/dir/, off
--size 20px | --size 20% Size to make the image, takes pixels or a percentage. --size 20px | --size 20% Size to make the image, takes pixels or a percentage.
--image_backend w3m/iterm2 Which program to use to draw images. --image_backend w3m/iterm2 Which program to use to draw images.
--shuffle_dir path/to/dir Which directory to shuffle for an image.
--image_position left/right Where to display the image: (Left/Right) --image_position left/right Where to display the image: (Left/Right)
--crop_mode mode Which crop mode to use --crop_mode mode Which crop mode to use
Takes the values: normal, fit, fill Takes the values: normal, fit, fill
@ -2692,7 +2693,6 @@ while [ "$1" ]; do
--size) image_size="$2" ;; --size) image_size="$2" ;;
--image_backend) image_backend="$2" ;; --image_backend) image_backend="$2" ;;
--shuffle_dir) shuffle_dir="$2" ;;
--image_position) image_position="$2" ;; --image_position) image_position="$2" ;;
--crop_mode) crop_mode="$2" ;; --crop_mode) crop_mode="$2" ;;
--crop_offset) crop_offset="$2" ;; --crop_offset) crop_offset="$2" ;;