Actually, to hell with this sugar stuff

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

README.md

@@ -1,38 +1,25 @@
-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
 
-	Usage: ufw [-RsF] [-D num] [file/url]"
+ufw can upload files to 8fw.me, shorten urls and show you your ip.  
-	Flags:
+Call ufw -h for help.
-	    -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 <num>             # Delay the shot by <num> seconds.
-	    -p                   # Make the file private. Requires $secret to be set in the config.
-	    -m                   # Maximum filesize (takes K, M and G suffixes).
 
-	Config options (~/.config/ufw):
+Dependencies: curl, jq
-	    secret               # Your personal token. Get it at https://zfh.so/settings_form
+
-	    cfg_screenshot_ext   # Screenshot file type, used by scrot.
+ufwd
-	    # Others are self-explanatory:
+----
-	    cfg_url_regex
+
-	    cfg_tmp_dir
+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_script_url
+Call ufwd -h for help.

config/ufw

@@ -0,0 +1,11 @@
+# Put your actual secret here, this is just a random string
+secret='rooxoosh7Aese7phiPh3Choh3uthiTha'
+
+# Override the default common curl behaviour:
+#curl() { command curl -sL "$@"; }
+
+#cfg_tmp_dir="$XDG_RUNTIME_DIR/ufw"
+#cfg_service_url='https://8fw.me'
+#cfg_max_filesize='200M' # Local limit, doesn't affect the server one :)
+#flag_shortlink=0 # Display short links
+#flag_directlink=1 # Display direct file links

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)
+# A simple upload script for UFW (http://zerofiles.org)
-
-_self="${0##*/}"
-
-
 
 _cat() {
 	while read; do
@@ -18,37 +15,49 @@ is_url() {
 	[[ "$1" =~ $cfg_url_regex ]]
 }
 
-msg() { printf '%s\n' "[ufw] $1"; }
+msg() {
-err() { msg "(error) $1" >&2; }
+	if ! (( flag_quiet )); then
+		printf '%s\n' "$1"
+	fi
+}
+
+err() { printf '(error) %s\n' "$*" >&2;  }
+
+curl() { command curl -sL "$@"; }
 
 usage() {
 	_cat <<- EOF
-		Usage: ${_self} [-RsF] [-D num] [file/url]"
+		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.
+		        -d|--description              # Supply a description.
-		        -F                   # Make a fullscreen shot instead of prompting for a window/area. Implies -s.
+		        -p|--public                   # Make the file public.
-		        -d                   # Supply a dexcription.
+		        -n|--no-notify                # Don't send immediate notifications for this upload.
-		        -D <num>             # Delay the shot by <num> seconds.
+		           --notify                   # Force a notification for this upload.
-		        -p                   # Make the file private. Requires \$secret to be set in the config.
+		        -u|--shorten <URL>            # Generate a shortlink from URL.
-		        -u                   # Generate a shortlink from URL.
+		        -S|--short-url                # Get a shortlink when uploading a file.
-		        -m                   # Maximum filesize (takes K, M and G suffixes).
+		        -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
-		        cfg_screenshot_ext   # Screenshot file type, used by scrot.
+		        cfg_max_filesize     # Maximum filesize (takes K, M and G suffixes).
-				  cfg_max_filesize     # Maximum filesize in megabytes.
 		        # Others are self-explanatory:
 		        cfg_url_regex
 		        cfg_tmp_dir
 		        cfg_service_url
-	EOF
-}
 
-ensure_env() {
+		    Environment variables:
-	for i in "$cfg_tmp_dir"; do
+		        UFW_CFG_FILE   # Config file to read, defaults to \$XDG_CONFIG_DIR/ufw
-		[[ -d "$i" ]] || { mkdir -p "$i"; }
+		        UFW_SECRET     # Your API secret
-	done
+		        UFW_TMP_DIR
+		        UFW_URL
+	EOF
 }
 
 get_file_hash() {
@@ -71,102 +80,133 @@ get_max_filesize() {
 	fi
 }
 
-upload() {
+get_album_id() {
-	if (( flag_scrot )); then
+	declare api_response api_status api_status_message
-		flag_rm=1
+
-		file=$(take_screenshot) || { return 1; }
+	api_response=$( curl -f "$cfg_service_url/albumctl.json?m=new&name=$1&secret=$secret" )
+
+	get_api_status <<< "$api_response"
+
+	if (( api_status == 200 )); then
+		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"
-			usage
+		return 1
+	fi
+}
+
+upload() {
+	declare api_response api_status api_status_message
+
+	(( $# )) || {
+		usage
+		return 1
+	}
+
+	target="$1"
+
+	if is_url "$target"; then
+		flag_rm=1
+		file=$(_mktemp "$cfg_tmp_dir")
+
+		get_max_filesize || { return 1; }
+
+		curl --max-filesize "$max_filesize_bytes" "$target" > "$file"
+		curl_result=$?
+
+		if (( curl_result )); then
+			case "$curl_result" in
+				63) err "File exceeds cfg_max_filesize";;
+				*) err "Could not download file.";;
+			esac
+
+			return 1
+		fi
+	else
+		file="$target"
+
+		[[ -f "$file" ]] || {
+			err "No such file: ${file}"
 			return 1
 		}
-
-		target="$1"
-
-		if is_url "$target"; then
-			flag_rm=1
-			file=$(_mktemp "$cfg_tmp_dir")
-
-			get_max_filesize || { return 1; }
-
-			curl --max-filesize "$max_filesize_bytes" -skL "$target" > "$file"
-			curl_result=$?
-
-			if (( curl_result )); then
-				case "$curl_result" in
-					63) err "File exceeds cfg_max_filesize";;
-					*) err "Could not download file.";;
-				esac
-
-				return 1
-			fi
-		else
-			file="$target"
-
-			[[ -f "$file" ]] || {
-				err "No such file: ${file}"
-				return 1
-			}
-		fi
 	fi
 
 	get_file_hash "$file"
 
-	file_url=$( curl -fsL "${cfg_service_url}/api?mode=file&file=${file_hash}&direct=1&short=${flag_shortlink}" )
+	if [[ "$album_name" ]]; then
-	if ! (( $? )); then
+		get_album_id "$album_name"
-		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
 
-	if (( $? )); then
+	api_response=$( curl \
-		err 'Something has gone wrong with the upload.'
+		-F file="@$file" \
-		return 7
+		-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/maw.json" )
+
+	if (( flag_shortlink )); then
+		if (( flag_directlink )); then
+			file_url_request='short_url'
+		else
+			file_url_request='page_short_url'
+		fi
 	else
+		file_url_request='url'
+	fi
+
+	get_api_status <<< "$api_response"
+
+	if (( api_status == 200 )); then
+		file_link=$( jq -r ".data.${file_url_request}" <<< "$api_response" )
+
+		(( flag_shortlink )) || {
+			(( flag_directlink )) || file_link="${file_link#*.}"
+		}
+
+		printf '%s\n' "$file_link"
+
 		if (( flag_rm )); then
 			msg "Removing file: $file"
 			rm "$file"
 		fi
+	else
+		printf 'Error: %s %s\n' "$api_status" "$api_status_message"
+		return 1
 	fi
 }
 
 get_shortlink() {
-	declare url=$1
+	declare url=$1 api_response api_status api_status_message
 
-	if ! curl -fsL "$cfg_service_url/api?mode=url_add&url=${url}&raw=1"; then
+	api_response=$( curl "$cfg_service_url/shrink.json?url=${url}&secret=$secret" )
-		err 'Something went wrong!'
+	get_api_status <<< "$api_response"
+
+	if (( api_status == 200 )); then
+		read -r short_url real_url < <(
+			jq -r '.data.short_url' <<< "$api_response"
+		)
+
+		printf '%s\n' "$short_url"
+	else
+		printf 'Error: %s %s\n' "$api_status" "$api_status_message"
 	fi
 }
 
-take_screenshot() {
+get_api_status() {
-	declare tmp_file
+	read -d '' -r api_status api_status_message < <(
+		jq -r '.status.code, .status.message'
+	)
 
-	[[ "$scrot_exec" ]] || { scrot_exec=$(type -P scrot); }
+	if (( api_status >= 400 )); then
-	[[ "$scrot_exec" ]] || {
-		err "Please install scrot to use this function"
 		return 1
-	}
+	fi
-
-	(( "$flag_scrot_fullscreen" )) || { scrot_args+=( '-s' ); }
-	[[ "$cfg_scrot_delay" ]] && { scrot_args+=( "-d $cfg_scrot_delay" ); }
-
-	tmp_file="$(_mktemp "${cfg_tmp_dir}" ".${cfg_screenshot_ext}")"
-
-	scrot "${scrot_args[@]}" "$tmp_file" || {
-		err "Failed to take a screenshot."
-		return 1
-	}
-
-	printf '%s\n' "$tmp_file"
 }
 
 _mktemp() {
@@ -185,10 +225,60 @@ _mktemp() {
 }
 
 get_my_ip() {
-	my_ip=$( curl -fsL https://zfh.so/ip )
+	declare api_response api_status api_status_message my_ip
 
-	if ! (( $? )); then
+	api_response=$( curl "$cfg_service_url/ip.json" )
-		printf '%s\n' $my_ip
+
+	get_api_status <<< "$api_response"
+
+	if (( api_status == 200 )); then
+		my_ip=$( jq -r '.data.ip' <<< "$api_response" )
+		printf '%s\n' "$my_ip"
+	else
+		printf 'Error: %s %s\n' "$api_status" "$api_status_message"
+	fi
+}
+
+login() {
+	declare api_response
+
+	api_response=$( curl "$cfg_service_url/token_request.json?login=$login" )
+
+	if get_api_status <<< "$api_response"; then
+		printf 'Check your email.\n'
+	else
+		printf 'Error: %s %s\n' "$api_status" "$api_status_message"
+	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
 }
 
@@ -228,8 +318,8 @@ set_argv() {
 }
 
 main() {
-	declare args file target flag_private flag_rm flag_scrot flag_scrot_fullscreen cfg_scrot_delay
+	declare args file target flag_private flag_rm flag_notify
-	declare flag_shortlink=0
+	declare flag_shortlink
 
 	# Defaults for XDG
 	if ! [[ "$XDG_RUNTIME_DIR" ]]; then
@@ -241,56 +331,105 @@ main() {
 	fi
 
 	cfg_url_regex='^[A-Za-z]([A-Za-z0-9+.-]+)?://.+'
-	cfg_tmp_dir="$XDG_RUNTIME_DIR/ufw"; TEMPDIR="$cfg_tmp_dir"
+	cfg_file=${UFW_CFG_FILE:-"$XDG_CONFIG_DIR/ufw"}
-	cfg_service_url='https://8fw.me'
-	cfg_screenshot_ext='png'
-	cfg_max_filesize='200M'
 
-	if [[ -f "$HOME/.suprc" ]]; then
+	[[ $UFW_SECRET ]] && secret=$UFW_SECRET
-		printf 'Found legacy configfile, moving...\n' >&2
+	[[ $UFW_TMP_DIR ]] && cfg_tmp_dir=$UFW_TMP_DIR
-		mv "$HOME/.suprc" "$XDG_CONFIG_DIR/ufw"
+	[[ $UFW_URL ]] && cfg_service_url=$UFW_URL
-	fi
 
-	if [[ -f "$XDG_CONFIG_DIR/ufw" ]]; then
+	[[ $1 ]] || { usage; return 1; }
-		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_max_filesize:='200M'}
+	: ${flag_shortlink:=0}
+	: ${flag_directlink:=1}
+
 	while [[ "$1" ]]; do
 		case "$1" in
-			-p|--private) flag_private='true';;
+			(-h|--help|--usage) usage; return;;
-			-R|--remove-file) flag_rm='1';;
+			(-m|--max-filesize) cfg_max_filesize=$2; shift;;
+			(-A|--album-name) album_name=$2; shift;;
+			(-t|--tags) tags=$2; shift;;
 
-			-s|--screenshot) flag_scrot='1';;
+			(--tmp-dir) cfg_tmp_dir=$2; shift;;
-			-d|--description) description="$2"; shift;;
+			(--url) cfg_service_url=$2; shift;;
-			-D|--screenshot-delay) cfg_scrot_delay="$2"; shift;;
+			(--max-filesize) cfg_max_filesize=$2; shift;;
-			-F|--fullscreen)
+
-				flag_scrot='1'
+			(-i|--my-ip) action='getmyip';;
-				flag_scrot_fullscreen='1'
+			(-u|--shorten) action='url';;
+
+			(-p|--public) flag_private='false';;
+			(-R|--remove-file) flag_rm='1';;
+			(-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;;
+
+			(-a|--album-id)
+				misc_curl_args+=( -F "album_id=$2" )
+				shift
 			;;
 
-			-i|--my-ip) action='getmyip';;
+			(-d|--description)
-
+				misc_curl_args+=( -F "description=$2" )
-			-S|--short) flag_shortlink='1';;
+				shift
-			-u|--url) action='url';;
+			;;
-			
-			-h|--help|--usage) usage; return;;
 
 			--) shift; break;;
 
+			-*)
+				err "Unknown flag: $1"
+				usage
+				return 1
+			;;
+
 			*) break;;
 		esac
 		shift
 	done
 
-	ensure_env
+	TEMPDIR="$cfg_tmp_dir"
+
+	for i in "$cfg_tmp_dir"; do
+		[[ -d "$i" ]] || { mkdir -p "$i"; }
+	done
 
 	case "${action:-upload}" in
-		upload) upload "$1";;
+		upload)
-		url) get_shortlink "$1";;
+			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,47 +6,75 @@ 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; }
 
-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'
+}
+
+upload() {
+	declare file=$1; shift
+
+	upload_output=$( ufw -R "$@" "$file" )
+	upload_return=$?
+
+	if (( flag_enable_notifications )); then
+		if (( $upload_return )); then
+			notify-send 'ufwd' "File upload failed: $upload_output"
+		else
+			notify-send 'ufwd' "File uploaded: $upload_output"
+		fi
+	fi
+
+	if (( flag_enable_clipboard )); then
+		read -r fl <<< "$upload_output"
+		xclip <<< "$fl"
+	fi
+
+	printf '%s\n' "$upload_output"
+}
 
 main() {
 	while (( $# )); do
 		case "$1" in
 			(--help|-h) usage; return 0;;
-			(--workdir|-d) cfg_workdir="$2"; shift;;
+			(--notify|-n) flag_enable_notifications=1;;
-			(--scan-delay|-D) cfg_scan_delay="$2"; shift;;
+			(--clipboard|-c) flag_enable_clipboard=1;;
+
+			(--workdir|-d) cfg_workdir+=( "$2" ); shift;;
 
 			(--) shift; break;;
-			(-*)
+			(-*) err "Unknown key: $1"; usage; return 1;;
-				err "Unknown key: $1"
-				usage
-				return 1
-			;;
-
 			(*) break;;
 		esac
 		shift
 	done
 
-	mkdir -p "$cfg_workdir" || {
+	[[ $cfg_workdir ]] || cfg_workdir="$XDG_RUNTIME_DIR/ufwd"
-		return 1
-	}
 
-	cd "$cfg_workdir" || {
+	if (( flag_enable_notifications )); then
-		return 1
+		if type -P notify-send &>/dev/null; then
-	}
+			msg "Found notify-send."
+		else
+			err "notify-send not found in PATH, disabling notifications."
+			flag_enable_notifications=0
+		fi
+	fi
 
-	while sleep "$cfg_scan_delay"; do
+	for p in "${cfg_workdir[@]}"; do
-		for i in *; do
+		[[ -d "$p" ]] || return 1
-			ufw -R "$i"
-		done
 	done
+
+	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 "$@"