Skip to content

Commit 9a5cde7

Browse files
committed
Refactor condition checks for fast_out and improve rate limit handling
1 parent 2d04488 commit 9a5cde7

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

src/lib/package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ update_package() {
9090
return
9191
fi
9292
done < <(grep "$owner" "$BKG_OPTOUT")
93-
elif $fast_out; then
93+
elif [ "${fast_out:-false}" = "true" ]; then
9494
return
9595
fi
9696

src/lib/util.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,9 @@ check_limit() {
177177
local min_passed
178178
local rate_limit_start
179179
rate_limit_end=$(date -u +%s)
180-
[ -n "$BKG_SCRIPT_START" ] && rate_limit_start="$BKG_SCRIPT_START" || {
181-
rate_limit_start=$(get_BKG BKG_SCRIPT_START)
182-
[ -n "$rate_limit_start" ] || echo "BKG_SCRIPT_START empty!"
183-
}
180+
rate_limit_start=$(get_BKG BKG_SCRIPT_START)
181+
[ -n "$rate_limit_start" ] || rate_limit_start="$BKG_SCRIPT_START"
182+
[ -n "$rate_limit_start" ] || echo "BKG_SCRIPT_START empty!"
184183
script_limit_diff=$((rate_limit_end - rate_limit_start))
185184
((script_limit_diff < BKG_MAX_LEN)) || save_and_exit
186185
(($? != 3)) || return 3

src/test/update.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,11 @@ popd || exit 1
7777
[ -f "$BKG_INDEX"/.env ] && \cp "$BKG_INDEX"/.env src/env.env || touch src/env.env
7878
pushd src || exit 1
7979
80-
db_size=$(stat -c %s "$BKG_INDEX_SQL".zst)
80+
if [ ! -f "$BKG_INDEX_SQL".zst ] && [ ! -f "$BKG_INDEX_DB" ]; then
81+
dldb >/dev/null 2>&1 || true
82+
fi
83+
84+
db_size=$(stat -c %s "$BKG_INDEX_SQL".zst 2>/dev/null || stat -c %s "$BKG_INDEX_DB" 2>/dev/null || echo 0)
8185
num_owner_db=$(sqlite3 "$BKG_INDEX_DB" "SELECT COUNT(DISTINCT owner) FROM $BKG_INDEX_TBL_PKG")
8286
num_owner_index=$(find "$BKG_INDEX_DIR" -mindepth 1 -maxdepth 1 -type d -exec basename {} \; 2>/dev/null | sort -u | awk '{print $1}' | wc -l)
8387

0 commit comments

Comments
 (0)