From 0bcdbc4a8245c31d80dd8764c7a36faca051f15b Mon Sep 17 00:00:00 2001
From: OzzieIsaacs <matthias1.knopp@googlemail.com>
Date: Thu, 29 Dec 2016 19:19:40 +0100
Subject: [PATCH] Bugfix Search opds feed Improvement OPDS feed for displaying
 covers

---
 cps/templates/feed.xml  | 15 ++++++---------
 cps/templates/index.xml | 36 ++++++++----------------------------
 cps/templates/osd.xml   |  4 ----
 cps/web.py              |  2 +-
 4 files changed, 15 insertions(+), 42 deletions(-)

diff --git a/cps/templates/feed.xml b/cps/templates/feed.xml
index 6e5575c0..52499069 100644
--- a/cps/templates/feed.xml
+++ b/cps/templates/feed.xml
@@ -40,17 +40,14 @@
     {% endfor %}
     <summary>{% if entry.comments[0] %}{{entry.comments[0].text|striptags}}{% endif %}</summary>
     {% if entry.has_cover %}
-    <link rel="http://opds-spec.org/image"
-          href="{{ url_for('feed_get_cover', cover_path=entry.path) }}"
-          type="image/jpg"/>
-    <link rel="http://opds-spec.org/image/thumbnail"
-          href="{{ url_for('feed_get_cover', cover_path=entry.path) }}"
-          type="image/jpg"/>
+    <link rel="http://opds-spec.org/image" href="{{ url_for('feed_get_cover', cover_path=entry.path) }}" type="image/jpg"/>
+    <link rel="http://opds-spec.org/cover"  href="{{ url_for('feed_get_cover', cover_path=entry.path) }}" type="image/jpg"/>
+    <link rel="http://opds-spec.org/image/thumbnail" href="{{ url_for('feed_get_cover', cover_path=entry.path) }}" type="image/jpg"/>
     {% endif %}
-
     {% for format in entry.data %}
-    <link rel="http://opds-spec.org/acquisition"
-          href="{{ url_for('get_opds_download_link', book_id=entry.id, format=format.format|lower)}}"{% if format.format|lower == "epub" %}
+    <link rel="http://opds-spec.org/acquisition" href="{{ url_for('get_opds_download_link', book_id=entry.id, format=format.format|lower)}}"
+          length="{{format.uncompressed_size}}" mtime="{{entry.timestamp}}"
+          {% if format.format|lower == "epub" %}
           type="application/epub+zip"/>
           {% else %}
           type="application/x-mobipocket-ebook"/>
diff --git a/cps/templates/index.xml b/cps/templates/index.xml
index 118f5481..dad1d449 100644
--- a/cps/templates/index.xml
+++ b/cps/templates/index.xml
@@ -1,24 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
   <id>urn:uuid:2853dacf-ed79-42f5-8e8a-a7bb3d1ae6a2</id>
-  <link rel="self"
-        href="{{url_for('feed_index')}}"
+  <link rel="self" href="{{url_for('feed_index')}}" type="application/atom+xml;profile=opds-catalog;kind=navigation"/>
+  <link rel="start" title="{{_('Start')}}" href="{{url_for('feed_index')}}"
         type="application/atom+xml;profile=opds-catalog;kind=navigation"/>
-  <link rel="start"
-        title="{{_('Start')}}"
-        href="{{url_for('feed_index')}}"
-        type="application/atom+xml;profile=opds-catalog;kind=navigation"/>
-  <link rel="search"
-        title="{{_('Search')}}"
-        href="{{url_for('feed_osd')}}"
+  <link rel="search" title="{{_('Search')}}" href="{{url_for('feed_osd')}}"
         type="application/opensearchdescription+xml"/>
   <title>Calibre Web</title>
   <author>
     <name>Calibre Web</name>
     <uri>https://github.com/janeczku/calibre-web</uri>
   </author>
-
-
   <entry>
     <title>{{_('Hot Books')}}</title>
     <link type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition" href="{{url_for('feed_hot')}}" />
@@ -26,50 +18,38 @@
     <id>{{url_for('feed_hot')}}</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;type=feed;kind=acquisition"/>
     <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;type=feed;kind=acquisition"/>
     <id>{{url_for('feed_discover')}}</id>
     <content type="text">{{_('Show Random 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;type=feed;kind=navigation"/>
     <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;type=feed;kind=navigation"/>
     <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;type=feed;kind=navigation"/>
     <id>{{url_for('feed_seriesindex')}}</id>
     <content type="text">{{_('Books ordered by series')}}</content>
    </entry>
diff --git a/cps/templates/osd.xml b/cps/templates/osd.xml
index ddbb3e91..bbc227c4 100644
--- a/cps/templates/osd.xml
+++ b/cps/templates/osd.xml
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
    <LongName>Calibre Web</LongName>
    <ShortName>Calibre Web</ShortName>
    <Description>Calibre Web ebook catalog</Description>
    <Developer>janeczku</Developer>
    <Contact>https://github.com/janeczku/calibre-web</Contact>
-
    <Url type="text/html"
         template="{{url_for('search')}}?query={searchTerms}"/>
-
    <Url type="application/atom+xml"
         template="{{url_for('feed_search')}}?query={searchTerms}"/>
-
    <SyndicationRight>open</SyndicationRight>
    <Language>de-DE</Language>
    <OutputEncoding>UTF-8</OutputEncoding>
diff --git a/cps/web.py b/cps/web.py
index e11c1ee6..7c22269d 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -452,7 +452,7 @@ def feed_search():
                                                            db.Books.authors.any(db.Authors.name.like("%" + term + "%")),
                                                            db.Books.title.like("%" + term + "%"))).filter(filter).all()
 
-        xml = render_template('feed.xml', searchterm=term, entries=entries, Last_Updated=Last_Updated)
+        xml = render_template('feed.xml', searchterm=term, entries=entries)
     else:
         xml = render_template('feed.xml', searchterm="")
     response = make_response(xml)