Compare commits

..

No commits in common. "master" and "1.17.1" have entirely different histories.

4 changed files with 121 additions and 179 deletions

View File

@ -16,9 +16,7 @@ ufw
ufw can upload files to 8fw.me, shorten urls and show you your ip. ufw can upload files to 8fw.me, shorten urls and show you your ip.
Call ufw -h for help. Call ufw -h for help.
Dependencies: curl, jq Dependencies: curl, jshon
The config goes into `$XDG_CONFIG_DIR/ufw`.
ufwd ufwd
---- ----

View File

@ -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

228
ufw
View File

@ -23,14 +23,15 @@ msg() {
err() { printf '(error) %s\n' "$*" >&2; } err() { printf '(error) %s\n' "$*" >&2; }
curl() { command curl -sL "$@"; }
usage() { usage() {
_cat <<- EOF _cat <<- EOF
Usage: ufw [-RsF] [-D num] [file/url] Usage: ufw [-RsF] [-D num] [file/url]"
Flags: Flags:
-R|--remove-file # Remove the file after uploading. -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|--description # Supply a description.
-D|--screenshot-delay <num> # Delay the shot by <num> seconds.
-p|--public # Make the file public. -p|--public # Make the file public.
-n|--no-notify # Don't send immediate notifications for this upload. -n|--no-notify # Don't send immediate notifications for this upload.
--notify # Force a notification for this upload. --notify # Force a notification for this upload.
@ -41,23 +42,15 @@ usage() {
-a|--album-id # Add the file to an album. -a|--album-id # Add the file to an album.
-A|--album-name # Add the file to an album by name. The album will be created, if necessary. -A|--album-name # Add the file to an album by name. The album will be created, if necessary.
-t|--tags "<tag1[, tag2,..]>" # Add tags to the file. -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): Config options (~/.config/ufw):
secret # Your personal token. Get it at https://zfh.so/settings_form 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). cfg_max_filesize # Maximum filesize (takes K, M and G suffixes).
# Others are self-explanatory: # Others are self-explanatory:
cfg_url_regex cfg_url_regex
cfg_tmp_dir cfg_tmp_dir
cfg_service_url cfg_service_url
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 EOF
} }
@ -84,15 +77,12 @@ get_max_filesize() {
get_album_id() { get_album_id() {
declare api_response api_status api_status_message declare api_response api_status api_status_message
api_response=$( curl --get \ api_response=$( curl -fsL "$cfg_service_url/albumctl.json?m=new&name=$1&secret=$secret" )
--data-urlencode "name=$1" \
--data-urlencode "secret=$secret" \
"$cfg_service_url/albumctl.json?m=new" )
get_api_status <<< "$api_response" get_api_status <<< "$api_response"
if (( api_status == 200 )); then if (( api_status == 200 )); then
album_id=$( jq -r '.data.album.id' <<< "$api_response" ) album_id=$( jshon -e data -e album -e id -u <<< "$api_response" )
misc_curl_args+=( -F album_id="$album_id" ) misc_curl_args+=( -F album_id="$album_id" )
else else
printf 'Error [album]: %s %s\n' "$api_status" "$api_status_message" printf 'Error [album]: %s %s\n' "$api_status" "$api_status_message"
@ -103,6 +93,10 @@ get_album_id() {
upload() { upload() {
declare api_response api_status api_status_message declare api_response api_status api_status_message
if (( flag_scn )); then
flag_rm=1
file=$(take_screenshot) || { return 1; }
else
(( $# )) || { (( $# )) || {
usage usage
return 1 return 1
@ -116,7 +110,7 @@ upload() {
get_max_filesize || { return 1; } get_max_filesize || { return 1; }
curl --max-filesize "$max_filesize_bytes" "$target" > "$file" curl --max-filesize "$max_filesize_bytes" -skL "$target" > "$file"
curl_result=$? curl_result=$?
if (( curl_result )); then if (( curl_result )); then
@ -135,6 +129,7 @@ upload() {
return 1 return 1
} }
fi fi
fi
get_file_hash "$file" get_file_hash "$file"
@ -142,14 +137,13 @@ upload() {
get_album_id "$album_name" get_album_id "$album_name"
fi fi
api_response=$( curl \ api_response=$( curl -sL \
-F file="@$file" \ -F file="@$file" \
-F format='json' \ -F api_format='json' \
-F flag_private="$flag_private" \ -F flag_private="$flag_private" \
-F secret="$secret" \ -F secret="$secret" \
-F tags="$tags" \ -F tags="$tags" \
-F notify="$flag_notify" \ -F notify="$flag_notify" \
-F void="${flag_void:-0}" \
-F submit="" \ -F submit="" \
"${misc_curl_args[@]}" \ "${misc_curl_args[@]}" \
-A 'zerofiles.org upload script' \ -A 'zerofiles.org upload script' \
@ -168,14 +162,12 @@ upload() {
get_api_status <<< "$api_response" get_api_status <<< "$api_response"
if (( api_status == 200 )); then if (( api_status == 200 )); then
file_link=$( jq -r ".data.${file_url_request}" <<< "$api_response" ) file_link=$( jshon -e data -e "$file_url_request" -u <<< "$api_response" )
(( flag_shortlink )) || { (( flag_shortlink )) || {
(( flag_directlink )) || file_link="${file_link#*.}" (( flag_directlink )) || file_link="${file_link#*.}"
} }
(( flag_clipboard )) && xclip "${xclip_args[@]}" <<< "$file_link"
printf '%s\n' "$file_link" printf '%s\n' "$file_link"
if (( flag_rm )); then if (( flag_rm )); then
@ -191,30 +183,48 @@ upload() {
get_shortlink() { get_shortlink() {
declare url=$1 api_response api_status api_status_message declare url=$1 api_response api_status api_status_message
api_response=$( curl --data-urlencode "url=$url" \ api_response=$( curl -sL "$cfg_service_url/shrink.json?url=${url}&secret=$secret" )
--data-urlencode "secret=$secret" \
"$cfg_service_url/shrink.json" )
get_api_status <<< "$api_response" get_api_status <<< "$api_response"
if (( api_status == 200 )); then if (( api_status == 200 )); then
read -r short_url real_url < <( read -r short_url real_url < <(
jq -r '.data.short_url' <<< "$api_response" jshon -e data -e short_url -u <<< "$api_response"
) )
(( flag_clipboard )) && xclip "${xclip_args[@]}" <<< "$short_url"
printf '%s\n' "$short_url" printf '%s\n' "$short_url"
else else
printf 'Error: %s %s\n' "$api_status" "$api_status_message" printf 'Error: %s %s\n' "$api_status" "$api_status_message"
fi 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() { get_api_status() {
read -d '' -r api_status api_status_message < <( read -d '' -r api_status api_status_message < <(
jq -r '.status.code, .status.message' jshon -e status -e code -u -p -e message -u
) )
if (( api_status >= 400 )); then if ! (( api_status == 200 )); then
return 1 return 1
fi fi
} }
@ -237,13 +247,12 @@ _mktemp() {
get_my_ip() { get_my_ip() {
declare api_response api_status api_status_message 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" get_api_status <<< "$api_response"
if (( api_status == 200 )); then if (( api_status == 200 )); then
my_ip=$( jq -r '.data.ip' <<< "$api_response" ) my_ip=$( jshon -e data -e ip -u <<< "$api_response" )
(( flag_clipboard )) && xclip "${xclip_args[@]}" <<< "$my_ip"
printf '%s\n' "$my_ip" printf '%s\n' "$my_ip"
else else
printf 'Error: %s %s\n' "$api_status" "$api_status_message" printf 'Error: %s %s\n' "$api_status" "$api_status_message"
@ -253,7 +262,7 @@ get_my_ip() {
login() { login() {
declare api_response 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 if get_api_status <<< "$api_response"; then
printf 'Check your email.\n' printf 'Check your email.\n'
@ -262,37 +271,6 @@ login() {
fi fi
} }
get_token() {
[[ $secret ]] && return 0
[[ -f $cfg_file ]] && return 1
declare api_response login password
printf "First-time setup...\n"
read -p 'Username: ' login
read -sp 'Password: ' password
printf '\n'
login_response=$(curl -c "$cfg_file.cookiejar" -d "login=$login" -d "password=$password" -sl "$cfg_service_url/login.json")
get_api_status <<< "$login_response" || {
jq -r '.status.message' <<< "$login_response"
return 1
}
api_response=$(curl -b "$cfg_file.cookiejar" -sl "$cfg_service_url/api_token.json")
rm -f "$cfg_file.cookiejar"
if get_api_status <<< "$api_response"; then
secret=$(jq -r '.data.token' <<< "$api_response")
printf 'export secret="%s"' "$secret" >> "$cfg_file"
chmod 600 "$cfg_file"
printf 'Done\n'
else
printf 'Error: %s %s\n' "$api_status" "$api_status_message"
return 1
fi
}
set_argv() { set_argv() {
declare arg opt c declare arg opt c
declare -g argv declare -g argv
@ -301,7 +279,7 @@ set_argv() {
unset -v arg opt c unset -v arg opt c
case "$1" in case "$1" in
(--) argv+=( "$1" ); shift; break;; (--) argv+=( "$1" ); break;;
(--*) (--*)
IFS='=' read arg opt <<< "$1" IFS='=' read arg opt <<< "$1"
@ -326,15 +304,11 @@ set_argv() {
esac esac
shift shift
done done
if (( $# )); then
argv+=( "$@" )
fi
} }
main() { 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 declare flag_shortlink=0
# Defaults for XDG # Defaults for XDG
if ! [[ "$XDG_RUNTIME_DIR" ]]; then if ! [[ "$XDG_RUNTIME_DIR" ]]; then
@ -346,65 +320,58 @@ main() {
fi fi
cfg_url_regex='^[A-Za-z]([A-Za-z0-9+.-]+)?://.+' cfg_url_regex='^[A-Za-z]([A-Za-z0-9+.-]+)?://.+'
cfg_file=${UFW_CFG_FILE:-"$XDG_CONFIG_DIR/ufw"} cfg_tmp_dir="$XDG_RUNTIME_DIR/ufw"; TEMPDIR="$cfg_tmp_dir"
cfg_service_url='https://8fw.me'
cfg_screenshot_ext='png'
cfg_max_filesize='200M'
[[ $UFW_SECRET ]] && secret=$UFW_SECRET flag_shortlink=0
[[ $UFW_TMP_DIR ]] && cfg_tmp_dir=$UFW_TMP_DIR flag_directlink=1
[[ $UFW_URL ]] && cfg_service_url=$UFW_URL
[[ $1 ]] || { usage; return 1; } if [[ -f "$HOME/.suprc" ]]; then
printf 'Found legacy configfile, moving...\n' >&2
if [[ -f "$cfg_file" ]]; then mv "$HOME/.suprc" "$XDG_CONFIG_DIR/ufw"
if ! source "$cfg_file"; then
printf 'Failed to source configuration file: %s\n' "$cfg_file"
return 1
fi
fi fi
# Defaults if [[ -f "$XDG_CONFIG_DIR/ufw" ]]; then
: ${cfg_file:="$XDG_CONFIG_DIR/ufw"} if ! source "$XDG_CONFIG_DIR/ufw"; then
: ${cfg_tmp_dir:="$XDG_RUNTIME_DIR/ufw"} printf 'Failed to source configuration file: %s\n' "$XDG_CONFIG_DIR/ufw"
: ${cfg_service_url:='https://8fw.me'} return $?
: ${cfg_max_filesize:='200M'} fi
: ${flag_shortlink:=0} fi
: ${flag_directlink:=1}
: ${flag_clipboard:=0}
: ${xclip_selector:='clipboard'}
while [[ "$1" ]]; do while [[ "$1" ]]; do
case "$1" in case "$1" in
(-h|--help|--usage) usage; return;; -h|--help|--usage) usage; return;;
(-m|--max-filesize) cfg_max_filesize=$2; shift;; -D|--screenshot-delay) cfg_scn_delay="$2"; shift;;
(-A|--album-name) album_name=$2; shift;; -m|--max-filesize) cfg_max_filesize=$2; shift;;
(-t|--tags) tags=$2; shift;; -A|--album-name) album_name=$2; shift;;
-t|--tags) tags=$2; shift;;
(--tmp-dir) cfg_tmp_dir=$2; shift;; -i|--my-ip) action='getmyip';;
(--url) cfg_service_url=$2; shift;; -u|--shorten) action='url';;
(--max-filesize) cfg_max_filesize=$2; shift;;
(-i|--my-ip) action='getmyip';; -p|--public) flag_private='false';;
(-u|--shorten) action='url';; -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;;
(-p|--public) flag_private='false';; --notify) flag_notify=1;;
(-R|--remove-file) flag_rm='1';; --no-notify|-n) flag_notify=0;;
(-S|--short-url) flag_shortlink=1;;
(-P|--page-url) flag_directlink=0;;
(-q|--quiet) flag_quiet=1;;
(-v|--void) flag_void=1;;
# Clipboard -F|--fullscreen)
(-c|--clipboard) flag_clipboard=1;; flag_scn='1'
(-C|--xclip-selector) xclip_selector=$2; shift;; flag_scn_fullscreen='1'
;;
(--notify) flag_notify=1;; -a|--album-id)
(--no-notify|-n) flag_notify=0;;
(-a|--album-id)
misc_curl_args+=( -F "album_id=$2" ) misc_curl_args+=( -F "album_id=$2" )
shift shift
;; ;;
(-d|--description) -d|--description)
misc_curl_args+=( -F "description=$2" ) misc_curl_args+=( -F "description=$2" )
shift shift
;; ;;
@ -417,40 +384,29 @@ main() {
return 1 return 1
;; ;;
*) args+=( "$1" );; *) break;;
esac esac
shift shift
done 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 for i in "$cfg_tmp_dir"; do
[[ -d "$i" ]] || { mkdir -p "$i"; } [[ -d "$i" ]] || { mkdir -p "$i"; }
done done
case "${action:-upload}" in case "${action:-upload}" in
upload) upload)
get_token || return $? if (( $# )); then
(( ${#args[@]} )) || return 1 for t in "$@"; do
for t in "${args[@]}"; do
upload "$t" upload "$t"
done done
else
upload
fi
;; ;;
url) url)
get_token || return $? for t in "$@"; do
get_shortlink "$1"
for t in "${args[@]}"; do
get_shortlink "$t"
done done
;; ;;

1
ufwd
View File

@ -14,7 +14,6 @@ usage() {
printf ' -h # Show this message.\n' printf ' -h # Show this message.\n'
printf ' -n # Enable notifications with notify-send. Must be installed.\n' printf ' -n # Enable notifications with notify-send. Must be installed.\n'
printf ' -d [path] # Set the dir that is to be watched.\n' printf ' -d [path] # Set the dir that is to be watched.\n'
printf ' -s # Push the file url into the clipboard.\n'
} }
upload() { upload() {