Started implementing cache.

Added placeholders in log folder, and the new cache folder so git wont ignore them.

8 files changed, 86 insertions, 97 deletions

diff --git a/forum/models/question.py b/forum/models/question.py
index 1c2cf749..f351dff0 100755
--- a/forum/models/question.py
+++ b/forum/models/question.py
@@ -1,6 +1,8 @@
 from base import *
 from tag import Tag
 
+from forum.utils.lists import LazyList
+
 class QuestionManager(models.Manager):
     def create_new(self, title=None,author=None,added_at=None, wiki=False,tagnames=None,summary=None, text=None):
         question = Question(
@@ -98,17 +100,25 @@ class QuestionManager(models.Manager):
         Questions with the individual tags will be added to list if above questions are not full.
         """
         #print datetime.datetime.now()
-        questions = list(self.filter(tagnames = question.tagnames, deleted=False).all())
 
-        tags_list = question.tags.all()
-        for tag in tags_list:
-            extend_questions = self.filter(tags__id = tag.id, deleted=False)[:50]
-            for item in extend_questions:
-                if item not in questions and len(questions) < 10:
-                    questions.append(item)
+        manager = self
+
+        def get_data():
+            questions = list(manager.filter(tagnames = question.tagnames, deleted=False).all())
+
+            tags_list = question.tags.all()
+            for tag in tags_list:
+                extend_questions = manager.filter(tags__id = tag.id, deleted=False)[:50]
+                for item in extend_questions:
+                    if item not in questions and len(questions) < 10:
+                        questions.append(item)
+
+            #print datetime.datetime.now()
+            return questions
+
+        return LazyList(get_data)
+
 
-        #print datetime.datetime.now()
-        return questions
 
 class Question(Content, DeletableContent):
     title    = models.CharField(max_length=300)
diff --git a/forum/skins/default/templates/footer.html b/forum/skins/default/templates/footer.html
index 2f95921d..66ea2bc5 100755
--- a/forum/skins/default/templates/footer.html
+++ b/forum/skins/default/templates/footer.html
@@ -21,7 +21,7 @@
                 {% endspaceless %}
 			</div>
 		  <p>
-			 <a href="http://github.com/cnprog/CNPROG/network" target="_blank">
+			 <a href="http://osqa.net" target="_blank">
 				powered by OSQA
 			 </a>
 		  </p>
diff --git a/forum/skins/default/templates/index.html b/forum/skins/default/templates/index.html
index 42fa175d..eb4dc224 100755
--- a/forum/skins/default/templates/index.html
+++ b/forum/skins/default/templates/index.html
@@ -5,6 +5,7 @@
 {% load humanize %}

 {% load extra_filters %}

 {% load smart_if %}

+{% load cache %}

 {% block title %}{% spaceless %}{% trans "Home" %}{% endspaceless %}{% endblock %}

 {% block meta %}<meta name="keywords" content="{{ settings.APP_KEYWORDS }}" />

         <meta name="description" content="{{ settings.APP_DESCRIPTION }}" />{% endblock %}

@@ -31,41 +32,7 @@
     </div>

 </div>

 <!-- ???? -->

-<div id="listA">

-    	{% for question in questions.object_list %}

-	<div class="short-summary">

-		<div class="counts">

-			<div class="votes">

-				<div class="item-count">{{question.score|intcomma}}</div>

-				<div>{% trans "votes" %}</div>

-			</div >

-			<div {% if question.answer_accepted %}title="{% trans "this answer has been accepted to be correct" %}"{% endif %} class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">

-				<div class="item-count">{{question.answer_count|intcomma}}</div>

-				<div>{% trans "answers" %}</div>

-			</div>

-			<div class="views">

-				 <div class="item-count">{{question.view_count|cnprog_intword|safe}}</div>

-				 <div>{% trans "views" %}</div>

-			</div>

-		</div>

-

-		<h2><a title="{{question.summary}}" href="{% url question id=question.id %}{{question.title|slugify}}">{{question.title}}</a></h2>

-

-		<div class="userinfo">

-			<span class="relativetime" title="{{question.last_activity_at}}">{% diff_date question.last_activity_at %}</span>

-			{% if question.last_activity_by %}

-			<a href="/users/{{ question.last_activity_by.id }}/{{ question.last_activity_by.username|slugify }}/">{{ question.last_activity_by }}</a> {% get_score_badge question.last_activity_by %}

-			{% endif %}

-		</div>

-

-		<div class="tags">

-			{% for tag in question.tagname_list %}

-			<a href="{% url tag_questions tag|urlencode %}" title="{% trans "see questions tagged" %} '{{ tag }}' {% trans "using tags" %}" rel="tag">{{ tag }}</a>

-			{% endfor %}

-		</div>

-	</div>

-	{% endfor %}

-</div>

+{% include "question_list.html" %}

 {% endblock %}

 

 {% block sidebar %}

@@ -85,10 +52,12 @@
 	<h3>{% trans "Recent tags" %}</h3>

 	<div class="body">

          <div class="tags">

+        {% cache 60 recent_tags %}

         {% for tag in tags %}

             <a rel="tag"

 				title="{% blocktrans with tag.name as tagname %}see questions tagged '{{tagname}}'{% endblocktrans %}" href="{% url tag_questions tag.name|urlencode %}">{{ tag.name }}</a>

         {% endfor %}

+        {% endcache %}

         </div>

         <div class="more"><a href="{% url tags %}">{% trans "popular tags" %} </a> </div>

     </div>

@@ -98,6 +67,7 @@
     <h3>{% trans "Recent awards" %}</h3>

         <div class="body">

              <ul class="badge-list">

+             {% cache 60 recent_awards %}

              {% for award in awards %}

                 <li>

                 <a href="{% url badges %}{{award.badge_id}}/{{award.badge_name}}" title="{{ award.badge_description }}" class="medal">

@@ -105,6 +75,7 @@
                 <a href="/users/{{ award.user_id }}/{{ award.user_name|slugify }}/">{{ award.user_name }}</a>

                 </li>

             {% endfor %}

+            {% endcache %}

             </ul>

         	<div class="more"><a href="{% url badges %}">{% trans "all awards" %} </a> </div>

          </div>

diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index 23c24113..3df778dc 100755
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -5,6 +5,7 @@
 {% load smart_if %}

 {% load humanize %}

 {% load i18n %}

+{% load cache %}

 {% block title %}{% spaceless %}{{ question.get_question_title }}{% endspaceless %}{% endblock %}

 {% block forejs %}

         <meta name="description" content="{{question.summary}}" />

@@ -164,8 +165,8 @@
                                 {% endjoinitems %}

                             </div>

                             <div class="post-update-info-container">

-                                {% post_contributor_info question "original_author" %}

-                                {% post_contributor_info question "last_updater" %}

+                                    {% post_contributor_info question "original_author" %}

+                                    {% post_contributor_info question "last_updater" %}

                             </div>

                             <div class="comments-container" id="comments-container-question-{{question.id}}">

                             {% for comment in question.get_comments|slice:":5" %}

@@ -313,8 +314,8 @@
                                             {% endjoinitems %}

                                         </div>

                                         <div class="post-update-info-container">

-                                            {% post_contributor_info answer "original_author" %}

-                                            {% post_contributor_info answer "last_updater" %}

+                                                {% post_contributor_info answer "original_author" %}

+                                                {% post_contributor_info answer "last_updater" %}

                                         </div>

                                         <div class="comments-container" id="comments-container-answer-{{answer.id}}">

                                         {% for comment in answer.get_comments|slice:":5" %}

@@ -468,6 +469,7 @@
 {% endblock %}

 

 {% block sidebar %}

+{% cache 600 questions_tags question.id %}

 <div class="boxC">

     <p>

 		{% trans "Question tags" %}:

@@ -489,17 +491,21 @@
         {% trans "last updated" %}: <strong title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</strong>

     </p>

 </div>

-

+{% endcache %}

+{% cache 1800 related_questions question.id %}

 <div class="boxC">

     <h3 class="subtitle">{% trans "Related questions" %}</h3>

     <div class="questions-related">

-        {% for question in similar_questions %}

+

+        {% for question in similar_questions.data %}

         <p>

             <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>

         </p>

         {% endfor %}

+

     </div>

 </div>

+{% endcache %}

 

 {% endblock %}

 

diff --git a/forum/skins/default/templates/question_list.html b/forum/skins/default/templates/question_list.html
new file mode 100755
index 00000000..cf69d133
--- /dev/null
+++ b/forum/skins/default/templates/question_list.html
@@ -0,0 +1,42 @@
+{% load cache %}

+{% load i18n %}

+{% load humanize %}

+{% load extra_filters %}

+{% load extra_tags %}

+

+<div id="listA">

+    {% for question in questions.object_list %}

+    {% cache 60 question_in_list question.id %}

+	<div class="short-summary">

+		<div class="counts">

+			<div class="votes">

+				<div class="item-count">{{question.score|intcomma}}</div>

+				<div>{% trans "votes" %}</div>

+			</div >

+			<div {% if question.answer_accepted %}title="{% trans "this answer has been accepted to be correct" %}"{% endif %} class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">

+				<div class="item-count">{{question.answer_count|intcomma}}</div>

+				<div>{% trans "answers" %}</div>

+			</div>

+			<div class="views">

+				 <div class="item-count">{{question.view_count|cnprog_intword|safe}}</div>

+				 <div>{% trans "views" %}</div>

+			</div>

+		</div>

+

+		<h2><a title="{{question.summary}}" href="{% url question id=question.id %}{{question.title|slugify}}">{{question.title}}</a></h2>

+		<div class="userinfo">

+			<span class="relativetime" title="{{question.last_activity_at}}">{% diff_date question.last_activity_at %}</span>

+			{% if question.last_activity_by %}

+			<a href="/users/{{ question.last_activity_by.id }}/{{ question.last_activity_by.username|slugify }}/">{{ question.last_activity_by }}</a> {% get_score_badge question.last_activity_by %}

+			{% endif %}

+		</div>

+

+		<div class="tags">

+			{% for tag in question.tagname_list %}

+			<a href="{% url tag_questions tag|urlencode %}" title="{% trans "see questions tagged" %} '{{ tag }}' {% trans "using tags" %}" rel="tag">{{ tag }}</a>

+			{% endfor %}

+		</div>

+	</div>

+    {% endcache %}

+	{% endfor %}

+</div>
\ No newline at end of file
diff --git a/forum/skins/default/templates/questions.html b/forum/skins/default/templates/questions.html
index 58ad4146..de6076ac 100755
--- a/forum/skins/default/templates/questions.html
+++ b/forum/skins/default/templates/questions.html
@@ -50,52 +50,7 @@
         <a id="mostvoted" href="{% if is_search %}{{ search_uri }}&{% else %}?{% endif %}sort=mostvoted" class="off" title="{% trans "most voted questions" %}">{% trans "most voted" %}</a>    

     </div>

 </div>

-<div id="listA">

-    {% for question in questions.object_list %}

-	<div class="short-summary">

-		<div class="counts">

-			<div class="votes">

-				<div class="item-count">{{question.score|intcomma}}</div>

-				<div>{% trans "votes" %}</div>

-			</div >

-			<div {% if question.answer_accepted %}title="{% trans "this answer has been accepted to be correct" %}"{% endif %} class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">

-				<div class="item-count">{{question.answer_count|intcomma}}</div>

-				<div>{% trans "answers" %}</div>

-			</div>

-			<div class="views">

-				 <div class="item-count">{{question.view_count|cnprog_intword|safe}}</div>

-				 <div>{% trans "views" %}</div>

-			</div>

-		</div>

-

-		<h2><a title="{{question.summary}}" href="{% url question id=question.id %}{{question.title|slugify}}">{{question.title}}</a></h2>

-

-		<div class="userinfo">

-			<span class="relativetime" title="{{question.last_activity_at}}">{% diff_date question.last_activity_at %}</span>

-			{% if question.last_activity_by %}

-			<a href="/users/{{ question.last_activity_by.id }}/{{ question.last_activity_by.username|slugify }}/">{{ question.last_activity_by }}</a> {% get_score_badge question.last_activity_by %}

-			{% endif %}

-		</div>

-

-		<div class="tags">

-			{% for tag in question.tagname_list %}

-			<a href="{% url tag_questions tag|urlencode %}" title="{% trans "see questions tagged" %} '{{ tag }}' {% trans "using tags" %}" rel="tag">{{ tag }}</a>

-			{% endfor %}

-		</div>

-	</div>

-	{% endfor %}

-    {% if searchtitle %}

-        {% if questions_count == 0 %}

-        <p class="evenMore" style="padding-top:30px;text-align:center;">

-            {% trans "Did not find anything?" %}

-        {% else %}

-        <p class="evenMore" style="padding-left:9px">

-            {% trans "Did not find what you were looking for?" %} 

-        {% endif %}

-        <a href="{% url ask %}">{% trans "Please, post your question!" %}</a>

-        </p>

-    {% endif %}

-</div>

+{% include "question_list.html" %}

 {% endblock %}

 

 {% block tail %}

diff --git a/forum/utils/lists.py b/forum/utils/lists.py
index bbcfae98..f69c8f20 100755
--- a/forum/utils/lists.py
+++ b/forum/utils/lists.py
@@ -1,5 +1,9 @@
 """Utilities for working with lists and sequences."""
 
+class LazyList(list):
+    def __init__(self, get_data):
+        self.data = get_data
+
 def flatten(x):
     """
     Returns a single, flat list which contains all elements retrieved
diff --git a/forum/views/readers.py b/forum/views/readers.py
index c4ce5ddf..938fa133 100644
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -14,6 +14,7 @@ from django.utils.translation import ugettext as _
 from django.template.defaultfilters import slugify
 from django.core.urlresolvers import reverse
 from django.utils.datastructures import SortedDict
+from django.views.decorators.cache import cache_page
 
 from forum.utils.html import sanitize_html
 from markdown2 import Markdown