From 3ea455d6e04e04ac7dbc9efed3be90d165e248c6 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sun, 11 Jun 2023 15:31:36 +0800
Subject: [PATCH] fix transfer

---
 app/chain/transfer.py                | 4 ++--
 app/modules/qbittorrent/__init__.py  | 2 +-
 app/modules/transmission/__init__.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/chain/transfer.py b/app/chain/transfer.py
index e7ddd660..c00a60a1 100644
--- a/app/chain/transfer.py
+++ b/app/chain/transfer.py
@@ -26,7 +26,7 @@ class TransferChain(ChainBase):
             """
             从字符串中提取种子hash和编号
             """
-            pattern = r'([a-fA-F0-9]{32}) (\d+)'
+            pattern = r'([a-fA-F0-9]+) (\d+)'
             match = re.search(pattern, string)
             if match:
                 hash_value = match.group(1)
@@ -72,7 +72,7 @@ class TransferChain(ChainBase):
                 if not mediainfo:
                     logger.warn(f'未识别到媒体信息，标题：{torrent.get("title")}')
                     self.post_message(title=f"{torrent.get('title')} 未识别到媒体信息，无法入库！\n"
-                                            f"回复：/transfer {torrent.get('hash')} [tmdbid] 手动识别转移。")
+                                            f"回复：```/transfer {torrent.get('hash')} [tmdbid]``` 手动识别转移。")
                     continue
             else:
                 mediainfo = arg_mediainfo
diff --git a/app/modules/qbittorrent/__init__.py b/app/modules/qbittorrent/__init__.py
index 6fe5b74d..c650f092 100644
--- a/app/modules/qbittorrent/__init__.py
+++ b/app/modules/qbittorrent/__init__.py
@@ -101,7 +101,7 @@ class QbittorrentModule(_ModuleBase):
         ret_torrents = []
         if hashs:
             # 按Hash获取
-            torrents, _ = self.qbittorrent.get_torrents(ids=hashs)
+            torrents, _ = self.qbittorrent.get_torrents(ids=hashs, tags=settings.TORRENT_TAG)
             for torrent in torrents:
                 content_path = torrent.get("content_path")
                 if content_path:
diff --git a/app/modules/transmission/__init__.py b/app/modules/transmission/__init__.py
index 99d0d347..24cb330b 100644
--- a/app/modules/transmission/__init__.py
+++ b/app/modules/transmission/__init__.py
@@ -89,7 +89,7 @@ class TransmissionModule(_ModuleBase):
         ret_torrents = []
         if hashs:
             # 按Hash获取
-            torrents, _ = self.transmission.get_torrents(ids=hashs)
+            torrents, _ = self.transmission.get_torrents(ids=hashs, tags=settings.TORRENT_TAG)
             for torrent in torrents:
                 ret_torrents.append({
                     'title': torrent.name,