smallsolar/libkiwix
1
0
Fork 0
mirror of https://github.com/kiwix/libkiwix.git synced 2025-06-26 10:11:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resource preprocessing handles relative links

Browse Source 
... but only if they contain "/skin/" as a substring.
This commit is contained in:
Veloman Yunkan
2022-02-27 20:32:57 +04:00
parent 150851b33d
commit c016dfd2ce
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/kiwix-resources
View File

@ -43,15 +43,12 @@ def fill_resource_revisions(resource_file_path):
for resource in read_resource_file(resource_file_path):
resource_revisions[resource] = get_resource_revision(base_dir, resource)
RESOURCE_WITH_CACHEID_URL_PATTERN=r'([^"?]+)\?KIWIXCACHEID([^"]*)'
RESOURCE_WITH_CACHEID_URL_PATTERN=r'((.*)/skin/([^"?]+))\?KIWIXCACHEID([^"]*)'
def set_cacheid(resource_matchobj):
path = resource_matchobj.group(1)
resource = path
root_prefix = '{{root}}/'
if resource.startswith(root_prefix):
resource = resource[len(root_prefix):]
extra_query = resource_matchobj.group(2)
resource = 'skin/' + resource_matchobj.group(3)
extra_query = resource_matchobj.group(4)
cacheid = 'cacheid=' + resource_revisions[resource]
return f'{path}?{cacheid}{extra_query}'