extern/bat-extras
1
0
Fork 0
mirror of https://github.com/eth-p/bat-extras.git synced 2025-06-24 22:11:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

batpipe: Change viewer_*_supports arg order

Browse Source
This commit is contained in:
Ethan P 2021-03-24 20:04:14 -07:00
parent 1734cedbd9
commit 9072ab47a1
No known key found for this signature in database
GPG Key ID: 6963FD04F6CF35EA
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/batpipe.md
View File

@ -39,7 +39,7 @@ External viewers are be added to batpipe by creating bash scripts inside the `~/
Viewers must define two functions and append the viewer's name to the `$BATPIPE_VIEWERS` array. Viewers must define two functions and append the viewer's name to the `$BATPIPE_VIEWERS` array.
- `viewer_${viewer}_supports [file_path] [file_basename]` - `viewer_${viewer}_supports [file_basename] [file_path] [inner_file_path]`
- `viewer_${viewer}_process [file_path] [inner_file_path]` - `viewer_${viewer}_process [file_path] [inner_file_path]`
The `viewer_${viewer}_supports` function is called to determine if the external viewer is capable of viewing the provided file. If this function returns successfully, the corresponding `process` function will be called. The `viewer_${viewer}_supports` function is called to determine if the external viewer is capable of viewing the provided file. If this function returns successfully, the corresponding `process` function will be called.

12
src/batpipe.sh
View File

@ -16,7 +16,7 @@
# Viewers must define two functions and append the viewer's name to the # Viewers must define two functions and append the viewer's name to the
# `BATPIPE_VIEWERS` array. # `BATPIPE_VIEWERS` array.
# #
# - viewer_${viewer}_supports [file_path] [file_basename] # - viewer_${viewer}_supports [file_basename] [file_path] [inner_file_path]
# If this returns 0, the viewer's process function will be used. # If this returns 0, the viewer's process function will be used.
# #
# - viewer_${viewer}_process [file_path] [inner_file_path] # - viewer_${viewer}_process [file_path] [inner_file_path]
@ -114,7 +114,7 @@ BATPIPE_VIEWERS=("ls" "tar" "unzip")
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
viewer_ls_supports() { viewer_ls_supports() {
[[ -d "$1" ]] [[ -d "$2" ]]
return $? return $?
} }
@ -130,7 +130,7 @@ viewer_ls_process() {
viewer_tar_supports() { viewer_tar_supports() {
command -v "tar" &> /dev/null || return 1 command -v "tar" &> /dev/null || return 1
case "$2" in case "$1" in
*.tar | *.tar.*) return 0 ;; *.tar | *.tar.*) return 0 ;;
esac esac
@ -153,7 +153,7 @@ viewer_tar_process() {
viewer_unzip_supports() { viewer_unzip_supports() {
command -v "unzip" &> /dev/null || return 1 command -v "unzip" &> /dev/null || return 1
case "$2" in case "$1" in
*.zip) return 0 ;; *.zip) return 0 ;;
esac esac
@ -161,7 +161,7 @@ viewer_unzip_supports() {
} }
viewer_unzip_process() { viewer_unzip_process() {
if [[ -n "$2" ]]; then if [[ -n "$1" ]]; then
unzip -p "$1" "$2" | bat_if_not_bat --file-name="$1/$2" unzip -p "$1" "$2" | bat_if_not_bat --file-name="$1/$2"
else else
batpipe_header "Viewing contents of archive: %{PATH}%s" "$1" batpipe_header "Viewing contents of archive: %{PATH}%s" "$1"
@ -324,7 +324,7 @@ fi
# Try opening the file with the first viewer that supports it. # Try opening the file with the first viewer that supports it.
for viewer in "${BATPIPE_VIEWERS[@]}"; do for viewer in "${BATPIPE_VIEWERS[@]}"; do
if "viewer_${viewer}_supports" "$__TARGET_FILE" "$__TARGET_BASENAME" 1>&2; then if "viewer_${viewer}_supports" "$__TARGET_BASENAME" "$__TARGET_FILE" "$__TARGET_INSIDE" 1>&2; then
"viewer_${viewer}_process" "$__TARGET_FILE" "$__TARGET_INSIDE" "viewer_${viewer}_process" "$__TARGET_FILE" "$__TARGET_INSIDE"
exit $? exit $?
fi fi