no more api/2

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, jshon
-	    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.

ufw

@@ -15,26 +15,38 @@ 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;  }
 
 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.
+		        -n|--no-notify                # Don't send immediate notifications for this upload.
-		        -m                   # Maximum filesize (takes K, M and G suffixes).
+		           --notify                   # Force a notification for this upload.
+		        -u|--shorten <URL>            # Generate a shortlink from URL.
+		        -S|--short-url                # Get a shortlink when uploading a file.
+		        -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.
 		
 		    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_screenshot_ext   # Screenshot file type, used by maim.
-				  cfg_max_filesize     # Maximum filesize in megabytes.
+		        cfg_max_filesize     # Maximum filesize (takes K, M and G suffixes).
 		        # Others are self-explanatory:
 		        cfg_url_regex
 		        cfg_tmp_dir
@@ -42,12 +54,6 @@ usage() {
 	EOF
 }
 
-ensure_env() {
-	for i in "$cfg_tmp_dir"; do
-		[[ -d "$i" ]] || { mkdir -p "$i"; }
-	done
-}
-
 get_file_hash() {
 	read file_hash _ < <( sha1sum "$1" )
 }
@@ -68,8 +74,26 @@ get_max_filesize() {
 	fi
 }
 
+get_album_id() {
+	declare api_response api_status api_status_message
+
+	api_response=$( curl -fsL "$cfg_service_url/albumctl.json?m=new&name=$1&secret=$secret" )
+
+	get_api_status <<< "$api_response"
+
+	if (( api_status == 200 )); then
+		album_id=$( jshon -e data -e album -e id -u <<< "$api_response" )
+		misc_curl_args+=( -F album_id="$album_id" )
+	else
+		printf 'Error [album]: %s %s\n' "$api_status" "$api_status_message"
+		return 1
+	fi
+}
+
 upload() {
-	if (( flag_scrot )); then
+	declare api_response api_status api_status_message
+
+	if (( flag_scn )); then
 		flag_rm=1
 		file=$(take_screenshot) || { return 1; }
 	else
@@ -109,56 +133,85 @@ upload() {
 
 	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 -sL \
-		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 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=$( jshon -e data -e "$file_url_request" -u <<< "$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 -sL "$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 < <(
+			jshon -e data -e short_url -u <<< "$api_response"
+		)
+
+		printf '%s\n' "$short_url"
+	else
+		printf 'Error: %s %s\n' "$api_status" "$api_status_message"
 	fi
 }
 
 take_screenshot() {
 	declare tmp_file
 
-	[[ "$scrot_exec" ]] || { scrot_exec=$(type -P scrot); }
+	[[ "$scn_exec" ]] || { scn_exec=$(type -P maim); }
-	[[ "$scrot_exec" ]] || {
+	[[ "$scn_exec" ]] || {
-		err "Please install scrot to use this function"
+		err "Please install maim to use this function"
 		return 1
 	}
 
-	(( "$flag_scrot_fullscreen" )) || { scrot_args+=( '-s' ); }
+	(( "$flag_scn_fullscreen" )) || { scn_args+=( '-s' ); }
-	[[ "$cfg_scrot_delay" ]] && { scrot_args+=( "-d $cfg_scrot_delay" ); }
+	[[ "$cfg_scn_delay" ]] && { scn_args+=( "-d $cfg_scn_delay" ); }
 
 	tmp_file="$(_mktemp "${cfg_tmp_dir}" ".${cfg_screenshot_ext}")"
 
-	scrot "${scrot_args[@]}" "$tmp_file" || {
+	maim "${scn_args[@]}" "$tmp_file" || {
 		err "Failed to take a screenshot."
 		return 1
 	}
@@ -166,6 +219,16 @@ take_screenshot() {
 	printf '%s\n' "$tmp_file"
 }
 
+get_api_status() {
+	read -d '' -r api_status api_status_message < <(
+		jshon -e status -e code -u -p -e message -u
+	)
+
+	if ! (( api_status == 200 )); then
+		return 1
+	fi
+}
+
 _mktemp() {
 	declare tmp_file_name tmp_file_name_extra="$2" tmp_dir="$1" 
 
@@ -182,10 +245,29 @@ _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 -sl "$cfg_service_url/ip.json" )
-		printf '%s\n' $my_ip
+
+	get_api_status <<< "$api_response"
+
+	if (( api_status == 200 )); then
+		my_ip=$( jshon -e data -e ip -u <<< "$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 -sl "$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
 }
 
@@ -225,7 +307,7 @@ 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_scn flag_scn_fullscreen cfg_scn_delay flag_notify
 	declare flag_shortlink=0
 
 	# Defaults for XDG
@@ -243,6 +325,9 @@ main() {
 	cfg_screenshot_ext='png'
 	cfg_max_filesize='200M'
 
+	flag_shortlink=0
+	flag_directlink=1
+
 	if [[ -f "$HOME/.suprc" ]]; then
 		printf 'Found legacy configfile, moving...\n' >&2
 		mv "$HOME/.suprc" "$XDG_CONFIG_DIR/ufw"
@@ -257,37 +342,76 @@ main() {
 
 	while [[ "$1" ]]; do
 		case "$1" in
-			-p|--private) flag_private='false';;
+			-h|--help|--usage) usage; return;;
-			-R|--remove-file) flag_rm='1';;
+			-D|--screenshot-delay) cfg_scn_delay="$2"; shift;;
-			
+			-m|--max-filesize) cfg_max_filesize=$2; shift;;
-			-s|--screenshot) flag_scrot='1';;
+			-A|--album-name) album_name=$2; shift;;
-			-d|--description) description="$2"; shift;;
+			-t|--tags) tags=$2; shift;;
-			-D|--screenshot-delay) cfg_scrot_delay="$2"; shift;;
-			-F|--fullscreen)
-				flag_scrot='1'
-				flag_scrot_fullscreen='1'
-			;;
 
 			-i|--my-ip) action='getmyip';;
+			-u|--shorten) action='url';;
 
-			-S|--short) flag_shortlink='1';;
+			-p|--public) flag_private='false';;
-			-u|--url) action='url';;
+			-R|--remove-file) flag_rm='1';;
+			-s|--screenshot) flag_scn='1';;
+			-S|--short-url) flag_shortlink=1;;
+			-P|--page-url) flag_directlink=0;;
+			-q|--quiet) flag_quiet=1;;
 
-			-h|--help|--usage) usage; return;;
+			--notify) flag_notify=1;;
+			--no-notify|-n) flag_notify=0;;
+
+			-F|--fullscreen)
+				flag_scn='1'
+				flag_scn_fullscreen='1'
+			;;
+
+			-a|--album-id)
+				misc_curl_args+=( -F "album_id=$2" )
+				shift
+			;;
+
+			-d|--description)
+				misc_curl_args+=( -F "description=$2" )
+				shift
+			;;
 
 			--) shift; break;;
 
+			-*)
+				err "Unknown flag: $1"
+				usage
+				return 1
+			;;
+
 			*) break;;
 		esac
 		shift
 	done
 
-	ensure_env
+	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";;
+			if (( $# )); then
+				for t in "$@"; do
+					upload "$t"
+				done
+			else
+				upload
+			fi
+		;;
+
+		url)
+			for t in "$@"; do
+				get_shortlink "$1"
+			done
+		;;
+
 		getmyip) get_my_ip;;
+		login) login;;
 	esac
 }
 

ufwd

@@ -6,57 +6,20 @@ 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'
-main() {
+	printf '   -h            # Show this message.\n'
-	while (( $# )); do
+	printf '   -n            # Enable notifications with notify-send. Must be installed.\n'
-		case "$1" in
+	printf '   -d [path]     # Set the dir that is to be watched.\n'
-			(--help|-h) usage; return 0;;
-
-			(--workdir|-d) cfg_workdir="$2"; shift;;
-			(--scan-delay|-D) cfg_scan_delay="$2"; shift;;
-
-			(--notify|-n) flag_enable_notifications=1;;
-
-			(--) shift; break;;
-			(-*)
-				err "Unknown key: $1"
-				usage
-				return 1
-			;;
-
-			(*) break;;
-		esac
-		shift
-	done
-
-	if (( flag_enable_notifications )); then
-		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
-
-	mkdir -p "$cfg_workdir" || {
-		return 1
 }
 
-	cd "$cfg_workdir" || {
+upload() {
-		return 1
+	declare file=$1; shift
-	}
 
-	while sleep "$cfg_scan_delay"; do
+	upload_output=$( ufw -R "$@" "$file" )
-		for i in *; do
-			upload_output=$( ufw -R "$i" )
 	upload_return=$?
 
 	if (( flag_enable_notifications )); then
@@ -67,9 +30,51 @@ main() {
 		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;;
+			(--notify|-n) flag_enable_notifications=1;;
+			(--clipboard|-c) flag_enable_clipboard=1;;
+
+			(--workdir|-d) cfg_workdir+=( "$2" ); shift;;
+
+			(--) shift; break;;
+			(-*) err "Unknown key: $1"; usage; return 1;;
+			(*) break;;
+		esac
+		shift
 	done
+
+	[[ $cfg_workdir ]] || cfg_workdir="$XDG_RUNTIME_DIR/ufwd"
+
+	if (( flag_enable_notifications )); then
+		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
+
+	for p in "${cfg_workdir[@]}"; do
+		[[ -d "$p" ]] || return 1
 	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 "$@"