Commit 61fec417 authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

Fix download format

parent 8d8ba954

opds_catalog/feeds.py

+2 −2
Original line number Diff line number Diff line
@@ -484,8 +484,8 @@ class SearchBooksFeed(AuthFeed): 
         

    def item_enclosures(self, item):

        enclosure = [

            opdsEnclosure(reverse("opds_catalog:download", kwargs={"book_id":item['id'],"zip":0}),"application/fb2" ,"http://opds-spec.org/acquisition/open-access"),

            opdsEnclosure(reverse("opds_catalog:download", kwargs={"book_id":item['id'],"zip":1}),"application/fb2+zip", "http://opds-spec.org/acquisition/open-access"),

            opdsEnclosure(reverse("opds_catalog:download", kwargs={"book_id":item['id'],"zip":0}),"application/%s"%item['format'] ,"http://opds-spec.org/acquisition/open-access"),

            opdsEnclosure(reverse("opds_catalog:download", kwargs={"book_id":item['id'],"zip":1}),"application/%s+zip"%item['format'], "http://opds-spec.org/acquisition/open-access"),

            opdsEnclosure(reverse("opds_catalog:cover", kwargs={"book_id":item['id']}),"image/jpeg", "http://opds-spec.org/image"),

        ]

        return enclosure

sopds_web_backend/templates/sopds_books.html

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 
		<div class="large-12 column">

			<b>{{ b.title }}</b>

			<i style="font-size:80%;">Скачать: </i>

			<i><a href="{% url 'opds_catalog:download' b.id 0 %}"><span class="label small">fb2</span></a></i>&nbsp;

			<i><a href="{% url 'opds_catalog:download' b.id 1 %}"><span class="label small">fb2+zip</span></a></i>&nbsp;

			<i><a href="{% url 'opds_catalog:download' b.id 0 %}"><span class="label small">{{b.format}}</span></a></i>&nbsp;

			<i><a href="{% url 'opds_catalog:download' b.id 1 %}"><span class="label small">{{b.format}}+zip</span></a></i>&nbsp;

		</div>

		

		<div class="large-12 column">

sopds_web_backend/views.py

+1 −4
Original line number Diff line number Diff line 
from django.shortcuts import render, render_to_response, redirect, Http404

from django.template import Context, RequestContext

from django.template.context_processors import csrf

from django.core.paginator import Paginator, InvalidPage



from opds_catalog.models import Book, Author, Series, bookshelf

from opds_catalog.settings import SPLITITEMS, MAXITEMS, DOUBLES_HIDE, AUTH, VERSION

from opds_catalog.settings import MAXITEMS, DOUBLES_HIDE, AUTH, VERSION



from sopds_web_backend.settings import HALF_PAGES_LINKS
@@ -65,8 +64,6 @@ def SearchBooksView(request): 
                #books = bookshelf.objects.filter(user=request.user).select_related('book')              

            else:

                books={}         

            print(books.query)



        # Поиск дубликатов для книги            

        elif searchtype == 'd':

            #try: