Mirrorlandia_minetest/contentdb
1
0
Fork 0
mirror of https://github.com/minetest/contentdb.git synced 2024-12-22 22:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Include status code in broken link messages

Browse Source
This commit is contained in:
rubenwardy 2024-07-04 21:35:37 +01:00
parent 3f62a41952
commit d738e19ce9
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/tasks/pkgtasks.py
View File

@ -108,19 +108,18 @@ def clear_removed_packages(all_packages: bool):
return f"Deleted {count} soft deleted packages packages" return f"Deleted {count} soft deleted packages packages"
def _url_exists(url: str) -> bool: def _url_exists(url: str) -> str:
try: try:
with requests.get(url, stream=True) as response: with requests.get(url, stream=True, timeout=10) as response:
try: response.raise_for_status()
response.raise_for_status() return ""
return True except requests.exceptions.HTTPError as e:
except requests.exceptions.HTTPError: return str(e.response.status_code)
return False
except requests.exceptions.ConnectionError: except requests.exceptions.ConnectionError:
return False return "ConnectionError"
def check_for_dead_links(package: Package) -> set[str]: def check_for_dead_links(package: Package) -> dict[str, str]:
links: list[Optional[str]] = [ links: list[Optional[str]] = [
package.repo, package.repo,
package.website, package.website,
@ -134,14 +133,15 @@ def check_for_dead_links(package: Package) -> set[str]:
if package.desc: if package.desc:
links.extend(get_links(render_markdown(package.desc), package.get_url("packages.view", absolute=True))) links.extend(get_links(render_markdown(package.desc), package.get_url("packages.view", absolute=True)))
bad_urls = set() bad_urls = {}
for link in links: for link in links:
if link is None: if link is None:
continue continue
if not _url_exists(link): res = _url_exists(link)
bad_urls.add(link) if res != "":
bad_urls[link] = res
return bad_urls return bad_urls
@ -155,7 +155,8 @@ def check_package_on_submit(package_id: int):
bad_urls = check_for_dead_links(package) bad_urls = check_for_dead_links(package)
if len(bad_urls) > 0: if len(bad_urls) > 0:
marked = f"Marked {package.title} as Changed Needed" marked = f"Marked {package.title} as Changed Needed"
msg = "The following broken links were found on your package:\n\n" + "\n".join([f"- {x}" for x in bad_urls]) msg = ("The following broken links were found on your package:\n\n" +
"\n".join([f"- {link} [{res}]" for link, res in bad_urls.items()]))
system_user = get_system_user() system_user = get_system_user()
post_to_approval_thread(package, system_user, marked, is_status_update=True, create_thread=True) post_to_approval_thread(package, system_user, marked, is_status_update=True, create_thread=True)