github/XHS_Downloader
1
0
Fork 0
mirror of https://github.com/JoeanAmier/XHS-Downloader.git synced 2026-03-22 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增支持命令行下载作品文件

Browse Source
This commit is contained in:
JoeanAmier
2024-03-07 23:25:32 +08:00
parent 18f92134d8
commit a997fe1a1d
14 changed files with 200 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/application/app.py
View File

@@ -94,14 +94,14 @@ class XHS:
def __extract_video(self, container: dict, data: Namespace):
container["下载地址"] = self.video.get_video_link(data)
async def __download_files(self, container: dict, download: bool, log, bar):
async def __download_files(self, container: dict, download: bool, index, log, bar):
name = self.__naming_rules(container)
path = self.manager.folder
if (u := container["下载地址"]) and download:
if await self.skip_download(i := container["作品ID"]):
logging(log, self.prompt.exist_record(i))
else:
path, result = await self.download.run(u, name, container["作品类型"], log, bar)
path, result = await self.download.run(u, index, name, container["作品类型"], log, bar)
await self.__add_record(i, result)
elif not u:
logging(log, self.prompt.download_link_error, ERROR)
@@ -111,7 +111,13 @@ class XHS:
if all(result):
await self.recorder.add(id_)
async def extract(self, url: str, download=False, efficient=False, log=None, bar=None) -> list[dict]:
async def extract(self,
url: str,
download=False,
index: list | tuple = None,
efficient=False,
log=None,
bar=None) -> list[dict]:
# return # 调试代码
urls = await self.__extract_links(url, log)
if not urls:
@@ -119,7 +125,20 @@ class XHS:
else:
logging(log, self.prompt.pending_processing(len(urls)))
# return urls # 调试代码
return [await self.__deal_extract(i, download, efficient, log, bar) for i in urls]
return [await self.__deal_extract(i, download, index, efficient, log, bar) for i in urls]
async def extract_cli(self,
url: str,
download=True,
index: list | tuple = None,
efficient=True,
log=None,
bar=None) -> None:
url = await self.__extract_links(url, log)
if not url:
logging(log, self.prompt.extract_link_failure, WARNING)
else:
await self.__deal_extract(url[0], download, index, efficient, log, bar)
async def __extract_links(self, url: str, log) -> list:
urls = []
@@ -133,7 +152,7 @@ class XHS:
urls.append(u.group())
return urls
async def __deal_extract(self, url: str, download: bool, efficient: bool, log, bar):
async def __deal_extract(self, url: str, download: bool, index: list | tuple | None, efficient: bool, log, bar):
logging(log, self.prompt.start_processing(url))
html = await self.html.request_url(url, log=log)
namespace = self.__generate_data_object(html)
@@ -153,7 +172,7 @@ class XHS:
self.__extract_image(data, namespace)
case _:
data["下载地址"] = []
await self.__download_files(data, download, log, bar)
await self.__download_files(data, download, index, log, bar)
logging(log, self.prompt.processing_completed(url))
return data

8
source/application/download.py
View File

@@ -33,13 +33,14 @@ class Download:
self.video_format = "mp4"
self.image_format = manager.image_format
async def run(self, urls: list, name: str, type_: str, log, bar) -> tuple[Path, tuple]:
async def run(self, urls: list, index: list | tuple | None, name: str, type_: str, log, bar) -> tuple[Path, tuple]:
path = self.__generate_path(name)
match type_:
case "视频":
tasks = self.__ready_download_video(urls, path, name, log)
case "图文":
tasks = self.__ready_download_image(urls, path, name, log)
tasks = self.__ready_download_image(
urls, index, path, name, log)
case _:
raise ValueError
tasks = [
@@ -74,11 +75,14 @@ class Download:
def __ready_download_image(
self,
urls: list[str],
index: list | tuple | None,
path: Path,
name: str,
log) -> list:
tasks = []
for i, j in enumerate(urls, start=1):
if index and i not in index:
continue
file = f"{name}_{i}"
if any(path.glob(f"{file}.*")):
logging(log, self.prompt.skip_download(file))