diff --git a/README-en.md b/README-en.md index d5a962b..329bc8e 100644 --- a/README-en.md +++ b/README-en.md @@ -181,7 +181,7 @@ LoginController().logout_bilibili() LoginController().check_bilibili_login() # Upload -UploadController().upload_video_entry(video_path: str, yaml: str, line: str, copyright: int, tid: int, title: str, desc: str, tag: str, source: str, cover: str, dynamic: str, cdn: str) +UploadController().upload_video_entry(video_path: str, yaml: str, line: str, tid: int, title: str, desc: str, tag: str, source: str, cover: str, dynamic: str, cdn: str) # Append UploadController().append_video_entry(video_path: str, bvid: str, cdn: str) diff --git a/README.md b/README.md index 71e9333..fc093cd 100644 --- a/README.md +++ b/README.md @@ -180,7 +180,7 @@ LoginController().logout_bilibili() LoginController().check_bilibili_login() # 上传 -UploadController().upload_video_entry(video_path: str, yaml: str, copyright: int, tid: int, title: str, desc: str, tag: str, source: str, cover: str, dynamic: str, cdn: str) +UploadController().upload_video_entry(video_path: str, yaml: str, tid: int, title: str, desc: str, tag: str, source: str, cover: str, dynamic: str, cdn: str) # 追加投稿(分p) UploadController().append_video_entry(video_path: str, bvid: str, cdn: str) diff --git a/bilitool/cli.py b/bilitool/cli.py index 0d6ba50..5f2b92f 100644 --- a/bilitool/cli.py +++ b/bilitool/cli.py @@ -63,12 +63,6 @@ def cli(): default="", help="The path to yaml file(if yaml file is provided, the arguments below will be ignored)", ) - upload_parser.add_argument( - "--copyright", - type=int, - default=2, - help="(default is 2) 1 for original, 2 for reprint", - ) upload_parser.add_argument( "--title", default="", help="(default is video name) The title of video" ) @@ -200,7 +194,6 @@ def cli(): UploadController().upload_video_entry( args.video_path, args.yaml, - args.copyright, args.tid, args.title, args.desc, diff --git a/bilitool/controller/upload_controller.py b/bilitool/controller/upload_controller.py index 5b807ab..6efd55e 100644 --- a/bilitool/controller/upload_controller.py +++ b/bilitool/controller/upload_controller.py @@ -16,10 +16,9 @@ def __init__(self): @staticmethod def package_upload_metadata( - copyright, tid, title, desc, tag, source, cover, dynamic + tid, title, desc, tag, source, cover, dynamic ): return { - "copyright": copyright, "tid": tid, "title": title, "desc": desc, @@ -138,7 +137,6 @@ def upload_video_entry( self, video_path, yaml, - copyright, tid, title, desc, @@ -153,7 +151,7 @@ def upload_video_entry( upload_metadata = self.package_upload_metadata(*parse_yaml(yaml)) else: upload_metadata = self.package_upload_metadata( - copyright, tid, title, desc, tag, source, cover, dynamic + tid, title, desc, tag, source, cover, dynamic ) if upload_metadata["cover"]: upload_metadata["cover"] = self.bili_uploader.cover_up( diff --git a/bilitool/utils/parse_yaml.py b/bilitool/utils/parse_yaml.py index a6991f4..548a430 100644 --- a/bilitool/utils/parse_yaml.py +++ b/bilitool/utils/parse_yaml.py @@ -8,7 +8,6 @@ def parse_yaml(yaml_path): data = yaml.safe_load(file) # Assuming there's only one streamer entry - copyright = data.get("copyright") tid = data.get("tid") title = data.get("title") desc = data.get("desc") @@ -16,7 +15,7 @@ def parse_yaml(yaml_path): source = data.get("source") cover = data.get("cover") dynamic = data.get("dynamic") - return copyright, tid, title, desc, tag, source, cover, dynamic + return tid, title, desc, tag, source, cover, dynamic if __name__ == "__main__": diff --git a/docs/upload.md b/docs/upload.md index 4c1dedc..2268e47 100644 --- a/docs/upload.md +++ b/docs/upload.md @@ -5,7 +5,7 @@ `bilitool upload -h ` 打印帮助信息: ```bash -usage: bilitool upload [-h] [-y YAML] [--copyright COPYRIGHT] [--title TITLE] [--desc DESC] [--tid TID] [--tag TAG] [--source SOURCE] [--cover COVER] +usage: bilitool upload [-h] [-y YAML] [--title TITLE] [--desc DESC] [--tid TID] [--tag TAG] [--source SOURCE] [--cover COVER] [--dynamic DYNAMIC] video_path @@ -15,8 +15,6 @@ positional arguments: options: -h, --help show this help message and exit -y YAML, --yaml YAML The path to yaml file(if yaml file is provided, the arguments below will be ignored) - --copyright COPYRIGHT - (default is 2) 1 for original, 2 for reprint --title TITLE (default is video name) The title of video --desc DESC (default is empty) The description of video --tid TID (default is 138) For more info to the type id, refer to https://biliup.github.io/tid-ref.html diff --git a/template/example-config.yaml b/template/example-config.yaml index 449dfbb..8d88dc7 100644 --- a/template/example-config.yaml +++ b/template/example-config.yaml @@ -1,4 +1,3 @@ -copyright: 1 # the copyright of video (1 for original, 2 for reprint) source: https://live.bilibili.com/xxxxxxxx # the source of video (required if your video is re-print) title: "your video title" desc: "your video description"