api tweaks

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

ufw

@@ -1,12 +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##*/}"
-
-
+# A simple upload script for UFW (http://zerofiles.org)
 
 _cat() {
 	while read; do
@@ -23,21 +20,23 @@ err() { msg "(error) $1" >&2; }
 
 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 (takes K, M and G suffixes).
+		        -a                   # Add the file to an album.
+		        -A                   # API response format.
 		
 		    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
@@ -112,21 +111,16 @@ upload() {
 
 	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
 		err 'Something has gone wrong with the upload.'
@@ -245,6 +239,8 @@ main() {
 	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
@@ -260,22 +256,38 @@ main() {
 
 	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) usage; return;;
 
 			--) shift; break;;

ufwd

@@ -56,7 +56,7 @@ main() {
 
 	while sleep "$cfg_scan_delay"; do
 		for i in *; do
-			upload_output=$( ufw -R "$i" )
+			upload_output=$( ufw "$@" -R "$i" )
 			upload_return=$?
 
 			if (( flag_enable_notifications )); then