From 2894fe34af15b8b6f230b01946e74e89953f8078 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Mon, 24 Jun 2024 10:33:45 +0800
Subject: [PATCH] fix https://github.com/jxxghp/MoviePilot/issues/2334

---
 package.json                   |  3 ++-
 plugins/dirmonitor/__init__.py | 14 +++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index e88a7f5..637d172 100644
--- a/package.json
+++ b/package.json
@@ -79,11 +79,12 @@
         "name": "目录监控",
         "description": "监控目录文件发生变化时实时整理到媒体库。",
         "labels": "文件整理",
-        "version": "2.3",
+        "version": "2.4",
         "icon": "directory.png",
         "author": "jxxghp",
         "level": 1,
         "history": {
+            "v2.4": "修复目录监控不使用ChatGPT辅助识别问题",
             "v2.3": "特殊场景下补充转移成功历史记录",
             "v2.2": "更新目录设置说明",
             "v2.1": "增加了元数据刮削开关，升级后需要手动打开，否则默认不刮削",
diff --git a/plugins/dirmonitor/__init__.py b/plugins/dirmonitor/__init__.py
index f6623e6..65dd05d 100644
--- a/plugins/dirmonitor/__init__.py
+++ b/plugins/dirmonitor/__init__.py
@@ -14,6 +14,7 @@ from watchdog.observers import Observer
 from watchdog.observers.polling import PollingObserver
 
 from app import schemas
+from app.chain.media import MediaChain
 from app.chain.tmdb import TmdbChain
 from app.chain.transfer import TransferChain
 from app.core.config import settings
@@ -59,7 +60,7 @@ class DirMonitor(_PluginBase):
     # 插件图标
     plugin_icon = "directory.png"
     # 插件版本
-    plugin_version = "2.3"
+    plugin_version = "2.4"
     # 插件作者
     plugin_author = "jxxghp"
     # 作者主页
@@ -77,6 +78,7 @@ class DirMonitor(_PluginBase):
     downloadhis = None
     transferchian = None
     tmdbchain = None
+    mediaChain = None
     _observer = []
     _enabled = False
     _notify = False
@@ -103,6 +105,7 @@ class DirMonitor(_PluginBase):
         self.transferhis = TransferHistoryOper()
         self.downloadhis = DownloadHistoryOper()
         self.transferchian = TransferChain()
+        self.mediaChain = MediaChain()
         self.tmdbchain = TmdbChain()
         # 清空配置
         self._dirconf = {}
@@ -374,10 +377,11 @@ class DirMonitor(_PluginBase):
                         download_history = self.downloadhis.get_by_hash(download_file.download_hash)
 
                 # 识别媒体信息
-                mediainfo: MediaInfo = self.chain.recognize_media(meta=file_meta,
-                                                                  mtype=MediaType(
-                                                                      download_history.type) if download_history else None,
-                                                                  tmdbid=download_history.tmdbid if download_history else None)
+                if download_history and download_history.tmdbid:
+                    mediainfo: MediaInfo = self.mediaChain.recognize_media(mtype=MediaType(download_history.type),
+                                                                           tmdbid=download_history.tmdbid)
+                else:
+                    mediainfo: MediaInfo = self.mediaChain.recognize_by_meta(file_meta)
                 if not mediainfo:
                     logger.warn(f'未识别到媒体信息，标题：{file_meta.name}')
                     # 新增转移成功历史记录