Merge pull request #591 from liangliangyy/dev

为评论增加分页功能

blog/models.py

@@ -145,7 +145,7 @@ class Article(BaseModel):
             logger.info('get article comments:{id}'.format(id=self.id))
             return value
         else:
-            comments = self.comment_set.filter(is_enable=True)
+            comments = self.comment_set.filter(is_enable=True).order_by('-id')
             cache.set(cache_key, comments, 60 * 100)
             logger.info('set article comments:{id}'.format(id=self.id))
             return comments
@@ -294,7 +294,7 @@ class SideBar(models.Model):
 
 
 class BlogSettings(models.Model):
-    '''站点设置 '''
+    """blog的配置"""
     sitename = models.CharField(
         "网站名称",
         max_length=200,
@@ -318,6 +318,7 @@ class BlogSettings(models.Model):
     article_sub_length = models.IntegerField("文章摘要长度", default=300)
     sidebar_article_count = models.IntegerField("侧边栏文章数目", default=10)
     sidebar_comment_count = models.IntegerField("侧边栏评论数目", default=5)
+    article_comment_count = models.IntegerField("文章评论数目", default=5)
     show_google_adsense = models.BooleanField('是否显示谷歌广告', default=False)
     google_adsense_codes = models.TextField(
         '广告内容', max_length=2000, null=True, blank=True, default='')

blog/views.py

@@ -1,10 +1,10 @@
 import datetime
 import logging
-# Create your views here.
 import os
 import uuid
 
 from django.conf import settings
+from django.core.paginator import Paginator
 from django.http import HttpResponse, HttpResponseForbidden
 from django.shortcuts import get_object_or_404
 from django.shortcuts import render
@@ -119,9 +119,23 @@ class ArticleDetailView(DetailView):
         comment_form = CommentForm()
 
         article_comments = self.object.comment_list()
-
+        parent_comments = article_comments.filter(parent_comment=None)
+        blog_setting = get_blog_setting()
+        paginator = Paginator(parent_comments, blog_setting.article_comment_count)
+        page = self.request.GET.get('comment_page', 1)
+        p_comments = paginator.page(page)
+        next_page = p_comments.next_page_number() if p_comments.has_next() else None
+        prev_page = p_comments.previous_page_number() if p_comments.has_previous() else None
+
+        if next_page:
+            kwargs[
+                'comment_next_page_url'] = self.object.get_absolute_url() + f'?comment_page={next_page}#commentlist-container'
+        if prev_page:
+            kwargs[
+                'comment_prev_page_url'] = self.object.get_absolute_url() + f'?comment_page={prev_page}#commentlist-container'
         kwargs['form'] = comment_form
         kwargs['article_comments'] = article_comments
+        kwargs['p_comments'] = p_comments
         kwargs['comment_count'] = len(
             article_comments) if article_comments else 0
 

docker-compose.yml

@@ -32,6 +32,7 @@ services:
       - "8000:8000"
     volumes:
       - ./collectedstatic:/code/djangoblog/collectedstatic
+      - ./logs:/code/djangoblog/logs
     environment:
       - DJANGO_MYSQL_DATABASE=djangoblog
       - DJANGO_MYSQL_USER=root

requirements.txt

@@ -12,7 +12,7 @@ gevent==21.12.0
 jieba==0.42.1
 jsonpickle==2.1.0
 Markdown==3.3.7
-mysqlclient==2.1.0
+mysqlclient==2.1.1
 Pillow==9.1.1
 Pygments==2.12.0
 python-logstash==0.4.6
@@ -24,4 +24,4 @@ urllib3==1.26.9
 WeRoBot==1.13.1
 Whoosh==2.7.4
 user-agents==2.2.0
-redis==4.3.3
+redis==4.3.4

templates/comments/tags/comment_list.html

@@ -1,27 +1,45 @@
-<section id="comments" class="themeform">
-    {% load blog_tags %}
-    {% load comments_tags %}
-    {% load cache %}
+<dev>
+    <section id="comments" class="themeform">
+        {% load blog_tags %}
+        {% load comments_tags %}
+        {% load cache %}
 
-    <ul class="comment-tabs group">
-        <li class="active"><a href="#commentlist-container"><i
-                class="fa fa-comments-o"></i>评论<span>{{ comment_count }}</span></a></li>
+        <ul class="comment-tabs group">
+            <li class="active"><a href="#commentlist-container"><i
+                    class="fa fa-comments-o"></i>评论<span>{{ comment_count }}</span></a></li>
 
-    </ul>
-    {% if article_comments %}
-        {% cache 36000 article_comments article.id %}
+        </ul>
+        {% if article_comments %}
             <div id="commentlist-container" class="comment-tab" style="display: block;">
                 <ol class="commentlist">
-                    {% query article_comments parent_comment=None as parent_comments %}
-                    {% for comment_item in parent_comments %}
+                    {#                    {% query article_comments parent_comment=None as parent_comments %}#}
+                    {% for comment_item in p_comments %}
+
                         {% with 0 as depth %}
                             {% include "comments/tags/comment_item_tree.html" %}
                         {% endwith %}
                     {% endfor %}
 
                 </ol><!--/.commentlist-->
-
+                <div class="navigation">
+                    <nav class="nav-single">
+                        {% if comment_prev_page_url %}
+                            <div class="nav-previous">
+                        <span><a href="{{ comment_prev_page_url }}" rel="prev"><span
+                                class="meta-nav">←</span> 上一页</a></span>
+                            </div>
+                        {% endif %}
+                        {% if comment_next_page_url %}
+                            <div class="nav-next">
+                        <span><a href="{{ comment_next_page_url }}" rel="next">下一页 <span
+                                class="meta-nav">→</span></a></span>
+                            </div>
+                        {% endif %}
+                    </nav>
+                </div>
+                <br/>
             </div>
-        {% endcache %}
-    {% endif %}
-</section>
+        {% endif %}
+    </section>
+
+</dev>