fix sub正则

This commit is contained in:
thsrite 2023-09-12 11:11:36 +08:00
parent 99a06dcba0
commit 7a9ee954c5
2 changed files with 5 additions and 5 deletions

View File

@ -215,8 +215,7 @@ class TorrentsChain(ChainBase, metaclass=Singleton):
if match: if match:
new_passkey = match.group(1) new_passkey = match.group(1)
# 获取过期rss除去passkey部分 # 获取过期rss除去passkey部分
old_rss = re.sub(r'&passkey=.*', '&passkey=', site.get("rss")) new_rss = re.sub(r'&passkey=([a-zA-Z0-9]+)', f'&passkey={new_passkey}', site.get("rss"))
new_rss = old_rss + new_passkey
logger.info(f"更新站点 {domain} RSS地址 ...") logger.info(f"更新站点 {domain} RSS地址 ...")
self.siteoper.update_rss(domain=domain, rss=new_rss) self.siteoper.update_rss(domain=domain, rss=new_rss)
else: else:

View File

@ -1,5 +1,5 @@
import xml.dom.minidom import xml.dom.minidom
from typing import List, Tuple, Optional from typing import List, Tuple, Union
from urllib.parse import urljoin from urllib.parse import urljoin
from lxml import etree from lxml import etree
@ -221,7 +221,7 @@ class RssHelper:
} }
@staticmethod @staticmethod
def parse(url, proxy: bool = False) -> Optional[List[dict], None]: def parse(url, proxy: bool = False) -> Union[List[dict], None]:
""" """
解析RSS订阅URL获取RSS中的种子信息 解析RSS订阅URL获取RSS中的种子信息
:param url: RSS地址 :param url: RSS地址
@ -291,7 +291,8 @@ class RssHelper:
# RSS过期 观众RSS 链接已过期,您需要获得一个新的! pthome RSS Link has expired, You need to get a new one! # RSS过期 观众RSS 链接已过期,您需要获得一个新的! pthome RSS Link has expired, You need to get a new one!
_rss_expired_msg = [ _rss_expired_msg = [
"RSS 链接已过期, 您需要获得一个新的!", "RSS 链接已过期, 您需要获得一个新的!",
"RSS Link has expired, You need to get a new one!" "RSS Link has expired, You need to get a new one!",
"RSS Link has expired, You need to get new!"
] ]
if ret_xml in _rss_expired_msg: if ret_xml in _rss_expired_msg:
return None return None