Merge pull request #4237 from wikrin/v2

app/chain/download.py

@@ -339,7 +339,8 @@ class DownloadChain(ChainBase):
                 meta=_meta,
                 mediainfo=_media,
                 torrentinfo=_torrent,
-                download_episodes=download_episodes
+                download_episodes=download_episodes,
+                username=username,
             )
             # 下载成功后处理
             self.download_added(context=context, download_dir=download_dir, torrent_path=torrent_file)

app/chain/subscribe.py

@@ -241,6 +241,7 @@ class SubscribeChain(ChainBase, metaclass=Singleton):
                     link=link,
                     username=username
                 ),
+                meta=metainfo,
                 mediainfo=mediainfo,
                 username=username
             )
@@ -1023,7 +1024,8 @@ class SubscribeChain(ChainBase, metaclass=Singleton):
             ),
             meta=meta,
             mediainfo=mediainfo,
-            msgstr=msgstr
+            msgstr=msgstr,
+            username=subscribe.username
         )
         # 发送事件
         EventManager().send_event(EventType.SubscribeComplete, {

app/chain/transfer.py

@@ -1385,5 +1385,6 @@ class TransferChain(ChainBase, metaclass=Singleton):
             meta=meta,
             mediainfo=mediainfo,
             transferinfo=transferinfo,
-            season_episode=season_episode
+            season_episode=season_episode,
+            username=username
         )

app/helper/message.py

@@ -42,7 +42,7 @@ class TemplateContextBuilder:
             transferinfo: Optional[TransferInfo] = None,
             file_extension: Optional[str] = None,
             episodes_info: Optional[List[TmdbEpisode]] = None,
-            include_raw_objects: bool = False,
+            include_raw_objects: bool = True,
             **kwargs
     ) -> Dict[str, Any]:
         """
@@ -80,8 +80,11 @@ class TemplateContextBuilder:
             "en_title": self.__convert_invalid_characters(mediainfo.en_title),
             # 原语种标题
             "original_title": self.__convert_invalid_characters(mediainfo.original_title),
+            # 季号
+            "season": self._context.get("season") or mediainfo.season,
             # 年份
             "year": mediainfo.year or self._context.get("year"),
+            # 媒体标题 + 年份
             "title_year": mediainfo.title_year or self._context.get("title_year"),
         }