oops-driven development

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

ufw

@@ -15,8 +15,13 @@ is_url() {
 	[[ "$1" =~ $cfg_url_regex ]]
 }
 
-msg() { printf '%s\n' "[ufw] $1"; }
-err() { msg "(error) $1" >&2; }
+msg() {
+	if ! (( flag_quiet )); then
+		printf '%s\n' "$1"
+	fi
+}
+
+err() { printf '(error) %s\n' "$*" >&2;  }
 
 usage() {
 	_cat <<- EOF
@@ -33,11 +38,11 @@ usage() {
 		        -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 crated, if necessary.
+		        -A|--album-name               # Add the file to an album by name. The album will be created, if necessary.
 		
 		    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 (takes K, M and G suffixes).
 		        # Others are self-explanatory:
 		        cfg_url_regex
@@ -47,12 +52,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" )
 }
@@ -92,7 +91,7 @@ get_album_id() {
 upload() {
 	declare api_response api_status api_status_message
 
-	if (( flag_scrot )); then
+	if (( flag_scn )); then
 		flag_rm=1
 		file=$(take_screenshot) || { return 1; }
 	else
@@ -198,18 +197,18 @@ get_shortlink() {
 take_screenshot() {
 	declare tmp_file
 
-	[[ "$scrot_exec" ]] || { scrot_exec=$(type -P scrot); }
-	[[ "$scrot_exec" ]] || {
-		err "Please install scrot to use this function"
+	[[ "$scn_exec" ]] || { scn_exec=$(type -P maim); }
+	[[ "$scn_exec" ]] || {
+		err "Please install maim to use this function"
 		return 1
 	}
 
-	(( "$flag_scrot_fullscreen" )) || { scrot_args+=( '-s' ); }
-	[[ "$cfg_scrot_delay" ]] && { scrot_args+=( "-d $cfg_scrot_delay" ); }
+	(( "$flag_scn_fullscreen" )) || { scn_args+=( '-s' ); }
+	[[ "$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
 	}
@@ -221,6 +220,10 @@ 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() {
@@ -253,6 +256,18 @@ get_my_ip() {
 	fi
 }
 
+login() {
+	declare api_response
+
+	api_response=$( curl -sl "$cfg_service_url/$cfg_api_path/get_login_token?login=$login&format=json" )
+
+	if get_api_status <<< "$api_response"; then
+		printf 'Check your email.\n'
+	else
+		printf 'Error: %s %s\n' "$api_status" "$api_status_message"
+	fi
+}
+
 set_argv() {
 	declare arg opt c
 	declare -g argv
@@ -289,7 +304,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
 	declare flag_shortlink=0
 
 	# Defaults for XDG
@@ -325,52 +340,58 @@ main() {
 
 	while [[ "$1" ]]; do
 		case "$1" in
-			-p|--public) flag_private='false';;
-			-R|--remove-file) flag_rm='1';;
-			
-			-s|--screenshot) flag_scrot='1';;
-			-D|--screenshot-delay) cfg_scrot_delay="$2"; shift;;
-			-F|--fullscreen)
-				flag_scrot='1'
-				flag_scrot_fullscreen='1'
-			;;
-
+			-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;;
 
 			-i|--my-ip) action='getmyip';;
-
 			-u|--shorten) action='url';;
 
+			-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;;
+
+			-F|--fullscreen)
+				flag_scn='1'
+				flag_scn_fullscreen='1'
+			;;
 
 			-a|--album-id)
 				misc_curl_args+=( -F "album_id=$2" )
 				shift
 			;;
 
-			-A|--album-name) album_name=$2; shift;;
-
 			-d|--description)
 				misc_curl_args+=( -F "description=$2" )
 				shift
 			;;
 
-			-h|--help|--usage) usage; return;;
-
 			--) 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";;
 		url) get_shortlink "$1";;
 		getmyip) get_my_ip;;
+		login) login;;
 	esac
 }
 

ufwd

@@ -21,6 +21,28 @@ usage() {
 	printf '   -D [sec]      # Set the check interval.\n'
 }
 
+upload() {
+	declare file=$1; shift
+
+	upload_output=$( ufw -R "$@" "$file" )
+	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
+
+	if (( flag_enable_clipboard )); then
+		read -r fl <<< "$upload_output"
+		xclip <<< "$fl"
+	fi
+
+	printf '%s\n' "$upload_output"
+}
+
 main() {
 	while (( $# )); do
 		case "$1" in
@@ -31,6 +53,8 @@ main() {
 
 			(--notify|-n) flag_enable_notifications=1;;
 
+			(--clipboard|-c) flag_enable_clipboard=1;;
+
 			(--) shift; break;;
 			(-*)
 				err "Unknown key: $1"
@@ -52,30 +76,12 @@ main() {
 		fi
 	fi
 
-	mkdir -p "$cfg_workdir" || {
-		return 1
-	}
+	mkdir -p "$cfg_workdir" || return 1
+	cd "$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
+	while read -r dir action path; do
+		upload "$dir$path" "$@" &
+	done < <( inotifywait -m -e create "$cfg_workdir" )
 }
 
 main "$@"