From b721e4bb7d26603d061fbf85b471bdd0d2d2aec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=8E=E4=B9=8B=E5=87=8C=E6=AE=87?= Date: Fri, 17 Dec 2021 23:59:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=93=9D=E5=A5=8F?= =?UTF-8?q?=E4=BA=91=E8=A7=A3=E6=9E=90=E6=96=87=E4=BB=B6=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E5=8F=98=E4=B8=BA=20lanzouo=20=E5=90=8E?= =?UTF-8?q?=EF=BC=8Cis=5Ffile=5Furl=20=E5=92=8C=20is=5Ffolder=5Furl=20?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lanzou/api/utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lanzou/api/utils.py b/lanzou/api/utils.py index 938d693..b90c480 100644 --- a/lanzou/api/utils.py +++ b/lanzou/api/utils.py @@ -78,8 +78,8 @@ def is_name_valid(filename: str) -> bool: def is_file_url(share_url: str) -> bool: """判断是否为文件的分享链接""" - base_pat = r'https?://[a-zA-Z0-9-]*?\.?lanzou[six].com/.+' # 子域名可个性化设置或者不存在 - user_pat = r'https?://[a-zA-Z0-9-]*?\.?lanzou[six].com/i[a-zA-Z0-9]{5,}/?' # 普通用户 URL 规则 + base_pat = r'https?://[a-zA-Z0-9-]*?\.?lanzou\w.com/.+' # 子域名可个性化设置或者不存在 + user_pat = r'https?://[a-zA-Z0-9-]*?\.?lanzou\w.com/i[a-zA-Z0-9]{5,}/?' # 普通用户 URL 规则 if not re.fullmatch(base_pat, share_url): return False elif re.fullmatch(user_pat, share_url): @@ -95,8 +95,8 @@ def is_file_url(share_url: str) -> bool: def is_folder_url(share_url: str) -> bool: """判断是否为文件夹的分享链接""" - base_pat = r'https?://[a-zA-Z0-9-]*?\.?lanzou[six].com/.+' - user_pat = r'https?://[a-zA-Z0-9-]*?\.?lanzou[six].com/(/s/)?b[a-zA-Z0-9]{7,}/?' + base_pat = r'https?://[a-zA-Z0-9-]*?\.?lanzou\w.com/.+' + user_pat = r'https?://[a-zA-Z0-9-]*?\.?lanzou\w.com/(/s/)?b[a-zA-Z0-9]{7,}/?' if not re.fullmatch(base_pat, share_url): return False elif re.fullmatch(user_pat, share_url):