smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cacheids are computed for all static resources 

Before this change cacheids were computed only for those static
resources that were referenced from other resources via KIWIXCACHEID.

A few static resources without such references existed.

Now all resources under skin/ have their cacheids computed.
This commit is contained in:
Veloman Yunkan 2022-10-11 14:32:57 +04:00
parent b9f60ecfe9
commit 415ec41099
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/kiwix-resources
View File

@ -112,7 +112,10 @@ def copy_resource_list_file(src_path, dst_path):
def preprocess_resources(resource_file_path): def preprocess_resources(resource_file_path):
resource_filename = os.path.basename(resource_file_path) resource_filename = os.path.basename(resource_file_path)
for resource in read_resource_file(resource_file_path): for resource in read_resource_file(resource_file_path):
preprocess_resource(resource) if resource.startswith('skin/'):
get_resource_revision(resource)
else:
preprocess_resource(resource)
copy_resource_list_file(resource_file_path, os.path.join(OUT_DIR, resource_filename)) copy_resource_list_file(resource_file_path, os.path.join(OUT_DIR, resource_filename))
if __name__ == "__main__": if __name__ == "__main__":

18
test/server.cpp
View File

@ -97,13 +97,13 @@ const ResourceCollection resources200Uncompressible{
{ DYNAMIC_CONTENT, "/ROOT/skin/caret.png" }, { DYNAMIC_CONTENT, "/ROOT/skin/caret.png" },
{ STATIC_CONTENT, "/ROOT/skin/caret.png?cacheid=22b942b4" }, { STATIC_CONTENT, "/ROOT/skin/caret.png?cacheid=22b942b4" },
{ DYNAMIC_CONTENT, "/ROOT/skin/css/images/search.svg" }, { DYNAMIC_CONTENT, "/ROOT/skin/css/images/search.svg" },
//{ STATIC_CONTENT, "/ROOT/skin/css/images/search.svg?cacheid=XXXX" }, { STATIC_CONTENT, "/ROOT/skin/css/images/search.svg?cacheid=f0bbdb80" },
{ DYNAMIC_CONTENT, "/ROOT/skin/download.png" }, { DYNAMIC_CONTENT, "/ROOT/skin/download.png" },
{ STATIC_CONTENT, "/ROOT/skin/download.png?cacheid=a39aa502" }, { STATIC_CONTENT, "/ROOT/skin/download.png?cacheid=a39aa502" },
{ DYNAMIC_CONTENT, "/ROOT/skin/favicon/android-chrome-192x192.png" }, { DYNAMIC_CONTENT, "/ROOT/skin/favicon/android-chrome-192x192.png" },
//{ STATIC_CONTENT, "/ROOT/skin/favicon/android-chrome-192x192.png?cacheid=" }, { STATIC_CONTENT, "/ROOT/skin/favicon/android-chrome-192x192.png?cacheid=bfac158b" },
{ DYNAMIC_CONTENT, "/ROOT/skin/favicon/android-chrome-512x512.png" }, { DYNAMIC_CONTENT, "/ROOT/skin/favicon/android-chrome-512x512.png" },
//{ STATIC_CONTENT, "/ROOT/skin/favicon/android-chrome-512x512.png?cacheid=" }, { STATIC_CONTENT, "/ROOT/skin/favicon/android-chrome-512x512.png?cacheid=380c3653" },
{ DYNAMIC_CONTENT, "/ROOT/skin/favicon/apple-touch-icon.png" }, { DYNAMIC_CONTENT, "/ROOT/skin/favicon/apple-touch-icon.png" },
{ STATIC_CONTENT, "/ROOT/skin/favicon/apple-touch-icon.png?cacheid=f86f8df3" }, { STATIC_CONTENT, "/ROOT/skin/favicon/apple-touch-icon.png?cacheid=f86f8df3" },
{ DYNAMIC_CONTENT, "/ROOT/skin/favicon/browserconfig.xml" }, { DYNAMIC_CONTENT, "/ROOT/skin/favicon/browserconfig.xml" },
@ -113,15 +113,15 @@ const ResourceCollection resources200Uncompressible{
{ DYNAMIC_CONTENT, "/ROOT/skin/favicon/favicon-32x32.png" }, { DYNAMIC_CONTENT, "/ROOT/skin/favicon/favicon-32x32.png" },
{ STATIC_CONTENT, "/ROOT/skin/favicon/favicon-32x32.png?cacheid=79ded625" }, { STATIC_CONTENT, "/ROOT/skin/favicon/favicon-32x32.png?cacheid=79ded625" },
{ DYNAMIC_CONTENT, "/ROOT/skin/favicon/mstile-144x144.png" }, { DYNAMIC_CONTENT, "/ROOT/skin/favicon/mstile-144x144.png" },
//{ STATIC_CONTENT, "/ROOT/skin/favicon/mstile-144x144.png?cacheid=" }, { STATIC_CONTENT, "/ROOT/skin/favicon/mstile-144x144.png?cacheid=c25a7641" },
{ DYNAMIC_CONTENT, "/ROOT/skin/favicon/mstile-150x150.png" }, { DYNAMIC_CONTENT, "/ROOT/skin/favicon/mstile-150x150.png" },
//{ STATIC_CONTENT, "/ROOT/skin/favicon/mstile-150x150.png?cacheid=" }, { STATIC_CONTENT, "/ROOT/skin/favicon/mstile-150x150.png?cacheid=6fa6f467" },
{ DYNAMIC_CONTENT, "/ROOT/skin/favicon/mstile-310x150.png" }, { DYNAMIC_CONTENT, "/ROOT/skin/favicon/mstile-310x150.png" },
//{ STATIC_CONTENT, "/ROOT/skin/favicon/mstile-310x150.png?cacheid=" }, { STATIC_CONTENT, "/ROOT/skin/favicon/mstile-310x150.png?cacheid=e0ed9032" },
{ DYNAMIC_CONTENT, "/ROOT/skin/favicon/mstile-310x310.png" }, { DYNAMIC_CONTENT, "/ROOT/skin/favicon/mstile-310x310.png" },
//{ STATIC_CONTENT, "/ROOT/skin/favicon/mstile-310x310.png?cacheid=" }, { STATIC_CONTENT, "/ROOT/skin/favicon/mstile-310x310.png?cacheid=26b20530" },
{ DYNAMIC_CONTENT, "/ROOT/skin/favicon/mstile-70x70.png" }, { DYNAMIC_CONTENT, "/ROOT/skin/favicon/mstile-70x70.png" },
//{ STATIC_CONTENT, "/ROOT/skin/favicon/mstile-70x70.png?cacheid=" }, { STATIC_CONTENT, "/ROOT/skin/favicon/mstile-70x70.png?cacheid=64ffd9dc" },
{ DYNAMIC_CONTENT, "/ROOT/skin/favicon/safari-pinned-tab.svg" }, { DYNAMIC_CONTENT, "/ROOT/skin/favicon/safari-pinned-tab.svg" },
{ STATIC_CONTENT, "/ROOT/skin/favicon/safari-pinned-tab.svg?cacheid=8d487e95" }, { STATIC_CONTENT, "/ROOT/skin/favicon/safari-pinned-tab.svg?cacheid=8d487e95" },
{ DYNAMIC_CONTENT, "/ROOT/skin/favicon/site.webmanifest" }, { DYNAMIC_CONTENT, "/ROOT/skin/favicon/site.webmanifest" },
@ -135,7 +135,7 @@ const ResourceCollection resources200Uncompressible{
{ DYNAMIC_CONTENT, "/ROOT/skin/magnet.png" }, { DYNAMIC_CONTENT, "/ROOT/skin/magnet.png" },
{ STATIC_CONTENT, "/ROOT/skin/magnet.png?cacheid=73b6bddf" }, { STATIC_CONTENT, "/ROOT/skin/magnet.png?cacheid=73b6bddf" },
{ DYNAMIC_CONTENT, "/ROOT/skin/search-icon.svg" }, { DYNAMIC_CONTENT, "/ROOT/skin/search-icon.svg" },
//{ STATIC_CONTENT, "/ROOT/skin/search-icon.svg?cacheid=" }, { STATIC_CONTENT, "/ROOT/skin/search-icon.svg?cacheid=b10ae7ed" },
{ DYNAMIC_CONTENT, "/ROOT/skin/search_results.css" }, { DYNAMIC_CONTENT, "/ROOT/skin/search_results.css" },
{ STATIC_CONTENT, "/ROOT/skin/search_results.css?cacheid=76d39c84" }, { STATIC_CONTENT, "/ROOT/skin/search_results.css?cacheid=76d39c84" },