Commit 6793ab3e authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

Fix Logout View

parent 50a01a26
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ from django.conf import settings

loglevels={'debug':logging.DEBUG,'info':logging.INFO,'warning':logging.WARNING,'error':logging.ERROR,'critical':logging.CRITICAL,'none':logging.NOTSET}

VERSION = "0.35"
VERSION = "0.36"

# ROOT_LIB содержит путь к каталогу в котором расположена ваша коллекция книг
ROOT_LIB = getattr(settings, "SOPDS_ROOT_LIB", "books/")

opds_catalog/sviews.py

deleted100644 → 0
+0 −262
Original line number Diff line number Diff line
from __future__ import unicode_literals

from calendar import timegm

from django.conf import settings
from django.contrib.sites.shortcuts import get_current_site
from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
from django.http import Http404, HttpResponse
from django.template import TemplateDoesNotExist, loader
from django.utils import feedgenerator, six
from django.utils.encoding import force_text, iri_to_uri, smart_text
from django.utils.html import escape
from django.utils.http import http_date
from django.utils.timezone import get_default_timezone, is_naive, make_aware

import time


def add_domain(domain, url, secure=False):
    protocol = 'https' if secure else 'http'
    if url.startswith('//'):
        # Support network-path reference (see #16753) - RSS requires a protocol
        url = '%s:%s' % (protocol, url)
    elif not url.startswith(('http://', 'https://', 'mailto:')):
        url = iri_to_uri('%s://%s%s' % (protocol, domain, url))
    return url


class FeedDoesNotExist(ObjectDoesNotExist):
    pass


class Feed(object):
    feed_type = feedgenerator.DefaultFeed
    title_template = None
    description_template = None

    def __call__(self, request, *args, **kwargs):
        print('__call__ 1', time.time())
        try:
            obj = self.get_object(request, *args, **kwargs)
        except ObjectDoesNotExist:
            raise Http404('Feed object does not exist.')
        print('__call__ 2', time.time())
        feedgen = self.get_feed(obj, request)
        print('__call__ 3', time.time())
        response = HttpResponse(content_type=feedgen.content_type)
        print('__call__ 4', time.time())
        if hasattr(self, 'item_pubdate') or hasattr(self, 'item_updateddate'):
            # if item_pubdate or item_updateddate is defined for the feed, set
            # header so as ConditionalGetMiddleware is able to send 304 NOT MODIFIED
            response['Last-Modified'] = http_date(
                timegm(feedgen.latest_post_date().utctimetuple()))
        print('__call__ 6', time.time())    
        feedgen.write(response, 'utf-8')
        print('__call__ 7', time.time())
        return response

    def item_title(self, item):
        # Titles should be double escaped by default (see #6533)
        return escape(force_text(item))

    def item_description(self, item):
        return force_text(item)

    def item_link(self, item):
        try:
            return item.get_absolute_url()
        except AttributeError:
            raise ImproperlyConfigured(
                'Give your %s class a get_absolute_url() method, or define an '
                'item_link() method in your Feed class.' % item.__class__.__name__
            )

    def item_enclosures(self, item):
        enc_url = self.__get_dynamic_attr('item_enclosure_url', item)
        if enc_url:
            enc = feedgenerator.Enclosure(
                url=smart_text(enc_url),
                length=smart_text(self.__get_dynamic_attr('item_enclosure_length', item)),
                mime_type=smart_text(self.__get_dynamic_attr('item_enclosure_mime_type', item)),
            )
            return [enc]
        return []

    def __get_dynamic_attr(self, attname, obj, default=None):
        try:
            attr = getattr(self, attname)
        except AttributeError:
            return default
        if callable(attr):
            # Check co_argcount rather than try/excepting the function and
            # catching the TypeError, because something inside the function
            # may raise the TypeError. This technique is more accurate.
            try:
                code = six.get_function_code(attr)
            except AttributeError:
                code = six.get_function_code(attr.__call__)
            if code.co_argcount == 2:       # one argument is 'self'
                return attr(obj)
            else:
                return attr()
        return attr

    def feed_extra_kwargs(self, obj):
        """
        Returns an extra keyword arguments dictionary that is used when
        initializing the feed generator.
        """
        return {}

    def item_extra_kwargs(self, item):
        """
        Returns an extra keyword arguments dictionary that is used with
        the `add_item` call of the feed generator.
        """
        return {}

    def get_object(self, request, *args, **kwargs):
        return None

    def get_context_data(self, **kwargs):
        """
        Returns a dictionary to use as extra context if either
        ``self.description_template`` or ``self.item_template`` are used.

        Default implementation preserves the old behavior
        of using {'obj': item, 'site': current_site} as the context.
        """
        return {'obj': kwargs.get('item'), 'site': kwargs.get('site')}

    def get_feed(self, obj, request):
        """
        Returns a feedgenerator.DefaultFeed object, fully populated, for
        this feed. Raises FeedDoesNotExist for invalid parameters.
        """
        print('get_feed 1', time.time())
        current_site = get_current_site(request)
        print('get_feed 2', time.time())
        
        link = self.__get_dynamic_attr('link', obj)
        print('get_feed 3', time.time())
        link = add_domain(current_site.domain, link, request.is_secure())
        print('get_feed 4', time.time())

        feed = self.feed_type(
            title=self.__get_dynamic_attr('title', obj),
            subtitle=self.__get_dynamic_attr('subtitle', obj),
            link=link,
            description=self.__get_dynamic_attr('description', obj),
            language=settings.LANGUAGE_CODE,
            feed_url=add_domain(
                current_site.domain,
                self.__get_dynamic_attr('feed_url', obj) or request.path,
                request.is_secure(),
            ),
            author_name=self.__get_dynamic_attr('author_name', obj),
            author_link=self.__get_dynamic_attr('author_link', obj),
            author_email=self.__get_dynamic_attr('author_email', obj),
            categories=self.__get_dynamic_attr('categories', obj),
            feed_copyright=self.__get_dynamic_attr('feed_copyright', obj),
            feed_guid=self.__get_dynamic_attr('feed_guid', obj),
            ttl=self.__get_dynamic_attr('ttl', obj),
            **self.feed_extra_kwargs(obj)
        )
        print('get_feed 5', time.time())
        
        title_tmp = None
        if self.title_template is not None:
            try:
                title_tmp = loader.get_template(self.title_template)
            except TemplateDoesNotExist:
                pass
        print('get_feed 6', time.time())
        
        description_tmp = None
        if self.description_template is not None:
            try:
                description_tmp = loader.get_template(self.description_template)
            except TemplateDoesNotExist:
                pass

        print('get_feed 7', time.time())
        
        i=0
        for item in self.__get_dynamic_attr('items', obj):
            if i==0: print('for item 1', time.time())
            context = self.get_context_data(item=item, site=current_site,
                                            obj=obj, request=request)
            if i==0: print('for item 2', time.time())
            if title_tmp is not None:
                title = title_tmp.render(context, request)
            else:
                title = self.__get_dynamic_attr('item_title', item)

            if i==0: print('for item 3', time.time())
            if description_tmp is not None:
                description = description_tmp.render(context, request)
            else:
                description = self.__get_dynamic_attr('item_description', item)

            if i==0: print('for item 4', time.time())
            link = add_domain(
                current_site.domain,
                self.__get_dynamic_attr('item_link', item),
                request.is_secure(),
            )

            if i==0: print('for item 5', time.time())
            enclosures = self.__get_dynamic_attr('item_enclosures', item)

            if i==0: print('for item 6', time.time())
            author_name = self.__get_dynamic_attr('item_author_name', item)

            if i==0: print('for item 7', time.time())
            if author_name is not None:
                author_email = self.__get_dynamic_attr('item_author_email', item)
                author_link = self.__get_dynamic_attr('item_author_link', item)
            else:
                author_email = author_link = None

            if i==0: print('for item 8', time.time())
            tz = get_default_timezone()

            if i==0: print('for item 9', time.time())
            pubdate = self.__get_dynamic_attr('item_pubdate', item)

            if i==0: print('for item 10', time.time())
            if pubdate and is_naive(pubdate):
                pubdate = make_aware(pubdate, tz)

            if i==0: print('for item 11', time.time())
            updateddate = self.__get_dynamic_attr('item_updateddate', item)

            if i==0: print('for item 12', time.time())
            if updateddate and is_naive(updateddate):
                updateddate = make_aware(updateddate, tz)

            if i==0: print('for item 13', time.time())
            feed.add_item(
                title=title,
                link=link,
                description=description,
                unique_id=self.__get_dynamic_attr('item_guid', item, link),
                unique_id_is_permalink=self.__get_dynamic_attr(
                    'item_guid_is_permalink', item),
                enclosures=enclosures,
                pubdate=pubdate,
                updateddate=updateddate,
                author_name=author_name,
                author_email=author_email,
                author_link=author_link,
                categories=self.__get_dynamic_attr('item_categories', item),
                item_copyright=self.__get_dynamic_attr('item_copyright', item),
                **self.item_extra_kwargs(item)
            )
            if i==0: print('for item 14', time.time())
            
            i += 1
            
        print('get_feed 8', time.time(), i)
        return feed
+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ urlpatterns = [
    url(r'^opds/', include('opds_catalog.urls', namespace='opds', app_name='opds_catalog')),
    url(r'^web/', include('sopds_web_backend.urls', namespace='web', app_name='opds_web_backend')),    
    url(r'^admin/', admin.site.urls),
    url(r'^logout/$', logout, {'next_page':'/web/'},name='logout'),   
    #url(r'^logout/$', logout, {'next_page':'/web/'},name='logout'),   
    url(r'^', include('sopds_web_backend.urls', namespace='web', app_name='opds_web_backend')),
]
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
        {% if sopds_auth %}
        <ul class="menu" style="font-size:90%;">
            {% if user.is_authenticated %}
                <li><a href="{% url "web:logout" %}" onClick="logout('/logout/')"><i class="fi-torsos"></i>{% trans "Logout" %} ({{ user.username }})</a></li>
                <li><a href="{% url "web:logout" %}"><i class="fi-torsos"></i>{% trans "Logout" %} ({{ user.username }})</a></li>
            {% if user.is_superuser %}
            	<li><a href="/admin/"><i class="fi-widget"></i>{% trans "Settings" %}</a></li>
            {% endif %}	                
+3 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ from django.shortcuts import render, redirect
from django.template.context_processors import csrf
from django.db.models import Count, Min
from django.utils.translation import ugettext as _
from django.contrib.auth import authenticate, login, REDIRECT_FIELD_NAME
from django.contrib.auth import authenticate, login, logout, REDIRECT_FIELD_NAME
from django.contrib.auth.decorators import user_passes_test
from django.core.urlresolvers import reverse, reverse_lazy

@@ -527,7 +527,9 @@ def LoginView(request):
    
    return render(request, 'sopds_login.html', args)

@sopds_login(url='web:login')
def LogoutView(request):
    logout(request)
    args = {}
    args['breadcrumbs'] = [_('Logout')]
    return redirect(reverse('web:main'))