fix 目录监控转移记录补充download_hash

app/db/downloadhistory_oper.py

@@ -42,3 +42,16 @@ class DownloadHistoryOper(DbOper):
         清空下载记录
         """
         DownloadHistory.truncate(self._db)
+
+    def get_last_by(self, mtype=None, title: str = None, year: str = None,
+                    season: str = None, episode: str = None, tmdbid=None) -> DownloadHistory:
+        """
+        按类型、标题、年份、季集查询下载记录
+        """
+        return DownloadHistory.get_last_by(db=self._db,
+                                           mtype=mtype,
+                                           title=title,
+                                           year=year,
+                                           season=season,
+                                           episode=episode,
+                                           tmdbid=tmdbid)

app/db/models/downloadhistory.py

@@ -49,3 +49,43 @@ class DownloadHistory(Base):
     @staticmethod
     def get_by_path(db: Session, path: str):
         return db.query(DownloadHistory).filter(DownloadHistory.path == path).first()
+
+    @staticmethod
+    def get_last_by(db: Session, mtype: str = None, title: str = None, year: int = None, season: str = None,
+                    episode: str = None, tmdbid: str = None):
+        """
+        据tmdbid、season、season_episode查询转移记录
+        """
+        if tmdbid and not season and not episode:
+            return db.query(DownloadHistory).filter(DownloadHistory.tmdbid == tmdbid).order_by(
+                DownloadHistory.id.desc()).first()
+        if tmdbid and season and not episode:
+            return db.query(DownloadHistory).filter(DownloadHistory.tmdbid == tmdbid,
+                                                    DownloadHistory.seasons == season).order_by(
+                DownloadHistory.id.desc()).first()
+        if tmdbid and season and episode:
+            return db.query(DownloadHistory).filter(DownloadHistory.tmdbid == tmdbid,
+                                                    DownloadHistory.seasons == season,
+                                                    DownloadHistory.episodes == episode).order_by(
+                DownloadHistory.id.desc()).first()
+        # 电视剧所有季集｜电影
+        if not season and not episode:
+            return db.query(DownloadHistory).filter(DownloadHistory.type == mtype,
+                                                    DownloadHistory.title == title,
+                                                    DownloadHistory.year == year).order_by(
+                DownloadHistory.id.desc()).first()
+        # 电视剧某季
+        if season and not episode:
+            return db.query(DownloadHistory).filter(DownloadHistory.type == mtype,
+                                                    DownloadHistory.title == title,
+                                                    DownloadHistory.year == year,
+                                                    DownloadHistory.seasons == season).order_by(
+                DownloadHistory.id.desc()).first()
+        # 电视剧某季某集
+        if season and episode:
+            return db.query(DownloadHistory).filter(DownloadHistory.type == mtype,
+                                                    DownloadHistory.title == title,
+                                                    DownloadHistory.year == year,
+                                                    DownloadHistory.seasons == season,
+                                                    DownloadHistory.episodes == episode).order_by(
+                DownloadHistory.id.desc()).first()

app/plugins/dirmonitor/__init__.py

@@ -12,6 +12,7 @@ from app.chain.transfer import TransferChain
 from app.core.config import settings
 from app.core.context import MediaInfo
 from app.core.metainfo import MetaInfo
+from app.db.downloadhistory_oper import DownloadHistoryOper
 from app.db.transferhistory_oper import TransferHistoryOper
 from app.log import logger
 from app.plugins import _PluginBase
@@ -65,6 +66,7 @@ class DirMonitor(_PluginBase):
 
     # 私有属性
     transferhis = None
+    downloadhis = None
     transferchian = None
     _observer = []
     _enabled = False
@@ -78,6 +80,7 @@ class DirMonitor(_PluginBase):
 
     def init_plugin(self, config: dict = None):
         self.transferhis = TransferHistoryOper()
+        self.downloadhis = DownloadHistoryOper()
         self.transferchian = TransferChain()
 
         # 读取配置
@@ -121,7 +124,8 @@ class DirMonitor(_PluginBase):
                 except Exception as e:
                     err_msg = str(e)
                     if "inotify" in err_msg and "reached" in err_msg:
-                        logger.warn(f"目录监控服务启动出现异常：{err_msg}，请在宿主机上（不是docker容器内）执行以下命令并重启："
+                        logger.warn(
+                            f"目录监控服务启动出现异常：{err_msg}，请在宿主机上（不是docker容器内）执行以下命令并重启："
                             + """
                                  echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf
                                  echo fs.inotify.max_user_instances=524288 | sudo tee -a /etc/sysctl.conf
@@ -226,6 +230,13 @@ class DirMonitor(_PluginBase):
                             ))
                         return
 
+                    # 获取downloadhash
+                    downloadHis = self.downloadhis.get_last_by(mtype=mediainfo.type.value,
+                                                               title=mediainfo.title,
+                                                               year=mediainfo.year,
+                                                               season=file_meta.season,
+                                                               episode=file_meta.episode,
+                                                               tmdbid=mediainfo.tmdb_id)
                     # 新增转移成功历史记录
                     self.transferhis.add(
                         src=event_path,
@@ -242,6 +253,7 @@ class DirMonitor(_PluginBase):
                         seasons=file_meta.season,
                         episodes=file_meta.episode,
                         image=mediainfo.get_poster_image(),
+                        download_hash=downloadHis.download_hash if downloadHis else None,
                         status=1
                     )
 
@@ -251,7 +263,8 @@ class DirMonitor(_PluginBase):
                     self.chain.refresh_mediaserver(mediainfo=mediainfo, file_path=transferinfo.target_path)
                     # 发送通知
                     if self._notify:
-                        self.transferchian.send_transfer_message(meta=file_meta, mediainfo=mediainfo, transferinfo=transferinfo)
+                        self.transferchian.send_transfer_message(meta=file_meta, mediainfo=mediainfo,
+                                                                 transferinfo=transferinfo)
                     # 广播事件
                     self.eventmanager.send_event(EventType.TransferComplete, {
                         'meta': file_meta,