octoleo/telegram-bot-bash
1
1
Fork 0
mirror of https://github.com/octoleo/telegram-bot-bash.git synced 2024-12-29 05:02:46 +00:00
Code Issues Projects Releases Wiki Activity

jsonDB updates: insertKey, use builtin alias, fix updateDB_async, fix shellcheck hints

Browse Source
This commit is contained in:
Kay Marquardt (Gnadelwartz) 2020-05-31 11:04:38 +02:00
parent da98b09d6b
commit 6d1e7cc065
4 changed files with 43 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dev/make-distribution.sh
View File

@ -2,7 +2,7 @@
# file: make-distribution.sh # file: make-distribution.sh
# creates files and arcchives to dirtribute bashbot # creates files and arcchives to dirtribute bashbot
# #
#### $$VERSION$$ v0.96-dev-7-g0153928 #### $$VERSION$$ 0.96-dev2-6-gda98b09
# magic to ensure that we're always inside the root of our application, # magic to ensure that we're always inside the root of our application,
# no matter from which directory we'll run script # no matter from which directory we'll run script
@ -21,9 +21,9 @@ DISTFILES="bashbot.rc bashbot.sh commands.sh mycommands.sh mycommands.sh.clean d
# run tests first! # run tests first!
for test in "dev/all-tests.sh" for test in dev/all-test*.sh
do do
[ ! -x ""${test} ] && continue [ ! -x "${test}" ] && continue
if ! "${test}" ; then if ! "${test}" ; then
echo "Test ${test} failed, can't create dist!" echo "Test ${test} failed, can't create dist!"
exit 1 exit 1

4
dev/make-standalone.sh
View File

@ -5,7 +5,7 @@
# If you your bot is finished you can use make-standalone.sh to create the # If you your bot is finished you can use make-standalone.sh to create the
# the old all-in-one bashbot: bashbot.sh and commands.sh only! # the old all-in-one bashbot: bashbot.sh and commands.sh only!
# #
#### $$VERSION$$ v0.96-dev-7-g0153928 #### $$VERSION$$ 0.96-dev2-6-gda98b09
# magic to ensure that we're always inside the root of our application, # magic to ensure that we're always inside the root of our application,
# no matter from which directory we'll run script # no matter from which directory we'll run script
@ -22,7 +22,7 @@ DISTFILES="bashbot.sh commands.sh mycommands.sh modules LICENSE README.txt tok
# run tests first! # run tests first!
for test in "dev/all-tests.sh" for test in dev/all-test*.sh
do do
[ ! -x "${test}" ] && continue [ ! -x "${test}" ] && continue
if ! "${test}" ; then if ! "${test}" ; then

78
modules/jsonDB.sh
View File

@ -5,7 +5,7 @@
# This file is public domain in the USA and all free countries. # This file is public domain in the USA and all free countries.
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
# #
#### $$VERSION$$ 0.96-dev2-0-gcbad540 #### $$VERSION$$ 0.96-dev2-6-gda98b09
# #
# source from commands.sh to use jsonDB functions # source from commands.sh to use jsonDB functions
# #
@ -74,13 +74,11 @@ if _exists flock; then
else else
# merge arrays # merge arrays
local key local key
set -x
for key in "${!ARRAY[@]}" for key in "${!ARRAY[@]}"
do do
oldARR["${key}"]="${ARRAY["${key}"]}" oldARR["${key}"]="${ARRAY["${key}"]}"
done done
Array2Json "oldARR" >"${DB}" Array2Json "oldARR" >"${DB}"
set +x
fi fi
} 200>"${DB}${BASHBOT_LOCKNAME}" } 200>"${DB}${BASHBOT_LOCKNAME}"
} }
@ -89,7 +87,9 @@ set +x
# $1 key name, can onyl contain -a-zA-Z0-9,._ # $1 key name, can onyl contain -a-zA-Z0-9,._
# $2 key value # $2 key value
# $3 filename (must exist!), must be relative to BASHBOT_ETC, and not contain '..' # $3 filename (must exist!), must be relative to BASHBOT_ETC, and not contain '..'
jssh_insertDB() { alias jssh_insertDB=jssh_insertKeyDB # backward compatibility
# renamed to be more consistent
jssh_insertKeyDB() {
[[ "$1" =~ ^[-a-zA-Z0-9,._]+$ ]] || return 3 [[ "$1" =~ ^[-a-zA-Z0-9,._]+$ ]] || return 3
local key="$1" value="$2" local key="$1" value="$2"
local DB; DB="$(jssh_checkDB "$3")" local DB; DB="$(jssh_checkDB "$3")"
@ -126,7 +126,7 @@ set +x
local DB; DB="$(jssh_checkDB "$2")" local DB; DB="$(jssh_checkDB "$2")"
declare -A oldARR declare -A oldARR
# start atomic delete here, exclusive max wait 1s # start atomic delete here, exclusive max wait 1s
{ flock -e -w 1 200 { flock -s -w 1 200
Json2Array "oldARR" <"${DB}" Json2Array "oldARR" <"${DB}"
} 200>"${DB}${BASHBOT_LOCKNAME}" } 200>"${DB}${BASHBOT_LOCKNAME}"
echo "${oldARR["$1"]}" echo "${oldARR["$1"]}"
@ -136,7 +136,7 @@ set +x
# add a value to key, used for conters # add a value to key, used for conters
# $1 key name, can onyl contain -a-zA-Z0-9,._ # $1 key name, can onyl contain -a-zA-Z0-9,._
# $2 filename (must exist!), must be relative to BASHBOT_ETC, and not contain '..' # $2 filename (must exist!), must be relative to BASHBOT_ETC, and not contain '..'
# $3 optional count, value added to count3r, add 1 if empty # $3 optional count, value added to counter, add 1 if empty
# side effect: if $3 is not given, we add to end of file to be as fast as possible # side effect: if $3 is not given, we add to end of file to be as fast as possible
jssh_countKeyDB() { jssh_countKeyDB() {
[[ "$1" =~ ^[-a-zA-Z0-9,._]+$ ]] || return 3 [[ "$1" =~ ^[-a-zA-Z0-9,._]+$ ]] || return 3
@ -160,35 +160,28 @@ set +x
else else
######### #########
# we have no flock, use "old" not atomic functions # we have no flock, use "old" not atomic functions
jssh_readDB() { alias jssh_readDB=ssh_readDB_async
jssh_readDB_async "$@" alias jssh_writeDB=jssh_writeDB_async
} alias jssh_updateDB=jssh_updateDB_async
alias jssh_insertDB=jssh_insertDB_async
jssh_writeDB() { alias ssh_deleteKeyDB=jssh_deleteKeyDB_async
jssh_writeDB_async "$@" alias jssh_getKeyDB=jssh_getKeyDB_async
} alias jssh_countKeyDB=jssh_countKeyDB_async
jssh_updateDB() {
jssh_updateDB_async "$@"
}
jssh_insertDB() {
jssh_insertDB_async "$@"
}
jssh_deleteKeyDB() {
jssh_deleteKeyDB_async "$@"
}
jssh_getKeyDB() {
jssh_getKeyDB_async "$@"
}
jssh_countKeyDB() {
jssh_countKeyDB "$@"
}
fi fi
# updatie key/value in place to jsshDB
# $1 key name, can onyl contain -a-zA-Z0-9,._
# $2 key value
# $3 filename (must exist!), must be relative to BASHBOT_ETC, and not contain '..'
#no own locking, so async is the same as updatekeyDB
alias jssh_updateKeyDB_async=jssh_updateKeyDB
jssh_updateKeyDB() {
[[ "$1" =~ ^[-a-zA-Z0-9,._]+$ ]] || return 3
declare -A oldARR
oldARR["$1"]="$2"
jssh_updateDB "oldARR" "${3}" || return 3
}
############## ##############
# no need for atomic # no need for atomic
@ -251,25 +244,24 @@ jssh_writeDB_async() {
jssh_updateDB_async() { jssh_updateDB_async() {
declare -n ARRAY="$1" declare -n ARRAY="$1"
[ -z "${ARRAY[*]}" ] && return 1 [ -z "${ARRAY[*]}" ] && return 1
declare -A oldARR newARR declare -A oldARR
jssh_readDB_async "oldARR" "$2" || return "$?" jssh_readDB_async "oldARR" "$2" || return "$?"
if [ -z "${oldARR[*]}" ]; then if [ -z "${oldARR[*]}" ]; then
# no old content # no old content
jssh_writeDB_async "$1" "$2" jssh_writeDB_async "$1" "$2"
else else
# merge arrays # merge arrays
local o1 o2 n1 n2 local key
o1="$(declare -p oldARR)"; o2="${o1#*\(}" for key in "${!ARRAY[@]}"
n1="$(declare -p ARRAY)"; n2="${n1#*\(}" do
unset IFS; set -f oldARR["${key}"]="${ARRAY["${key}"]}"
#shellcheck disable=SC2034,SC2190,SC2206 done
newARR=( ${o2:0:${#o2}-1} ${n2:0:${#n2}-1} ) Array2Json "oldARR" >"${DB}"
set +f
jssh_writeDB_async "newARR" "$2"
fi fi
} }
jssh_insertDB_async() { alias jssh_insertDB_async=jssh_insertKeyDB_async
jssh_insertKeyDB_async() {
[[ "$1" =~ ^[-a-zA-Z0-9,._]+$ ]] || return 3 [[ "$1" =~ ^[-a-zA-Z0-9,._]+$ ]] || return 3
local key="$1" value="$2" local key="$1" value="$2"
local DB; DB="$(jssh_checkDB "$3")" local DB; DB="$(jssh_checkDB "$3")"

5
modules/sendMessage.sh
View File

@ -5,7 +5,7 @@
# This file is public domain in the USA and all free countries. # This file is public domain in the USA and all free countries.
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
# #
#### $$VERSION$$ v0.96-dev-7-g0153928 #### $$VERSION$$ 0.96-dev2-6-gda98b09
# source once magic, function named like file # source once magic, function named like file
eval "$(basename "${BASH_SOURCE[0]}")(){ :; }" eval "$(basename "${BASH_SOURCE[0]}")(){ :; }"
@ -189,7 +189,8 @@ send_message() {
[ -z "$2" ] && return [ -z "$2" ] && return
local text keyboard btext burl no_keyboard file lat long title address sent local text keyboard btext burl no_keyboard file lat long title address sent
text="$(sed <<< "${2}" 's/ mykeyboardend.*//;s/ *my[kfltab][a-z]\{2,13\}startshere.*//')$(sed <<< "${2}" -n '/mytextstartshere/ s/.*mytextstartshere//p')" text="$(sed <<< "${2}" 's/ mykeyboardend.*//;s/ *my[kfltab][a-z]\{2,13\}startshere.*//')$(sed <<< "${2}" -n '/mytextstartshere/ s/.*mytextstartshere//p')"
text="$(sed <<< "${text}" 's/ *mynewlinestartshere */\r\n/g')" #text="$(sed <<< "${text}" 's/ *mynewlinestartshere */\r\n/g')"
text="${text//?([[:blank:]]|^)mynewlinestartshere?([[:blank:]]|$)/$'\n\r'}"
[ "$3" != "safe" ] && { [ "$3" != "safe" ] && {
no_keyboard="$(sed <<< "${2}" '/mykeyboardendshere/!d;s/.*mykeyboardendshere.*/mykeyboardendshere/')" no_keyboard="$(sed <<< "${2}" '/mykeyboardendshere/!d;s/.*mykeyboardendshere.*/mykeyboardendshere/')"
keyboard="$(sed <<< "${2}" '/mykeyboardstartshere /!d;s/.*mykeyboardstartshere *//;s/ *my[nkfltab][a-z]\{2,13\}startshere.*//;s/ *mykeyboardendshere.*//')" keyboard="$(sed <<< "${2}" '/mykeyboardstartshere /!d;s/.*mykeyboardstartshere *//;s/ *my[nkfltab][a-z]\{2,13\}startshere.*//;s/ *mykeyboardendshere.*//')"