From 415ec4109989ef2d2b7443f3dbcd54081b934115 Mon Sep 17 00:00:00 2001
From: Veloman Yunkan <veloman.yunkan@gmail.com>
Date: Tue, 11 Oct 2022 14:32:57 +0400
Subject: [PATCH] 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.
---
 scripts/kiwix-resources |  5 ++++-
 test/server.cpp         | 18 +++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/scripts/kiwix-resources b/scripts/kiwix-resources
index 5fb7b8db2..569c25e41 100755
--- a/scripts/kiwix-resources
+++ b/scripts/kiwix-resources
@@ -112,7 +112,10 @@ def copy_resource_list_file(src_path, dst_path):
 def preprocess_resources(resource_file_path):
     resource_filename = os.path.basename(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))
 
 if __name__ == "__main__":
diff --git a/test/server.cpp b/test/server.cpp
index 1f646574c..ceabaa887 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -97,13 +97,13 @@ const ResourceCollection resources200Uncompressible{
   { DYNAMIC_CONTENT, "/ROOT/skin/caret.png" },
   { STATIC_CONTENT,  "/ROOT/skin/caret.png?cacheid=22b942b4" },
   { 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" },
   { STATIC_CONTENT,  "/ROOT/skin/download.png?cacheid=a39aa502" },
   { 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" },
-  //{ 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" },
   { STATIC_CONTENT,  "/ROOT/skin/favicon/apple-touch-icon.png?cacheid=f86f8df3" },
   { DYNAMIC_CONTENT, "/ROOT/skin/favicon/browserconfig.xml" },
@@ -113,15 +113,15 @@ const ResourceCollection resources200Uncompressible{
   { DYNAMIC_CONTENT, "/ROOT/skin/favicon/favicon-32x32.png" },
   { STATIC_CONTENT,  "/ROOT/skin/favicon/favicon-32x32.png?cacheid=79ded625" },
   { 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" },
-  //{ 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" },
-  //{ 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" },
-  //{ 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" },
-  //{ 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" },
   { STATIC_CONTENT,  "/ROOT/skin/favicon/safari-pinned-tab.svg?cacheid=8d487e95" },
   { DYNAMIC_CONTENT, "/ROOT/skin/favicon/site.webmanifest" },
@@ -135,7 +135,7 @@ const ResourceCollection resources200Uncompressible{
   { DYNAMIC_CONTENT, "/ROOT/skin/magnet.png" },
   { STATIC_CONTENT,  "/ROOT/skin/magnet.png?cacheid=73b6bddf" },
   { 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" },
   { STATIC_CONTENT,  "/ROOT/skin/search_results.css?cacheid=76d39c84" },