Commit 67289b1a authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

Update Cache system (now templates cache use)

parent d60bc56a

sopds/settings.py

+4 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ MIDDLEWARE = [ 
    'django.contrib.messages.middleware.MessageMiddleware',

    'django.middleware.clickjacking.XFrameOptionsMiddleware',

    #'django.middleware.cache.CacheMiddleware',

    'opds_catalog.middleware.FetchFromCacheMiddleware',

    #'opds_catalog.middleware.FetchFromCacheMiddleware',

]



ROOT_URLCONF = 'sopds.urls'
@@ -152,6 +152,7 @@ USE_TZ = True 


CACHE_BACKEND = "locmem://"

CACHE_MIDDLEWARE_KEY_PREFIX = "sopds"

SOPDS_CACHE_TIME = 1200



# Static files (CSS, JavaScript, Images)

# https://docs.djangoproject.com/en/1.9/howto/static-files/
@@ -172,6 +173,7 @@ CONSTANCE_CONFIG = OrderedDict([ 
    ('SOPDS_ROOT_LIB', ('books/',_('Absolute path to books collection directory'))),

    ('SOPDS_BOOK_EXTENSIONS', ('.pdf .djvu .fb2 .epub .mobi', _('List of managed book files extensions'))),

    ('SOPDS_SCAN_START_DIRECTLY', (False,_('Turn once scanning directly'))),

    ('SOPDS_CACHE_TIME', (1200, _('Pages cache time'))),

    

    ('SOPDS_AUTH', (True,_('Enable authentication'))),

    ('SOPDS_ALPHABET_MENU', (True,_('Enable alphabet submenu'))),
@@ -209,7 +211,7 @@ CONSTANCE_CONFIG = OrderedDict([ 
])



CONSTANCE_CONFIG_FIELDSETS = {

    '1. General Options': ('SOPDS_LANGUAGE', 'SOPDS_ROOT_LIB', 'SOPDS_BOOK_EXTENSIONS','SOPDS_SCAN_START_DIRECTLY'),

    '1. General Options': ('SOPDS_LANGUAGE', 'SOPDS_ROOT_LIB', 'SOPDS_BOOK_EXTENSIONS','SOPDS_CACHE_TIME', 'SOPDS_SCAN_START_DIRECTLY'),

    '2. Server Options': ('SOPDS_AUTH', 'SOPDS_ALPHABET_MENU', 'SOPDS_DOUBLES_HIDE', 'SOPDS_COVER_SHOW', 'SOPDS_SPLITITEMS', 'SOPDS_MAXITEMS', 'SOPDS_TITLE_AS_FILENAME', 'SOPDS_NOCOVER_PATH'),    

    '3. Scanner Options': ('SOPDS_FB2SAX','SOPDS_ZIPSCAN','SOPDS_ZIPCODEPAGE', 'SOPDS_INPX_ENABLE', 'SOPDS_INPX_SKIP_UNCHANGED', 'SOPDS_INPX_TEST_ZIP', 'SOPDS_INPX_TEST_FILES', 'SOPDS_DELETE_LOGICAL'),

    '4. Scanner Shedule': ('SOPDS_SCAN_SHED_MIN', 'SOPDS_SCAN_SHED_HOUR', 'SOPDS_SCAN_SHED_DAY','SOPDS_SCAN_SHED_DOW'),

sopds_web_backend/templates/sopds_error.html

+1 −1
Original line number Diff line number Diff line 
{% extends "sopds_main.html" %}



{% block body %}

{% block ext-body %}

{% if errormsg %}

<div class="callout small alert">

  <p>{{ errormsg }}</p>

sopds_web_backend/templates/sopds_hello.html

+1 −1
Original line number Diff line number Diff line 
{% extends "sopds_main.html" %}

{% load i18n %}



{% block body %}

{% block ext-body %}

<div class="row">

<div class="small-12 medium-8 large-8 small-centered columns">

<h3 style="text-align:center;">{% trans "Hello" %} {% if user.is_authenticated %}{{ user.username }}{% endif %}{% if not user.is_authenticated %}{% trans "Guest" %}{% endif %} !</h3>

sopds_web_backend/templates/sopds_login.html

+1 −1
Original line number Diff line number Diff line 
{% extends "sopds_main.html" %}

{% load i18n %}



{% block body %}

{% block ext-body %}

<form method="post" sction='{% url "web:login" %}'>

{% csrf_token %}

<div class="row">

sopds_web_backend/templates/sopds_main.html

+6 −3
Original line number Diff line number Diff line 
{% load staticfiles %}

{% load cache %}



<!DOCTYPE html>



<html lang="ru">
@@ -42,9 +44,10 @@ 


{% block content %}

<div class="row"><div class="large-12 column">

    {% block body %}



    {% endblock %}  {# body #}

    {% block ext-body %} {% endblock %}  {# ext-body #}

{% cache cache_t body cache_id %}

    {% block body %} {% endblock %}  {# body #}

{% endcache %}

</div></div>

{% endblock %}  {# content #}