api tweaks

Signed-off-by: fbt <fbt@fleshless.org>

README.md

@@ -16,19 +16,20 @@ The help information that the scripts give is dynamic and is provided here only
 Scripts
 =======
 
-sup
+ufw
 ---
 A very simple tool to upload files to the zfh.so file hosting
 
-	Usage: sup [-RsF] [-D num] [file/url]"
+	Usage: ufw [-RsF] [-D num] [file/url]"
 	Flags:
 	    -R                   # Remove the file after uploading.
 	    -s                   # Make a screenshot and upload it instead of a file.
 	    -F                   # Make a fullscreen shot instead of prompting for a window/area. Implies -s.
 	    -D <num>             # Delay the shot by <num> seconds.
 	    -p                   # Make the file private. Requires $secret to be set in the config.
+	    -m                   # Maximum filesize (takes K, M and G suffixes).
 
-	Config options (~/.suprc):
+	Config options (~/.config/ufw):
 	    secret               # Your personal token. Get it at https://zfh.so/settings_form
 	    cfg_screenshot_ext   # Screenshot file type, used by scrot.
 	    # Others are self-explanatory:

ufw

@@ -1,23 +1,9 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 # Copyright (c) 2012 fbt <fbt@fleshless.org>
+# License: ISC
 #
 # About:
-# A simple upload script for ZFH (http://zerofiles.org)
-
-_self="${0##*/}"
-
-# Defaults for XDG
-if ! [[ "$XDG_RUNTIME_DIR" ]]; then
-	XDG_RUNTIME_DIR="/run/user/$UID"
-fi
-
-cfg_url_regex='^[A-Za-z]([A-Za-z0-9+.-]+)?://.+'
-cfg_tmp_dir="$XDG_RUNTIME_DIR/sup"; TEMPDIR="$cfg_tmp_dir"
-cfg_service_url='https://8fw.me'
-cfg_screenshot_ext='png'
-cfg_max_filesize='200M'
-
-[[ -f $HOME/.suprc ]] && { source "$HOME/.suprc"; }
+# A simple upload script for UFW (http://zerofiles.org)
 
 _cat() {
 	while read; do
@@ -29,26 +15,28 @@ is_url() {
 	[[ "$1" =~ $cfg_url_regex ]]
 }
 
-sup.msg() { printf '%s\n' "[sup] $1"; }
-sup.err() { sup.msg "(error) $1" >&2; }
+msg() { printf '%s\n' "[ufw] $1"; }
+err() { msg "(error) $1" >&2; }
 
-sup.usage() {
+usage() {
 	_cat <<- EOF
-		Usage: ${_self} [-RsF] [-D num] [file/url]"
+		Usage: ufw [-RsF] [-D num] [file/url]"
 		    Flags:
 		        -R                   # Remove the file after uploading.
 		        -s                   # Make a screenshot and upload it instead of a file.
 		        -F                   # Make a fullscreen shot instead of prompting for a window/area. Implies -s.
 		        -d                   # Supply a dexcription.
 		        -D <num>             # Delay the shot by <num> seconds.
-		        -p                   # Make the file private. Requires \$secret to be set in the config.
+		        -p                   # Make the file public.
 		        -u                   # Generate a shortlink from URL.
-				  -m                   # Maximum filesize (in megabytes)
+		        -m                   # Maximum filesize (takes K, M and G suffixes).
+		        -a                   # Add the file to an album.
+		        -A                   # API response format.
 		
-		    Config options (~/.suprc):
+		    Config options (~/.config/ufw):
 		        secret               # Your personal token. Get it at https://zfh.so/settings_form
 		        cfg_screenshot_ext   # Screenshot file type, used by scrot.
-				  cfg_max_filesize     # Maximum filesize in megabytes.
+		        cfg_max_filesize     # Maximum filesize in megabytes.
 		        # Others are self-explanatory:
 		        cfg_url_regex
 		        cfg_tmp_dir
@@ -56,17 +44,17 @@ sup.usage() {
 	EOF
 }
 
-sup.env() {
+ensure_env() {
 	for i in "$cfg_tmp_dir"; do
 		[[ -d "$i" ]] || { mkdir -p "$i"; }
 	done
 }
 
-sup.get_hash() {
+get_file_hash() {
 	read file_hash _ < <( sha1sum "$1" )
 }
 
-sup.get_max_filesize() {
+get_max_filesize() {
 	if [[ $cfg_max_filesize =~ ^[0-9]+[BKMG]?$ ]]; then
 		max_filesize_base="${cfg_max_filesize//[BKMG]/}"
 
@@ -77,18 +65,18 @@ sup.get_max_filesize() {
 			*) max_filesize_bytes=$max_filesize_base;;
 		esac
 	else
-		sup.err "Wrong cfg_max_filesize: $cfg_max_filesize"
+		err "Wrong cfg_max_filesize: $cfg_max_filesize"
 		return 1
 	fi
 }
 
-sup.upload() {
+upload() {
 	if (( flag_scrot )); then
 		flag_rm=1
-		file=$(sup.scrot) || { return 1; }
+		file=$(take_screenshot) || { return 1; }
 	else
 		(( $# )) || {
-			sup.usage
+			usage
 			return 1
 		}
 
@@ -96,17 +84,17 @@ sup.upload() {
 
 		if is_url "$target"; then
 			flag_rm=1
-			file=$(sup.mktemp "$cfg_tmp_dir")
+			file=$(_mktemp "$cfg_tmp_dir")
 
-			sup.get_max_filesize || { return 1; }
+			get_max_filesize || { return 1; }
 
 			curl --max-filesize "$max_filesize_bytes" -skL "$target" > "$file"
 			curl_result=$?
 
 			if (( curl_result )); then
 				case "$curl_result" in
-					63) sup.err "File exceeds cfg_max_filesize";;
-					*) sup.err "Could not download file.";;
+					63) err "File exceeds cfg_max_filesize";;
+					*) err "Could not download file.";;
 				esac
 
 				return 1
@@ -115,85 +103,71 @@ sup.upload() {
 			file="$target"
 
 			[[ -f "$file" ]] || {
-				sup.err "No such file: ${file}"
+				err "No such file: ${file}"
 				return 1
 			}
 		fi
 	fi
 
-	sup.get_hash "$file"
+	get_file_hash "$file"
 
-	file_url=$( curl -fsL "${cfg_service_url}/api?mode=file&file=${file_hash}&direct=1&short=${flag_shortlink}" )
-	if ! (( $? )); then
-		printf '%s\n' "$file_url"
-	else
-		curl -sL \
-			-F file="@$file" \
-			-F upload_mode='api' \
-			-F flag_private="$flag_private" \
-			-F short="$flag_shortlink" \
-			-F description="$description" \
-			-F secret="$secret" \
-			-F submit="" \
-			-A 'zerofiles.org upload script' \
-			"$cfg_service_url/upload"
-	fi
+	curl -sL \
+		-F file="@$file" \
+		-F api_format="$cfg_api_format" \
+		-F flag_private="$flag_private" \
+		-F short="$flag_shortlink" \
+		-F secret="$secret" \
+		-F submit="" \
+		"${misc_curl_args[@]}" \
+		-A 'zerofiles.org upload script' \
+		"$cfg_service_url/$cfg_api_path/upload"
 
 	if (( $? )); then
-		sup.err 'Something has gone wrong with the upload.'
+		err 'Something has gone wrong with the upload.'
 		return 7
 	else
 		if (( flag_rm )); then
-			sup.msg "Removing file: $file"
+			msg "Removing file: $file"
 			rm "$file"
 		fi
 	fi
 }
 
-sup.url() {
+get_shortlink() {
 	declare url=$1
 
 	if ! curl -fsL "$cfg_service_url/api?mode=url_add&url=${url}&raw=1"; then
-		sup.err 'Something went wrong!'
+		err 'Something went wrong!'
 	fi
 }
 
-sup.mktemp() {
-	>"$1" || {
-		sup.err "Cannot create $1!"
-		return 1
-	}
-
-	printf '%s\n' "$1"
-}
-
-sup.scrot() {
+take_screenshot() {
 	declare tmp_file
 
 	[[ "$scrot_exec" ]] || { scrot_exec=$(type -P scrot); }
 	[[ "$scrot_exec" ]] || {
-		sup.err "Please install scrot to use this function"
+		err "Please install scrot to use this function"
 		return 1
 	}
 
 	(( "$flag_scrot_fullscreen" )) || { scrot_args+=( '-s' ); }
 	[[ "$cfg_scrot_delay" ]] && { scrot_args+=( "-d $cfg_scrot_delay" ); }
 
-	tmp_file="$(sup.mktemp "${cfg_tmp_dir}" ".${cfg_screenshot_ext}")"
+	tmp_file="$(_mktemp "${cfg_tmp_dir}" ".${cfg_screenshot_ext}")"
 
 	scrot "${scrot_args[@]}" "$tmp_file" || {
-		sup.err "Failed to take a screenshot."
+		err "Failed to take a screenshot."
 		return 1
 	}
 
 	printf '%s\n' "$tmp_file"
 }
 
-sup.mktemp() {
+_mktemp() {
 	declare tmp_file_name tmp_file_name_extra="$2" tmp_dir="$1" 
 
 	[[ -d "$tmp_dir" ]] || {
-		sup.err "${tmp_dir} does not exist or is not a directory."
+		err "${tmp_dir} does not exist or is not a directory."
 		return 1
 	}
 
@@ -204,7 +178,7 @@ sup.mktemp() {
 	printf '%s\n' "${tmp_dir}/${tmp_file_name}"
 }
 
-sup.get_my_ip() {
+get_my_ip() {
 	my_ip=$( curl -fsL https://zfh.so/ip )
 
 	if ! (( $? )); then
@@ -212,7 +186,7 @@ sup.get_my_ip() {
 	fi
 }
 
-sup.set_argv() {
+set_argv() {
 	declare arg opt c
 	declare -g argv
 
@@ -251,25 +225,70 @@ main() {
 	declare args file target flag_private flag_rm flag_scrot flag_scrot_fullscreen cfg_scrot_delay
 	declare flag_shortlink=0
 
+	# Defaults for XDG
+	if ! [[ "$XDG_RUNTIME_DIR" ]]; then
+		XDG_RUNTIME_DIR="/run/user/$UID"
+	fi
+
+	if ! [[ "$XDG_CONFIG_DIR" ]]; then
+		XDG_CONFIG_DIR="$HOME/.config"
+	fi
+
+	cfg_url_regex='^[A-Za-z]([A-Za-z0-9+.-]+)?://.+'
+	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'
+	cfg_api_format='plain'
+	cfg_api_path='/api/2'
+
+	if [[ -f "$HOME/.suprc" ]]; then
+		printf 'Found legacy configfile, moving...\n' >&2
+		mv "$HOME/.suprc" "$XDG_CONFIG_DIR/ufw"
+	fi
+
+	if [[ -f "$XDG_CONFIG_DIR/ufw" ]]; then
+		if ! source "$XDG_CONFIG_DIR/ufw"; then
+			printf 'Failed to source configuration file: %s\n' "$XDG_CONFIG_DIR/ufw"
+			return $?
+		fi
+	fi
+
 	while [[ "$1" ]]; do
 		case "$1" in
-			-p|--private) flag_private='true';;
+			-p|--private) flag_private='false';;
 			-R|--remove-file) flag_rm='1';;
 			
 			-s|--screenshot) flag_scrot='1';;
-			-d|--description) description="$2"; shift;;
 			-D|--screenshot-delay) cfg_scrot_delay="$2"; shift;;
 			-F|--fullscreen)
 				flag_scrot='1'
 				flag_scrot_fullscreen='1'
 			;;
 
+			-A|--api-format) cfg_api_format=$2; shift;;
+
 			-i|--my-ip) action='getmyip';;
 
 			-S|--short) flag_shortlink='1';;
 			-u|--url) action='url';;
+
+			-a|--album-id)
+				misc_curl_args+=( -F "album_id=$2" )
+				shift
+			;;
+
+			-A|--album-name)
+				misc_curl_args+=( -F "album_name=$2" )
+				shift
+			;;
+
+			-d|--description)
+				misc_curl_args+=( -F "description=$2" )
+				shift
+			;;
 			
-			-h|--help|--usage) sup.usage; return;;
+			-h|--help|--usage) usage; return;;
 
 			--) shift; break;;
 
@@ -278,14 +297,14 @@ main() {
 		shift
 	done
 
-	sup.env
+	ensure_env
 
 	case "${action:-upload}" in
-		upload) sup.upload "$1";;
-		url) sup.url "$1";;
-		getmyip) sup.get_my_ip;;
+		upload) upload "$1";;
+		url) get_shortlink "$1";;
+		getmyip) get_my_ip;;
 	esac
 }
 
-sup.set_argv "$@"
+set_argv "$@"
 main "${argv[@]}"

ufwd

@@ -7,7 +7,7 @@ if ! [[ "$XDG_RUNTIME_DIR" ]]; then
 fi
 
 # Defaults
-cfg_workdir="$XDG_RUNTIME_DIR/supd"
+cfg_workdir="$XDG_RUNTIME_DIR/ufwd"
 cfg_scan_delay='30'
 
 msg() { printf '%s\n' "$*"; }
@@ -19,9 +19,12 @@ main() {
 	while (( $# )); do
 		case "$1" in
 			(--help|-h) usage; return 0;;
+
 			(--workdir|-d) cfg_workdir="$2"; shift;;
 			(--scan-delay|-D) cfg_scan_delay="$2"; shift;;
 
+			(--notify|-n) flag_enable_notifications=1;;
+
 			(--) shift; break;;
 			(-*)
 				err "Unknown key: $1"
@@ -34,6 +37,15 @@ main() {
 		shift
 	done
 
+	if (( flag_enable_notifications )); then
+		if type -P notify-send &>/dev/null; then
+			msg "Found notify-send."
+		else
+			err "notify-send not found in PATH, disabling notifications."
+			flag_enable_notifications=0
+		fi
+	fi
+
 	mkdir -p "$cfg_workdir" || {
 		return 1
 	}
@@ -44,7 +56,18 @@ main() {
 
 	while sleep "$cfg_scan_delay"; do
 		for i in *; do
-			sup -R "$i"
+			upload_output=$( ufw "$@" -R "$i" )
+			upload_return=$?
+
+			if (( flag_enable_notifications )); then
+				if (( $upload_return )); then
+					notify-send 'ufwd' "File upload failed: $upload_output"
+				else
+					notify-send 'ufwd' "File uploaded: $upload_output"
+				fi
+			fi
+
+			printf '%s\n' "$upload_output"
 		done
 	done
 }