From 8b8473b92c508b3e387152c0217fd017b5783ff8 Mon Sep 17 00:00:00 2001 From: thsrite Date: Sun, 20 Aug 2023 21:08:30 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=8C=B9=E9=85=8Ddownload=5Fhash?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/db/transferhistory_oper.py | 6 +++++- app/plugins/dirmonitor/__init__.py | 12 +++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/db/transferhistory_oper.py b/app/db/transferhistory_oper.py index 8feef55f..ff701c6a 100644 --- a/app/db/transferhistory_oper.py +++ b/app/db/transferhistory_oper.py @@ -79,4 +79,8 @@ class TransferHistoryOper(DbOper): """ 新增转移历史 """ - return TransferHistory(**kwargs).create(self._db) \ No newline at end of file + if kwargs.get("src"): + transferhistory = TransferHistory.get_by_src(self._db, kwargs.get("src")) + if transferhistory: + transferhistory.delete(self._db, transferhistory.id) + return TransferHistory(**kwargs).create(self._db) diff --git a/app/plugins/dirmonitor/__init__.py b/app/plugins/dirmonitor/__init__.py index 239e7908..4c5bbf4d 100644 --- a/app/plugins/dirmonitor/__init__.py +++ b/app/plugins/dirmonitor/__init__.py @@ -264,8 +264,7 @@ class DirMonitor(_PluginBase): # 获取downloadhash download_hash = self.get_download_hash(file_name=os.path.basename(event_path), - mediainfo=mediainfo, - file_meta=file_meta) + tmdb_id=mediainfo.tmdb_id) # 新增转移成功历史记录 self.transferhis.add_force( @@ -306,16 +305,11 @@ class DirMonitor(_PluginBase): except Exception as e: logger.error("目录监控发生错误：%s - %s" % (str(e), traceback.format_exc())) - def get_download_hash(self, file_name, mediainfo, file_meta): + def get_download_hash(self, file_name, tmdb_id): """ 获取download_hash """ - 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) + downloadHis = self.downloadhis.get_last_by(tmdbid=tmdb_id) if downloadHis: for his in downloadHis: # qb