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

Finish work with separate auth

parent 5b6f8751

opds_catalog/feeds.py

+3 −8
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ from opds_catalog.models import Book, Catalog, Author, Genre, Series, bookshelf, 
from opds_catalog import models

from opds_catalog import settings

from opds_catalog.opds_middleware import BasicAuthMiddleware

#from django.http.response import Http404



class AuthFeed(Feed):

    request = None
@@ -136,7 +135,6 @@ class opdsFeed(Atom1Feed): 
                                                     "title":_("Book doublicates")})

                handler.characters("\n")

            



class MainFeed(AuthFeed):

    feed_type = opdsFeed

    title = settings.TITLE
@@ -339,7 +337,6 @@ class SearchTypesFeed(AuthFeed): 
    def item_enclosures(self, item):

        return (opdsEnclosure(self.item_link(item),"application/atom+xml;profile=opds-catalog;kind=navigation", "subsection"),)





class SearchBooksFeed(AuthFeed):

    feed_type = opdsFeed

    subtitle = settings.SUBTITLE
@@ -558,7 +555,6 @@ class SelectSeriesFeed(AuthFeed): 
    def item_enclosures(self, item):

        return (opdsEnclosure(self.item_link(item),"application/atom+xml;profile=opds-catalog;kind=navigation", "subsection"),)

            

            

class SearchAuthorsFeed(AuthFeed):

    feed_type = opdsFeed

    subtitle = settings.SUBTITLE
@@ -761,7 +757,6 @@ class LangFeed(AuthFeed): 
    def item_enclosures(self, item):

        return (opdsEnclosure(self.item_link(item),"application/atom+xml;profile=opds-catalog;kind=navigation", "subsection"),)





class BooksFeed(AuthFeed):

    feed_type = opdsFeed

    subtitle = settings.SUBTITLE
@@ -820,7 +815,6 @@ class BooksFeed(AuthFeed): 
    def item_enclosures(self, item):

        return (opdsEnclosure(self.item_link(item),"application/atom+xml;profile=opds-catalog;kind=navigation", "subsection"),)

    



class AuthorsFeed(AuthFeed):

    feed_type = opdsFeed

    subtitle = settings.SUBTITLE
@@ -879,7 +873,6 @@ class AuthorsFeed(AuthFeed): 
    def item_enclosures(self, item):

        return (opdsEnclosure(self.item_link(item),"application/atom+xml;profile=opds-catalog;kind=navigation", "subsection"),)

    



class SeriesFeed(AuthFeed):

    feed_type = opdsFeed

    subtitle = settings.SUBTITLE
@@ -985,3 +978,5 @@ class GenresFeed(AuthFeed): 
        

    def item_enclosures(self, item):

        return (opdsEnclosure(self.item_link(item),"application/atom+xml;profile=opds-catalog;kind=navigation", "subsection"),)



        
 No newline at end of file

opds_catalog/locale/ru/LC_MESSAGES/django.po

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ msgid "" 
msgstr ""

"Project-Id-Version: PACKAGE VERSION\n"

"Report-Msgid-Bugs-To: \n"

"POT-Creation-Date: 2016-11-17 20:13+0300\n"

"POT-Creation-Date: 2016-11-17 20:36+0300\n"

"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

"Language-Team: LANGUAGE <LL@li.org>\n"

opds_catalog/utils.py

+2 −1
Original line number Diff line number Diff line
@@ -18,3 +18,4 @@ def translit(s): 


def to_ascii(s):

    return s.encode('ascii', 'replace').decode('utf-8')

 No newline at end of file