From ebf6d3063caef1a73dd9f0e00d2f11a2bdd789b0 Mon Sep 17 00:00:00 2001
From: yzqzss <yzqzss@yandex.com>
Date: Tue, 18 Jul 2023 12:03:29 +0800
Subject: [PATCH] cli: update_existing

---
 biliarchiver/_biliarchiver_upload_bvid.py | 10 +++++-----
 biliarchiver/cli_tools/bili_upload.py     |  9 +++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/biliarchiver/_biliarchiver_upload_bvid.py b/biliarchiver/_biliarchiver_upload_bvid.py
index 503bbf6..ad30f37 100644
--- a/biliarchiver/_biliarchiver_upload_bvid.py
+++ b/biliarchiver/_biliarchiver_upload_bvid.py
@@ -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)')
diff --git a/biliarchiver/cli_tools/bili_upload.py b/biliarchiver/cli_tools/bili_upload.py
index 945c5f9..553e107 100644
--- a/biliarchiver/cli_tools/bili_upload.py
+++ b/biliarchiver/cli_tools/bili_upload.py
@@ -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()
\ No newline at end of file