From d336f9faa6fdf0bd932c44441e80dcd748b1e0d4 Mon Sep 17 00:00:00 2001
From: unknown <okutyrin@gmail.com>
Date: Sun, 1 Oct 2017 17:16:57 +0200
Subject: [PATCH] fixed OPDS templates

---
 Descript.ion            |  1 +
 cps/templates/feed.xml  |  3 +--
 cps/templates/index.xml | 27 +++++++++------------------
 3 files changed, 11 insertions(+), 20 deletions(-)
 create mode 100644 Descript.ion

diff --git a/Descript.ion b/Descript.ion
new file mode 100644
index 00000000..cd5434bb
--- /dev/null
+++ b/Descript.ion
@@ -0,0 +1 @@
+cps zexit()
diff --git a/cps/templates/feed.xml b/cps/templates/feed.xml
index 6f79a3aa..fce047d9 100644
--- a/cps/templates/feed.xml
+++ b/cps/templates/feed.xml
@@ -64,8 +64,7 @@
   <entry>
     <title>{{entry.name}}</title>
     <id>{{ url_for(folder, book_id=entry.id) }}</id>
-    <link type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition" href="{{url_for(folder, book_id=entry.id)}}"/>
-    <link type="application/atom+xml" href="{{url_for(folder, book_id=entry.id)}}" rel="subsection"/>
+    <link rel="subsection" type="application/atom+xml;profile=opds-catalog" href="{{url_for(folder, book_id=entry.id)}}"/>
   </entry>
   {% endfor %}
 </feed>
diff --git a/cps/templates/index.xml b/cps/templates/index.xml
index 228637c2..66e32a69 100644
--- a/cps/templates/index.xml
+++ b/cps/templates/index.xml
@@ -12,64 +12,55 @@
   </author>
   <entry>
     <title>{{_('Hot Books')}}</title>
-    <link type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition" href="{{url_for('feed_hot')}}" />
-    <link type="application/atom+xml" href="{{url_for('feed_hot')}}" rel="http://opds-spec.org/sort/popular"/>
+    <link rel="http://opds-spec.org/sort/popular" href="{{url_for('feed_hot')}}" type="application/atom+xml;profile=opds-catalog"/>
     <id>{{url_for('feed_hot')}}</id>
     <content type="text">{{_('Popular publications from this catalog based on Downloads.')}}</content>
   </entry>
   <entry>
     <title>{{_('Best rated Books')}}</title>
-    <link type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition" href="{{url_for('feed_best_rated')}}" />
-    <link type="application/atom+xml" href="{{url_for('feed_best_rated')}}" rel="http://opds-spec.org/recommended"/>
+    <link rel="http://opds-spec.org/recommended" href="{{url_for('feed_best_rated')}}" type="application/atom+xml;profile=opds-catalog"/>
     <id>{{url_for('feed_best_rated')}}</id>
     <content type="text">{{_('Popular publications from this catalog based on Rating.')}}</content>
   </entry>
   <entry>
     <title>{{_('New Books')}}</title>
-    <link type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition" href="{{url_for('feed_new')}}" />
-    <link rel="http://opds-spec.org/sort/new" href="{{url_for('feed_new')}}" type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition"/>
+    <link rel="http://opds-spec.org/sort/new" href="{{url_for('feed_new')}}" type="application/atom+xml;profile=opds-catalog"/>
     <id>{{url_for('feed_new')}}</id>
     <content type="text">{{_('The latest Books')}}</content>
   </entry>
   <entry>
     <title>{{_('Random Books')}}</title>
-    <link type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition" href="{{url_for('feed_discover')}}"/>
-    <link rel="http://opds-spec.org/featured" href="{{url_for('feed_discover')}}" type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition"/>
+    <link rel="http://opds-spec.org/featured" href="{{url_for('feed_discover')}}" type="application/atom+xml;profile=opds-catalog"/>
     <id>{{url_for('feed_discover')}}</id>
     <content type="text">{{_('Show Random Books')}}</content>
   </entry>
   <entry>
     <title>{{_('Read Books')}}</title>
-    <link type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition" href="{{url_for('feed_read_books')}}" />
-    <link rel="subsection" href="{{url_for('feed_read_books')}}" type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition"/>
+    <link rel="subsection" href="{{url_for('feed_read_books')}}" type="application/atom+xml;profile=opds-catalog"/>
     <id>{{url_for('feed_read_books')}}</id>
     <content type="text">{{_('Read Books')}}</content>
   </entry>
   <entry>
     <title>{{_('Unread Books')}}</title>
-    <link type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition" href="{{url_for('feed_unread_books')}}" />
-    <link rel="subsection" href="{{url_for('feed_unread_books')}}" type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition"/>
+    <link rel="subsection" href="{{url_for('feed_unread_books')}}" type="application/atom+xml;profile=opds-catalog"/>
     <id>{{url_for('feed_unread_books')}}</id>
     <content type="text">{{_('Unread Books')}}</content>
   </entry>
   <entry>
     <title>{{_('Authors')}}</title>
-    <link type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition" href="{{url_for('feed_authorindex')}}"/>
-    <link rel="subsection" href="{{url_for('feed_authorindex')}}" type="application/atom+xml;profile=opds-catalog;type=feed;kind=navigation"/>
+    <link rel="subsection" href="{{url_for('feed_authorindex')}}" type="application/atom+xml;profile=opds-catalog"/>
     <id>{{url_for('feed_authorindex')}}</id>
     <content type="text">{{_('Books ordered by Author')}}</content>
    </entry>
    <entry>
     <title>{{_('Category list')}}</title>
-    <link type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition" href="{{url_for('feed_categoryindex')}}"/>
-    <link rel="subsection" href="{{url_for('feed_categoryindex')}}" type="application/atom+xml;profile=opds-catalog;type=feed;kind=navigation"/>
+    <link rel="subsection" href="{{url_for('feed_categoryindex')}}" type="application/atom+xml;profile=opds-catalog"/>
     <id>{{url_for('feed_categoryindex')}}</id>
     <content type="text">{{_('Books ordered by category')}}</content>
    </entry>
    <entry>
     <title>{{_('Series list')}}</title>
-    <link type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition" href="{{url_for('feed_seriesindex')}}"/>
-    <link rel="subsection" href="{{url_for('feed_seriesindex')}}" type="application/atom+xml;profile=opds-catalog;type=feed;kind=navigation"/>
+    <link rel="subsection" href="{{url_for('feed_seriesindex')}}" type="application/atom+xml;profile=opds-catalog"/>
     <id>{{url_for('feed_seriesindex')}}</id>
     <content type="text">{{_('Books ordered by series')}}</content>
    </entry>