X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/967eed676fc83d15b26149047f353ac61faa8217..HEAD:/src/wolnelektury/utils.py diff --git a/src/wolnelektury/utils.py b/src/wolnelektury/utils.py index c65a172bd..dfa8522f8 100644 --- a/src/wolnelektury/utils.py +++ b/src/wolnelektury/utils.py @@ -1,5 +1,5 @@ -# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # import codecs import csv @@ -8,24 +8,17 @@ from inspect import getargspec from io import BytesIO import json import os -import pytz import re +from django.conf import settings +from django.contrib import admin +from django.core.cache import cache from django.core.mail import send_mail from django.http import HttpResponse from django.template.loader import render_to_string -from django.utils import timezone +from django.utils.translation import get_language from django.conf import settings -from django.utils.translation import ugettext - - -tz = pytz.timezone(settings.TIME_ZONE) - - -def localtime_to_utc(localtime): - return timezone.utc.normalize( - tz.localize(localtime) - ) +from django.utils.safestring import mark_safe def utc_for_js(dt): @@ -90,7 +83,7 @@ def ajax(login_required=False, method=None, template=None, permission_required=N if fun_kwargs or key in fun_params) kwargs.update(stringify_keys(request_params)) res = None - if login_required and not request.user.is_authenticated(): + if login_required and not request.user.is_authenticated: res = {'result': 'logout'} if (permission_required and not request.user.has_perm(permission_required)): @@ -114,8 +107,8 @@ def ajax(login_required=False, method=None, template=None, permission_required=N def send_noreply_mail(subject, message, recipient_list, **kwargs): send_mail( - u'[WolneLektury] ' + subject, - message + u"\n\n-- \n" + ugettext(u'Message sent automatically. Please do not reply.'), + '[WolneLektury] ' + subject, + message + "\n\n-- \nWiadomość wysłana automatycznie. Prosimy nie odpowiadać.", 'no-reply@wolnelektury.pl', recipient_list, **kwargs) @@ -155,12 +148,58 @@ def re_escape(s): return re.sub(r"[(){}\[\].*?|^$\\+-]", r"\\\g<0>", s) -BOT_BITS = ['bot', 'slurp', 'spider', 'facebook', 'crawler', 'parser', 'http'] +def get_cached_render_key(instance, property_name, language=None): + if language is None: + language = get_language() + return 'cached_render:%s.%s:%s:%s' % ( + type(instance).__name__, + property_name, + instance.pk, + language + ) + + +def cached_render(template_name, timeout=24 * 60 * 60): + def decorator(method): + @wraps(method) + def wrapper(self): + key = get_cached_render_key(self, method.__name__) + content = cache.get(key) + if content is None: + context = method(self) + content = render_to_string(template_name, context) + cache.set(key, str(content), timeout=timeout) + else: + content = mark_safe(content) + return content + return wrapper + return decorator + + +def clear_cached_renders(bound_method): + for lc, ln in settings.LANGUAGES: + cache.delete( + get_cached_render_key( + bound_method.__self__, + bound_method.__name__, + lc + ) + ) + + +class YesNoFilter(admin.SimpleListFilter): + def lookups(self, request, model_admin): + return ( + ('yes', 'Tak'), + ('no', 'Nie'), + ) + + def queryset(self, request, queryset): + if self.value() == 'yes': + return queryset.filter(self.q) + elif self.value() == 'no': + return queryset.exclude(self.q) -def is_crawler(request): - user_agent = request.META.get('HTTP_USER_AGENT') - if not user_agent: - return True - user_agent = user_agent.lower() - return any(bot_bit in user_agent for bot_bit in BOT_BITS) +def is_ajax(request): + return request.headers.get('x-requested-with') == 'XMLHttpRequest'