diff --git a/biliarchiver/_biliarchiver_upload_bvid.py b/biliarchiver/_biliarchiver_upload_bvid.py index 860b09f..42204c1 100644 --- a/biliarchiver/_biliarchiver_upload_bvid.py +++ b/biliarchiver/_biliarchiver_upload_bvid.py @@ -69,16 +69,16 @@ def _upload_bvid(bvid: str, create_redirect_item: bool=False): if file.startswith('_'): continue filedict[filename] = file - - for filename in os.listdir(f'{OLD_videos_basepath}/{local_identifier}'): - file = f'{OLD_videos_basepath}/{local_identifier}/{filename}' - if os.path.isfile(file): - if os.path.basename(file).startswith('_'): - continue - if not os.path.isfile(file): - continue - filedict[filename] = file break + + # for filename in os.listdir(f'{OLD_videos_basepath}/{local_identifier}'): + # file = f'{OLD_videos_basepath}/{local_identifier}/{filename}' + # if os.path.isfile(file): + # if os.path.basename(file).startswith('_'): + # continue + # if not os.path.isfile(file): + # continue + # filedict[filename] = file # IA 去重 diff --git a/biliarchiver/bili_upload.py b/biliarchiver/bili_upload.py index ef89212..9704ecd 100644 --- a/biliarchiver/bili_upload.py +++ b/biliarchiver/bili_upload.py @@ -30,14 +30,15 @@ def parse_args(): def main(): args = parse_args() if args.by_storage_home_dir: - for bvid_with_upper_part in os.listdir(config.storage_home_dir / 'videos'): - bvid = bvid_with_upper_part - if '-' in bvid_with_upper_part: - bvid = bvid_with_upper_part.split('-')[0] - create_redirect_item = True - else: - print('Skipping', bvid) + for bvid_raw in os.listdir(config.storage_home_dir / 'videos'): + if '-' in bvid_raw: + bvid_with_upper_part = bvid_raw.split('-')[0] + print('Skipping', bvid_with_upper_part) + bvid = bvid_with_upper_part continue + else: + bvid = bvid_raw + create_redirect_item = True upload_bvid(bvid, create_redirect_item)