Skip to content

Commit 1bbea0e

Browse files
committed
feat: pre-filter the github cache
Since this is no longer json we rename the cache file and filter before writing out
1 parent b846fc0 commit 1bbea0e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

deb-get

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ function follow_url() {
156156

157157
function get_github_releases() {
158158
METHOD="github"
159-
CACHE_FILE="${CACHE_DIR}/${APP}.json"
159+
CACHE_FILE="${CACHE_DIR}/${APP}.json_extract"
160160
# Cache github releases json for 1 hour to try and prevent API rate limits
161161
# https://docs.github.com/en/rest/overview/resources-in-the-rest-api#rate-limiting
162162
# {"message":"API rate limit exceeded for 62.31.16.154. (But here's the good news: Authenticated requests get a higher rate limit. Check out the documentation for more details.)","documentation_url":"https://docs.github.com/rest/overview/resources-in-the-rest-api#rate-limiting"}
@@ -167,8 +167,8 @@ function get_github_releases() {
167167
if [ ! -e "${CACHE_FILE}" ] || [ -n "$(find "${CACHE_FILE}" -mmin +"${DEBGET_CACHE_RTN:-60}")" ]; then
168168
fancy_message info "Updating ${CACHE_FILE}"
169169
local URL="https://api.github.com/repos/${1}/releases${2:+/$2}"
170-
wgetcmdarray=(wget "${HEADERPARAM}" "${HEADERAUTH}" -q --no-use-server-timestamps "${URL}" -O "${CACHE_FILE}")
171-
${ELEVATE} "${wgetcmdarray[@]}" || ( fancy_message warn "Updating ${CACHE_FILE} failed." )
170+
wgetcmdarray=(wget "${HEADERPARAM}" "${HEADERAUTH}" -q --no-use-server-timestamps "${URL}" -O- )
171+
${ELEVATE} "${wgetcmdarray[@]}" | sed '/browser_download/!d;/\.deb/!d' > "${CACHE_FILE}" || ( fancy_message warn "Updating ${CACHE_FILE} failed." )
172172
if [ -f "${CACHE_FILE}" ] && grep "API rate limit exceeded" "${CACHE_FILE}"; then
173173
fancy_message warn "Updating ${CACHE_FILE} exceeded GitHub API limits. Deleting it."
174174
${ELEVATE} rm "${CACHE_FILE}" 2>/dev/null
@@ -1372,7 +1372,7 @@ function dg_action_cache() {
13721372
function dg_action_clean() {
13731373
elevate_privs
13741374
${ELEVATE} rm -fv "${CACHE_DIR}"/*.deb
1375-
${ELEVATE} rm -fv "${CACHE_DIR}"/*.json
1375+
${ELEVATE} rm -fv "${CACHE_DIR}"/*.json*
13761376
${ELEVATE} rm -fv "${CACHE_DIR}"/*.html
13771377
${ELEVATE} rm -fv "${CACHE_DIR}"/*.txt
13781378

0 commit comments

Comments
 (0)