How long has that been there, wtf

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

README.md

@@ -16,7 +16,7 @@ ufw
 ufw can upload files to 8fw.me, shorten urls and show you your ip.  
 Call ufw -h for help.
 
-Dependencies: curl, jshon
+Dependencies: curl, jq
 
 ufwd
 ----

ufw

@@ -33,12 +33,15 @@ usage() {
 		        -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.
 		        -u|--shorten <URL>            # Generate a shortlink from URL.
 		        -S|--short-url                # Get a shortlink when uploading a file.
 		        -P|--page-url                 # Get a link to the file page instead of a direct one.
 		        -m|--max-filesize <num>[suf]  # Maximum filesize (takes K, M and G suffixes).
 		        -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.
+		        -t|--tags "<tag1[, tag2,..]>" # Add tags to the file.
 		
 		    Config options (~/.config/ufw):
 		        secret               # Your personal token. Get it at https://zfh.so/settings_form
@@ -48,7 +51,6 @@ usage() {
 		        cfg_url_regex
 		        cfg_tmp_dir
 		        cfg_service_url
-		        cfg_api_path
 	EOF
 }
 
@@ -75,12 +77,12 @@ get_max_filesize() {
 get_album_id() {
 	declare api_response api_status api_status_message
 
-	api_response=$( curl -fsL "$cfg_service_url/$cfg_api_path/album?a=new&name=$1&format=json&secret=$secret" )
+	api_response=$( curl -fsL "$cfg_service_url/albumctl.json?m=new&name=$1&secret=$secret" )
 
 	get_api_status <<< "$api_response"
 
 	if (( api_status == 200 )); then
-		album_id=$( jshon -e data -e album -e id -u <<< "$api_response" )
+		album_id=$( jq -r '.data.album.id' <<< "$api_response" )
 		misc_curl_args+=( -F album_id="$album_id" )
 	else
 		printf 'Error [album]: %s %s\n' "$api_status" "$api_status_message"
@@ -108,7 +110,7 @@ upload() {
 
 			get_max_filesize || { return 1; }
 
-			curl --max-filesize "$max_filesize_bytes" -skL "$target" > "$file"
+			curl --max-filesize "$max_filesize_bytes" -sL "$target" > "$file"
 			curl_result=$?
 
 			if (( curl_result )); then
@@ -140,29 +142,31 @@ upload() {
 		-F api_format='json' \
 		-F flag_private="$flag_private" \
 		-F secret="$secret" \
+		-F tags="$tags" \
+		-F notify="$flag_notify" \
 		-F submit="" \
 		"${misc_curl_args[@]}" \
 		-A 'zerofiles.org upload script' \
-		"$cfg_service_url/$cfg_api_path/upload" )
+		"$cfg_service_url/maw.json" )
 
 	if (( flag_shortlink )); then
 		if (( flag_directlink )); then
-			file_url_request='short_url_direct'
-		else
 			file_url_request='short_url'
+		else
+			file_url_request='page_short_url'
 		fi
 	else
-		if (( flag_directlink )); then
+		file_url_request='url'
-			file_url_request='direct_url'
-		else
-			file_url_request='page_url'
-		fi
 	fi
 
 	get_api_status <<< "$api_response"
 
 	if (( api_status == 200 )); then
-		file_link=$( jshon -e data -e file -e "$file_url_request" -u <<< "$api_response" )
+		file_link=$( jq -r ".data.${file_url_request}" <<< "$api_response" )
+
+		(( flag_shortlink )) || {
+			(( flag_directlink )) || file_link="${file_link#*.}"
+		}
 
 		printf '%s\n' "$file_link"
 
@@ -179,13 +183,12 @@ upload() {
 get_shortlink() {
 	declare url=$1 api_response api_status api_status_message
 
-	api_response=$( curl -sL "$cfg_service_url/$cfg_api_path/url?a=add&url=${url}&format=json&secret=$secret" )
+	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 < <(
-			jshon -e data -e URL -e shorturl -u <<< "$api_response"
+			jq -r '.data.short_url' <<< "$api_response"
 		)
 
 		printf '%s\n' "$short_url"
@@ -218,7 +221,7 @@ take_screenshot() {
 
 get_api_status() {
 	read -d '' -r api_status api_status_message < <(
-		jshon -e status -e code -u -p -e message -u
+		jq -r '.status.code, .status.message'
 	)
 
 	if ! (( api_status == 200 )); then
@@ -244,12 +247,12 @@ _mktemp() {
 get_my_ip() {
 	declare api_response api_status api_status_message my_ip
 
-	api_response=$( curl -sl "$cfg_service_url/$cfg_api_path/ip?format=json" )
+	api_response=$( curl -sl "$cfg_service_url/ip.json" )
 
 	get_api_status <<< "$api_response"
 
 	if (( api_status == 200 )); then
-		my_ip=$( jshon -e data -e ip -u <<< "$api_response" )
+		my_ip=$( jq -r '.data.ip' <<< "$api_response" )
 		printf '%s\n' "$my_ip"
 	else
 		printf 'Error: %s %s\n' "$api_status" "$api_status_message"
@@ -259,7 +262,7 @@ get_my_ip() {
 login() {
 	declare api_response
 
-	api_response=$( curl -sl "$cfg_service_url/$cfg_api_path/get_login_token?login=$login&format=json" )
+	api_response=$( curl -sl "$cfg_service_url/token_request.json?login=$login" )
 
 	if get_api_status <<< "$api_response"; then
 		printf 'Check your email.\n'
@@ -304,7 +307,7 @@ set_argv() {
 }
 
 main() {
-	declare args file target flag_private flag_rm flag_scn flag_scn_fullscreen cfg_scn_delay
+	declare args file target flag_private flag_rm flag_scn flag_scn_fullscreen cfg_scn_delay flag_notify
 	declare flag_shortlink=0
 
 	# Defaults for XDG
@@ -321,7 +324,6 @@ main() {
 	cfg_service_url='https://8fw.me'
 	cfg_screenshot_ext='png'
 	cfg_max_filesize='200M'
-	cfg_api_path='/api/2'
 
 	flag_shortlink=0
 	flag_directlink=1
@@ -344,6 +346,7 @@ main() {
 			-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;;
 
 			-i|--my-ip) action='getmyip';;
 			-u|--shorten) action='url';;
@@ -355,6 +358,9 @@ main() {
 			-P|--page-url) flag_directlink=0;;
 			-q|--quiet) flag_quiet=1;;
 
+			--notify) flag_notify=1;;
+			--no-notify|-n) flag_notify=0;;
+
 			-F|--fullscreen)
 				flag_scn='1'
 				flag_scn_fullscreen='1'
@@ -388,8 +394,22 @@ main() {
 	done
 
 	case "${action:-upload}" in
-		upload) upload "$1";;
+		upload)
-		url) get_shortlink "$1";;
+			if (( $# )); then
+				for t in "$@"; do
+					upload "$t"
+				done
+			else
+				upload
+			fi
+		;;
+
+		url)
+			for t in "$@"; do
+				get_shortlink "$1"
+			done
+		;;
+
 		getmyip) get_my_ip;;
 		login) login;;
 	esac

ufwd

@@ -6,10 +6,6 @@ if ! [[ "$XDG_RUNTIME_DIR" ]]; then
 	XDG_RUNTIME_DIR="/run/user/$UID"
 fi
 
-# Defaults
-cfg_workdir="$XDG_RUNTIME_DIR/ufwd"
-cfg_scan_delay='30'
-
 msg() { printf '%s\n' "$*"; }
 err() { echo "$*" >&2; }
 
@@ -18,17 +14,14 @@ usage() {
 	printf '   -h            # Show this message.\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 [sec]      # Set the check interval.\n'
 }
 
 upload() {
-	declare file=$1
+	declare file=$1; shift
 
 	upload_output=$( ufw -R "$@" "$file" )
 	upload_return=$?
 
-	echo "ufw $* -R $file"
-
 	if (( flag_enable_notifications )); then
 		if (( $upload_return )); then
 			notify-send 'ufwd' "File upload failed: $upload_output"
@@ -49,26 +42,20 @@ 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;;
-
 			(--clipboard|-c) flag_enable_clipboard=1;;
 
-			(--) shift; break;;
+			(--workdir|-d) cfg_workdir+=( "$2" ); shift;;
-			(-*)
-				err "Unknown key: $1"
-				usage
-				return 1
-			;;
 
+			(--) shift; break;;
+			(-*) err "Unknown key: $1"; usage; return 1;;
 			(*) break;;
 		esac
 		shift
 	done
 
+	[[ $cfg_workdir ]] || cfg_workdir="$XDG_RUNTIME_DIR/ufwd"
+
 	if (( flag_enable_notifications )); then
 		if type -P notify-send &>/dev/null; then
 			msg "Found notify-send."
@@ -78,12 +65,16 @@ main() {
 		fi
 	fi
 
-	mkdir -p "$cfg_workdir" || return 1
+	for p in "${cfg_workdir[@]}"; do
-	cd "$cfg_workdir" || return 1
+		[[ -d "$p" ]] || return 1
+	done
 
-	while read -r dir action path; do
+	printf 'Working in:\n'
-		upload "$dir$path" &
+	printf ' - %s\n' "${cfg_workdir[@]}"
-	done < <( inotifywait -m -e create "$cfg_workdir" )
+
+	while read -r d e f; do
+		upload "$d$f" "$@" &
+	done < <( inotifywait -m -e close_write "${cfg_workdir[@]}" )
 }
 
 main "$@"