From 6ef25d6409495e5786546c5f0462eb5410e686ab Mon Sep 17 00:00:00 2001 From: amtoaer Date: Sat, 2 Dec 2023 00:40:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=8C=E5=8A=A0=E5=85=A5=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commands.py | 23 +++++++++++++---------- models.py | 4 ++-- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/commands.py b/commands.py index a5dbddd..ab876f3 100644 --- a/commands.py +++ b/commands.py @@ -41,19 +41,22 @@ async def upper_thumb(): makedir_tasks = [] other_tasks = [] for upper in await Upper.all(): - if not all( + if all( await asyncio.gather( aexists(upper.thumb_path), aexists(upper.meta_path) ) ): - makedir_tasks.append( - amakedirs(upper.thumb_path.parent, exist_ok=True) - ) - other_tasks.extend( - [ - upper.save_metadata(), - download_content(upper.thumb_url, upper.thumb_path), - ] - ) + logger.info("Upper {} {} already exists, skipped.", upper.mid, upper.name) + makedir_tasks.append( + amakedirs(upper.thumb_path.parent, exist_ok=True) + ) + logger.info("Saving metadata for upper {} {}...", upper.mid, upper.name) + other_tasks.extend( + [ + upper.save_metadata(), + download_content(upper.thumb_url, upper.thumb_path), + ] + ) await asyncio.gather(*makedir_tasks) await asyncio.gather(*other_tasks) + logger.info("All done.") diff --git a/models.py b/models.py index c018f27..f6caf40 100644 --- a/models.py +++ b/models.py @@ -41,13 +41,13 @@ class Upper(Model): @property def thumb_path(self) -> Path: return ( - DEFAULT_THUMB_PATH / f"{self.mid[0]}" / f"{self.mid}" / "folder.jpg" + DEFAULT_THUMB_PATH / str(self.mid)[0] / f"{self.mid}" / "folder.jpg" ) @property def meta_path(self) -> Path: return ( - DEFAULT_THUMB_PATH / f"{self.mid[0]}" / f"{self.mid}" / "person.nfo" + DEFAULT_THUMB_PATH / str(self.mid)[0] / f"{self.mid}" / "person.nfo" ) async def save_metadata(self):