remove debug stuff

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

README.md

@@ -16,7 +16,9 @@ ufw
 ufw can upload files to 8fw.me, shorten urls and show you your ip.  
 Call ufw -h for help.
 
-Dependencies: curl, jshon
+Dependencies: curl, jq
+
+The config goes into `$XDG_CONFIG_DIR/ufw`.
 
 ufwd
 ----

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

@@ -23,15 +23,14 @@ msg() {
 
 err() { printf '(error) %s\n' "$*" >&2;  }
 
+curl() { command curl -sL "$@"; }
+
 usage() {
 	_cat <<- EOF
-		Usage: ufw [-RsF] [-D num] [file/url]"
+		Usage: ufw [-RsF] [-D num] [file/url]
 		    Flags:
 		        -R|--remove-file              # Remove the file after uploading.
-		        -s|--screenshot               # Make a screenshot and upload it instead of a file.
-		        -F|--fullscreen               # Make a fullscreen shot instead of prompting for a window/area. Implies -s.
 		        -d|--description              # Supply a description.
-		        -D|--screenshot-delay <num>   # Delay the shot by <num> seconds.
 		        -p|--public                   # Make the file public.
 		        -n|--no-notify                # Don't send immediate notifications for this upload.
 		           --notify                   # Force a notification for this upload.
@@ -42,16 +41,23 @@ usage() {
 		        -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.
+		        -c|--clipboard                # Throw the result into the clipboard
 		
 		    Config options (~/.config/ufw):
 		        secret               # Your personal token. Get it at https://zfh.so/settings_form
-		        cfg_screenshot_ext   # Screenshot file type, used by maim.
 		        cfg_max_filesize     # Maximum filesize (takes K, M and G suffixes).
 		        # Others are self-explanatory:
 		        cfg_url_regex
 		        cfg_tmp_dir
 		        cfg_service_url
-		        cfg_api_path
+
+		    Environment variables:
+		        UFW_CFG_FILE   # Config file to read, defaults to \$XDG_CONFIG_DIR/ufw
+		        UFW_SECRET     # Your API secret
+		        UFW_TMP_DIR
+		        UFW_URL
 	EOF
 }
 
@@ -78,12 +84,15 @@ get_max_filesize() {
 get_album_id() {
 	declare api_response api_status api_status_message
 
-	api_response=$( curl -fsL "$cfg_service_url/$cfg_api_path/album?a=new&name=$1&format=json&secret=$secret" )
+	api_response=$( curl --get \
+	                --data-urlencode "name=$1" \
+	                --data-urlencode "secret=$secret" \
+	                "$cfg_service_url/albumctl.json?m=new" )
 
 	get_api_status <<< "$api_response"
 
 	if (( api_status == 200 )); then
-		album_id=$( jshon -e data -e album -e id -u <<< "$api_response" )
+		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"
@@ -94,42 +103,37 @@ get_album_id() {
 upload() {
 	declare api_response api_status api_status_message
 
-	if (( flag_scn )); then
+	(( $# )) || {
+		usage
+		return 1
+	}
+
+	target="$1"
+
+	if is_url "$target"; then
 		flag_rm=1
-		file=$(take_screenshot) || { return 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
-		(( $# )) || {
-			usage
+		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"
@@ -138,36 +142,39 @@ upload() {
 		get_album_id "$album_name"
 	fi
 
-	api_response=$( curl -sL \
+	api_response=$( curl \
 		-F file="@$file" \
-		-F api_format='json' \
+		-F 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/$cfg_api_path/upload" )
+		"$cfg_service_url/maw.json" )
 
 	if (( flag_shortlink )); then
 		if (( flag_directlink )); then
-			file_url_request='short_url_direct'
-		else
 			file_url_request='short_url'
+		else
+			file_url_request='page_short_url'
 		fi
 	else
-		if (( flag_directlink )); then
-			file_url_request='direct_url'
-		else
-			file_url_request='page_url'
-		fi
+		file_url_request='url'
 	fi
 
 	get_api_status <<< "$api_response"
 
 	if (( api_status == 200 )); then
-		file_link=$( jshon -e data -e file -e "$file_url_request" -u <<< "$api_response" )
+		file_link=$( jq -r ".data.${file_url_request}" <<< "$api_response" )
+
+		(( flag_shortlink )) || {
+			(( flag_directlink )) || file_link="${file_link#*.}"
+		}
+
+		(( flag_clipboard )) && xclip "${xclip_args[@]}" <<< "$file_link"
 
 		printf '%s\n' "$file_link"
 
@@ -184,49 +191,30 @@ upload() {
 get_shortlink() {
 	declare url=$1 api_response api_status api_status_message
 
-	api_response=$( curl -sL "$cfg_service_url/$cfg_api_path/url?a=add&url=${url}&format=json&secret=$secret" )
+	api_response=$( curl --data-urlencode "url=$url" \
+	                     --data-urlencode "secret=$secret" \
+	                     "$cfg_service_url/shrink.json" )
 
 	get_api_status <<< "$api_response"
 
 	if (( api_status == 200 )); then
 		read -r short_url real_url < <(
-			jshon -e data -e URL -e shorturl -u <<< "$api_response"
+			jq -r '.data.short_url' <<< "$api_response"
 		)
-
+		
+		(( flag_clipboard )) && xclip "${xclip_args[@]}" <<< "$short_url"
 		printf '%s\n' "$short_url"
 	else
 		printf 'Error: %s %s\n' "$api_status" "$api_status_message"
 	fi
 }
 
-take_screenshot() {
-	declare tmp_file
-
-	[[ "$scn_exec" ]] || { scn_exec=$(type -P maim); }
-	[[ "$scn_exec" ]] || {
-		err "Please install maim to use this function"
-		return 1
-	}
-
-	(( "$flag_scn_fullscreen" )) || { scn_args+=( '-s' ); }
-	[[ "$cfg_scn_delay" ]] && { scn_args+=( "-d $cfg_scn_delay" ); }
-
-	tmp_file="$(_mktemp "${cfg_tmp_dir}" ".${cfg_screenshot_ext}")"
-
-	maim "${scn_args[@]}" "$tmp_file" || {
-		err "Failed to take a screenshot."
-		return 1
-	}
-
-	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
+		jq -r '.status.code, .status.message'
 	)
 
-	if ! (( api_status == 200 )); then
+	if (( api_status >= 400 )); then
 		return 1
 	fi
 }
@@ -249,12 +237,13 @@ _mktemp() {
 get_my_ip() {
 	declare api_response api_status api_status_message my_ip
 
-	api_response=$( curl -sl "$cfg_service_url/ip.json" )
+	api_response=$( curl "$cfg_service_url/ip.json" )
 
 	get_api_status <<< "$api_response"
 
 	if (( api_status == 200 )); then
-		my_ip=$( jshon -e data -e ip -u <<< "$api_response" )
+		my_ip=$( jq -r '.data.ip' <<< "$api_response" )
+		(( flag_clipboard )) && xclip "${xclip_args[@]}" <<< "$my_ip"
 		printf '%s\n' "$my_ip"
 	else
 		printf 'Error: %s %s\n' "$api_status" "$api_status_message"
@@ -264,7 +253,7 @@ get_my_ip() {
 login() {
 	declare api_response
 
-	api_response=$( curl -sl "$cfg_service_url/$cfg_api_path/get_login_token?login=$login&format=json" )
+	api_response=$( curl "$cfg_service_url/token_request.json?login=$login" )
 
 	if get_api_status <<< "$api_response"; then
 		printf 'Check your email.\n'
@@ -273,6 +262,37 @@ login() {
 	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
+}
+
 set_argv() {
 	declare arg opt c
 	declare -g argv
@@ -281,7 +301,7 @@ set_argv() {
 		unset -v arg opt c
 
 		case "$1" in
-			(--) argv+=( "$1" ); break;;
+			(--) argv+=( "$1" ); shift; break;;
 
 			(--*)
 				IFS='=' read arg opt <<< "$1"
@@ -306,11 +326,15 @@ set_argv() {
 		esac
 		shift
 	done
+
+	if (( $# )); then
+		argv+=( "$@" )
+	fi
 }
 
 main() {
-	declare args file target flag_private flag_rm flag_scn flag_scn_fullscreen cfg_scn_delay flag_notify
-	declare flag_shortlink=0
+	declare args file target flag_private flag_rm flag_notify
+	declare flag_shortlink
 
 	# Defaults for XDG
 	if ! [[ "$XDG_RUNTIME_DIR" ]]; then
@@ -322,59 +346,65 @@ main() {
 	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'
-	cfg_api_path='/api/2'
+	cfg_file=${UFW_CFG_FILE:-"$XDG_CONFIG_DIR/ufw"}
 
-	flag_shortlink=0
-	flag_directlink=1
+	[[ $UFW_SECRET ]] && secret=$UFW_SECRET
+	[[ $UFW_TMP_DIR ]] && cfg_tmp_dir=$UFW_TMP_DIR
+	[[ $UFW_URL ]] && cfg_service_url=$UFW_URL
 
-	if [[ -f "$HOME/.suprc" ]]; then
-		printf 'Found legacy configfile, moving...\n' >&2
-		mv "$HOME/.suprc" "$XDG_CONFIG_DIR/ufw"
-	fi
+	[[ $1 ]] || { usage; return 1; }
 
-	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 $?
+	if [[ -f "$cfg_file" ]]; then
+		if ! source "$cfg_file"; then
+			printf 'Failed to source configuration file: %s\n' "$cfg_file"
+			return 1
 		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}
+	: ${flag_clipboard:=0}
+	: ${xclip_selector:='clipboard'}
+
 	while [[ "$1" ]]; do
 		case "$1" in
-			-h|--help|--usage) usage; return;;
-			-D|--screenshot-delay) cfg_scn_delay="$2"; shift;;
-			-m|--max-filesize) cfg_max_filesize=$2; shift;;
-			-A|--album-name) album_name=$2; shift;;
-			-t|--tags) tags=$2; shift;;
+			(-h|--help|--usage) usage; return;;
+			(-m|--max-filesize) cfg_max_filesize=$2; shift;;
+			(-A|--album-name) album_name=$2; shift;;
+			(-t|--tags) tags=$2; shift;;
 
-			-i|--my-ip) action='getmyip';;
-			-u|--shorten) action='url';;
+			(--tmp-dir) cfg_tmp_dir=$2; shift;;
+			(--url) cfg_service_url=$2; shift;;
+			(--max-filesize) cfg_max_filesize=$2; shift;;
 
-			-p|--public) flag_private='false';;
-			-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;;
+			(-i|--my-ip) action='getmyip';;
+			(-u|--shorten) action='url';;
 
-			--notify) flag_notify=1;;
-			--no-notify|-n) flag_notify=0;;
+			(-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;;
 
-			-F|--fullscreen)
-				flag_scn='1'
-				flag_scn_fullscreen='1'
-			;;
+			# Clipboard
+			(-c|--clipboard) flag_clipboard=1;;
+			(-C|--xclip-selector) xclip_selector=$2; shift;;
 
-			-a|--album-id)
+			(--notify) flag_notify=1;;
+			(--no-notify|-n) flag_notify=0;;
+
+			(-a|--album-id)
 				misc_curl_args+=( -F "album_id=$2" )
 				shift
 			;;
 
-			-d|--description)
+			(-d|--description)
 				misc_curl_args+=( -F "description=$2" )
 				shift
 			;;
@@ -387,29 +417,40 @@ main() {
 				return 1
 			;;
 
-			*) break;;
+			*) args+=( "$1" );;
 		esac
 		shift
 	done
 
+	xclip_args+=( -selection "$xclip_selector" )
+
+	# Catch the args after --
+	if (( $# )); then
+		args+=( "$@" )
+		shift
+	fi
+
+	TEMPDIR="$cfg_tmp_dir"
+
 	for i in "$cfg_tmp_dir"; do
 		[[ -d "$i" ]] || { mkdir -p "$i"; }
 	done
 
 	case "${action:-upload}" in
 		upload)
-			if (( $# )); then
-				for t in "$@"; do
-					upload "$t"
-				done
-			else
-				upload
-			fi
+			get_token || return $?
+			(( ${#args[@]} )) || return 1
+
+			for t in "${args[@]}"; do
+				upload "$t"
+			done
 		;;
 
 		url)
-			for t in "$@"; do
-				get_shortlink "$1"
+			get_token || return $?
+
+			for t in "${args[@]}"; do
+				get_shortlink "$t"
 			done
 		;;
 

ufwd

@@ -14,6 +14,7 @@ usage() {
 	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'
+	printf '   -s            # Push the file url into the clipboard.\n'
 }
 
 upload() {