From 247b4b6306b97ff32126038d930f2c60e5725196 Mon Sep 17 00:00:00 2001 From: tasi788 Date: Wed, 10 Apr 2024 00:31:52 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E6=96=B0=E5=A2=9E=20NRD=20?= =?UTF-8?q?=E6=B8=85=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutoBuild/nrdlist.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/AutoBuild/nrdlist.py b/AutoBuild/nrdlist.py index 2a861f1..21ac299 100644 --- a/AutoBuild/nrdlist.py +++ b/AutoBuild/nrdlist.py @@ -38,16 +38,20 @@ class Downloader: if r.status_code != 200: logger.error("Download failed: %s", url) return False - self.data[date.format("YYYY-MM-DD")] = BytesIO(r.content) + zip_file = BytesIO(r.content) + with ZipFile(zip_file, 'r') as zip_obj: + # print(zip_obj.read('domain-names.txt')) + self.data[date.format("YYYY-MM-DD")] = zip_obj.read('domain-names.txt') return True async def write(self): # todo: extract zip file and write to disk - pass - # date = sorted(self.data.keys(), reverse=True) - # for d in date: - # f = self.data[d] - # ZipFile(f).extractall(self.base_path / d) + + sort_date = sorted(self.data.keys(), reverse=True) + accumulate = '' + for date in range(len(sort_date)): + accumulate += self.data[sort_date[date]].decode() + self.base_path.joinpath(f"ndr_past_{date}.txt").write_bytes(accumulate.encode()) def run(self): loop = asyncio.get_event_loop()