mirror of
https://github.com/JoeanAmier/XHS-Downloader.git
synced 2025-12-26 04:48:05 +08:00
refactor(app): 将 account_archive 更新为 author_archive
This commit is contained in:
parent
c43f3ad23e
commit
f332b3fb2d
@ -233,7 +233,7 @@ async def example():
|
||||
live_download = False # 图文动图文件下载开关
|
||||
download_record = True # 是否记录下载成功的作品 ID
|
||||
language = "zh_CN" # 设置程序提示语言
|
||||
account_archive = True # 是否将每个作者的作品存至单独的文件夹
|
||||
author_archive = True # 是否将每个作者的作品存至单独的文件夹
|
||||
read_cookie = None # 读取浏览器 Cookie,支持设置浏览器名称(字符串)或者浏览器序号(整数),设置为 None 代表不读取
|
||||
|
||||
# async with XHS() as xhs:
|
||||
@ -258,7 +258,7 @@ async def example():
|
||||
download_record=download_record,
|
||||
language=language,
|
||||
read_cookie=read_cookie,
|
||||
account_archive=account_archive,
|
||||
author_archive=author_archive,
|
||||
) as xhs: # 使用自定义参数
|
||||
download = True # 是否下载作品文件,默认值:False
|
||||
# 返回作品详细信息,包括下载地址
|
||||
@ -382,7 +382,7 @@ async def example():
|
||||
<td align="center">true</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center">account_archive</td>
|
||||
<td align="center">author_archive</td>
|
||||
<td align="center">bool</td>
|
||||
<td align="center">是否将每个作者的作品储存至单独的文件夹;文件夹名称为 <code>作者ID_作者昵称</code></td>
|
||||
<td align="center">false</td>
|
||||
|
||||
@ -237,7 +237,7 @@ async def example():
|
||||
live_download = False # 图文动图文件下载开关
|
||||
download_record = True # 是否记录下载成功的作品 ID
|
||||
language = "zh_CN" # 设置程序提示语言
|
||||
account_archive = True # 是否将每个作者的作品存至单独的文件夹
|
||||
author_archive = True # 是否将每个作者的作品存至单独的文件夹
|
||||
read_cookie = None # 读取浏览器 Cookie,支持设置浏览器名称(字符串)或者浏览器序号(整数),设置为 None 代表不读取
|
||||
|
||||
# async with XHS() as xhs:
|
||||
@ -262,7 +262,7 @@ async def example():
|
||||
download_record=download_record,
|
||||
language=language,
|
||||
read_cookie=read_cookie,
|
||||
account_archive=account_archive,
|
||||
author_archive=author_archive,
|
||||
) as xhs: # 使用自定义参数
|
||||
download = True # 是否下载作品文件,默认值:False
|
||||
# 返回作品详细信息,包括下载地址
|
||||
@ -386,7 +386,7 @@ async def example():
|
||||
<td align="center">true</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center">account_archive</td>
|
||||
<td align="center">author_archive</td>
|
||||
<td align="center">bool</td>
|
||||
<td align="center">Whether to save each author's works into a separate folder; The folder name is <code>authorID_nickname</code></td>
|
||||
<td align="center">false</td>
|
||||
|
||||
@ -28,7 +28,7 @@ async def example():
|
||||
live_download = False # 图文动图文件下载开关
|
||||
download_record = True # 是否记录下载成功的作品 ID
|
||||
language = "zh_CN" # 设置程序提示语言
|
||||
account_archive = True # 是否将每个作者的作品存至单独的文件夹
|
||||
author_archive = True # 是否将每个作者的作品存至单独的文件夹
|
||||
read_cookie = None # 读取浏览器 Cookie,支持设置浏览器名称(字符串)或者浏览器序号(整数),设置为 None 代表不读取
|
||||
|
||||
# async with XHS() as xhs:
|
||||
@ -53,7 +53,7 @@ async def example():
|
||||
download_record=download_record,
|
||||
language=language,
|
||||
read_cookie=read_cookie,
|
||||
account_archive=account_archive,
|
||||
author_archive=author_archive,
|
||||
) as xhs: # 使用自定义参数
|
||||
download = True # 是否下载作品文件,默认值:False
|
||||
# 返回作品详细信息,包括下载地址
|
||||
|
||||
@ -166,6 +166,12 @@ class CLI:
|
||||
"bool",
|
||||
_("是否将每个作品的文件储存至单独的文件夹"),
|
||||
),
|
||||
(
|
||||
"--author_archive",
|
||||
"-aa",
|
||||
"bool",
|
||||
_("是否将每个作者的作品储存至单独的文件夹"),
|
||||
),
|
||||
("--language", "-l", "choice", _("设置程序语言,目前支持:zh_CN、en_US")),
|
||||
("--settings", "-s", "str", _("读取指定配置文件")),
|
||||
(
|
||||
@ -279,6 +285,11 @@ class CLI:
|
||||
"-fm",
|
||||
type=bool,
|
||||
)
|
||||
@option(
|
||||
"--author_archive",
|
||||
"-aa",
|
||||
type=bool,
|
||||
)
|
||||
@option(
|
||||
"--language",
|
||||
"-l",
|
||||
|
||||
@ -159,8 +159,8 @@ class Setting(Screen):
|
||||
),
|
||||
Checkbox(
|
||||
_("作者归档保存模式"),
|
||||
id="account_archive",
|
||||
value=self.data["account_archive"],
|
||||
id="author_archive",
|
||||
value=self.data["author_archive"],
|
||||
),
|
||||
classes="horizontal-layout",
|
||||
),
|
||||
@ -234,7 +234,7 @@ class Setting(Screen):
|
||||
"video_download": self.query_one("#video_download").value,
|
||||
"live_download": self.query_one("#live_download").value,
|
||||
"download_record": self.query_one("#download_record").value,
|
||||
"account_archive": self.query_one("#account_archive").value,
|
||||
"author_archive": self.query_one("#author_archive").value,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@ -103,7 +103,7 @@ class XHS:
|
||||
live_download=False,
|
||||
folder_mode=False,
|
||||
download_record=True,
|
||||
account_archive=False,
|
||||
author_archive=False,
|
||||
language="zh_CN",
|
||||
read_cookie: int | str = None,
|
||||
_print: bool = True,
|
||||
@ -129,7 +129,7 @@ class XHS:
|
||||
live_download,
|
||||
download_record,
|
||||
folder_mode,
|
||||
account_archive,
|
||||
author_archive,
|
||||
_print,
|
||||
)
|
||||
self.html = Html(self.manager)
|
||||
|
||||
@ -63,7 +63,7 @@ class Download:
|
||||
self.image_download = manager.image_download
|
||||
self.video_download = manager.video_download
|
||||
self.live_download = manager.live_download
|
||||
self.account_archive = manager.account_archive
|
||||
self.author_archive = manager.author_archive
|
||||
|
||||
async def run(
|
||||
self,
|
||||
@ -110,7 +110,7 @@ class Download:
|
||||
return path, tasks
|
||||
|
||||
def __generate_path(self, nickname:str, filename: str):
|
||||
if self.account_archive:
|
||||
if self.author_archive:
|
||||
folder = self.folder.joinpath(nickname)
|
||||
folder.mkdir(exist_ok=True)
|
||||
else:
|
||||
|
||||
@ -65,7 +65,7 @@ class Manager:
|
||||
live_download: bool,
|
||||
download_record: bool,
|
||||
folder_mode: bool,
|
||||
account_archive:bool,
|
||||
author_archive:bool,
|
||||
_print: bool,
|
||||
):
|
||||
self.root = root
|
||||
@ -116,7 +116,7 @@ class Manager:
|
||||
self.image_download = self.check_bool(image_download, True)
|
||||
self.video_download = self.check_bool(video_download, True)
|
||||
self.live_download = self.check_bool(live_download, True)
|
||||
self.account_archive = self.check_bool(account_archive, False)
|
||||
self.author_archive = self.check_bool(author_archive, False)
|
||||
|
||||
def __check_path(self, path: str) -> Path:
|
||||
if not path:
|
||||
|
||||
@ -27,7 +27,7 @@ class Settings:
|
||||
"live_download": False,
|
||||
"folder_mode": False,
|
||||
"download_record": True,
|
||||
"account_archive": False,
|
||||
"author_archive": False,
|
||||
"language": "zh_CN",
|
||||
}
|
||||
encode = "UTF-8-SIG" if system() == "Windows" else "UTF-8"
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
**注意:**
|
||||
|
||||
<p><strong>配置文件新增参数 <code>account_archive</code>,旧版本更新需要手动添加配置内容:<code>"account_archive": false</code>;或者直接删除旧版配置文件后再运行程序!</strong></p>
|
||||
<p><strong>配置文件新增参数 <code>author_archive</code>,旧版本更新需要手动添加配置内容:<code>"author_archive": false</code>;或者直接删除旧版配置文件后再运行程序!</strong></p>
|
||||
|
||||
*****
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user