Merge pull request #882 from kiwix/rssFeed

kiwix · Feb 9, 2023 · 29519df · 29519df
2 parents fa80be8 + 6b8f9aa
commit 29519df
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 4 deletions.
diff --git a/static/resources_list.txt b/static/resources_list.txt
@@ -1,6 +1,7 @@
 skin/caret.png
 skin/bittorrent.png
 skin/magnet.png
+skin/feed.png
 skin/download.png
 skin/hash.png
 skin/search-icon.svg

diff --git a/static/skin/feed.png b/static/skin/feed.png
diff --git a/static/skin/index.css b/static/skin/index.css
@@ -441,6 +441,13 @@ body {
     width: auto;
 }
 
+.feedLogo {
+    margin: 16px 12px 0 0;
+    height: 30px;
+    float: right;
+    border-radius: 5px;
+}
+
 @media screen and (max-width: 1100px) {
 
     .kiwixHomeBody {
@@ -482,4 +489,8 @@ body {
     .kiwixNav__filters {
         grid-template-columns: 1fr;
     }
+
+    .feedLogo {
+        display: none;
+    }
 }
diff --git a/static/skin/index.js b/static/skin/index.js
@@ -18,6 +18,19 @@
     let timer;
     let languages = {};
 
+    function updateFeedLink() {
+        const inputParams = new URLSearchParams(window.location.search);
+        const filteredParams = new URLSearchParams();
+        for (const [key, value] of inputParams) {
+            if ( value != '' ) {
+                filteredParams.append(key, value);
+            }
+        }
+        const feedLink = `${root}/catalog/v2/entries?${filteredParams.toString()}`;
+        document.querySelector('#headFeedLink').href = feedLink;
+        document.querySelector('#feedLink').href = feedLink;
+    }
+
     function queryUrlBuilder() {
         let url = `${root}/catalog/search?`;
         url += Object.keys(incrementalLoadingParams).map(key => `${key}=${incrementalLoadingParams[key]}`).join("&");
@@ -363,6 +376,7 @@
             setCookie(filterCookieName, params.toString());
         }
         updateFilterColors();
+        updateFeedLink();
         await loadAndDisplayBooks(true);
     }
 
@@ -492,6 +506,7 @@
                 langFilter.dispatchEvent(new Event('change'));
             }
         }
+        updateFeedLink();
         setCookie(filterCookieName, params.toString());
     }
 })();

diff --git a/static/templates/index.html b/static/templates/index.html
@@ -10,6 +10,13 @@
       href="{{root}}/skin/index.css?KIWIXCACHEID"
       rel="Stylesheet"
     />
+    <link 
+      rel="alternate" 
+      type="application/atom+xml" 
+      title="Library OPDS Feed"
+      id="headFeedLink" 
+      href="{{root}}/catalog/v2/entries"
+    />
     <link rel="apple-touch-icon" sizes="180x180" href="{{root}}/skin/favicon/apple-touch-icon.png?KIWIXCACHEID">
     <link rel="icon" type="image/png" sizes="32x32" href="{{root}}/skin/favicon/favicon-32x32.png?KIWIXCACHEID">
     <link rel="icon" type="image/png" sizes="16x16" href="{{root}}/skin/favicon/favicon-16x16.png?KIWIXCACHEID">
@@ -35,6 +42,9 @@
     <script type="text/javascript" src="{{root}}/skin/index.js?KIWIXCACHEID" defer></script>
   </head>
   <body>
+    <a href="{{root}}/catalog/v2/entries" id="feedLink">
+      <img src="{{root}}/skin/feed.png?KIWIXCACHEID" class="feedLogo" alt="Library OPDS Feed" aria-label="Library OPDS Feed" title="Library OPDS Feed">
+    </a>
     <div class='kiwixNav'>
       <div class="kiwixNav__filters">
         <div class="kiwixNav__select">

diff --git a/test/server.cpp b/test/server.cpp
@@ -61,9 +61,9 @@ const ResourceCollection resources200Compressible{
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/i18n.js" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/i18n.js?cacheid=6da2bca0" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.css" },
-  { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.css?cacheid=0f9ba34e" },
+  { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.css?cacheid=316dbc21" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.js" },
-  { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.js?cacheid=2f5a81ac" },
+  { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.js?cacheid=b0cc9d6b" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/isotope.pkgd.min.js" },
@@ -268,7 +268,7 @@ TEST_F(ServerTest, CacheIdsOfStaticResources)
   const std::vector<UrlAndExpectedResult> testData{
     {
       /* url */ "/ROOT%23%3F/",
-R"EXPECTEDRESULT(      href="/ROOT%23%3F/skin/index.css?cacheid=0f9ba34e"
+R"EXPECTEDRESULT(      href="/ROOT%23%3F/skin/index.css?cacheid=316dbc21"
     <link rel="apple-touch-icon" sizes="180x180" href="/ROOT%23%3F/skin/favicon/apple-touch-icon.png?cacheid=f86f8df3">
     <link rel="icon" type="image/png" sizes="32x32" href="/ROOT%23%3F/skin/favicon/favicon-32x32.png?cacheid=79ded625">
     <link rel="icon" type="image/png" sizes="16x16" href="/ROOT%23%3F/skin/favicon/favicon-16x16.png?cacheid=a986fedc">
@@ -280,7 +280,8 @@ R"EXPECTEDRESULT(      href="/ROOT%23%3F/skin/index.css?cacheid=0f9ba34e"
           src: url("/ROOT%23%3F/skin/fonts/Roboto.ttf?cacheid=84d10248") format("truetype");
     <script src="/ROOT%23%3F/skin/isotope.pkgd.min.js?cacheid=2e48d392" defer></script>
     <script src="/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3"></script>
-    <script type="text/javascript" src="/ROOT%23%3F/skin/index.js?cacheid=2f5a81ac" defer></script>
+    <script type="text/javascript" src="/ROOT%23%3F/skin/index.js?cacheid=b0cc9d6b" defer></script>
+      <img src="/ROOT%23%3F/skin/feed.png?cacheid=56a672b1" class="feedLogo" alt="Library OPDS Feed" aria-label="Library OPDS Feed" title="Library OPDS Feed">
 )EXPECTEDRESULT"
     },
     {