Skip to content

Streamline log output #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cytopia merged 1 commit into from
Dec 17, 2022
Merged

Streamline log output #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions test/01.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ touch "${DIR_PATH}/file 2"
### 02. Setup expected
###
{
echo "[OK] ADD: succeeded: ./dir 1"
echo "[OK] ADD: succeeded: ./dir 2"
echo "[OK] ADD: succeeded: ./dir 3"
echo "[OK] ADD: succeeded: ./dir 4"
echo "[OK] ADD succeeded: ./dir 1"
echo "[OK] ADD succeeded: ./dir 2"
echo "[OK] ADD succeeded: ./dir 3"
echo "[OK] ADD succeeded: ./dir 4"
} > "${SCRIPT_PATH}/01.expected"


Expand Down
16 changes: 8 additions & 8 deletions watcherd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ MY_DATE="2022-12-17"
MY_URL="https://github.com/devilbox/watcherd"
MY_AUTHOR="cytopia <cytopia@everythingcli.org>"
MY_GPGKEY="0xA02C56F0"
MY_VERSION="1.0.4"
MY_VERSION="1.0.5"
MY_LICENSE="MIT"

# Default settings
Expand Down Expand Up @@ -152,11 +152,11 @@ function trigger() {
if [ "${changes}" -eq "1" ]; then
if eval "${action}"; then
if [ "${verbose}" -gt "0" ]; then
printf "%s: [%s] [OK] %s succeeded: %s\\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )" "TRIGGER" "${action}"
printf "%s: [%s] [OK] %s succeeded: %s\\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )" "TRG" "${action}"
fi
return 0
else
printf "%s: [%s] [ERR] %s failed: %s\\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )" "TRIGGER" "${action}" >&2
printf "%s: [%s] [ERR] %s failed: %s\\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )" "TRG" "${action}" >&2
# Also return 0 here in order to not abort the loop
return 0
fi
Expand Down Expand Up @@ -283,7 +283,7 @@ fi
# Initial add
for d in ${ALL_DIRS}; do
# Only CHANGE if adding was successful
if action "${d}" "${CMD_ADD}" "ADD:" "${VERBOSE}"; then
if action "${d}" "${CMD_ADD}" "ADD" "${VERBOSE}"; then
CHANGES=1
fi
done
Expand Down Expand Up @@ -311,11 +311,11 @@ if [ "${WATCHER}" = "inotify" ]; then
"${WATCH_DIR}" | while read -r output; do
d="${output##*\\}"
if [[ "${output}" =~ ^(CREATE|MOVED_TO),ISDIR/\\ ]]; then
if action "${d}" "${CMD_ADD}" "ADD:" "${VERBOSE}"; then
if action "${d}" "${CMD_ADD}" "ADD" "${VERBOSE}"; then
trigger "${CMD_TRIGGER}" "1" "${VERBOSE}"
fi
elif [[ "${output}" =~ ^(DELETE|MOVED_FROM),ISDIR/\\ ]]; then
if action "${d}" "${CMD_DEL}" "DEL:" "${VERBOSE}"; then
if action "${d}" "${CMD_DEL}" "DEL" "${VERBOSE}"; then
trigger "${CMD_TRIGGER}" "1" "${VERBOSE}"
fi
fi
Expand All @@ -342,14 +342,14 @@ else

# Run ADD command
for d in $ADD_DIRS; do
if action "${d}" "${CMD_ADD}" "ADD:" "${VERBOSE}"; then
if action "${d}" "${CMD_ADD}" "ADD" "${VERBOSE}"; then
CHANGES=1
fi
done

# Run DEL command
for d in $DEL_DIRS; do
if action "${d}" "${CMD_DEL}" "DEL:" "${VERBOSE}"; then
if action "${d}" "${CMD_DEL}" "DEL" "${VERBOSE}"; then
CHANGES=1
fi
done
Expand Down