README

README.md

@@ -27,6 +27,7 @@ A very simple tool to upload files to the zfh.so file hosting
 	    -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 (~/.suprc):
 	    secret               # Your personal token. Get it at https://zfh.so/settings_form

sup

@@ -6,10 +6,16 @@
 
 _self="${0##*/}"
 
+# Defaults for XDG
+if ! [[ "$XDG_RUNTIME_DIR" ]]; then
+	XDG_RUNTIME_DIR="/run/user/$UID"
+fi
+
 cfg_url_regex='^[A-Za-z]([A-Za-z0-9+.-]+)?://.+'
-cfg_tmp_dir="/tmp/$USER/sup"; TEMPDIR="$cfg_tmp_dir"
+cfg_tmp_dir="$XDG_RUNTIME_DIR/sup"; TEMPDIR="$cfg_tmp_dir"
-cfg_script_url='https://zfh.so/upload'
+cfg_service_url='https://8fw.me'
 cfg_screenshot_ext='png'
+cfg_max_filesize='200M'
 
 [[ -f $HOME/.suprc ]] && { source "$HOME/.suprc"; }
 
@@ -19,6 +25,10 @@ _cat() {
 	done
 }
 
+is_url() {
+	[[ "$1" =~ $cfg_url_regex ]]
+}
+
 sup.msg() { printf '%s\n' "[sup] $1"; }
 sup.err() { sup.msg "(error) $1" >&2; }
 
@@ -29,16 +39,20 @@ sup.usage() {
 		        -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 private. Requires \$secret to be set in the config.
+		        -u                   # Generate a shortlink from URL.
+		        -m                   # Maximum filesize (takes K, M and G suffixes).
 		
 		    Config options (~/.suprc):
 		        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_script_url
+		        cfg_service_url
 	EOF
 }
 
@@ -48,15 +62,100 @@ sup.env() {
 	done
 }
 
+sup.get_hash() {
+	read file_hash _ < <( sha1sum "$1" )
+}
+
+sup.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
+		sup.err "Wrong cfg_max_filesize: $cfg_max_filesize"
+		return 1
+	fi
+}
+
 sup.upload() {
-	curl -fsL \
+	if (( flag_scrot )); then
+		flag_rm=1
+		file=$(sup.scrot) || { return 1; }
+	else
+		(( $# )) || {
+			sup.usage
+			return 1
+		}
+
+		target="$1"
+
+		if is_url "$target"; then
+			flag_rm=1
+			file=$(sup.mktemp "$cfg_tmp_dir")
+
+			sup.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) sup.err "File exceeds cfg_max_filesize";;
+					*) sup.err "Could not download file.";;
+				esac
+
+				return 1
+			fi
+		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
+		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_script_url"
+			"$cfg_service_url/upload"
+	fi
+
+	if (( $? )); then
+		sup.err 'Something has gone wrong with the upload.'
+		return 7
+	else
+		if (( flag_rm )); then
+			sup.msg "Removing file: $file"
+			rm "$file"
+		fi
+	fi
+}
+
+sup.url() {
+	declare url=$1
+
+	if ! curl -fsL "$cfg_service_url/api?mode=url_add&url=${url}&raw=1"; then
+		sup.err 'Something went wrong!'
+	fi
 }
 
 sup.mktemp() {
@@ -90,8 +189,6 @@ sup.scrot() {
 	printf '%s\n' "$tmp_file"
 }
 
-sup.if_url() { printf '%s\n' "$1" | grep -oE "$cfg_url_regex" &>/dev/null; }
-
 sup.mktemp() {
 	declare tmp_file_name tmp_file_name_extra="$2" tmp_dir="$1" 
 
@@ -107,6 +204,14 @@ sup.mktemp() {
 	printf '%s\n' "${tmp_dir}/${tmp_file_name}"
 }
 
+sup.get_my_ip() {
+	my_ip=$( curl -fsL https://zfh.so/ip )
+
+	if ! (( $? )); then
+		printf '%s\n' $my_ip
+	fi
+}
+
 sup.set_argv() {
 	declare arg opt c
 	declare -g argv
@@ -144,6 +249,7 @@ sup.set_argv() {
 
 main() {
 	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
@@ -151,12 +257,18 @@ main() {
 			-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) sup.usage; return;;
 
 			--) shift; break;;
@@ -168,41 +280,11 @@ main() {
 
 	sup.env
 
-	if (( flag_scrot )); then
+	case "${action:-upload}" in
-		file=$(sup.scrot) || { return 1; }
+		upload) sup.upload "$1";;
-	else
+		url) sup.url "$1";;
-		(( $# )) || {
+		getmyip) sup.get_my_ip;;
-			sup.usage
+	esac
-			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
-
-	if sup.upload; then
-		if (( "$flag_rm" )); then
-			rm "$file"
-		fi
-	else
-		sup.err 'Something has gone wrong with the upload.'
-		return 7
-	fi
 }
 
 sup.set_argv "$@"

supd

@@ -1,8 +1,13 @@
 #!/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="/tmp/$USER/supd"
+cfg_workdir="$XDG_RUNTIME_DIR/supd"
 cfg_scan_delay='30'
 
 msg() { printf '%s\n' "$*"; }