Commit 043feea6 authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

Start create Search Function

parent 54916a50

.idea/workspace.xml

+163 −187

File changed.

Preview size limit exceeded, changes collapsed.

my_notes.md

+3 −0
Original line number Diff line number Diff line
@@ -19,3 +19,6 @@ http://job-blog.bullgare.ru/2011/02/%D0%B8%D0%BD%D1%82%D0%B5%D1%80%D0%BD%D0%B0%D 
File /mnt/SATA1TB-1/КНИГИ/BOOKS/Художественная литература/LIB.RUS.EC/516006-517007.zip corrupt

**opds_catalog.zipf.BadZipFile: Bad magic number for file header**





## Регулярные выражения re-module

https://docs.python.org/2/library/re.html

opds_catalog/feeds.py

+126 −28
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ from django.utils.xmlutils import SimplerXMLGenerator 
from django.contrib.syndication.views import Feed

from django.core.urlresolvers import reverse

from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger

from django.shortcuts import render



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

from opds_catalog import settings
@@ -34,8 +35,8 @@ class opdsFeed(Atom1Feed): 
        handler.characters("\n")

        handler.addQuickElement("id", self.feed['id'])

        handler.characters("\n")

        if self.feed.get('feed_url') is not None:

            handler.addQuickElement('link', None, {"href":self.feed["feed_url"],"rel":"self","type":"application/atom+xml;profile=opds-catalog;kind=navigation"})

        if self.feed.get('link') is not None:

            handler.addQuickElement('link', None, {"href":self.feed["link"],"rel":"self","type":"application/atom+xml;profile=opds-catalog;kind=navigation"})

            handler.characters("\n")

        if self.feed.get('start_url') is not None:

            handler.addQuickElement('link', None, {"href":self.feed["start_url"],"rel":"start","type":"application/atom+xml;profile=opds-catalog;kind=navigation"})
@@ -99,6 +100,16 @@ class MainFeed(Feed): 
    title = settings.TITLE

    subtitle = settings.SUBTITLE



    def link(self):

        return reverse("opds_catalog:main")



    def feed_extra_kwargs(self, obj):

        return {

                "searchTerm_url":"/opds/search/{searchTerms}/",

                "start_url":reverse("opds_catalog:main"),

                "description_mime_type":"text",

        }



    def items(self):

        return [

                    {"id":1, "title":_("By catalogs"), "link":"opds_catalog:catalogs", "descr": _("Catalogs: %(catalogs)s, books: %(books)s.")%{"catalogs":Catalog.objects.count(),"books":Book.objects.count()}},
@@ -109,28 +120,56 @@ class MainFeed(Feed): 
                    {"id":6, "title":_("Book shelf"), "link":"opds_catalog:bookshelf", "descr": _("Books readed: %(bookshelf)s.")%{"bookshelf":bookshelf.objects.count()}},

        ]



    def link(self):

        """

        Return link for rel="alternate"

        """

        return reverse("opds_catalog:main")

    def item_link(self, item):

        return reverse(item['link'])



    def item_title(self, item):

        return item['title']



    def item_description(self, item):

        return item['descr']



    def item_guid(self, item):

        return "m:%s"%item["id"]



    def item_updateddate(self):

        return timezone.now()



    def feed_url(self):

    def item_enclosures(self, item):

        return (opdsEnclosure(reverse(item['link']),"application/atom+xml;profile=opds-catalog;kind=navigation", "subsection"),)



def Search(request):

    """

        Return link for rel="self"

    Выводим шаблон поиска

    """

        return reverse("opds_catalog:main")

    return render(request, 'opensearch.html')



class SearchTypesFeed(Feed):

    feed_type = opdsFeed

    subtitle = settings.SUBTITLE



    def get_object(self, request, searchterms=""):

        return searchterms



    def link(self, obj):

        return "/opds/search/{searchTerms}/"



    def feed_extra_kwargs(self, obj):

        return {

                #"search_url":"sopds.wsgi?id=09",

                "searchTerm_url":"sopds.wsgi?searchTerm={searchTerms}",

                "searchTerm_url":"/opds/search/{searchTerms}/",

                "start_url":reverse("opds_catalog:main"),

                "description_mime_type":"text",

        }



    def items(self, obj):

        return [

                    {"id":1, "title":_("Search by titles"), "type":"titles", "term":obj, "descr": _("Search books by title")},

                    {"id":2, "title":_("Search by authors"), "type":"authors", "term":obj, "descr": _("Search authors by name")},

                    {"id":3, "title":_("Search genres"), "type":"genres", "term":obj, "descr": _("Search genres")},

        ]



    def item_link(self, item):

        return reverse(item['link'])

        return reverse("opds_catalog:searchterms", kwargs={"searchtype":item["type"], "searchterms":item["term"]})



    def item_title(self, item):

        return item['title']
@@ -139,13 +178,82 @@ class MainFeed(Feed): 
        return item['descr']



    def item_guid(self, item):

        return "m:%s"%item["id"]

        return "st:%s"%item["id"]



    def item_updateddate(self):

        return timezone.now()



    def item_enclosures(self, item):

        return (opdsEnclosure(reverse(item['link']),"application/atom+xml;profile=opds-catalog;kind=navigation", "subsection"),)

        return (opdsEnclosure(reverse("opds_catalog:searchterms", kwargs={"searchtype":item["type"], "searchterms":item["term"]}),"application/atom+xml;profile=opds-catalog;kind=navigation", "subsection"),)





class SearchBooksFeed(Feed):

    feed_type = opdsFeed

    subtitle = settings.SUBTITLE

    description_template = "book_description.html"



    def get_object(self, request, searchterms, searchtype, page=1):

        if not isinstance(page, int):

            page = int(page)



        if searchtype == 'authors':

            # TODO: Переделать на поиск авторов

            books = Book.objects.filter(authors__last_name__contains=searchterms)

        elif searchtype == 'genres':

            # TODO: Переделать на поиск жанров

            books = Book.objects.filter(genres__section__contains=searchterms)

        else:

            books = Book.objects.filter(title__contains=searchterms)



        return {"books":books, "searchterms":searchterms, "searchtype":searchtype, "page":page}



    def link(self, obj):

        return reverse("opds_catalog:searchterms", kwargs={"searchtype":obj["searchtype"], "searchterms":obj["searchterms"]})



    def feed_extra_kwargs(self, obj):

        if obj["page"] != 1:

            prev_url = reverse("opds_catalog:searchterms", kwargs={"searchtype":obj["searchtype"], "searchterms":obj["searchterms"], "page":(obj["page"]-1)})

        else:

            prev_url  = None



        if obj["page"]*settings.MAXITEMS<obj["books"].count():

            next_url = reverse("opds_catalog:searchterms", kwargs={"searchtype":obj["searchtype"], "searchterms":obj["searchterms"], "page":(obj["page"]+1)})

        else:

            next_url  = None

        return {

                "searchTerm_url":"/opds/search/{searchTerms}/",

                "start_url":reverse("opds_catalog:main"),

                "description_mime_type":"text/html",

                "prev_url":prev_url,

                "next_url":next_url,

        }



    def items(self, obj):

        books_list = obj["books"].order_by("title")



        paginator = Paginator(books_list,settings.MAXITEMS)

        try:

            page = paginator.page(obj["page"])

        except EmptyPage:

            page = paginator.page(paginator.num_pages)



        return page



    def item_title(self, item):

        return item.title



    def item_guid(self, item):

        return "b:%s"%(item.id)



    def item_link(self, item):

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



    def item_enclosures(self, item):

        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:cover", kwargs={"book_id":item.id}),"image/jpeg", "http://opds-spec.org/image"),

        )



class CatalogsFeed(Feed):

    feed_type = opdsFeed
@@ -169,16 +277,6 @@ class CatalogsFeed(Feed): 
            return "%s | %s"%(settings.TITLE,_("By catalogs"))



    def link(self, obj):

        """

        Return link for rel="alternate"

        """

        cat, current_page = obj

        return reverse("opds:cat_page", kwargs={"cat_id":cat.id, "page":current_page})



    def feed_url(self, obj):

        """

        Return link for rel="self"

        """

        cat, current_page = obj

        return reverse("opds:cat_page", kwargs={"cat_id":cat.id, "page":current_page})
@@ -197,7 +295,7 @@ class CatalogsFeed(Feed): 


        return {

                #"search_url":"sopds.wsgi?id=09",

                #"searchTerm_url":"sopds.wsgi?searchTerm={searchTerms}",

                "searchTerm_url":"/opds/search/{searchTerms}/",

                "start_url":start_url,

                "prev_url":prev_url,

                "next_url":next_url,