NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from janeczku/master

Browse Source 
Bugfix search in opds feed (#79 again)
This commit is contained in:
Ethan Lin 2017-01-17 11:16:42 +08:00 committed by GitHub
commit 9303fce5fd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cps/templates/json.txt
View File

@ -16,7 +16,7 @@
{% endfor %} {% endfor %}
], ],
"series": null, "series": null,
"cover": "/opds/cover/{{entry.id}}", "cover": "{{url_for('feed_get_cover', book_id=entry.id)}}",
"languages": [ "languages": [
{% for lang in entry.languages %} {% for lang in entry.languages %}
"{{lang.lang_code}}"{% if not loop.last %},{% endif %} "{{lang.lang_code}}"{% if not loop.last %},{% endif %}
@ -34,9 +34,9 @@
"author_sort": "{{entry.author_sort}}", "author_sort": "{{entry.author_sort}}",
"uuid": "{{entry.uuid}}", "uuid": "{{entry.uuid}}",
"timestamp": "{{entry.timestamp}}", "timestamp": "{{entry.timestamp}}",
"thumbnail": "/opds/cover/{{entry.id}}", "thumbnail": "{{url_for('feed_get_cover', book_id=entry.id)}}",
"main_format": { "main_format": {
"{{entry.data[0].format|lower}}": "/download/{{entry.id}}/{{entry.data[0].format|lower}}" "{{entry.data[0].format|lower}}": "{{ url_for('get_opds_download_link', book_id=entry.id, format=entry.data[0].format|lower)}}"
}, },
"rating":{% if entry.ratings.__len__() > 0 %} "{{entry.ratings[0].rating}}.0"{% else %}0.0{% endif %}, "rating":{% if entry.ratings.__len__() > 0 %} "{{entry.ratings[0].rating}}.0"{% else %}0.0{% endif %},
"authors": [ "authors": [
@ -47,7 +47,7 @@
"other_formats": { "other_formats": {
{% if entry.data.__len__() > 1 %} {% if entry.data.__len__() > 1 %}
{% for format in entry.data[1:] %} {% for format in entry.data[1:] %}
"{{format.format|lower}}": "/download/{{entry.id}}/{{format.format|lower}}"{% if not loop.last %},{% endif %} "{{format.format|lower}}": "{{ url_for('get_opds_download_link', book_id=entry.id, format=format.format|lower)}}"{% if not loop.last %},{% endif %}
{% endfor %} {% endfor %}
{% endif %} }, {% endif %} },
"title_sort": "{{entry.sort}}" "title_sort": "{{entry.sort}}"

2
cps/templates/osd.xml
View File

@ -8,7 +8,7 @@
<Url type="text/html" <Url type="text/html"
template="{{url_for('search')}}?query={searchTerms}"/> template="{{url_for('search')}}?query={searchTerms}"/>
<Url type="application/atom+xml" <Url type="application/atom+xml"
template="{{url_for('feed_search')}}?query={searchTerms}"/> template="{{url_for('feed_normal_search')}}?query={searchTerms}"/>
<SyndicationRight>open</SyndicationRight> <SyndicationRight>open</SyndicationRight>
<Language>de-DE</Language> <Language>de-DE</Language>
<OutputEncoding>UTF-8</OutputEncoding> <OutputEncoding>UTF-8</OutputEncoding>