Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 修复蓝奏云解析文件链接域名变为 lanzouo 后，is_file_url 和 is_folder_url 判定失败的问题 #69

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: 修复蓝奏云解析文件链接域名变为 lanzouo 后，is_file_url 和 is_folder_url 判定失败的问题 #69

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
779da62
Merge pull request #61 from fzls/避免直接使用未设置超时参数的requests.get
zaxtyson May 15, 2021
b721e4b
fix: 修复蓝奏云解析文件链接域名变为 lanzouo 后，is_file_url 和 is_folder_url 判定失败的问题
fzls Dec 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lanzou/api/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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):
Expand Down