Merge a8447849eabab924ff368709e22f8f8acafa7780 into d8a8970715070f73bcb6333e3fe851b6802ac702

This commit is contained in:
Jane42070 2023-08-09 13:56:33 -05:00 committed by GitHub
commit 5adab9ea46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions

View File

@ -49,6 +49,14 @@ case "$(file --dereference --brief --mime-type -- "$1")" in
[ ! -f "$CACHE.jpg" ] && gnome-epub-thumbnailer "$1" "$CACHE.jpg" [ ! -f "$CACHE.jpg" ] && gnome-epub-thumbnailer "$1" "$CACHE.jpg"
image "$CACHE.jpg" "$2" "$3" "$4" "$5" "$1" image "$CACHE.jpg" "$2" "$3" "$4" "$5" "$1"
;; ;;
*officedocument* | application/msword)
CACHE="${XDG_CACHE_HOME:-$HOME/.cache}/lf/thumb.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' -- "$(readlink -f "$1")" | sha256sum | cut -d' ' -f1)"
[ ! -f "$CACHE.jpg" ] && libreoffice --convert-to jpg "$1" --outdir "$CACHE" >/dev/null
# 将绝对路径转换为文件名
tmpfile=$(echo "$1"| rev | cut -f 1 -d"/" | rev | sed -r 's/.[^\.]*$//')
mv $CACHE/$tmpfile.jpg $CACHE.jpg && rmdir $CACHE
image "$CACHE.jpg" "$2" "$3" "$4" "$5" "$1"
;;
application/*zip) atool --list -- "$1" ;; application/*zip) atool --list -- "$1" ;;
*opendocument*) odt2txt "$1" ;; *opendocument*) odt2txt "$1" ;;
application/pgp-encrypted) gpg -d -- "$1" ;; application/pgp-encrypted) gpg -d -- "$1" ;;

View File

@ -80,7 +80,8 @@ case "$chosen" in
chosen="${chosen%% *}" chosen="${chosen%% *}"
chosen="${chosen:1}" # This is a bashism. chosen="${chosen:1}" # This is a bashism.
attemptmount || getmount attemptmount || getmount
sudo -A mount "$chosen" "$mp" -o uid="$(id -u)",gid="$(id -g)" # ext4 does not support uid,gid
[ $(lsblk -npro "fstype" $chosen) == ext[2-4] ] && sudo -A mount "$chosen" "$mp" -o user="$USER",rw || sudo -A mount "$chosen" "$mp" -o uid="$(id -u)",gid="$(id -g)"
notify-send "💾Drive Mounted." "$chosen mounted to $mp." notify-send "💾Drive Mounted." "$chosen mounted to $mp."
;; ;;