Forgot to change this

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,17 @@ 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.
+		        -q|--quiet                    # Be quiet.
+		        -v|--void                     # Don't add the file to my files.
 		
 		    Config options (~/.config/ufw):
 		        secret               # Your personal token. Get it at https://zfh.so/settings_form
@@ -48,7 +53,9 @@ usage() {
 		        cfg_url_regex
 		        cfg_tmp_dir
 		        cfg_service_url
-		        cfg_api_path
+
+		    Environment variables:
+		        UFW_CFG_FILE   # Config file to read, defaults to \$XDG_CONFIG_DIR/ufw
 	EOF
 }
 
@@ -75,12 +82,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 +115,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 +147,32 @@ upload() {
 		-F api_format='json' \
 		-F flag_private="$flag_private" \
 		-F secret="$secret" \
+		-F tags="$tags" \
+		-F notify="$flag_notify" \
+		-F void="${flag_void:-0}" \
 		-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='direct_url'
-		else
-			file_url_request='page_url'
-		fi
+		file_url_request='url'
 	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 +189,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"
@@ -204,7 +213,7 @@ take_screenshot() {
 	}
 
 	(( "$flag_scn_fullscreen" )) || { scn_args+=( '-s' ); }
-	[[ "$cfg_scn_delay" ]] && { scn_args+=( "-d $cfg_scn_delay" ); }
+	[[ "$cfg_scn_delay" ]] && { scn_args+=( "-d" "$cfg_scn_delay" ); }
 
 	tmp_file="$(_mktemp "${cfg_tmp_dir}" ".${cfg_screenshot_ext}")"
 
@@ -218,10 +227,10 @@ 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
+	if (( api_status >= 400 )); then
 		return 1
 	fi
 }
@@ -244,12 +253,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 +268,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'
@@ -268,6 +277,37 @@ login() {
 	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() {
 	declare arg opt c
 	declare -g argv
@@ -304,8 +344,8 @@ set_argv() {
 }
 
 main() {
-	declare args file target flag_private flag_rm flag_scn flag_scn_fullscreen cfg_scn_delay
-	declare flag_shortlink=0
+	declare args file target flag_private flag_rm flag_scn flag_scn_fullscreen cfg_scn_delay flag_notify
+	declare flag_shortlink
 
 	# Defaults for XDG
 	if ! [[ "$XDG_RUNTIME_DIR" ]]; then
@@ -317,33 +357,33 @@ main() {
 	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_path='/api/2'
+	cfg_file=${UFW_CFG_FILE:-"$XDG_CONFIG_DIR/ufw"}
 
-	flag_shortlink=0
-	flag_directlink=1
+	[[ $1 ]] || { usage; return 1; }
 
-	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"
+	if [[ -f "$cfg_file" ]]; then
+		if ! source "$cfg_file"; then
+			printf 'Failed to source configuration file: %s\n' "$cfg_file"
 			return $?
 		fi
 	fi
 
+	# Defaults
+	: ${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}
+
 	while [[ "$1" ]]; do
 		case "$1" in
 			-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;;
 
 			-i|--my-ip) action='getmyip';;
 			-u|--shorten) action='url';;
@@ -354,6 +394,10 @@ main() {
 			-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;;
 
 			-F|--fullscreen)
 				flag_scn='1'
@@ -383,13 +427,33 @@ main() {
 		shift
 	done
 
+	TEMPDIR="$cfg_tmp_dir"
+
 	for i in "$cfg_tmp_dir"; do
 		[[ -d "$i" ]] || { mkdir -p "$i"; }
 	done
 
 	case "${action:-upload}" in
-		upload) upload "$1";;
-		url) get_shortlink "$1";;
+		upload)
+			get_token || return $?
+
+			if (( $# )); then
+				for t in "$@"; do
+					upload "$t"
+				done
+			else
+				upload
+			fi
+		;;
+
+		url)
+			get_token || return $?
+
+			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;;
-			(-*)
-				err "Unknown key: $1"
-				usage
-				return 1
-			;;
+			(--workdir|-d) cfg_workdir+=( "$2" ); shift;;
 
+			(--) 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
-	cd "$cfg_workdir" || return 1
+	for p in "${cfg_workdir[@]}"; do
+		[[ -d "$p" ]] || return 1
+	done
 
-	while read -r dir action path; do
-		upload "$dir$path" &
-	done < <( inotifywait -m -e create "$cfg_workdir" )
+	printf 'Working in:\n'
+	printf ' - %s\n' "${cfg_workdir[@]}"
+
+	while read -r d e f; do
+		upload "$d$f" "$@" &
+	done < <( inotifywait -m -e close_write "${cfg_workdir[@]}" )
 }
 
 main "$@"