codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #574 from thsrite/main

Browse Source
This commit is contained in:
jxxghp
2023-09-13 12:36:13 +08:00
committed by GitHub
parent c9a6081a57 e675e4358a
commit 9baa5e1d35
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/db/models/transferhistory.py
View File

@ -93,24 +93,28 @@ class TransferHistory(Base):
""" """
# TMDBID + 类型 # TMDBID + 类型
if tmdbid and mtype: if tmdbid and mtype:
# 电视剧某季某集
if season and episode: if season and episode:
# 查询一集
return db.query(TransferHistory).filter(TransferHistory.tmdbid == tmdbid, return db.query(TransferHistory).filter(TransferHistory.tmdbid == tmdbid,
TransferHistory.type == mtype, TransferHistory.type == mtype,
TransferHistory.seasons == season, TransferHistory.seasons == season,
TransferHistory.episodes == episode, TransferHistory.episodes == episode,
TransferHistory.dest == dest).all() TransferHistory.dest == dest).all()
# 电视剧某季
elif season: elif season:
# 查询一季
return db.query(TransferHistory).filter(TransferHistory.tmdbid == tmdbid, return db.query(TransferHistory).filter(TransferHistory.tmdbid == tmdbid,
TransferHistory.type == mtype, TransferHistory.type == mtype,
TransferHistory.seasons == season, TransferHistory.seasons == season).all()
TransferHistory.dest == dest).all()
else: else:
# 查询所有 if dest:
return db.query(TransferHistory).filter(TransferHistory.tmdbid == tmdbid, # 电影
TransferHistory.type == mtype, return db.query(TransferHistory).filter(TransferHistory.tmdbid == tmdbid,
TransferHistory.dest == dest).all() TransferHistory.type == mtype,
TransferHistory.dest == dest).all()
else:
# 电视剧所有季集
return db.query(TransferHistory).filter(TransferHistory.tmdbid == tmdbid,
TransferHistory.type == mtype).all()
# 标题 + 年份 # 标题 + 年份
elif title and year: elif title and year:
# 电视剧某季某集 # 电视剧某季某集
@ -124,14 +128,17 @@ class TransferHistory(Base):
elif season: elif season:
return db.query(TransferHistory).filter(TransferHistory.title == title, return db.query(TransferHistory).filter(TransferHistory.title == title,
TransferHistory.year == year, TransferHistory.year == year,
TransferHistory.seasons == season, TransferHistory.seasons == season).all()
TransferHistory.dest == dest).all()
# 电视剧所有季集｜电影
else: else:
return db.query(TransferHistory).filter(TransferHistory.title == title, if dest:
TransferHistory.year == year, # 电影
TransferHistory.dest == dest).all() 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 [] return []
@staticmethod @staticmethod

13
app/plugins/mediasyncdel/__init__.py
View File

@ -502,6 +502,7 @@ class MediaSyncDel(_PluginBase):
"enabled": False, "enabled": False,
"del_source": self._del_source, "del_source": self._del_source,
"exclude_path": self._exclude_path, "exclude_path": self._exclude_path,
"library_path": self._library_path,
"notify": self._notify, "notify": self._notify,
"cron": self._cron, "cron": self._cron,
"sync_type": self._sync_type, "sync_type": self._sync_type,
@ -679,8 +680,7 @@ class MediaSyncDel(_PluginBase):
elif mtype == MediaType.TV and not season_num and not episode_num: elif mtype == MediaType.TV and not season_num and not episode_num:
msg = f'剧集 {media_name} {tmdb_id}' msg = f'剧集 {media_name} {tmdb_id}'
transfer_history: List[TransferHistory] = self._transferhis.get_by(tmdbid=tmdb_id, transfer_history: List[TransferHistory] = self._transferhis.get_by(tmdbid=tmdb_id,
mtype=mtype.value, mtype=mtype.value)
dest=media_path)
# 删除季 S02 # 删除季 S02
elif mtype == MediaType.TV and season_num and not episode_num: elif mtype == MediaType.TV and season_num and not episode_num:
if not season_num or not str(season_num).isdigit(): 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}' msg = f'剧集 {media_name} S{season_num} {tmdb_id}'
transfer_history: List[TransferHistory] = self._transferhis.get_by(tmdbid=tmdb_id, transfer_history: List[TransferHistory] = self._transferhis.get_by(tmdbid=tmdb_id,
mtype=mtype.value, mtype=mtype.value,
season=f'S{season_num}', season=f'S{season_num}')
dest=media_path)
# 删除剧集S02E02 # 删除剧集S02E02
elif mtype == MediaType.TV and season_num and episode_num: 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(): 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}' msg = f'剧集 {media_name}'
transfer_history: List[TransferHistory] = self._transferhis.get_by( transfer_history: List[TransferHistory] = self._transferhis.get_by(
title=media_name, title=media_name,
year=media_year, year=media_year)
dest=media_path)
# 删除季 S02 # 删除季 S02
elif media_type == "Season": elif media_type == "Season":
msg = f'剧集 {media_name} {media_season}' msg = f'剧集 {media_name} {media_season}'
transfer_history: List[TransferHistory] = self._transferhis.get_by( transfer_history: List[TransferHistory] = self._transferhis.get_by(
title=media_name, title=media_name,
year=media_year, year=media_year,
season=media_season, season=media_season)
dest=media_path)
# 删除剧集S02E02 # 删除剧集S02E02
elif media_type == "Episode": elif media_type == "Episode":
msg = f'剧集 {media_name} {media_season}{media_episode}' msg = f'剧集 {media_name} {media_season}{media_episode}'