Compare commits
No commits in common. "master" and "1.19.1" have entirely different histories.
|
|
@ -18,8 +18,6 @@ Call ufw -h for help.
|
|||
|
||||
Dependencies: curl, jq
|
||||
|
||||
The config goes into `$XDG_CONFIG_DIR/ufw`.
|
||||
|
||||
ufwd
|
||||
----
|
||||
|
||||
|
|
|
|||
11
config/ufw
11
config/ufw
|
|
@ -1,11 +0,0 @@
|
|||
# Put your actual secret here, this is just a random string
|
||||
secret='rooxoosh7Aese7phiPh3Choh3uthiTha'
|
||||
|
||||
# Override the default common curl behaviour:
|
||||
#curl() { command curl -sL "$@"; }
|
||||
|
||||
#cfg_tmp_dir="$XDG_RUNTIME_DIR/ufw"
|
||||
#cfg_service_url='https://8fw.me'
|
||||
#cfg_max_filesize='200M' # Local limit, doesn't affect the server one :)
|
||||
#flag_shortlink=0 # Display short links
|
||||
#flag_directlink=1 # Display direct file links
|
||||
204
ufw
204
ufw
|
|
@ -23,14 +23,15 @@ msg() {
|
|||
|
||||
err() { printf '(error) %s\n' "$*" >&2; }
|
||||
|
||||
curl() { command curl -sL "$@"; }
|
||||
|
||||
usage() {
|
||||
_cat <<- EOF
|
||||
Usage: ufw [-RsF] [-D num] [file/url]
|
||||
Usage: ufw [-RsF] [-D num] [file/url]"
|
||||
Flags:
|
||||
-R|--remove-file # Remove the file after uploading.
|
||||
-s|--screenshot # Make a screenshot and upload it instead of a file.
|
||||
-F|--fullscreen # Make a fullscreen shot instead of prompting for a window/area. Implies -s.
|
||||
-d|--description # Supply a description.
|
||||
-D|--screenshot-delay <num> # Delay the shot by <num> seconds.
|
||||
-p|--public # Make the file public.
|
||||
-n|--no-notify # Don't send immediate notifications for this upload.
|
||||
--notify # Force a notification for this upload.
|
||||
|
|
@ -43,10 +44,10 @@ usage() {
|
|||
-t|--tags "<tag1[, tag2,..]>" # Add tags to the file.
|
||||
-q|--quiet # Be quiet.
|
||||
-v|--void # Don't add the file to my files.
|
||||
-c|--clipboard # Throw the result into the clipboard
|
||||
|
||||
Config options (~/.config/ufw):
|
||||
secret # Your personal token. Get it at https://zfh.so/settings_form
|
||||
cfg_screenshot_ext # Screenshot file type, used by maim.
|
||||
cfg_max_filesize # Maximum filesize (takes K, M and G suffixes).
|
||||
# Others are self-explanatory:
|
||||
cfg_url_regex
|
||||
|
|
@ -55,9 +56,6 @@ usage() {
|
|||
|
||||
Environment variables:
|
||||
UFW_CFG_FILE # Config file to read, defaults to \$XDG_CONFIG_DIR/ufw
|
||||
UFW_SECRET # Your API secret
|
||||
UFW_TMP_DIR
|
||||
UFW_URL
|
||||
EOF
|
||||
}
|
||||
|
||||
|
|
@ -84,10 +82,7 @@ get_max_filesize() {
|
|||
get_album_id() {
|
||||
declare api_response api_status api_status_message
|
||||
|
||||
api_response=$( curl --get \
|
||||
--data-urlencode "name=$1" \
|
||||
--data-urlencode "secret=$secret" \
|
||||
"$cfg_service_url/albumctl.json?m=new" )
|
||||
api_response=$( curl -fsL "$cfg_service_url/albumctl.json?m=new&name=$1&secret=$secret" )
|
||||
|
||||
get_api_status <<< "$api_response"
|
||||
|
||||
|
|
@ -103,37 +98,42 @@ get_album_id() {
|
|||
upload() {
|
||||
declare api_response api_status api_status_message
|
||||
|
||||
(( $# )) || {
|
||||
usage
|
||||
return 1
|
||||
}
|
||||
|
||||
target="$1"
|
||||
|
||||
if is_url "$target"; then
|
||||
if (( flag_scn )); then
|
||||
flag_rm=1
|
||||
file=$(_mktemp "$cfg_tmp_dir")
|
||||
|
||||
get_max_filesize || { return 1; }
|
||||
|
||||
curl --max-filesize "$max_filesize_bytes" "$target" > "$file"
|
||||
curl_result=$?
|
||||
|
||||
if (( curl_result )); then
|
||||
case "$curl_result" in
|
||||
63) err "File exceeds cfg_max_filesize";;
|
||||
*) err "Could not download file.";;
|
||||
esac
|
||||
|
||||
return 1
|
||||
fi
|
||||
file=$(take_screenshot) || { return 1; }
|
||||
else
|
||||
file="$target"
|
||||
|
||||
[[ -f "$file" ]] || {
|
||||
err "No such file: ${file}"
|
||||
(( $# )) || {
|
||||
usage
|
||||
return 1
|
||||
}
|
||||
|
||||
target="$1"
|
||||
|
||||
if is_url "$target"; then
|
||||
flag_rm=1
|
||||
file=$(_mktemp "$cfg_tmp_dir")
|
||||
|
||||
get_max_filesize || { return 1; }
|
||||
|
||||
curl --max-filesize "$max_filesize_bytes" -sL "$target" > "$file"
|
||||
curl_result=$?
|
||||
|
||||
if (( curl_result )); then
|
||||
case "$curl_result" in
|
||||
63) err "File exceeds cfg_max_filesize";;
|
||||
*) err "Could not download file.";;
|
||||
esac
|
||||
|
||||
return 1
|
||||
fi
|
||||
else
|
||||
file="$target"
|
||||
|
||||
[[ -f "$file" ]] || {
|
||||
err "No such file: ${file}"
|
||||
return 1
|
||||
}
|
||||
fi
|
||||
fi
|
||||
|
||||
get_file_hash "$file"
|
||||
|
|
@ -142,9 +142,9 @@ upload() {
|
|||
get_album_id "$album_name"
|
||||
fi
|
||||
|
||||
api_response=$( curl \
|
||||
api_response=$( curl -sL \
|
||||
-F file="@$file" \
|
||||
-F format='json' \
|
||||
-F api_format='json' \
|
||||
-F flag_private="$flag_private" \
|
||||
-F secret="$secret" \
|
||||
-F tags="$tags" \
|
||||
|
|
@ -174,8 +174,6 @@ upload() {
|
|||
(( flag_directlink )) || file_link="${file_link#*.}"
|
||||
}
|
||||
|
||||
(( flag_clipboard )) && xclip "${xclip_args[@]}" <<< "$file_link"
|
||||
|
||||
printf '%s\n' "$file_link"
|
||||
|
||||
if (( flag_rm )); then
|
||||
|
|
@ -191,24 +189,42 @@ upload() {
|
|||
get_shortlink() {
|
||||
declare url=$1 api_response api_status api_status_message
|
||||
|
||||
api_response=$( curl --data-urlencode "url=$url" \
|
||||
--data-urlencode "secret=$secret" \
|
||||
"$cfg_service_url/shrink.json" )
|
||||
|
||||
api_response=$( curl -sL "$cfg_service_url/shrink.json?url=${url}&secret=$secret" )
|
||||
get_api_status <<< "$api_response"
|
||||
|
||||
if (( api_status == 200 )); then
|
||||
read -r short_url real_url < <(
|
||||
jq -r '.data.short_url' <<< "$api_response"
|
||||
)
|
||||
|
||||
(( flag_clipboard )) && xclip "${xclip_args[@]}" <<< "$short_url"
|
||||
|
||||
printf '%s\n' "$short_url"
|
||||
else
|
||||
printf 'Error: %s %s\n' "$api_status" "$api_status_message"
|
||||
fi
|
||||
}
|
||||
|
||||
take_screenshot() {
|
||||
declare tmp_file
|
||||
|
||||
[[ "$scn_exec" ]] || { scn_exec=$(type -P maim); }
|
||||
[[ "$scn_exec" ]] || {
|
||||
err "Please install maim to use this function"
|
||||
return 1
|
||||
}
|
||||
|
||||
(( "$flag_scn_fullscreen" )) || { scn_args+=( '-s' ); }
|
||||
[[ "$cfg_scn_delay" ]] && { scn_args+=( "-d" "$cfg_scn_delay" ); }
|
||||
|
||||
tmp_file="$(_mktemp "${cfg_tmp_dir}" ".${cfg_screenshot_ext}")"
|
||||
|
||||
maim "${scn_args[@]}" "$tmp_file" || {
|
||||
err "Failed to take a screenshot."
|
||||
return 1
|
||||
}
|
||||
|
||||
printf '%s\n' "$tmp_file"
|
||||
}
|
||||
|
||||
get_api_status() {
|
||||
read -d '' -r api_status api_status_message < <(
|
||||
jq -r '.status.code, .status.message'
|
||||
|
|
@ -237,13 +253,12 @@ _mktemp() {
|
|||
get_my_ip() {
|
||||
declare api_response api_status api_status_message my_ip
|
||||
|
||||
api_response=$( curl "$cfg_service_url/ip.json" )
|
||||
api_response=$( curl -sl "$cfg_service_url/ip.json" )
|
||||
|
||||
get_api_status <<< "$api_response"
|
||||
|
||||
if (( api_status == 200 )); then
|
||||
my_ip=$( jq -r '.data.ip' <<< "$api_response" )
|
||||
(( flag_clipboard )) && xclip "${xclip_args[@]}" <<< "$my_ip"
|
||||
printf '%s\n' "$my_ip"
|
||||
else
|
||||
printf 'Error: %s %s\n' "$api_status" "$api_status_message"
|
||||
|
|
@ -253,7 +268,7 @@ get_my_ip() {
|
|||
login() {
|
||||
declare api_response
|
||||
|
||||
api_response=$( curl "$cfg_service_url/token_request.json?login=$login" )
|
||||
api_response=$( curl -sl "$cfg_service_url/token_request.json?login=$login" )
|
||||
|
||||
if get_api_status <<< "$api_response"; then
|
||||
printf 'Check your email.\n'
|
||||
|
|
@ -301,7 +316,7 @@ set_argv() {
|
|||
unset -v arg opt c
|
||||
|
||||
case "$1" in
|
||||
(--) argv+=( "$1" ); shift; break;;
|
||||
(--) argv+=( "$1" ); break;;
|
||||
|
||||
(--*)
|
||||
IFS='=' read arg opt <<< "$1"
|
||||
|
|
@ -326,14 +341,10 @@ set_argv() {
|
|||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
if (( $# )); then
|
||||
argv+=( "$@" )
|
||||
fi
|
||||
}
|
||||
|
||||
main() {
|
||||
declare args file target flag_private flag_rm flag_notify
|
||||
declare args file target flag_private flag_rm flag_scn flag_scn_fullscreen cfg_scn_delay flag_notify
|
||||
declare flag_shortlink
|
||||
|
||||
# Defaults for XDG
|
||||
|
|
@ -348,16 +359,12 @@ main() {
|
|||
cfg_url_regex='^[A-Za-z]([A-Za-z0-9+.-]+)?://.+'
|
||||
cfg_file=${UFW_CFG_FILE:-"$XDG_CONFIG_DIR/ufw"}
|
||||
|
||||
[[ $UFW_SECRET ]] && secret=$UFW_SECRET
|
||||
[[ $UFW_TMP_DIR ]] && cfg_tmp_dir=$UFW_TMP_DIR
|
||||
[[ $UFW_URL ]] && cfg_service_url=$UFW_URL
|
||||
|
||||
[[ $1 ]] || { usage; return 1; }
|
||||
|
||||
if [[ -f "$cfg_file" ]]; then
|
||||
if ! source "$cfg_file"; then
|
||||
printf 'Failed to source configuration file: %s\n' "$cfg_file"
|
||||
return 1
|
||||
return $?
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -365,46 +372,44 @@ main() {
|
|||
: ${cfg_file:="$XDG_CONFIG_DIR/ufw"}
|
||||
: ${cfg_tmp_dir:="$XDG_RUNTIME_DIR/ufw"}
|
||||
: ${cfg_service_url:='https://8fw.me'}
|
||||
: ${cfg_screenshot_ext:='png'}
|
||||
: ${cfg_max_filesize:='200M'}
|
||||
: ${flag_shortlink:=0}
|
||||
: ${flag_directlink:=1}
|
||||
: ${flag_clipboard:=0}
|
||||
: ${xclip_selector:='clipboard'}
|
||||
|
||||
while [[ "$1" ]]; do
|
||||
case "$1" in
|
||||
(-h|--help|--usage) usage; return;;
|
||||
(-m|--max-filesize) cfg_max_filesize=$2; shift;;
|
||||
(-A|--album-name) album_name=$2; shift;;
|
||||
(-t|--tags) tags=$2; shift;;
|
||||
-h|--help|--usage) usage; return;;
|
||||
-D|--screenshot-delay) cfg_scn_delay="$2"; shift;;
|
||||
-m|--max-filesize) cfg_max_filesize=$2; shift;;
|
||||
-A|--album-name) album_name=$2; shift;;
|
||||
-t|--tags) tags=$2; shift;;
|
||||
|
||||
(--tmp-dir) cfg_tmp_dir=$2; shift;;
|
||||
(--url) cfg_service_url=$2; shift;;
|
||||
(--max-filesize) cfg_max_filesize=$2; shift;;
|
||||
-i|--my-ip) action='getmyip';;
|
||||
-u|--shorten) action='url';;
|
||||
|
||||
(-i|--my-ip) action='getmyip';;
|
||||
(-u|--shorten) action='url';;
|
||||
-p|--public) flag_private='false';;
|
||||
-R|--remove-file) flag_rm='1';;
|
||||
-s|--screenshot) flag_scn='1';;
|
||||
-S|--short-url) flag_shortlink=1;;
|
||||
-P|--page-url) flag_directlink=0;;
|
||||
-q|--quiet) flag_quiet=1;;
|
||||
-v|--void) flag_void=1;;
|
||||
|
||||
(-p|--public) flag_private='false';;
|
||||
(-R|--remove-file) flag_rm='1';;
|
||||
(-S|--short-url) flag_shortlink=1;;
|
||||
(-P|--page-url) flag_directlink=0;;
|
||||
(-q|--quiet) flag_quiet=1;;
|
||||
(-v|--void) flag_void=1;;
|
||||
--notify) flag_notify=1;;
|
||||
--no-notify|-n) flag_notify=0;;
|
||||
|
||||
# Clipboard
|
||||
(-c|--clipboard) flag_clipboard=1;;
|
||||
(-C|--xclip-selector) xclip_selector=$2; shift;;
|
||||
-F|--fullscreen)
|
||||
flag_scn='1'
|
||||
flag_scn_fullscreen='1'
|
||||
;;
|
||||
|
||||
(--notify) flag_notify=1;;
|
||||
(--no-notify|-n) flag_notify=0;;
|
||||
|
||||
(-a|--album-id)
|
||||
-a|--album-id)
|
||||
misc_curl_args+=( -F "album_id=$2" )
|
||||
shift
|
||||
;;
|
||||
|
||||
(-d|--description)
|
||||
-d|--description)
|
||||
misc_curl_args+=( -F "description=$2" )
|
||||
shift
|
||||
;;
|
||||
|
|
@ -417,19 +422,11 @@ main() {
|
|||
return 1
|
||||
;;
|
||||
|
||||
*) args+=( "$1" );;
|
||||
*) break;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
xclip_args+=( -selection "$xclip_selector" )
|
||||
|
||||
# Catch the args after --
|
||||
if (( $# )); then
|
||||
args+=( "$@" )
|
||||
shift
|
||||
fi
|
||||
|
||||
TEMPDIR="$cfg_tmp_dir"
|
||||
|
||||
for i in "$cfg_tmp_dir"; do
|
||||
|
|
@ -439,18 +436,21 @@ main() {
|
|||
case "${action:-upload}" in
|
||||
upload)
|
||||
get_token || return $?
|
||||
(( ${#args[@]} )) || return 1
|
||||
|
||||
for t in "${args[@]}"; do
|
||||
upload "$t"
|
||||
done
|
||||
if (( $# )); then
|
||||
for t in "$@"; do
|
||||
upload "$t"
|
||||
done
|
||||
else
|
||||
upload
|
||||
fi
|
||||
;;
|
||||
|
||||
url)
|
||||
get_token || return $?
|
||||
|
||||
for t in "${args[@]}"; do
|
||||
get_shortlink "$t"
|
||||
for t in "$@"; do
|
||||
get_shortlink "$1"
|
||||
done
|
||||
;;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user