From 7307105dcd323968d43a5d4c1b2a2abbbef8ac9f Mon Sep 17 00:00:00 2001 From: jxxghp Date: Fri, 1 Sep 2023 11:01:13 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E7=AB=99=E7=82=B9=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=94=AF=E6=8C=81Rousi=E3=80=81=E8=9D=B4=E8=9D=B6=E3=80=81Open?= =?UTF-8?q?CD=20-=20=E7=94=B5=E5=BD=B1=E6=90=9C=E7=B4=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E7=BA=AA=E5=BD=95=E7=89=87=E7=B1=BB=E5=9E=8B=20-=20?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE=E8=87=AA=E5=BB=BAOCR?= =?UTF-8?q?=E8=AF=86=E5=88=AB=E6=9C=8D=E5=8A=A1=E5=9C=B0=E5=9D=80=20-=20?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=99=A8=E7=9B=91=E6=8E=A7=E3=80=81=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E6=95=B4=E7=90=86=E6=8C=89=E6=96=87=E4=BB=B6=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=20-=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BA=86=E4=B8=8B=E8=BD=BD=E5=99=A8=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8F=92=E4=BB=B6=EF=BC=8C=E5=8F=AF=E5=B0=86?= =?UTF-8?q?=E9=9D=9EMoviePilot=E6=B7=BB=E5=8A=A0=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1=E6=96=87=E4=BB=B6=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=EF=BC=8C=E4=BB=A5=E4=BE=BF=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=96=87=E4=BB=B6=E6=97=B6=E8=81=94=E5=8A=A8=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=B8=8B=E8=BD=BD=E4=BB=BB=E5=8A=A1=20-=20=E6=95=B4?= =?UTF-8?q?=E7=90=86=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C=20-=20=E6=92=AD=E6=94=BE?= =?UTF-8?q?=E9=99=90=E9=80=9F=E6=8F=92=E4=BB=B6=E6=94=AF=E6=8C=81=E6=99=BA?= =?UTF-8?q?=E8=83=BD=E9=99=90=E9=80=9F=20-=20=E5=88=AE=E5=89=8A=E6=B5=B7?= =?UTF-8?q?=E6=8A=A5=E4=BC=98=E5=85=88=E4=BD=BF=E7=94=A8TMDB=E5=9B=BE?= =?UTF-8?q?=E7=89=87=20-=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=86=A8=E6=86=A8?= =?UTF-8?q?=E7=AB=99=E7=82=B9=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=20-=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=BF=87=E6=BB=A4=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=B8=85=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20-=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E8=AE=A2=E9=98=85=E5=B7=B2=E5=A4=84=E7=90=86=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E7=9A=84=E9=97=AE=E9=A2=98=20-=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=BA=86Slack=E6=B6=88=E6=81=AF=E8=BF=87=E9=95=BF?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=8F=91=E9=80=81=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20-=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=8A=A8?= =?UTF-8?q?=E6=BC=AB=E7=8B=AC=E7=AB=8B=E7=9B=AE=E5=BD=95=E6=97=B6=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E4=B8=A4=E7=BA=A7=E7=9B=AE=E5=BD=95=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20-=20=E8=B0=83=E6=95=B4=E4=BA=86=E6=9A=97=E9=BB=91?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E7=9A=84UI=E9=85=8D=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/endpoints/history.py | 3 ++- app/core/context.py | 6 ++++++ app/modules/fanart/__init__.py | 5 ++++- version.py | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/api/endpoints/history.py b/app/api/endpoints/history.py index 3c110876..c71800a4 100644 --- a/app/api/endpoints/history.py +++ b/app/api/endpoints/history.py @@ -74,7 +74,8 @@ def delete_transfer_history(history_in: schemas.TransferHistory, if not history: return schemas.Response(success=False, msg="记录不存在") # 册除文件 - TransferChain(db).delete_files(Path(history.dest)) + if history.dest: + TransferChain(db).delete_files(Path(history.dest)) # 删除记录 TransferHistory.delete(db, history_in.id) return schemas.Response(success=True) diff --git a/app/core/context.py b/app/core/context.py index 702848a6..a1877433 100644 --- a/app/core/context.py +++ b/app/core/context.py @@ -252,6 +252,12 @@ class MediaInfo: """ setattr(self, f"{name}_path", image) + def get_image(self, name: str): + """ + 获取图片地址 + """ + return getattr(self, f"{name}_path") + def set_category(self, cat: str): """ 设置二级分类 diff --git a/app/modules/fanart/__init__.py b/app/modules/fanart/__init__.py index 2b2f9109..a783174f 100644 --- a/app/modules/fanart/__init__.py +++ b/app/modules/fanart/__init__.py @@ -47,7 +47,10 @@ class FanartModule(_ModuleBase): continue # 按欢迎程度倒排 images.sort(key=lambda x: int(x.get('likes', 0)), reverse=True) - mediainfo.set_image(self.__name(name), images[0].get('url')) + # 图片属性xx_path + image_name = self.__name(name) + if not mediainfo.get_image(image_name): + mediainfo.set_image(image_name, images[0].get('url')) return mediainfo diff --git a/version.py b/version.py index 81922b1e..34f2fd14 100644 --- a/version.py +++ b/version.py @@ -1 +1 @@ -APP_VERSION = 'v1.0.10' +APP_VERSION = 'v1.1.0'