Merge pull request #5319 from cddjr/fix_5314

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

app/chain/__init__.py

@@ -4,6 +4,7 @@ import pickle
 import traceback
 from abc import ABCMeta
 from collections.abc import Callable
+from datetime import datetime
 from pathlib import Path
 from typing import Optional, Any, Tuple, List, Set, Union, Dict
 
@@ -849,6 +850,8 @@ class ChainBase(metaclass=ABCMeta):
         :param kwargs:  其他参数(覆盖业务对象属性值)
         :return: 成功或失败
         """
+        # 添加格式化的时间参数
+        kwargs.setdefault('current_time', datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
         # 渲染消息
         message = MessageTemplateHelper.render(message=message, meta=meta, mediainfo=mediainfo,
                                                torrentinfo=torrentinfo, transferinfo=transferinfo, **kwargs)
@@ -932,6 +935,8 @@ class ChainBase(metaclass=ABCMeta):
         :param kwargs:  其他参数(覆盖业务对象属性值)
         :return: 成功或失败
         """
+        # 添加格式化的时间参数
+        kwargs.setdefault('current_time', datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
         # 渲染消息
         message = MessageTemplateHelper.render(message=message, meta=meta, mediainfo=mediainfo,
                                                torrentinfo=torrentinfo, transferinfo=transferinfo, **kwargs)

app/chain/media.py

@@ -618,7 +618,7 @@ class MediaChain(ChainBase):
                                 should_scrape = True  # 未知类型默认刮削
 
                             if should_scrape:
-                                image_path = filepath.with_name(image_name)
+                                image_path = filepath / image_name
                                 if overwrite or not storagechain.get_file_item(storage=fileitem.storage,
                                                                                path=image_path):
                                     # 流式下载图片并直接保存

app/chain/message.py

@@ -195,10 +195,14 @@ class MessageChain(ChainBase):
                 if text.isdigit():
                     # 用户选择了具体的条目
                     # 缓存
-                    cache_data: dict = user_cache.get(userid).copy()
+                    cache_data: dict = user_cache.get(userid)
+                    if not cache_data:
+                        # 发送消息
+                        self.post_message(Notification(channel=channel, source=source, title="输入有误！", userid=userid))
+                        return
+                    cache_data = cache_data.copy()
                     # 选择项目
-                    if not cache_data \
-                            or not cache_data.get('items') \
+                    if not cache_data.get('items') \
                             or len(cache_data.get('items')) < int(text):
                         # 发送消息
                         self.post_message(Notification(channel=channel, source=source, title="输入有误！", userid=userid))
@@ -370,12 +374,13 @@ class MessageChain(ChainBase):
                         del cache_data
                 elif text.lower() == "p":
                     # 上一页
-                    cache_data: dict = user_cache.get(userid).copy()
+                    cache_data: dict = user_cache.get(userid)
                     if not cache_data:
                         # 没有缓存
                         self.post_message(Notification(
                             channel=channel, source=source, title="输入有误！", userid=userid))
                         return
+                    cache_data = cache_data.copy()
                     try:
                         if _current_page == 0:
                             # 第一页
@@ -422,12 +427,13 @@ class MessageChain(ChainBase):
                         del cache_data
                 elif text.lower() == "n":
                     # 下一页
-                    cache_data: dict = user_cache.get(userid).copy()
+                    cache_data: dict = user_cache.get(userid)
                     if not cache_data:
                         # 没有缓存
                         self.post_message(Notification(
                             channel=channel, source=source, title="输入有误！", userid=userid))
                         return
+                    cache_data = cache_data.copy()
                     try:
                         cache_type: str = cache_data.get('type')
                         # 产生副本，避免修改原值

app/core/metainfo.py

@@ -71,12 +71,14 @@ def MetaInfoPath(path: Path) -> MetaBase:
     file_meta = MetaInfo(title=path.name)
     # 上级目录元数据
     dir_meta = MetaInfo(title=path.parent.name)
-    # 合并元数据
-    file_meta.merge(dir_meta)
+    if file_meta.type == MediaType.TV or dir_meta.type != MediaType.TV:
+        # 合并元数据
+        file_meta.merge(dir_meta)
     # 上上级目录元数据
     root_meta = MetaInfo(title=path.parent.parent.name)
-    # 合并元数据
-    file_meta.merge(root_meta)
+    if file_meta.type == MediaType.TV or root_meta.type != MediaType.TV:
+        # 合并元数据
+        file_meta.merge(root_meta)
     return file_meta
 
 

app/modules/indexer/spider/mtorrent.py

@@ -118,24 +118,36 @@ class MTorrentSpider:
                 labels_value = self._labels.get(result.get('labels') or "0") or ""
                 if labels_value:
                     labels = labels_value.split()
+            status = result.get('status', {})
             torrent = {
                 'title': result.get('name'),
                 'description': result.get('smallDescr'),
                 'enclosure': self.__get_download_url(result.get('id')),
                 'pubdate': StringUtils.format_timestamp(result.get('createdDate')),
                 'size': int(result.get('size') or '0'),
-                'seeders': int(result.get('status', {}).get("seeders") or '0'),
-                'peers': int(result.get('status', {}).get("leechers") or '0'),
-                'grabs': int(result.get('status', {}).get("timesCompleted") or '0'),
-                'downloadvolumefactor': self.__get_downloadvolumefactor(result.get('status', {}).get("discount")),
-                'uploadvolumefactor': self.__get_uploadvolumefactor(result.get('status', {}).get("discount")),
+                'seeders': int(status.get("seeders") or '0'),
+                'peers': int(status.get("leechers") or '0'),
+                'grabs': int(status.get("timesCompleted") or '0'),
+                'downloadvolumefactor': self.__get_downloadvolumefactor(status.get("discount")),
+                'uploadvolumefactor': self.__get_uploadvolumefactor(status.get("discount")),
                 'page_url': self._pageurl % (self._url, result.get('id')),
                 'imdbid': self.__find_imdbid(result.get('imdb')),
                 'labels': labels,
                 'category': category
             }
-            if discount_end_time := (result.get('status') or {}).get('discountEndTime'):
+            if discount_end_time := status.get('discountEndTime'):
                 torrent['freedate'] = StringUtils.format_timestamp(discount_end_time)
+            # 解析全站促销时的规则(当前馒头只有下载促销)
+            if promotion_rule := status.get("promotionRule"):
+                discount = promotion_rule.get("discount", "NORMAL")
+                torrent["downloadvolumefactor"] = self.__get_downloadvolumefactor(discount)
+                if end_time := promotion_rule.get("endTime"):
+                    torrent["freedate"] = StringUtils.format_timestamp(end_time)
+            if mall_single_free := status.get("mallSingleFree"):
+                if mall_single_free.get("status") == "ONGOING":
+                    torrent["downloadvolumefactor"] = self.__get_downloadvolumefactor("FREE")
+                    if end_date := mall_single_free.get("endDate"):
+                        torrent["freedate"] = StringUtils.format_timestamp(end_date)
             torrents.append(torrent)
         return torrents
 

app/modules/subtitle/__init__.py

@@ -85,7 +85,11 @@ class SubtitleModule(_ModuleBase):
                     )
                 # TODO 其它采用API访问的站点
         # 普通站点通过解析网站代码的方式获取
-        request = RequestUtils(cookies=torrent.site_cookie, ua=torrent.site_ua)
+        request = RequestUtils(
+            cookies=torrent.site_cookie,
+            ua=torrent.site_ua,
+            proxies=settings.PROXY if torrent.site_proxy else None,
+        )
         res = request.get_res(torrent.page_url)
         if res and res.status_code == 200:
             if not res.text:
@@ -176,7 +180,11 @@ class SubtitleModule(_ModuleBase):
             logger.warn(f"{torrent.page_url} 页面未找到字幕下载链接")
             return
         # 下载所有字幕文件
-        request = RequestUtils(cookies=torrent.site_cookie, ua=torrent.site_ua)
+        request = RequestUtils(
+            cookies=torrent.site_cookie,
+            ua=torrent.site_ua,
+            proxies=settings.PROXY if torrent.site_proxy else None,
+        )
         for sublink in sublink_list:
             logger.info(f"找到字幕下载链接：{sublink}，开始下载...")
             # 下载

tests/cases/meta.py

@@ -1117,4 +1117,19 @@ meta_cases = [{
         "audio_codec": "",
         "tmdbid": 19995
     }
+}, {
+    "path": "/movies/DouBan_IMDB.TOP250.Movies.Mixed.Collection.20240501.FRDS/为奴十二年.12.Years.a.Slave.2013.BluRay.1080p.x265.10bit.2Audio.MNHD-FRDS/12.Years.a.Slave.2013.BluRay.1080p.x265.10bit.2Audio.MNHD-FRDS.mkv",
+    "target": {
+        "type": "未知",
+        "cn_name": "",
+        "en_name": "12 Years A Slave",
+        "year": "2013",
+        "part": "",
+        "season": "",
+        "episode": "",
+        "restype": "BluRay",
+        "pix": "1080p",
+        "video_codec": "x265 10bit",
+        "audio_codec": "2Audio"
+    }
 }]

version.py

@@ -1,2 +1,2 @@
-APP_VERSION = 'v2.9.1'
-FRONTEND_VERSION = 'v2.9.1'
+APP_VERSION = 'v2.9.2'
+FRONTEND_VERSION = 'v2.9.2'