From 6a4013edd08c6e5cbca058820bd79543ee0bdff6 Mon Sep 17 00:00:00 2001 From: yzqzss Date: Sat, 3 Jun 2023 04:32:11 +0800 Subject: [PATCH] rename biliarchiver --- .gitignore | 4 ++-- README.md | 2 +- ...up_archive_bvid.py => _biliarchiver_archive_bvid.py | 4 ++-- _biliup_upload_bvid.py => _biliarchiver_upload_bvid.py | 10 +++++----- ...p_archive_bvids.py => biliarchiver_archive_bvids.py | 2 +- ...py => biliarchiver_get_bvids_from_ranking_by_rid.py | 0 ...hiver_upload_to_ia_from_default_biliup_video_dir.py | 9 +++++++++ biliup_upload_to_ia_from_default_biliup_video_dir.py | 9 --------- 8 files changed, 20 insertions(+), 20 deletions(-) rename _biliup_archive_bvid.py => _biliarchiver_archive_bvid.py (97%) rename _biliup_upload_bvid.py => _biliarchiver_upload_bvid.py (95%) rename biliup_archive_bvids.py => biliarchiver_archive_bvids.py (96%) rename biliup_get_bvids_from_ranking_by_rid.py => biliarchiver_get_bvids_from_ranking_by_rid.py (100%) create mode 100644 biliarchiver_upload_to_ia_from_default_biliup_video_dir.py delete mode 100644 biliup_upload_to_ia_from_default_biliup_video_dir.py diff --git a/.gitignore b/.gitignore index 3c962ac..3ed2ef8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ -biliup/ +biliarchiver/ bvids/ sess_data.txt -biliup.home +biliarchiver.home .venv/ __pycache__/ videos/ \ No newline at end of file diff --git a/README.md b/README.md index f5908bf..788cd1f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# biliup +# biliarchiver ## 基于 bilix 的 BiliBili 存档工具 diff --git a/_biliup_archive_bvid.py b/_biliarchiver_archive_bvid.py similarity index 97% rename from _biliup_archive_bvid.py rename to _biliarchiver_archive_bvid.py index 5eee4ec..914afbd 100644 --- a/_biliup_archive_bvid.py +++ b/_biliarchiver_archive_bvid.py @@ -37,9 +37,9 @@ api.get_subtitle_info = new_get_subtitle_info async def archive_bvid(d: DownloaderBilibili, bvid: str): assert d.hierarchy is True, 'hierarchy 必须为 True' # 为保持后续目录结构、文件命名的一致性 assert d.client.cookies.get('SESSDATA') is not None, 'sess_data 不能为空' # 开个大会员呗,能下 4k 呢。 - assert os.path.exists('biliup.home'), '先创建 biliup.home 文件' # 防误操作 + assert os.path.exists('biliarchiver.home'), '先创建 biliarchiver.home 文件' # 防误操作 - videos_basepath = f'biliup/videos/{bvid}' + videos_basepath = f'biliarchiver/videos/{bvid}' if os.path.exists(f'{videos_basepath}/_all_downloaded.mark'): print(f'{bvid} 所有分p都已下载过了') return diff --git a/_biliup_upload_bvid.py b/_biliarchiver_upload_bvid.py similarity index 95% rename from _biliup_upload_bvid.py rename to _biliarchiver_upload_bvid.py index e7a4d2f..0551e45 100644 --- a/_biliup_upload_bvid.py +++ b/_biliarchiver_upload_bvid.py @@ -4,15 +4,15 @@ import time from internetarchive import get_item from rich import print -from _biliup_archive_bvid import BILIBILI_IDENTIFIER_PERFIX +from _biliarchiver_archive_bvid import BILIBILI_IDENTIFIER_PERFIX def upload_bvid(bvid): - if not os.path.exists('biliup.home'): - raise Exception('先创建 biliup.home 文件') + if not os.path.exists('biliarchiver.home'): + raise Exception('先创建 biliarchiver.home 文件') access_key, secret_key = read_ia_keys(os.path.expanduser('~/.bili_ia_keys.txt')) # sample: BiliBili-BV1Zh4y1x7RL_p3 - videos_basepath = f'biliup/videos/{bvid}' + videos_basepath = f'biliarchiver/videos/{bvid}' for identifier in os.listdir(videos_basepath): if os.path.exists(f'{videos_basepath}/{identifier}/_uploaded.mark'): print(f'{identifier} 已经上传过了(_uploaded.mark)') @@ -96,7 +96,7 @@ def upload_bvid(bvid): ), # Keywords should be separated by ; but it doesn't matter much; the alternative is to set one per field with subject[0], subject[1], ... "upload-state": "uploading", 'originalurl': f'https://www.bilibili.com/video/{bvid}/?p={pid}', - 'scanner': 'biliup v2233.0.4 (dev)', + 'scanner': 'biliarchiver v2233.0.4 (dev)', } print(filedict) print(md) diff --git a/biliup_archive_bvids.py b/biliarchiver_archive_bvids.py similarity index 96% rename from biliup_archive_bvids.py rename to biliarchiver_archive_bvids.py index 8fbf242..152c0e5 100644 --- a/biliup_archive_bvids.py +++ b/biliarchiver_archive_bvids.py @@ -2,7 +2,7 @@ import asyncio import os import argparse -from _biliup_archive_bvid import archive_bvid +from _biliarchiver_archive_bvid import archive_bvid from bilix.sites.bilibili.downloader import DownloaderBilibili from rich.console import Console diff --git a/biliup_get_bvids_from_ranking_by_rid.py b/biliarchiver_get_bvids_from_ranking_by_rid.py similarity index 100% rename from biliup_get_bvids_from_ranking_by_rid.py rename to biliarchiver_get_bvids_from_ranking_by_rid.py diff --git a/biliarchiver_upload_to_ia_from_default_biliup_video_dir.py b/biliarchiver_upload_to_ia_from_default_biliup_video_dir.py new file mode 100644 index 0000000..2e00f6e --- /dev/null +++ b/biliarchiver_upload_to_ia_from_default_biliup_video_dir.py @@ -0,0 +1,9 @@ +from _biliarchiver_upload_bvid import upload_bvid +import os + +def main(): + for bvid in os.listdir('biliarchiver/videos'): + upload_bvid(bvid) + +if __name__ == '__main__': + main() \ No newline at end of file diff --git a/biliup_upload_to_ia_from_default_biliup_video_dir.py b/biliup_upload_to_ia_from_default_biliup_video_dir.py deleted file mode 100644 index 0357a84..0000000 --- a/biliup_upload_to_ia_from_default_biliup_video_dir.py +++ /dev/null @@ -1,9 +0,0 @@ -from _biliup_upload_bvid import upload_bvid -import os - -def main(): - for bvid in os.listdir('biliup/videos'): - upload_bvid(bvid) - -if __name__ == '__main__': - main() \ No newline at end of file