Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
47fe62a7c8 | |||
639a97f43e | |||
784ad95215 | |||
58e1b63fb7 | |||
65fdd688bf | |||
488fdc0a5a |
14
ufw
14
ufw
@@ -388,8 +388,18 @@ main() {
|
||||
done
|
||||
|
||||
case "${action:-upload}" in
|
||||
upload) upload "$1";;
|
||||
url) get_shortlink "$1";;
|
||||
upload)
|
||||
for t in "$@"; do
|
||||
upload "$t"
|
||||
done
|
||||
;;
|
||||
|
||||
url)
|
||||
for t in "$@"; do
|
||||
get_shortlink "$1"
|
||||
done
|
||||
;;
|
||||
|
||||
getmyip) get_my_ip;;
|
||||
login) login;;
|
||||
esac
|
||||
|
39
ufwd
39
ufwd
@@ -6,10 +6,6 @@ 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; }
|
||||
|
||||
@@ -18,17 +14,14 @@ 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 ' -D [sec] # Set the check interval.\n'
|
||||
}
|
||||
|
||||
upload() {
|
||||
declare file=$1
|
||||
declare file=$1; shift
|
||||
|
||||
upload_output=$( ufw -R "$@" "$file" )
|
||||
upload_return=$?
|
||||
|
||||
echo "ufw $* -R $file"
|
||||
|
||||
if (( flag_enable_notifications )); then
|
||||
if (( $upload_return )); then
|
||||
notify-send 'ufwd' "File upload failed: $upload_output"
|
||||
@@ -49,26 +42,20 @@ 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;;
|
||||
|
||||
(--clipboard|-c) flag_enable_clipboard=1;;
|
||||
|
||||
(--) shift; break;;
|
||||
(-*)
|
||||
err "Unknown key: $1"
|
||||
usage
|
||||
return 1
|
||||
;;
|
||||
(--workdir|-d) cfg_workdir+=( "$2" ); shift;;
|
||||
|
||||
(--) shift; break;;
|
||||
(-*) err "Unknown key: $1"; usage; return 1;;
|
||||
(*) break;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
[[ $cfg_workdir ]] || cfg_workdir="$XDG_RUNTIME_DIR/ufwd"
|
||||
|
||||
if (( flag_enable_notifications )); then
|
||||
if type -P notify-send &>/dev/null; then
|
||||
msg "Found notify-send."
|
||||
@@ -78,12 +65,16 @@ main() {
|
||||
fi
|
||||
fi
|
||||
|
||||
mkdir -p "$cfg_workdir" || return 1
|
||||
cd "$cfg_workdir" || return 1
|
||||
for p in "${cfg_workdir[@]}"; do
|
||||
[[ -d "$p" ]] || return 1
|
||||
done
|
||||
|
||||
while read -r dir action path; do
|
||||
upload "$dir$path" &
|
||||
done < <( inotifywait -m -e create "$cfg_workdir" )
|
||||
printf 'Working in:\n'
|
||||
printf ' - %s\n' "${cfg_workdir[@]}"
|
||||
|
||||
while read -r d e f; do
|
||||
upload "$d$f" "$@" &
|
||||
done < <( inotifywait -m -e close_write "${cfg_workdir[@]}" )
|
||||
}
|
||||
|
||||
main "$@"
|
||||
|
Reference in New Issue
Block a user