saveweb/biliarchiver
1
0
Fork 0
mirror of https://github.com/saveweb/biliarchiver.git synced 2024-09-19 11:05:28 -07:00
Code Issues Packages Projects Releases Wiki Activity

cli: update_existing

Browse Source
This commit is contained in:
yzqzss 2023-07-18 12:03:29 +08:00
parent c5347c4845
commit ebf6d3063c
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
biliarchiver/_biliarchiver_upload_bvid.py
View File

@ -13,12 +13,12 @@ from biliarchiver.config import BILIBILI_IDENTIFIER_PERFIX, config
from biliarchiver.utils.dirLock import UploadLock, AlreadyRunningError
from biliarchiver.version import BILI_ARCHIVER_VERSION
def upload_bvid(bvid):
def upload_bvid(bvid: str, *, update_existing: bool = False):
try:
lock_dir = config.storage_home_dir / '.locks' / bvid
os.makedirs(lock_dir, exist_ok=True)
with UploadLock(lock_dir): # type: ignore
_upload_bvid(bvid)
_upload_bvid(bvid, update_existing=update_existing)
except AlreadyRunningError:
print(f'已经有一个上传 {bvid} 的进程在运行，跳过')
except VideosBasePathNotFoundError:
@ -27,7 +27,7 @@ def upload_bvid(bvid):
print(f'上传 {bvid} 时出错：')
raise e
def _upload_bvid(bvid: str):
def _upload_bvid(bvid: str, *, update_existing: bool = False):
access_key, secret_key = read_ia_keys(config.ia_key_file)
# identifier format: BiliBili-{bvid}_p{pid}-{upper_part}
@ -43,7 +43,7 @@ def _upload_bvid(bvid: str):
raise VideosBasePathNotFoundError(f'{videos_basepath}')
for local_identifier in os.listdir(videos_basepath):
remote_identifier = f'{local_identifier}-{upper_part}'
if os.path.exists(f'{videos_basepath}/{local_identifier}/_uploaded.mark'):
if os.path.exists(f'{videos_basepath}/{local_identifier}/_uploaded.mark') and not update_existing:
print(f'{local_identifier} => {remote_identifier} 已经上传过了(_uploaded.mark)')
continue
if local_identifier.startswith('_') :
@ -61,7 +61,7 @@ def _upload_bvid(bvid: str):
print(f'=== 开始上传 {local_identifier} => {remote_identifier} ===')
item = get_item(remote_identifier)
if item.exists:
if item.exists and not update_existing:
print(f'item {remote_identifier} 已存在(item.exists)')
if item.metadata.get("upload-state") == "uploaded":
print(f'{remote_identifier} 已经上传过了，跳过(item.metadata.uploaded)')

9
biliarchiver/cli_tools/bili_upload.py
View File

@ -10,6 +10,7 @@ from biliarchiver.config import config
class Args:
bvids: str
by_storage_home_dir: bool
update_existing: bool
def parse_args():
@ -22,6 +23,10 @@ def parse_args():
storage_home_dir_group.title = 'storage_home_dir'
storage_home_dir_group.add_argument('--by-storage_home_dir', action='store_true', dest='by_storage_home_dir',
help='从 config.json 中读取 storage_home_dir，然后上传 storage_home_dir/videos 下的所有视频')
update_existing_group = parser.add_argument_group()
update_existing_group.title = 'update_existing'
update_existing_group.add_argument('--update_existing', action='store_true', dest='update_existing',
help='更新已存在的 item')
args = Args(**vars(parser.parse_args()))
@ -35,14 +40,14 @@ def main():
if '-' in bvid_with_upper_part:
bvid = bvid_with_upper_part.split('-')[0]
upload_bvid(bvid)
upload_bvid(bvid, update_existing=args.update_existing)
if args.bvids:
with open(args.bvids, 'r', encoding='utf-8') as f:
bvids_from_file = f.read().splitlines()
for bvid in bvids_from_file:
upload_bvid(bvid)
upload_bvid(bvid, update_existing=args.update_existing)
if __name__ == '__main__':
main()