2020-07-16 15:47:01 +00:00
9 changed files with 29 additions and 32 deletions
--- a/CalibreWebCompanion/CalibreWebCompanion/pycache/settings.cpython-38.pyc
+++ b/CalibreWebCompanion/CalibreWebCompanion/pycache/settings.cpython-38.pyc
--- a/CalibreWebCompanion/CalibreWebCompanion/settings.py
+++ b/CalibreWebCompanion/CalibreWebCompanion/settings.py
@ -19,6 +19,20 @@ CALIBRE_DIR = os.path.abspath(
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'


+
+# optimisation stuff
+CONN_MAX_AGE = 60 * 5 
+
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+        'LOCATION': 'unique-snowflake',
+        "TIMEOUT" : 60 * 5,
+        
+    }
+}
+
+
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.0/howto/static-files/

@ -43,7 +57,7 @@ INTERNAL_IPS = [
    '127.0.0.1',
    # ...
 ]
-# Don't change things beyond this
+


 # SECURITY WARNING: don't run with debug turned on in production!
@ -83,6 +97,7 @@ INSTALLED_APPS = [

 MIDDLEWARE = [
    'debug_toolbar.middleware.DebugToolbarMiddleware', # DEBUG purposes
+    'django.middleware.cache.UpdateCacheMiddleware', # cache
    'django.middleware.security.SecurityMiddleware',
    'django.contrib.sessions.middleware.SessionMiddleware',
    'django.middleware.common.CommonMiddleware',
@ -90,6 +105,7 @@ MIDDLEWARE = [
    'django.contrib.auth.middleware.AuthenticationMiddleware',
    'django.contrib.messages.middleware.MessageMiddleware',
    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'django.middleware.cache.FetchFromCacheMiddleware', # cache
 ]

 ROOT_URLCONF = 'CalibreWebCompanion.urls'
--- a/CalibreWebCompanion/library/pycache/models.cpython-38.pyc
+++ b/CalibreWebCompanion/library/pycache/models.cpython-38.pyc
--- a/CalibreWebCompanion/library/pycache/urls.cpython-38.pyc
+++ b/CalibreWebCompanion/library/pycache/urls.cpython-38.pyc
--- a/CalibreWebCompanion/library/pycache/views.cpython-38.pyc
+++ b/CalibreWebCompanion/library/pycache/views.cpython-38.pyc
--- a/CalibreWebCompanion/library/models.py
+++ b/CalibreWebCompanion/library/models.py
@ -383,25 +383,3 @@ class BookTagLink(models.Model):
 #     class Meta:
 #         managed = False
 #         db_table = 'feeds'
-#
-#
-# class LastReadPositions(models.Model):
-#     book = models.IntegerField()
-#     format = models.TextField()
-#     user = models.TextField()
-#     device = models.TextField()
-#     cfi = models.TextField()
-#     epoch = models.FloatField()
-#     pos_frac = models.FloatField()
-#
-#     class Meta:
-#         managed = False
-#         db_table = 'last_read_positions'
-
-
-# class MetadataDirtied(models.Model):
-#     book = models.IntegerField()
-
-#     class Meta:
-#         managed = False
-#         db_table = 'metadata_dirtied'
--- a/CalibreWebCompanion/library/templates/base.html
+++ b/CalibreWebCompanion/library/templates/base.html
@ -19,7 +19,7 @@
      background-color: #515151;
      border: 1px #303030;
      border-radius: 0.5rem;
-      padding: .2rem .25rem ;
+      padding: .2rem .25rem;
      margin: 0.1rem 0.1rem .1rem;

    }
@ -48,6 +48,7 @@
    .tags {
      width: 25%;
    }
+
    .added {
      width: 10%;
    }
@ -55,12 +56,13 @@
    .published {
      width: 10%;
    }
-
  </style>
 </head>

 <body>

+
+
  <div class="navbar-fixed">
    <nav>
      <div class="nav-wrapper row green darken-1">
@ -70,7 +72,9 @@
          <li class="active"><a href="{{user.get_absolute_url}}"> {{ user.get_username }}</a></li>
          <li><a href="{% url 'logout'%}?next={{request.path}}">Logout</a></li>
        </ul>
-
+        {% load cache %}
+        {% cache 500 sidebar request.user.username %}
+        <!--Maybe i'm retarded but this is not caching versions per user-->
        <ul class="left">
          <li><a href="{% url 'books' %}">Books</a></li>
          <li><a class="dropdown-trigger" href={% url 'authors' %} data-target="dropdown-authors">Authors<i
@ -126,7 +130,7 @@
          <li><a href="{{pub.get_absolute_url}}">{{pub}} <p class="count">{{pub.num_books}}</p> </a> </li>
          {% endfor %}
        </ul>
-
+        {% endcache %}
        {% else %}
        <li><a href="{% url 'sign-up'%}?next={{request.path}}">Sign up</a></li>
        <li><a href="{% url 'login'%}?next={{request.path}}">Login</a></li>
@ -134,7 +138,6 @@
        {% endif %}
      </div>

-
    </nav>
  </div>
  <script>
@ -145,7 +148,6 @@
    });
  </script>

-
  {% if user.is_authenticated %}
  {% block content %} {% endblock %}
  {% else %}
--- a/CalibreWebCompanion/library/urls.py
+++ b/CalibreWebCompanion/library/urls.py
@ -1,6 +1,6 @@
 from django.urls import path
 from . import views
-
+from django.views.decorators.cache import cache_page


 urlpatterns = [
--- a/CalibreWebCompanion/library/views.py
+++ b/CalibreWebCompanion/library/views.py
@ -10,6 +10,7 @@ from django.contrib.auth import login
 from django.contrib.auth.decorators import login_required


+
@login_required
 def index(request):
    return render(request, 'accounts/index.html')