Skip to content

Commit

Permalink
Format code
Browse files Browse the repository at this point in the history
  • Loading branch information
Denis-Averin committed May 12, 2024
1 parent 6bdccb6 commit c8ad9c5
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ format: format-black

.PHONY: format-black
format-black:
python -m black --line-length=120 -v .
python -m black --line-length=120 --exclude submodules -v .

.PHONY: swagger
swagger:
Expand Down
13 changes: 4 additions & 9 deletions scripts/check-urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ class Curl:
See: https://curl.se/libcurl/c/libcurl-errors.html
"""

CURL_STDERR_HTTP_RE = re.compile(
r"^curl: \(22\) The requested URL returned error: (?P<http_code>\d+)"
)
CURL_STDERR_HTTP_RE = re.compile(r"^curl: \(22\) The requested URL returned error: (?P<http_code>\d+)")
OK = 0
COULDNT_RESOLVE_HOST = 6
HTTP_RETURNED_ERROR = 22
Expand Down Expand Up @@ -162,9 +160,7 @@ def create_new_task(url) -> Task:

def process_finished_task(task) -> None:
# print("Finish task:", task.url)
expected_ret_code, expected_http_code = CURL_EXIT_CODES_AND_HTTP_CODES.get(
task.url, (0, None)
)
expected_ret_code, expected_http_code = CURL_EXIT_CODES_AND_HTTP_CODES.get(task.url, (0, None))
if task.ret_code == expected_ret_code:
print("OK:", "'%s' %.2fs" % (task.url, task.age))
JOB_SUMMARY.add_success(task.url)
Expand All @@ -181,8 +177,7 @@ def process_finished_task(task) -> None:
return

print(
"Expected %d got %d for '%s': %s"
% (expected_ret_code, task.ret_code, task.url, task.stderr),
"Expected %d got %d for '%s': %s" % (expected_ret_code, task.ret_code, task.url, task.stderr),
file=sys.stderr,
)
JOB_SUMMARY.add_error(f"Broken URL '{task.url}': {task.stderr}Files: {EXTRACTED_URLS_WITH_FILES[task.url]}")
Expand Down Expand Up @@ -221,7 +216,7 @@ def url_checker(num_workers=8):
print("Worker finished")


JOB_SUMMARY = JobSummary(os.environ.get('GITHUB_STEP_SUMMARY', "step_summary.md"))
JOB_SUMMARY = JobSummary(os.environ.get("GITHUB_STEP_SUMMARY", "step_summary.md"))
JOB_SUMMARY.add_header("Test all URLs")


Expand Down
20 changes: 12 additions & 8 deletions scripts/github_job_summary.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@


class JobSummary:
"""
See https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#adding-a-job-summary
"""

def __init__(self, filename: str):
"""
:param filename: Use $GITHUB_STEP_SUMMARY inside GitHub
"""
self.__file: TextIO = open(filename, mode='wt')
self.__file: TextIO = open(filename, mode="wt")
self._errors = []
self._success = []
self._lock = Lock()
Expand All @@ -23,7 +26,7 @@ def __str__(self) -> str:
if not self.has_errors:
return "OK"
lines = ["Errors:"] + self._errors
return '\n\n'.join(lines)
return "\n\n".join(lines)

def _write_line(self, line):
with self._lock:
Expand All @@ -37,6 +40,9 @@ def add_header(self, text: str, level: int = 3):
self._write_line(f"{'#' * level} {text}\n\n")

def add_error(self, text: str):
"""
See https://github.com/markdown-templates/markdown-emojis
"""
if not self._errors:
self._write_line("Errors:\n")
self._errors.append(text)
Expand All @@ -47,11 +53,9 @@ def add_success(self, text: str):

def finalize(self, format_str: str):
total = len(self._success) + len(self._errors)
self._write_line('\n' + format_str.format(
total=total,
success=len(self._success),
failed=len(self._errors)
) + '\n')
self._write_line(
"\n" + format_str.format(total=total, success=len(self._success), failed=len(self._errors)) + "\n"
)


def test():
Expand All @@ -64,5 +68,5 @@ def test():
summary.finalize("Total={total}, success={success}, failed={failed}")


if __name__ == '__main__':
if __name__ == "__main__":
test()

0 comments on commit c8ad9c5

Please sign in to comment.