From 3387225d13d68c69045fbe244b01255b1725736d Mon Sep 17 00:00:00 2001 From: JoeamAmier Date: Mon, 25 Sep 2023 22:27:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20TUI=20=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 16 ++++++++-------- source/Download.py | 21 ++++++++++++++------- source/__init__.py | 14 +++++++------- static/XHS_Downloader.tcss | 1 + 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/main.py b/main.py index 3879004..65b0f30 100644 --- a/main.py +++ b/main.py @@ -90,20 +90,20 @@ class XHSDownloader(App): def solo(self): url = self.query_one(Input).value - self.APP.extract(url, download=True) - # self.query_one(Log).write_line() + self.APP.extract(url, True, self.query_one(Log)) def batch(self): urls = self.Batch.read_txt() + log = self.query_one(Log) if not urls: - self.query_one(Log).write_line("未检测到 xhs.txt 文件 或者 该文件为空！") + log.write_line("未检测到 xhs.txt 文件 或者 该文件为空！") for url in urls: - self.query_one(Log).write_line(f"当前作品链接: {url}") - self.APP.extract(url) + log.write_line(f"当前作品链接: {url}") + self.APP.extract(url, True, log) if __name__ == '__main__': # example() - program() - # app = XHSDownloader() - # app.run() + # program() + app = XHSDownloader() + app.run() diff --git a/source/Download.py b/source/Download.py index 87ea265..92822a8 100644 --- a/source/Download.py +++ b/source/Download.py @@ -40,18 +40,18 @@ class Download: self.temp.mkdir() return root - def run(self, urls: list, name: str, type_: int): + def run(self, urls: list, name: str, type_: int, log): if type_ == 0: - self.__download(urls[0], f"{name}.mp4") + self.__download(urls[0], f"{name}.mp4", log) elif type_ == 1: for index, url in enumerate(urls): - self.__download(url, f"{name}_{index + 1}.jpeg") + self.__download(url, f"{name}_{index + 1}.jpeg", log) - def __download(self, url: str, name: str): + def __download(self, url: str, name: str, log): temp = self.temp.joinpath(name) file = self.root.joinpath(name) if self.manager.is_exists(file): - print(f"{name} 已存在，跳过下载！") + self.output_prompt(f"文件 {name} 已存在，跳过下载！", log) return try: with get(url, headers=self.headers, proxies=self.proxies, stream=True) as response: @@ -59,13 +59,20 @@ class Download: for chunk in response.iter_content(chunk_size=self.chunk): f.write(chunk) self.manager.move(temp, file) - print(f"{name} 下载成功！") + self.output_prompt(f"文件 {name} 下载成功！", log) except exceptions.ChunkedEncodingError: self.manager.delete(temp) - print(f"网络异常，{name} 下载失败！") + self.output_prompt(f"网络异常，文件 {name} 下载失败！", log) @staticmethod def __delete_cookie(headers: dict) -> dict: download_headers = headers.copy() del download_headers["Cookie"] return download_headers + + @staticmethod + def output_prompt(tip: str, log): + if log: + log.write_line(tip) + else: + print(tip) diff --git a/source/__init__.py b/source/__init__.py index f3bdf83..2d211a7 100644 --- a/source/__init__.py +++ b/source/__init__.py @@ -46,19 +46,19 @@ class XHS: proxies, chunk) - def __get_image(self, container: dict, html: str, download): + def __get_image(self, container: dict, html: str, download, log): urls = self.image.get_image_link(html) if download: - self.download.run(urls, self.__naming_rules(container), 1) + self.download.run(urls, self.__naming_rules(container), 1, log) container["下载地址"] = urls - def __get_video(self, container: dict, html: str, download): + def __get_video(self, container: dict, html: str, download, log): url = self.video.get_video_link(html) if download: - self.download.run(url, self.__naming_rules(container), 0) + self.download.run(url, self.__naming_rules(container), 0, log) container["下载地址"] = url - def extract(self, url: str, download=False) -> dict: + def extract(self, url: str, download=False, log=None) -> dict: if not self.__check(url): print(f"无效的作品链接: {url}") return {} @@ -70,9 +70,9 @@ class XHS: print(f"获取作品数据失败: {url}") return {} if data["作品类型"] == "视频": - self.__get_video(data, html, download) + self.__get_video(data, html, download, log) else: - self.__get_image(data, html, download) + self.__get_image(data, html, download, log) return data def __check(self, url: str): diff --git a/static/XHS_Downloader.tcss b/static/XHS_Downloader.tcss index b159595..8f94a38 100644 --- a/static/XHS_Downloader.tcss +++ b/static/XHS_Downloader.tcss @@ -8,4 +8,5 @@ Label { color: white; content-align-horizontal: center; content-align-vertical: middle; + text-style: bold; }