support for getting shortlinks on upload

supd is a very simple tool that uploads everything from a directory to zfh.
Also some refactoring on sup.

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014, Jack L. Frost <fbt@fleshless.org>
+Copyright (c) 2012-2014, Jack L. Frost <fbt@fleshless.org>
 
 
 Permission to use, copy, modify, and/or distribute this software for any purpose with or without

README.md

@@ -20,4 +20,18 @@ sup
 ---
 A very simple tool to upload files to the zfh.so file hosting
 
-	Usage: sup [-RsF] [-D num] [file/url]
+	Usage: sup [-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 <num>             # Delay the shot by <num> seconds.
+	    -p                   # Make the file private. Requires $secret to be set in the config.
+
+	Config options (~/.suprc):
+	    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:
+	    cfg_url_regex
+	    cfg_tmp_dir
+	    cfg_script_url

sup

@@ -4,18 +4,43 @@
 # About:
 # A simple upload script for ZFH (http://zerofiles.org)
 
+_self="${0##*/}"
+
 cfg_url_regex='^[A-Za-z]([A-Za-z0-9+.-]+)?://.+'
 cfg_tmp_dir="/tmp/$USER/sup"; TEMPDIR="$cfg_tmp_dir"
-cfg_script_url='https://zfh.so/upload'
+cfg_service_url='https://zfh.so'
 cfg_screenshot_ext='png'
 
-[[ -f $HOME/.suprc ]] && { source $HOME/.suprc; }
+[[ -f $HOME/.suprc ]] && { source "$HOME/.suprc"; }
 
-sup.msg() { echo "[sup] $1"; }
+_cat() {
+	while read; do
+		printf '%s\n' "$REPLY"
+	done
+}
+
+sup.msg() { printf '%s\n' "[sup] $1"; }
 sup.err() { sup.msg "(error) $1" >&2; }
 
 sup.usage() {
-	echo "Usage: `basename $0` [-RsF] [-D num] [file/url]"
+	_cat <<- EOF
+		Usage: ${_self} [-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 <num>             # Delay the shot by <num> seconds.
+		        -p                   # Make the file private. Requires \$secret to be set in the config.
+		        -u                   # Generate a shortlink from URL.
+		
+		    Config options (~/.suprc):
+		        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:
+		        cfg_url_regex
+		        cfg_tmp_dir
+		        cfg_service_url
+	EOF
 }
 
 sup.env() {
@@ -24,17 +49,71 @@ sup.env() {
 	done
 }
 
+sup.get_hash() {
+	read file_hash _ < <( sha1sum "$1" )
+}
+
 sup.upload() {
-	curl -F file="@$file" \
+	if (( flag_scrot )); then
+		file=$(sup.scrot) || { return 1; }
+	else
+		(( $# )) || {
+			sup.usage
+			return 1
+		}
+
+		target="$1"
+
+		if sup.if_url "$target"; then
+			file=$(sup.mktemp "$cfg_tmp_dir")
+
+			curl -skL "$target" > "$file" || {
+				sup.err "Could not download file."
+				return 1
+			}
+		else
+			file="$target"
+
+			[[ -f "$file" ]] || {
+				sup.err "No such file: ${file}"
+				return 1
+			}
+		fi
+	fi
+
+	sup.get_hash "$file"
+
+	file_url=$( curl -fsL "${cfg_service_url}/api?mode=file&file=${file_hash}&direct=1&short=${flag_shortlink}" )
+	if ! (( $? )); then
+		printf '%s\n' "$file_url"
+	else
+		if curl -sL \
+			-F file="@$file" \
 			-F upload_mode='api' \
 			-F flag_private="$flag_private" \
+			-F short="$flag_shortlink" \
 			-F secret="$secret" \
 			-F submit="" \
-		"$cfg_script_url" -sL -A 'zerofiles.org upload script' || { return 1; }
+			-A 'zerofiles.org upload script' \
+			"$cfg_service_url/upload"
+		then
+			if (( flag_rm )); then
+				sup.msg "Removing file: $file"
+				rm "$file"
+			fi
+		else
+			sup.err 'Something has gone wrong with the upload.'
+			return 7
+		fi
+	fi
+}
 
-	[[ "$flag_rm" ]] && { rm "$file"; }
+sup.url() {
+	declare url=$1
 
-	return 0
+	if ! curl -fsL "$cfg_service_url/api?mode=url_add&url=${url}&raw=1"; then
+		sup.err 'Something went wrong!'
+	fi
 }
 
 sup.mktemp() {
@@ -43,19 +122,19 @@ sup.mktemp() {
 		return 1
 	}
 
-	echo "$1"
+	printf '%s\n' "$1"
 }
 
 sup.scrot() {
-	local tmp_file
+	declare tmp_file
 
-	[[ "$scrot_exec" ]] || { scrot_exec=`which scrot`; }
+	[[ "$scrot_exec" ]] || { scrot_exec=$(type -P scrot); }
 	[[ "$scrot_exec" ]] || {
 		sup.err "Please install scrot to use this function"
 		return 1
 	}
 
-	[[ "$flag_scrot_fullscreen" ]] || { scrot_args+=( '-s' ); }
+	(( "$flag_scrot_fullscreen" )) || { scrot_args+=( '-s' ); }
 	[[ "$cfg_scrot_delay" ]] && { scrot_args+=( "-d $cfg_scrot_delay" ); }
 
 	tmp_file="$(sup.mktemp "${cfg_tmp_dir}" ".${cfg_screenshot_ext}")"
@@ -65,18 +144,13 @@ sup.scrot() {
 		return 1
 	}
 
-	echo "$tmp_file"
+	printf '%s\n' "$tmp_file"
 }
 
-sup.exclude() {
+sup.if_url() { printf '%s\n' "$1" | grep -oE "$cfg_url_regex" &>/dev/null; }
-	[[ "$2" ]] && { echo "$1"; return 1; }
-	return 0
-}
-
-sup.if_url() { echo "$1" | grep -oE "$cfg_url_regex" &>/dev/null; }
 
 sup.mktemp() {
-	local tmp_file_name tmp_file_name_extra="$2" tmp_dir="$1" 
+	declare tmp_file_name tmp_file_name_extra="$2" tmp_dir="$1" 
 
 	[[ -d "$tmp_dir" ]] || {
 		sup.err "${tmp_dir} does not exist or is not a directory."
@@ -87,35 +161,47 @@ sup.mktemp() {
 		tmp_file_name="${RANDOM}${RANDOM}${tmp_file_name_extra}"
 	done
 
-	echo "${tmp_dir}/${tmp_file_name}"
+	printf '%s\n' "${tmp_dir}/${tmp_file_name}"
 }
 
-sup.getopt() {
+sup.set_argv() {
-	local keys
+	declare arg opt c
+	declare -g argv
 
-	for i in "$@"; do
+	while (( $# )); do
-		case "$i" in
+		unset -v arg opt c
-			--*) echo "$i";;
 
-			-*)
+		case "$1" in
-				keys=( `echo "${i##*-}" | fold -w1` )
+			(--) argv+=( "$1" ); break;;
 
-				[[ "${#keys[@]}" -gt 1 ]] && {
+			(--*)
-					for k in ${keys[@]}; do
+				IFS='=' read arg opt <<< "$1"
-						echo "-${k}"
+				argv+=( "$arg" )
-					done
+
-				} || {
+				[[ "$opt" ]] && {
-					echo "$i"
+					argv+=( "$opt" )
 				}
 			;;
 
-			*) echo "$i";;
+			(-*)
+				while read -n1 c
+				do
+					case "$c" in
+						-|'') :;;
+						*) argv+=( "-$c" );;
 					esac
+				done <<< "$1"
+			;;
+
+			(*) argv+=( "$1" );;
+		esac
+		shift
 	done
 }
 
 main() {
-	local args file target flag_private flag_rm flag_scrot flag_scrot_fullscreen cfg_scrot_delay
+	declare args file target flag_private flag_rm flag_scrot flag_scrot_fullscreen cfg_scrot_delay
+	declare flag_shortlink=0
 
 	while [[ "$1" ]]; do
 		case "$1" in
@@ -123,38 +209,31 @@ main() {
 			-R|--remove-file) flag_rm='1';;
 			
 			-s|--screenshot) flag_scrot='1';;
-			-F|--fullscreen) flag_scrot_fullscreen='1';;
 			-D|--screenshot-delay) cfg_scrot_delay="$2"; shift;;
+			-F|--fullscreen)
+				flag_scrot='1'
+				flag_scrot_fullscreen='1'
+			;;
+
+			-S|--short) flag_shortlink='1';;
+			-u|--url) action='url';;
 			
 			-h|--help|--usage) sup.usage; return;;
 
-			--) break;;
+			--) shift; break;;
 
-			*) args+=( "$1" );;
+			*) break;;
 		esac
 		shift
 	done
 
 	sup.env
 
-	if [[ "$flag_scrot" ]]; then
+	case "${action:-upload}" in
-		file="$(sup.scrot)" || { return 1; }
+		upload) sup.upload "$1";;
-	else
+		url) sup.url "$1";;
-		target="${args[0]}"; [[ "$target" ]] || { sup.usage; exit 1; }
+	esac
-
-		if sup.if_url "$target"; then
-			file=`sup.mktemp "$cfg_tmp_dir"`
-
-			curl -s "$target" > "$file" || {
-				sup.err "Could not download file."
-				return 1
-			}
-		else
-			file="$target"
-		fi
-	fi
-
-	sup.upload
 }
 
-main $(sup.getopt "$@")
+sup.set_argv "$@"
+main "${argv[@]}"

supd

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+shopt -s nullglob
+
+# Defaults
+cfg_workdir="/tmp/$USER/supd"
+cfg_scan_delay='30'
+
+msg() { printf '%s\n' "$*"; }
+err() { echo "$*" >&2; }
+
+usage() { echo "No help available."; }
+
+main() {
+	while (( $# )); do
+		case "$1" in
+			(--help|-h) usage; return 0;;
+			(--workdir|-d) cfg_workdir="$2"; shift;;
+			(--scan-delay|-D) cfg_scan_delay="$2"; shift;;
+
+			(--) shift; break;;
+			(-*)
+				err "Unknown key: $1"
+				usage
+				return 1
+			;;
+
+			(*) break;;
+		esac
+		shift
+	done
+
+	mkdir -p "$cfg_workdir" || {
+		return 1
+	}
+
+	cd "$cfg_workdir" || {
+		return 1
+	}
+
+	while sleep "$cfg_scan_delay"; do
+		for i in *; do
+			sup -R "$i"
+		done
+	done
+}
+
+main "$@"