From cc66587d2d02cd2b7491a41ce925f68fd44a022a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=81=A24=2E435km/s?= <54017765+CoolZxp@users.noreply.github.com> Date: Sat, 4 May 2024 20:44:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9=20(#910)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 使上传转载来源生效 修复手动上传时未填写转载来源无默认值 --- app/lib/api-streamer.ts | 2 +- app/ui/TemplateFields.tsx | 11 ++++++++--- app/upload-manager/add/page.tsx | 2 +- app/upload-manager/edit/page.tsx | 2 +- biliup/database/models.py | 3 ++- biliup/plugins/biliuprs.py | 9 +++++---- biliup/plugins/stream_gears.py | 6 ++++-- 7 files changed, 22 insertions(+), 13 deletions(-) diff --git a/app/lib/api-streamer.ts b/app/lib/api-streamer.ts index 7b19888..b7d157d 100644 --- a/app/lib/api-streamer.ts +++ b/app/lib/api-streamer.ts @@ -69,7 +69,7 @@ export interface StudioEntity { template_name: string; user_cookie: string; copyright: number; - source: string; + copyright_source: string; tid: number; cover_path: string; title: string; diff --git a/app/ui/TemplateFields.tsx b/app/ui/TemplateFields.tsx index 04ac269..6c6a9e3 100644 --- a/app/ui/TemplateFields.tsx +++ b/app/ui/TemplateFields.tsx @@ -123,12 +123,17 @@ const TemplateFields: React.FC = ({ formState, formApi, values }) = label='类型' direction='vertical' initValue={formApi.getValue('copyright') || 2} + extraText={ +
+ 如不填写转载来源默认为直播间地址 +
+ } > - + 转载 - formApi.setValue('copyright', 2)} placeholder="转载视频请注明来源（例：转自http://www.xx.com/yy）注明来源会更快地通过审核哦" noLabel fieldStyle={{padding: 0, marginLeft: 24, width: 560}}/> + formApi.setValue('copyright', 2)} placeholder="转载视频请注明来源（例：转自http://www.xx.com/yy）注明来源会更快地通过审核哦" noLabel fieldStyle={{padding: 0, marginLeft: 24, width: 560}} /> -
formApi.setValue('source', '')}> +
formApi.setValue('copyright_source', '')}> 自制
diff --git a/app/upload-manager/add/page.tsx b/app/upload-manager/add/page.tsx index 5213f8c..ca33e0f 100644 --- a/app/upload-manager/add/page.tsx +++ b/app/upload-manager/add/page.tsx @@ -47,7 +47,7 @@ export default function Add() { user_cookie: values.user_cookie, copyright: values.copyright, id: values.id, - source: values.source ?? '', + copyright_source: values.copyright_source ?? '', tid: values.tid[1], cover_path: values.cover_path ?? '', title: values.title ?? '', diff --git a/app/upload-manager/edit/page.tsx b/app/upload-manager/edit/page.tsx index 5c24b35..d494c86 100644 --- a/app/upload-manager/edit/page.tsx +++ b/app/upload-manager/edit/page.tsx @@ -60,7 +60,7 @@ const Edit = () => { user_cookie: values?.user_cookie, copyright: values?.copyright, id: values?.id, - source: values?.source ?? '', + copyright_source: values?.copyright_source ?? '', tid: values?.tid[1], cover_path: values?.cover_path ?? '', title: values?.title ?? '', diff --git a/biliup/database/models.py b/biliup/database/models.py index c3a5ba8..c7aec6a 100644 --- a/biliup/database/models.py +++ b/biliup/database/models.py @@ -111,7 +111,8 @@ class UploadStreamers(BaseModel): title: Mapped[str] = mapped_column( nullable=True) # 自定义标题的时间格式, {title}代表当场直播间标题 {streamer}代表在本config里面设置的主播名称 {url}代表设置的该主播的第一条直播间链接 tid: Mapped[int] = mapped_column(nullable=True) # 投稿分区码,171为电子竞技分区 - copyright: Mapped[int] = mapped_column(nullable=True) # 1为自制 + copyright: Mapped[int] = mapped_column(nullable=True) # 1为自制 2转载 + copyright_source: Mapped[str] = mapped_column(nullable=True) # 转载来源 cover_path: Mapped[str] = mapped_column(nullable=True) # 封面路径 # 支持strftime, {title}, {streamer}, {url}占位符。 description = mapped_column(TEXT(), nullable=True) # 视频简介 diff --git a/biliup/plugins/biliuprs.py b/biliup/plugins/biliuprs.py index c17ec3d..4319acd 100644 --- a/biliup/plugins/biliuprs.py +++ b/biliup/plugins/biliuprs.py @@ -13,8 +13,8 @@ class BiliWeb(UploadBase): def __init__( self, principal, data, submit_api=None, copyright=2, postprocessor=None, dtime=None, dynamic='', lines='AUTO', threads=3, tid=122, tags=None, cover_path=None, description='', - dolby=0, hires=0, no_reprint=0, open_elec=0, credits=[], - user_cookie='cookies.json' + dolby=0, hires=0, no_reprint=0, open_elec=0, credits=None, + user_cookie='cookies.json', copyright_source=None ): super().__init__(principal, data, persistence_path='bili.cookie', postprocessor=postprocessor) if tags is None: @@ -33,7 +33,7 @@ class BiliWeb(UploadBase): else: self.cover_path = None self.desc = description - self.credits = credits + self.credits = credits if credits else [] self.dynamic = dynamic self.copyright = copyright self.dtime = dtime @@ -42,6 +42,7 @@ class BiliWeb(UploadBase): self.no_reprint = no_reprint self.open_elec = open_elec self.user_cookie = user_cookie + self.copyright_source = copyright_source def upload(self, file_list: List[UploadBase.FileInfo]) -> List[UploadBase.FileInfo]: if self.credits: @@ -63,7 +64,7 @@ class BiliWeb(UploadBase): "tid": self.tid, "tag": ','.join(self.tags), "copyright": self.copyright, - "source": self.data["url"] if self.copyright == 2 else "", + "source": self.copyright_source if self.copyright_source else self.data["url"], "desc": self.desc, "dynamic": self.dynamic, "cover": self.cover_path if self.cover_path is not None else "", diff --git a/biliup/plugins/stream_gears.py b/biliup/plugins/stream_gears.py index 2795250..a41acd5 100644 --- a/biliup/plugins/stream_gears.py +++ b/biliup/plugins/stream_gears.py @@ -13,7 +13,7 @@ class BiliWeb(UploadBase): self, principal, data, submit_api=None, copyright=2, postprocessor=None, dtime=None, dynamic='', lines='AUTO', threads=3, tid=122, tags=None, cover_path=None, description='', dolby=0, hires=0, no_reprint=0, open_elec=0, credits=None, - user_cookie='cookies.json' + user_cookie='cookies.json', copyright_source=None ): super().__init__(principal, data, persistence_path='bili.cookie', postprocessor=postprocessor) if credits is None: @@ -41,6 +41,7 @@ class BiliWeb(UploadBase): self.no_reprint = no_reprint self.open_elec = open_elec self.user_cookie = user_cookie + self.copyright_source = copyright_source def upload(self, file_list) -> List[UploadBase.FileInfo]: line = None @@ -65,7 +66,8 @@ class BiliWeb(UploadBase): "biz_id": "", "type": 1 }] - source = self.data["url"] if self.copyright == 2 else "" + + source = self.copyright_source if self.copyright_source else "https://github.com/biliup/biliup" cover = self.cover_path if self.cover_path is not None else "" dtime = None if self.dtime: