7 Commits

Author SHA1 Message Date
fbt
83bbe70c80 Fix: ufw does nothing without a positional argument even if it's not required
Signed-off-by: fbt <fbt@fleshless.org>
2019-11-18 04:07:42 +03:00
fbt
47fe62a7c8 duh
Signed-off-by: fbt <fbt@fleshless.org>
2019-06-03 02:21:56 +03:00
fbt
639a97f43e I SAID NO MORE
Signed-off-by: fbt <fbt@fleshless.org>
2019-05-20 15:31:06 +03:00
fbt
784ad95215 There is no scan anymore
Signed-off-by: fbt <fbt@fleshless.org>
2019-05-20 15:30:35 +03:00
fbt
58e1b63fb7 Support multiple workdirs
Signed-off-by: fbt <fbt@fleshless.org>
2019-05-20 15:28:03 +03:00
fbt
65fdd688bf That was poorly researched
Signed-off-by: fbt <fbt@fleshless.org>
2019-05-13 22:57:40 +03:00
fbt
488fdc0a5a oops-driven development
Signed-off-by: fbt <fbt@fleshless.org>
2019-05-10 00:18:29 +03:00
2 changed files with 31 additions and 26 deletions

18
ufw
View File

@@ -388,8 +388,22 @@ main() {
done done
case "${action:-upload}" in case "${action:-upload}" in
upload) upload "$1";; upload)
url) get_shortlink "$1";; if (( $# )); then
for t in "$@"; do
upload "$t"
done
else
upload
fi
;;
url)
for t in "$@"; do
get_shortlink "$1"
done
;;
getmyip) get_my_ip;; getmyip) get_my_ip;;
login) login;; login) login;;
esac esac

39
ufwd
View File

@@ -6,10 +6,6 @@ if ! [[ "$XDG_RUNTIME_DIR" ]]; then
XDG_RUNTIME_DIR="/run/user/$UID" XDG_RUNTIME_DIR="/run/user/$UID"
fi fi
# Defaults
cfg_workdir="$XDG_RUNTIME_DIR/ufwd"
cfg_scan_delay='30'
msg() { printf '%s\n' "$*"; } msg() { printf '%s\n' "$*"; }
err() { echo "$*" >&2; } err() { echo "$*" >&2; }
@@ -18,17 +14,14 @@ usage() {
printf ' -h # Show this message.\n' printf ' -h # Show this message.\n'
printf ' -n # Enable notifications with notify-send. Must be installed.\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 ' -d [path] # Set the dir that is to be watched.\n'
printf ' -D [sec] # Set the check interval.\n'
} }
upload() { upload() {
declare file=$1 declare file=$1; shift
upload_output=$( ufw -R "$@" "$file" ) upload_output=$( ufw -R "$@" "$file" )
upload_return=$? upload_return=$?
echo "ufw $* -R $file"
if (( flag_enable_notifications )); then if (( flag_enable_notifications )); then
if (( $upload_return )); then if (( $upload_return )); then
notify-send 'ufwd' "File upload failed: $upload_output" notify-send 'ufwd' "File upload failed: $upload_output"
@@ -49,26 +42,20 @@ main() {
while (( $# )); do while (( $# )); do
case "$1" in case "$1" in
(--help|-h) usage; return 0;; (--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;; (--notify|-n) flag_enable_notifications=1;;
(--clipboard|-c) flag_enable_clipboard=1;; (--clipboard|-c) flag_enable_clipboard=1;;
(--) shift; break;; (--workdir|-d) cfg_workdir+=( "$2" ); shift;;
(-*)
err "Unknown key: $1"
usage
return 1
;;
(--) shift; break;;
(-*) err "Unknown key: $1"; usage; return 1;;
(*) break;; (*) break;;
esac esac
shift shift
done done
[[ $cfg_workdir ]] || cfg_workdir="$XDG_RUNTIME_DIR/ufwd"
if (( flag_enable_notifications )); then if (( flag_enable_notifications )); then
if type -P notify-send &>/dev/null; then if type -P notify-send &>/dev/null; then
msg "Found notify-send." msg "Found notify-send."
@@ -78,12 +65,16 @@ main() {
fi fi
fi fi
mkdir -p "$cfg_workdir" || return 1 for p in "${cfg_workdir[@]}"; do
cd "$cfg_workdir" || return 1 [[ -d "$p" ]] || return 1
done
while read -r dir action path; do printf 'Working in:\n'
upload "$dir$path" & printf ' - %s\n' "${cfg_workdir[@]}"
done < <( inotifywait -m -e create "$cfg_workdir" )
while read -r d e f; do
upload "$d$f" "$@" &
done < <( inotifywait -m -e close_write "${cfg_workdir[@]}" )
} }
main "$@" main "$@"