From e675e4358a03caaa900a5a26abea844145fdaa82 Mon Sep 17 00:00:00 2001
From: thsrite <thsrite@gmail.com>
Date: Wed, 13 Sep 2023 12:35:09 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=90=8C=E6=AD=A5=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/db/models/transferhistory.py     | 37 +++++++++++++++++-----------
 app/plugins/mediasyncdel/__init__.py | 13 ++++------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/app/db/models/transferhistory.py b/app/db/models/transferhistory.py
index 88e172bb..b231af5b 100644
--- a/app/db/models/transferhistory.py
+++ b/app/db/models/transferhistory.py
@@ -93,24 +93,28 @@ class TransferHistory(Base):
         """
         # TMDBID + 类型
         if tmdbid and mtype:
+            # 电视剧某季某集
             if season and episode:
-                # 查询一集
                 return db.query(TransferHistory).filter(TransferHistory.tmdbid == tmdbid,
                                                         TransferHistory.type == mtype,
                                                         TransferHistory.seasons == season,
                                                         TransferHistory.episodes == episode,
                                                         TransferHistory.dest == dest).all()
+            # 电视剧某季
             elif season:
-                # 查询一季
                 return db.query(TransferHistory).filter(TransferHistory.tmdbid == tmdbid,
                                                         TransferHistory.type == mtype,
-                                                        TransferHistory.seasons == season,
-                                                        TransferHistory.dest == dest).all()
+                                                        TransferHistory.seasons == season).all()
             else:
-                # 查询所有
-                return db.query(TransferHistory).filter(TransferHistory.tmdbid == tmdbid,
-                                                        TransferHistory.type == mtype,
-                                                        TransferHistory.dest == dest).all()
+                if dest:
+                    # 电影
+                    return db.query(TransferHistory).filter(TransferHistory.tmdbid == tmdbid,
+                                                            TransferHistory.type == mtype,
+                                                            TransferHistory.dest == dest).all()
+                else:
+                    # 电视剧所有季集
+                    return db.query(TransferHistory).filter(TransferHistory.tmdbid == tmdbid,
+                                                            TransferHistory.type == mtype).all()
         # 标题 + 年份
         elif title and year:
             # 电视剧某季某集
@@ -124,14 +128,17 @@ class TransferHistory(Base):
             elif season:
                 return db.query(TransferHistory).filter(TransferHistory.title == title,
                                                         TransferHistory.year == year,
-                                                        TransferHistory.seasons == season,
-                                                        TransferHistory.dest == dest).all()
-            # 电视剧所有季集｜电影
+                                                        TransferHistory.seasons == season).all()
             else:
-                return db.query(TransferHistory).filter(TransferHistory.title == title,
-                                                        TransferHistory.year == year,
-                                                        TransferHistory.dest == dest).all()
-
+                if dest:
+                    # 电影
+                    return db.query(TransferHistory).filter(TransferHistory.title == title,
+                                                            TransferHistory.year == year,
+                                                            TransferHistory.dest == dest).all()
+                else:
+                    # 电视剧所有季集
+                    return db.query(TransferHistory).filter(TransferHistory.title == title,
+                                                            TransferHistory.year == year).all()
         return []
 
     @staticmethod
diff --git a/app/plugins/mediasyncdel/__init__.py b/app/plugins/mediasyncdel/__init__.py
index 5e410c33..5caab2ee 100644
--- a/app/plugins/mediasyncdel/__init__.py
+++ b/app/plugins/mediasyncdel/__init__.py
@@ -502,6 +502,7 @@ class MediaSyncDel(_PluginBase):
                 "enabled": False,
                 "del_source": self._del_source,
                 "exclude_path": self._exclude_path,
+                "library_path": self._library_path,
                 "notify": self._notify,
                 "cron": self._cron,
                 "sync_type": self._sync_type,
@@ -679,8 +680,7 @@ class MediaSyncDel(_PluginBase):
         elif mtype == MediaType.TV and not season_num and not episode_num:
             msg = f'剧集 {media_name} {tmdb_id}'
             transfer_history: List[TransferHistory] = self._transferhis.get_by(tmdbid=tmdb_id,
-                                                                               mtype=mtype.value,
-                                                                               dest=media_path)
+                                                                               mtype=mtype.value)
         # 删除季 S02
         elif mtype == MediaType.TV and season_num and not episode_num:
             if not season_num or not str(season_num).isdigit():
@@ -689,8 +689,7 @@ class MediaSyncDel(_PluginBase):
             msg = f'剧集 {media_name} S{season_num} {tmdb_id}'
             transfer_history: List[TransferHistory] = self._transferhis.get_by(tmdbid=tmdb_id,
                                                                                mtype=mtype.value,
-                                                                               season=f'S{season_num}',
-                                                                               dest=media_path)
+                                                                               season=f'S{season_num}')
         # 删除剧集S02E02
         elif mtype == MediaType.TV and season_num and episode_num:
             if not season_num or not str(season_num).isdigit() or not episode_num or not str(episode_num).isdigit():
@@ -774,16 +773,14 @@ class MediaSyncDel(_PluginBase):
                 msg = f'剧集 {media_name}'
                 transfer_history: List[TransferHistory] = self._transferhis.get_by(
                     title=media_name,
-                    year=media_year,
-                    dest=media_path)
+                    year=media_year)
             # 删除季 S02
             elif media_type == "Season":
                 msg = f'剧集 {media_name} {media_season}'
                 transfer_history: List[TransferHistory] = self._transferhis.get_by(
                     title=media_name,
                     year=media_year,
-                    season=media_season,
-                    dest=media_path)
+                    season=media_season)
             # 删除剧集S02E02
             elif media_type == "Episode":
                 msg = f'剧集 {media_name} {media_season}{media_episode}'