* Fix README

* Create the album ourselves.

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

README.md

@@ -1,38 +1,50 @@
-LICENSE
+ufw-tools
-=======
+=========
-All scripts here are released uder the ISC permissive free software license (http://en.wikipedia.org/wiki/ISC_license).
+
-It basically says that you can do whatever you like with the code as long as you credit the author and provide the license with it.
+ufw-tools are two simple-ish scripts for uploading files to 8fw.me.
-Also see LICENSE in the repo.
 
 Support
 =======
 I do not promise any support for any of the provided scripts. That said, I'll do what I can for you if I'm not too busy and/or drunk.
 
-General information
-===================
-The paths are all configurable of course.
-The help information that the scripts give is dynamic and is provided here only for reference.
-
 Scripts
 =======
 
 ufw
 ---
-A very simple tool to upload files to the zfh.so file hosting
+
+ufw is the main one, it uploads shit.
+
 
 	Usage: ufw [-RsF] [-D num] [file/url]"
-	Flags:
+	    Flags:
-	    -R                   # Remove the file after uploading.
+	        -R                   # Remove the file after uploading.
-	    -s                   # Make a screenshot and upload it instead of a file.
+	        -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.
+	        -F                   # Make a fullscreen shot instead of prompting for a window/area. Implies -s.
-	    -D <num>             # Delay the shot by <num> seconds.
+	        -d                   # Supply a dexcription.
-	    -p                   # Make the file private. Requires $secret to be set in the config.
+	        -D <num>             # Delay the shot by <num> seconds.
-	    -m                   # Maximum filesize (takes K, M and G suffixes).
+	        -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.
+	        # Others are self-explanatory:
+	        cfg_url_regex
+	        cfg_tmp_dir
+	        cfg_service_url
 
-	Config options (~/.config/ufw):
+ufwd
-	    secret               # Your personal token. Get it at https://zfh.so/settings_form
+----
-	    cfg_screenshot_ext   # Screenshot file type, used by scrot.
+
-	    # Others are self-explanatory:
+ufwd periodically checks a directory of your choosing (defaults to $XDG_RUNTIME DIR/ufwd) and invokes ufw to upload the files and remove them.
-	    cfg_url_regex
+
-	    cfg_tmp_dir
+	Usage: ufwd [-hn] [-d workdir] -D [check delay] -- [ufw flags]
-	    cfg_script_url
+	   -h            # Show this message.
+	   -n            # Enable notifications with notify-send. Must be installed.
+	   -d [path]     # Set the dir that is to be watched.
+	   -D [sec]      # Set the check interval.

ufw

@@ -22,24 +22,28 @@ usage() {
 	_cat <<- EOF
 		Usage: ufw [-RsF] [-D num] [file/url]"
 		    Flags:
-		        -R                   # Remove the file after uploading.
+		        -R|--remove-file              # Remove the file after uploading.
-		        -s                   # Make a screenshot and upload it instead of a file.
+		        -s|--screenshot               # Make a screenshot and upload it instead of a file.
-		        -F                   # Make a fullscreen shot instead of prompting for a window/area. Implies -s.
+		        -F|--fullscreen               # Make a fullscreen shot instead of prompting for a window/area. Implies -s.
-		        -d                   # Supply a dexcription.
+		        -d|--description              # Supply a description.
-		        -D <num>             # Delay the shot by <num> seconds.
+		        -D|--screenshot-delay <num>   # Delay the shot by <num> seconds.
-		        -p                   # Make the file public.
+		        -p|--public                   # Make the file public.
-		        -u                   # Generate a shortlink from URL.
+		        -u|--short                    # Generate a shortlink from URL.
-		        -m                   # Maximum filesize (takes K, M and G suffixes).
+		        -m|--max-filesize             # Maximum filesize (takes K, M and G suffixes).
-		        -a                   # Add the file to an album.
+		        -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
 }
 
@@ -110,16 +114,24 @@ 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 upload_mode='api' \
+		-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/upload"
+		"$cfg_service_url/$cfg_api_path/upload"
 
 	if (( $? )); then
 		err 'Something has gone wrong with the upload.'
@@ -238,6 +250,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
@@ -253,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';;
@@ -263,6 +277,10 @@ main() {
 				flag_scrot_fullscreen='1'
 			;;
 
+			-m|--max-filesize) cfg_max_filesize=$2; shift;;
+
+			-M|--api-format) cfg_api_format=$2; shift;;
+
 			-i|--my-ip) action='getmyip';;
 
 			-S|--short) flag_shortlink='1';;
@@ -273,10 +291,7 @@ main() {
 				shift
 			;;
 
-			-A|--album-name)
+			-A|--album-name) album_name=$2; shift;;
-				misc_curl_args+=( -F "album_name=$2" )
-				shift
-			;;
 
 			-d|--description)
 				misc_curl_args+=( -F "description=$2" )

ufwd

@@ -13,7 +13,13 @@ cfg_scan_delay='30'
 msg() { printf '%s\n' "$*"; }
 err() { echo "$*" >&2; }
 
-usage() { echo "No help available."; }
+usage() {
+	printf 'Usage: ufwd [-hn] [-d workdir] -D [check delay]\n'
+	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'
+}
 
 main() {
 	while (( $# )); do