From 4c03d1fc4c403828a4b17106e3c82957846f3ef3 Mon Sep 17 00:00:00 2001 From: meetwq Date: Sat, 11 Mar 2023 13:53:59 +0800 Subject: [PATCH] fix download error --- meme_generator/download.py | 25 +++++++++++-------------- meme_generator/version.py | 2 +- pyproject.toml | 2 +- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/meme_generator/download.py b/meme_generator/download.py index 1faebcf8..8734128a 100644 --- a/meme_generator/download.py +++ b/meme_generator/download.py @@ -12,25 +12,22 @@ from .version import __version__ -async def _download( - client: httpx.AsyncClient, - url: str, - semaphore: asyncio.Semaphore = asyncio.Semaphore(10), -): - async with semaphore: - try: - resp = await client.get(url, timeout=20, follow_redirects=True) - resp.raise_for_status() - return resp.content - except httpx.HTTPError as e: - logger.warning(f"{url} download failed!\n{e}") - - def _resource_url(path: str) -> str: return f"{meme_config.resource.resource_url}/blob/v{__version__}/{path}" async def check_resources(): + semaphore = asyncio.Semaphore(10) + + async def _download(client: httpx.AsyncClient, url: str): + async with semaphore: + try: + resp = await client.get(url, timeout=20, follow_redirects=True) + resp.raise_for_status() + return resp.content + except httpx.HTTPError as e: + logger.warning(f"{url} download failed!\n{e}") + async with httpx.AsyncClient() as client: if content := await _download( client, _resource_url("resources/resource_list.json") diff --git a/meme_generator/version.py b/meme_generator/version.py index 27fdca49..81f0fdec 100644 --- a/meme_generator/version.py +++ b/meme_generator/version.py @@ -1 +1 @@ -__version__ = "0.0.3" +__version__ = "0.0.4" diff --git a/pyproject.toml b/pyproject.toml index 73925b1e..d79f7c7a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "meme-generator" -version = "0.0.3" +version = "0.0.4" description = "Python package for making fun pictures" authors = ["meetwq "] license = "MIT"