Commit 3a24cf94 authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

Change zip argument for Download to zip_flag

parent 5da22175

opds_catalog/feeds.py

+6 −6
Original line number Diff line number Diff line
@@ -268,15 +268,15 @@ class CatalogsFeed(AuthFeed): 
        if isinstance(item, Catalog):

            return reverse("opds_catalog:cat_tree", kwargs={"cat_id":item.id})

        else:

            return reverse("opds_catalog:download", kwargs={"book_id":item.id,"zip":0})

            return reverse("opds_catalog:download", kwargs={"book_id":item.id,"zip_flag":0})



    def item_enclosures(self, item):

        if isinstance(item, Catalog):

            return (opdsEnclosure(reverse("opds_catalog:cat_tree", kwargs={"cat_id":item.id}),"application/atom+xml;profile=opds-catalog;kind=navigation", "subsection"),)

        else:

            return (

                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_flag":0}),"application/fb2" ,"http://opds-spec.org/acquisition/open-access"),

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

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

            )
@@ -475,15 +475,15 @@ class SearchBooksFeed(AuthFeed): 
        return "b:%s"%(item['id'])



    def item_link(self, item):

        return reverse("opds_catalog:download", kwargs={"book_id":item['id'],"zip":0})

        return reverse("opds_catalog:download", kwargs={"book_id":item['id'],"zip_flag":0})

  

    def item_updateddate(self, item):

        return item['registerdate'] 

         

    def item_enclosures(self, item):

        enclosure = [

            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:download", kwargs={"book_id":item['id'],"zip_flag":0}),"application/%s"%item['format'] ,"http://opds-spec.org/acquisition/open-access"),

            opdsEnclosure(reverse("opds_catalog:download", kwargs={"book_id":item['id'],"zip_flag":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"),

        ]

        if (settings.FB2TOEPUB!="") and (item['format']=='fb2'):

opds_catalog/urls.py

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ urlpatterns = [ 
    url(r'^search/(?P<searchterms>.+)/',feeds.SearchTypesFeed(), name='searchtypes'),

    

    url(r'^convert/(?P<book_id>[0-9]+)/(?P<convert_type>.+)/$',dl.ConvertFB2, name='convert'),    

    url(r'^download/(?P<book_id>[0-9]+)/(?P<zip>[0-1])/$',dl.Download, name='download'),

    url(r'^download/(?P<book_id>[0-9]+)/(?P<zip_flag>[0-1])/$',dl.Download, name='download'),

    url(r'^cover/(?P<book_id>[0-9]+)/$',dl.Cover, name='cover'),    

        

    url(r'^',feeds.MainFeed(), name='main'),