From e610dce293cd5ee4795822ad68876c137b7ecb28 Mon Sep 17 00:00:00 2001
From: fbt <fbt@fleshless.org>
Date: Sun, 6 Mar 2016 07:35:25 +0300
Subject: [PATCH] * Fix README * Create the album ourselves.

Signed-off-by: fbt <fbt@fleshless.org>
---
 ufw | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/ufw b/ufw
index b2fa43e..7b15789 100755
--- a/ufw
+++ b/ufw
@@ -22,25 +22,28 @@ usage() {
 	_cat <<- EOF
 		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 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.
+		        -R|--remove-file              # Remove the file after uploading.
+		        -s|--screenshot               # Make a screenshot and upload it instead of a file.
+		        -F|--fullscreen               # Make a fullscreen shot instead of prompting for a window/area. Implies -s.
+		        -d|--description              # Supply a description.
+		        -D|--screenshot-delay <num>   # Delay the shot by <num> seconds.
+		        -p|--public                   # Make the file public.
+		        -u|--short                    # Generate a shortlink from URL.
+		        -m|--max-filesize             # 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 crated, if necessary.
+		        -M|--api-format               # 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 (takes K, M and G suffixes).
+		        cfg_api_format       # Set the api response format. Supports json or plain (default).
 		        # Others are self-explanatory:
 		        cfg_url_regex
 		        cfg_tmp_dir
 		        cfg_service_url
+		        cfg_api_path
 	EOF
 }
 
@@ -111,6 +114,14 @@ upload() {
 
 	get_file_hash "$file"
 
+	if [[ "$album_name" ]]; then
+		if album_id=$( curl -fsL "$cfg_service_url/$cfg_api_path/album?a=new&name=$album_name&format=plain&secret=$secret" ); then
+			misc_curl_args+=( -F album_id="$album_id" )
+		else
+			return 1
+		fi
+	fi
+
 	curl -sL \
 		-F file="@$file" \
 		-F api_format="$cfg_api_format" \
@@ -256,7 +267,7 @@ main() {
 
 	while [[ "$1" ]]; do
 		case "$1" in
-			-p|--private) flag_private='false';;
+			-p|--public) flag_private='false';;
 			-R|--remove-file) flag_rm='1';;
 			
 			-s|--screenshot) flag_scrot='1';;
@@ -266,7 +277,9 @@ main() {
 				flag_scrot_fullscreen='1'
 			;;
 
-			-A|--api-format) cfg_api_format=$2; shift;;
+			-m|--max-filesize) cfg_max_filesize=$2; shift;;
+
+			-M|--api-format) cfg_api_format=$2; shift;;
 
 			-i|--my-ip) action='getmyip';;
 
@@ -278,10 +291,7 @@ main() {
 				shift
 			;;
 
-			-A|--album-name)
-				misc_curl_args+=( -F "album_name=$2" )
-				shift
-			;;
+			-A|--album-name) album_name=$2; shift;;
 
 			-d|--description)
 				misc_curl_args+=( -F "description=$2" )