8fw now marks new files as private unless stated otherwise

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

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

@@ -16,8 +16,23 @@ The help information that the scripts give is dynamic and is provided here only
 Scripts
 =======
 
-sup
+ufw
 ---
 A very simple tool to upload files to the zfh.so file hosting
 
-	Usage: sup [-RsF] [-D num] [file/url]
+	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 <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):
+	    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

@@ -1,160 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) 2012 fbt <fbt@fleshless.org>
-#
-# About:
-# A simple upload script for ZFH (http://zerofiles.org)
-
-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_screenshot_ext='png'
-
-[[ -f $HOME/.suprc ]] && { source $HOME/.suprc; }
-
-sup.msg() { echo "[sup] $1"; }
-sup.err() { sup.msg "(error) $1" >&2; }
-
-sup.usage() {
-	echo "Usage: `basename $0` [-RsF] [-D num] [file/url]"
-}
-
-sup.env() {
-	for i in "$cfg_tmp_dir"; do
-		[[ -d "$i" ]] || { mkdir -p "$i"; }
-	done
-}
-
-sup.upload() {
-	curl -F file="@$file" \
-		-F upload_mode='api' \
-		-F flag_private="$flag_private" \
-		-F secret="$secret" \
-		-F submit="" \
-		"$cfg_script_url" -sL -A 'zerofiles.org upload script' || { return 1; }
-
-	[[ "$flag_rm" ]] && { rm "$file"; }
-
-	return 0
-}
-
-sup.mktemp() {
-	>"$1" || {
-		sup.err "Cannot create $1!"
-		return 1
-	}
-
-	echo "$1"
-}
-
-sup.scrot() {
-	local tmp_file
-
-	[[ "$scrot_exec" ]] || { scrot_exec=`which scrot`; }
-	[[ "$scrot_exec" ]] || {
-		sup.err "Please install scrot to use this function"
-		return 1
-	}
-
-	[[ "$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}")"
-
-	scrot "${scrot_args[@]}" "$tmp_file" || {
-		sup.err "Failed to take a screenshot."
-		return 1
-	}
-
-	echo "$tmp_file"
-}
-
-sup.exclude() {
-	[[ "$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" 
-
-	[[ -d "$tmp_dir" ]] || {
-		sup.err "${tmp_dir} does not exist or is not a directory."
-		return 1
-	}
-
-	until [[ ! -e "${tmp_dir}/${tmp_file_name}" ]]; do
-		tmp_file_name="${RANDOM}${RANDOM}${tmp_file_name_extra}"
-	done
-
-	echo "${tmp_dir}/${tmp_file_name}"
-}
-
-sup.getopt() {
-	local keys
-
-	for i in "$@"; do
-		case "$i" in
-			--*) echo "$i";;
-
-			-*)
-				keys=( `echo "${i##*-}" | fold -w1` )
-
-				[[ "${#keys[@]}" -gt 1 ]] && {
-					for k in ${keys[@]}; do
-						echo "-${k}"
-					done
-				} || {
-					echo "$i"
-				}
-			;;
-
-			*) echo "$i";;
-		esac
-	done
-}
-
-main() {
-	local args file target flag_private flag_rm flag_scrot flag_scrot_fullscreen cfg_scrot_delay
-
-	while [[ "$1" ]]; do
-		case "$1" in
-			-p|--private) flag_private='true';;
-			-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;;
-			
-			-h|--help|--usage) sup.usage; return;;
-
-			--) break;;
-
-			*) args+=( "$1" );;
-		esac
-		shift
-	done
-
-	sup.env
-
-	if [[ "$flag_scrot" ]]; then
-		file="$(sup.scrot)" || { return 1; }
-	else
-		target="${args[0]}"; [[ "$target" ]] || { sup.usage; exit 1; }
-
-		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 "$@")

ufw

@@ -0,0 +1,295 @@
+#!/usr/bin/bash
+# Copyright (c) 2012 fbt <fbt@fleshless.org>
+# License: ISC
+#
+# About:
+# A simple upload script for UFW (http://zerofiles.org)
+
+_cat() {
+	while read; do
+		printf '%s\n' "$REPLY"
+	done
+}
+
+is_url() {
+	[[ "$1" =~ $cfg_url_regex ]]
+}
+
+msg() { printf '%s\n' "[ufw] $1"; }
+err() { msg "(error) $1" >&2; }
+
+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).
+		
+		    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
+	EOF
+}
+
+ensure_env() {
+	for i in "$cfg_tmp_dir"; do
+		[[ -d "$i" ]] || { mkdir -p "$i"; }
+	done
+}
+
+get_file_hash() {
+	read file_hash _ < <( sha1sum "$1" )
+}
+
+get_max_filesize() {
+	if [[ $cfg_max_filesize =~ ^[0-9]+[BKMG]?$ ]]; then
+		max_filesize_base="${cfg_max_filesize//[BKMG]/}"
+
+		case "$cfg_max_filesize" in
+			*K) max_filesize_bytes=$(( max_filesize_base * 1024 ));;
+			*M) max_filesize_bytes=$(( max_filesize_base * 1024 * 1024 ));;
+			*G) max_filesize_bytes=$(( max_filesize_base * 1024 * 1024 * 1024 ));;
+			*) max_filesize_bytes=$max_filesize_base;;
+		esac
+	else
+		err "Wrong cfg_max_filesize: $cfg_max_filesize"
+		return 1
+	fi
+}
+
+upload() {
+	if (( flag_scrot )); then
+		flag_rm=1
+		file=$(take_screenshot) || { return 1; }
+	else
+		(( $# )) || {
+			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" -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 ! (( $? )); then
+		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
+		err 'Something has gone wrong with the upload.'
+		return 7
+	else
+		if (( flag_rm )); then
+			msg "Removing file: $file"
+			rm "$file"
+		fi
+	fi
+}
+
+get_shortlink() {
+	declare url=$1
+
+	if ! curl -fsL "$cfg_service_url/api?mode=url_add&url=${url}&raw=1"; then
+		err 'Something went wrong!'
+	fi
+}
+
+take_screenshot() {
+	declare tmp_file
+
+	[[ "$scrot_exec" ]] || { scrot_exec=$(type -P scrot); }
+	[[ "$scrot_exec" ]] || {
+		err "Please install scrot to use this function"
+		return 1
+	}
+
+	(( "$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() {
+	declare tmp_file_name tmp_file_name_extra="$2" tmp_dir="$1" 
+
+	[[ -d "$tmp_dir" ]] || {
+		err "${tmp_dir} does not exist or is not a directory."
+		return 1
+	}
+
+	until [[ ! -e "${tmp_dir}/${tmp_file_name}" ]]; do
+		tmp_file_name="${RANDOM}${RANDOM}${tmp_file_name_extra}"
+	done
+
+	printf '%s\n' "${tmp_dir}/${tmp_file_name}"
+}
+
+get_my_ip() {
+	my_ip=$( curl -fsL https://zfh.so/ip )
+
+	if ! (( $? )); then
+		printf '%s\n' $my_ip
+	fi
+}
+
+set_argv() {
+	declare arg opt c
+	declare -g argv
+
+	while (( $# )); do
+		unset -v arg opt c
+
+		case "$1" in
+			(--) argv+=( "$1" ); break;;
+
+			(--*)
+				IFS='=' read arg opt <<< "$1"
+				argv+=( "$arg" )
+
+				[[ "$opt" ]] && {
+					argv+=( "$opt" )
+				}
+			;;
+
+			(-*)
+				while read -n1 c
+				do
+					case "$c" in
+						-|'') :;;
+						*) argv+=( "-$c" );;
+					esac
+				done <<< "$1"
+			;;
+
+			(*) argv+=( "$1" );;
+		esac
+		shift
+	done
+}
+
+main() {
+	declare args file target flag_private flag_rm flag_scrot flag_scrot_fullscreen cfg_scrot_delay
+	declare flag_shortlink=0
+
+	# Defaults for XDG
+	if ! [[ "$XDG_RUNTIME_DIR" ]]; then
+		XDG_RUNTIME_DIR="/run/user/$UID"
+	fi
+
+	if ! [[ "$XDG_CONFIG_DIR" ]]; then
+		XDG_CONFIG_DIR="$HOME/.config"
+	fi
+
+	cfg_url_regex='^[A-Za-z]([A-Za-z0-9+.-]+)?://.+'
+	cfg_tmp_dir="$XDG_RUNTIME_DIR/ufw"; TEMPDIR="$cfg_tmp_dir"
+	cfg_service_url='https://8fw.me'
+	cfg_screenshot_ext='png'
+	cfg_max_filesize='200M'
+
+	if [[ -f "$HOME/.suprc" ]]; then
+		printf 'Found legacy configfile, moving...\n' >&2
+		mv "$HOME/.suprc" "$XDG_CONFIG_DIR/ufw"
+	fi
+
+	if [[ -f "$XDG_CONFIG_DIR/ufw" ]]; then
+		if ! source "$XDG_CONFIG_DIR/ufw"; then
+			printf 'Failed to source configuration file: %s\n' "$XDG_CONFIG_DIR/ufw"
+			return $?
+		fi
+	fi
+
+	while [[ "$1" ]]; do
+		case "$1" in
+			-p|--private) flag_private='false';;
+			-R|--remove-file) flag_rm='1';;
+			
+			-s|--screenshot) flag_scrot='1';;
+			-d|--description) description="$2"; shift;;
+			-D|--screenshot-delay) cfg_scrot_delay="$2"; shift;;
+			-F|--fullscreen)
+				flag_scrot='1'
+				flag_scrot_fullscreen='1'
+			;;
+
+			-i|--my-ip) action='getmyip';;
+
+			-S|--short) flag_shortlink='1';;
+			-u|--url) action='url';;
+			
+			-h|--help|--usage) usage; return;;
+
+			--) shift; break;;
+
+			*) break;;
+		esac
+		shift
+	done
+
+	ensure_env
+
+	case "${action:-upload}" in
+		upload) upload "$1";;
+		url) get_shortlink "$1";;
+		getmyip) get_my_ip;;
+	esac
+}
+
+set_argv "$@"
+main "${argv[@]}"

ufwd

@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+shopt -s nullglob
+
+# Defaults for XDG
+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."; }
+
+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;;
+
+			(--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" || {
+		return 1
+	}
+
+	while sleep "$cfg_scan_delay"; do
+		for i in *; do
+			upload_output=$( ufw -R "$i" )
+			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
+
+			printf '%s\n' "$upload_output"
+		done
+	done
+}
+
+main "$@"