From 92cb221dc45f6f02bed7860e111565af396529f4 Mon Sep 17 00:00:00 2001 From: yzhh <2596322644@qq.com> Date: Wed, 5 May 2021 12:04:01 +0800 Subject: [PATCH] Update wikilib.py --- modules/wiki/wikilib.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/wiki/wikilib.py b/modules/wiki/wikilib.py index 94be04d1..ab9a548d 100644 --- a/modules/wiki/wikilib.py +++ b/modules/wiki/wikilib.py @@ -291,7 +291,7 @@ class wikilib: if x != '': desc_list.append(x) desc = '\n'.join(desc_list) - desc_end = re.findall(r'(.*?(?:!|\?|\.\s|!|?|。)).*', desc, re.S | re.M) + desc_end = re.findall(r'(.*?(?:!\s|\?\s|\.\s|!|?|。)).*', desc, re.S | re.M) if desc_end: desc = desc_end[0] except Exception: @@ -313,7 +313,7 @@ class wikilib: if x != '': desc_list.append(x) desc_raw = '\n'.join(desc_list) - cut_desc = re.findall(r'(.*?(?:!|\?|\.\s|!|?|。)).*', desc_raw, re.S | re.M) + cut_desc = re.findall(r'(.*?(?:!\s|\?\s|\.\s|!|?|。)).*', desc_raw, re.S | re.M) if cut_desc: desc = cut_desc[0] else: @@ -380,11 +380,10 @@ class wikilib: self.query_text_name = geturl_pagename + '/doc' except AttributeError: self.query_text_name = geturl_pagename + '/doc' - if 'TextExtracts' in await self.get_enabled_extensions(): + enabled_extensions = await self.get_enabled_extensions() + if 'TextExtracts' in enabled_extensions: desc = await self.get_desc() else: - desc = '' - if desc == '': desc = await self.get_first_line() print(desc) fin_page_name = geturl_pagename