arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2025-03-16 09:16:04 +00:00
Code Issues Releases Wiki Activity

remove second request to get the etag

Browse Source 
Signed-off-by: Yoshimo <yoshimo@users.noreply.github.com>
This commit is contained in:
Yoshimo 2023-05-01 11:13:24 +02:00
parent 4c6df42f31
commit 453bcc62f9
1 changed files with 8 additions and 8 deletions

16
gravity.sh
View File

@ -563,9 +563,9 @@ gravity_DownloadBlocklistFromUrl() {
cmd_ext="--resolve $domain:$port:$ip" cmd_ext="--resolve $domain:$port:$ip"
fi fi
if [ -f "${piholeDir}/list.${id}.${domain}.etag" ] if [ -f "${piholeDir}/list.${id}.${domain}.header" ]
then then
currentetag=$(<"${piholeDir}/list.${id}.${domain}.etag") currentetag=$(sed -n 's/^etag: //Ip' < "${piholeDir}/list.${id}.${domain}.header")
else else
currentetag=$"" currentetag=$""
fi fi
@ -575,20 +575,20 @@ gravity_DownloadBlocklistFromUrl() {
# shellcheck disable=SC2086 # shellcheck disable=SC2086
####httpCode=$(curl --connect-timeout ${curl_connect_timeout} -s -L ${compression} ${cmd_ext} ${heisenbergCompensator} -w "%{http_code}" -A "${agent}" "${url}" -o "${listCurlBuffer}" 2> /dev/null) ####httpCode=$(curl --connect-timeout ${curl_connect_timeout} -s -L ${compression} ${cmd_ext} ${heisenbergCompensator} -w "%{http_code}" -A "${agent}" "${url}" -o "${listCurlBuffer}" 2> /dev/null)
if [ -z "$currentetag" ] if [ -z "$currentetag" ]
then then
httpCode=$(curl --connect-timeout ${curl_connect_timeout} -s -L ${compression} ${cmd_ext} ${heisenbergCompensator} -w "%{http_code}" -A "${agent}" "${url}" -o "${listCurlBuffer}" 2> /dev/null) httpCode=$(curl --connect-timeout ${curl_connect_timeout} -s -L ${compression} ${cmd_ext} ${heisenbergCompensator} -w "%{http_code}" -A "${agent}" "${url}" -o "${listCurlBuffer}" -D "${piholeDir}/list.${id}.${domain}.header" 2> /dev/null)
else else
httpCode=$(curl --connect-timeout ${curl_connect_timeout} -s -L ${compression} ${cmd_ext} --header "If-None-Match: ${currentetag}" -w "%{http_code}" -A "${agent}" "${url}" -o "${listCurlBuffer}" 2> /dev/null) httpCode=$(curl --connect-timeout ${curl_connect_timeout} -s -L ${compression} ${cmd_ext} --header "If-None-Match: ${currentetag}" -w "%{http_code}" -A "${agent}" "${url}" -o "${listCurlBuffer}" -D "${piholeDir}/list.${id}.${domain}.header" 2>> /dev/null)
fi fi
# shellcheck disable=SC2086 # shellcheck disable=SC2086
curl -sI "${url}" -L ${compression} ${cmd_ext} ${heisenbergCompensator} -A "${agent}" | sed -n 's/^etag: //Ip' > "${piholeDir}/list.${id}.${domain}.etag" curl -sI "${url}" -L ${compression} ${cmd_ext} ${heisenbergCompensator} -A "${agent}" | sed -n 's/^etag: //Ip' > "${piholeDir}/list.${id}.${domain}.etag"
# if [ "${httpCode}" != 304 ] # if [ "${httpCode}" != 304 ]
# then # then
# echo -e "\n statuscode: " "$httpCode" # echo -e "\n statuscode: " "$httpCode"
# newetag=$(<"${piholeDir}/list.${id}.${domain}.etag") # newetag=$(cat "${piholeDir}/list.${id}.${domain}.header"|sed -n 's/^etag: //Ip')
# echo -e "\n new Etag: " "$newetag" # echo -e "\n new Etag: " "$newetag"
# fi # fi