Skip to content

Replace CDN panic with warning. #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vladimish wants to merge 1 commit into
base: v4-main
Choose a base branch
from
Open

Replace CDN panic with warning. #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions wikiteam3/dumpgenerator/dump/image/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,12 @@
WBM_BEST = 3


def check_response(r: requests.Response) -> None:
def check_response(r: requests.Response, bypass_cdn_image_compression: bool = False) -> None:
if r.headers.get("cf-polished", ""):
raise RuntimeError("Found cf-polished header in response, use --bypass-cdn-image-compression to bypass it")
if bypass_cdn_image_compression:
raise RuntimeError("cf-polished header detected despite --bypass-cdn-image-compression. CDN bypass failed.")
else:
print("cf-polished header detected. Image may be compressed by CDN. Use --bypass-cdn-image-compression to attempt bypass.")

class Image:

Expand Down Expand Up @@ -264,7 +267,7 @@ def get_ia_wbm_response() -> Optional[requests.Response]:
r = session.get(url=url, params=modify_params(), headers=_headers, allow_redirects=True, stream=True)
r._content = r.raw.read()

check_response(r)
check_response(r, other.bypass_cdn_image_compression)

# a trick to get original file (fandom)
ori_url = url
Expand All @@ -278,7 +281,7 @@ def get_ia_wbm_response() -> Optional[requests.Response]:
ori_url = url + "&format=original"
Delay(config=config)
r = session.get(url=ori_url, params=modify_params(), headers=modify_headers(), allow_redirects=True)
check_response(r)
check_response(r, other.bypass_cdn_image_compression)

# Try to fix a broken HTTP to HTTPS redirect
original_url_redirected: bool = r.url in (url, ori_url)
Expand All @@ -291,7 +294,7 @@ def get_ia_wbm_response() -> Optional[requests.Response]:
url = "https://" + url_raw.split("://")[1]
# print 'Maybe a broken http to https redirect, trying ', url
r = session.get(url=url, params=modify_params(), headers=modify_headers(), allow_redirects=True)
check_response(r)
check_response(r, other.bypass_cdn_image_compression)

if r.status_code == 200:
try:
Expand Down