api tweaks

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

ufw

@@ -30,11 +30,13 @@ usage() {
 		        -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
@@ -109,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}" )
+	curl -sL \
-	if ! (( $? )); then
+		-F file="@$file" \
-		printf '%s\n' "$file_url"
+		-F api_format="$cfg_api_format" \
-	else
+		-F flag_private="$flag_private" \
-		curl -sL \
+		-F short="$flag_shortlink" \
-			-F file="@$file" \
+		-F secret="$secret" \
-			-F upload_mode='api' \
+		-F submit="" \
-			-F flag_private="$flag_private" \
+		"${misc_curl_args[@]}" \
-			-F short="$flag_shortlink" \
+		-A 'zerofiles.org upload script' \
-			-F description="$description" \
+		"$cfg_service_url/$cfg_api_path/upload"
-			-F secret="$secret" \
-			-F submit="" \
-			-A 'zerofiles.org upload script' \
-			"$cfg_service_url/upload"
-	fi
 
 	if (( $? )); then
 		err 'Something has gone wrong with the upload.'
@@ -242,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
@@ -261,18 +260,34 @@ main() {
 			-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;;