langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

match both forward slash and os seperator

Browse Source
This commit is contained in:
BlueGreenMagick 2020-02-29 12:36:10 +09:00
parent cb71cbad54
commit e46ace5044
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qt/aqt/mediasrv.py
View File

@ -161,9 +161,8 @@ class RequestHandler(http.server.SimpleHTTPRequestHandler):
if not pattern: if not pattern:
return path return path
if not re.fullmatch(pattern, subPath): subPath2 = subPath.replace(os.sep, "/")
return path if re.fullmatch(pattern, subPath) or re.fullmatch(pattern, subPath2):
newPath = os.path.join(addMgr.addonsFolder(), addonPath) newPath = os.path.join(addMgr.addonsFolder(), addonPath)
return newPath return newPath

2
qt/aqt/webview.py
View File

@ -149,6 +149,8 @@ class WebContent:
f"/_addons/{addon_package}/web/my-addon.css") f"/_addons/{addon_package}/web/my-addon.css")
web_content.js.append( web_content.js.append(
f"/_addons/{addon_package}/web/my-addon.js") f"/_addons/{addon_package}/web/my-addon.js")
Note that '/' will also match the os specific path separator.
""" """
body: str = "" body: str = ""