Skip to content

Commit a47873e

Browse files
committed
better tag handling
1 parent 4e25967 commit a47873e

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/lib/package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ update_package() {
204204
\"raw_downloads_month\": $raw_downloads_month,
205205
\"raw_downloads_week\": $raw_downloads_week,
206206
\"raw_downloads_day\": $raw_downloads_day,
207-
\"tags\": [\"\"]
207+
\"tags\": []
208208
}]")
209209
}" | tr -d '\n' | jq -c . >"$json_file".abs || echo "Failed to update $owner/$package with $size bytes and $raw_downloads downloads and $version_count versions and $version_with_tag_count tagged versions and $raw_downloads_month downloads this month and $raw_downloads_week downloads this week and $raw_downloads_day downloads today and $latest_version latest version and $version_newest_id newest version"
210210
[[ ! -f "$json_file".abs || ! -s "$json_file".abs ]] || jq -c --arg newest "$version_newest_id" --arg latest "$latest_version" '.version |= map(if .id == ($newest | tonumber) then .newest = true else . end | if .id == ($latest | tonumber) then .latest = true else . end)' "$json_file".abs >"$json_file".rel

src/lib/version.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ save_version() {
2121
[[ -n "$version_tags" && "$version_tags" != "[]" ]] || version_tags=$(_jq "$1" '.. | try .tags | select(. != null and . != "")')
2222
version_tags=$(perl -pe 's/(?<!\\)"/\\"/g' <<<"$version_tags")
2323

24-
if [[ -z "$version_tags" || "$version_tags" == "[]" ]]; then
24+
if [[ -z "$version_tags" || "$version_tags" == "[]" || "$version_tags" == '"[]"' ]]; then
2525
for page in $(seq 1 2); do
2626
local html
2727
html=$(curl "https://github.com/$owner/$repo/pkgs/$package_type/$package/versions?page=$page")
@@ -38,11 +38,12 @@ save_version() {
3838
fi
3939

4040
version_tags=$(perl -pe 's/(?<!\\)"/\\"/g' <<<"$version_tags")
41-
[ "$version_tags" != "[]" ] || version_tags=""
41+
[[ "$version_tags" != "[]" && "$version_tags" != '"[]"' ]] || version_tags=""
42+
[[ -z "$version_tags" || "$version_tags" =~ ^\".*\"$ ]] || version_tags=\"$version_tags\"
4243
echo "{
4344
\"id\": $version_id,
4445
\"name\": \"$version_name\",
45-
\"tags\": \"$version_tags\"
46+
\"tags\": $version_tags
4647
}" | tr -d '\n' | jq -c . >"$BKG_INDEX_DIR/$owner/$repo/$package.$version_id.json" || echo "Failed to save $owner/$repo/$package/$version_id"
4748
else
4849
local version_size
@@ -153,6 +154,7 @@ update_version() {
153154
fi
154155

155156
[[ "$version_size" =~ ^[0-9]+$ ]] || version_size=-1
157+
[[ "$version_tags" != "[]" && "$version_tags" != '"[]"' ]] || version_tags=""
156158
sqlite3 "$BKG_INDEX_DB" "insert or replace into '$table_version_name' (id, name, size, downloads, downloads_month, downloads_week, downloads_day, date, tags) values ('$version_id', '$version_name', '$version_size', '$version_raw_downloads', '$version_raw_downloads_month', '$version_raw_downloads_week', '$version_raw_downloads_day', '$today', '$version_tags');"
157159
echo "Updated $owner/$package/$version_id"
158160
}

0 commit comments

Comments
 (0)