[update]3.0

Author: jhao104

requirements.txt

@@ -1,4 +1,3 @@
 Django==2.2.0
-Markdown==2.5.2
-Pygments==2.0.1
-pymysql==0.8.0
+Markdown==3.3
+PyMySQL==0.10.1

src/blog/templatetags/custom_filter.py

@@ -12,12 +12,10 @@
 """
 __author__ = 'JHao'
 
-import re
-# import markdown
+import markdown
 from django import template
-from django.template.defaultfilters import stringfilter
-from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage
 from django.utils.safestring import mark_safe
+from django.template.defaultfilters import stringfilter
 
 register = template.Library()
 
@@ -30,46 +28,16 @@ def slice_list(value, index):
 @register.filter(is_safe=True)
 @stringfilter
 def custom_markdown(value):
-    # content = mark_safe(markdown.markdown(value, extensions=['markdown.extensions.fenced_code',
-    #                                                          # 'markdown.extensions.codehilite',
-    #                                                          'markdown.extensions.tables'],
-    #                                       safe_mode=True, enable_attributes=False))
-    #
-    # # Prism 代码高亮查件 需要将所有的
-    # # markdown转换的代码:<pre><code class="python">import *** </code></pre>
-    # # 转换为
-    # # <pre class="line-numbers"><code class="language-python">import *** </code></pre>
-    # code_list = re.findall(r'<pre><code class="(.*)">', content, re.M)
-    # for code in code_list:
-    #     content = re.sub(r'<pre><code class="(.*)">',
-    #                      '<pre class="line-numbers"><code class="language-{code}">'.format(code=code.lower()), content,
-    #                      1)
-    # content = re.sub(r'<pre>\s?<code>', '<pre class="line-numbers"><code class="language-python">', content)
-    # return content
-    return value
-
-
-@register.simple_tag(takes_context=True)
-def paginate(context, object_list, page_count):
-    context['count'] = object_list.count
-    paginator = Paginator(object_list, page_count)
-    page = context['request'].GET.get('page')
-
-    try:
-        object_list = paginator.page(page)
-        context['current_page'] = int(page)
-
-    except PageNotAnInteger:
-        object_list = paginator.page(1)
-        context['current_page'] = 1
-    except EmptyPage:
-        object_list = paginator.page(paginator.num_pages)
-        context['current_page'] = paginator.num_pages
-
-    context['article_list'] = object_list
-    context['last_page'] = paginator.num_pages
-    context['first_page'] = 1
-    return ''  # 必须加这个，否则首页会显示个None
+    content = mark_safe(markdown.markdown(value,
+                                          output_format='html5',
+                                          extensions=[
+                                              'markdown.extensions.extra',
+                                              'markdown.extensions.fenced_code',
+                                              'markdown.extensions.tables',
+                                          ],
+                                          safe_mode=True,
+                                          enable_attributes=False))
+    return content
 
 
 @register.filter
@@ -82,20 +50,5 @@ def tag2string(value):
     return ','.join([each.get('tag_name', '') for each in value])
 
 
-@register.filter
-def getTag(value):
-    """
-    展示一个tag
-    :param value:
-    :return:
-    """
-    tag = ''
-    for each in value:
-        if each.get('tag_name'):
-            tag = each.get("tag_name")
-            break
-    return tag
-
-
 if __name__ == '__main__':
     pass

src/blog/urls.py

@@ -24,7 +24,6 @@
     path('archive/', views.archive, name='archive'),
     path('search/', views.search, name='search'),
     path('message/', views.message, name='message'),
-    path('article/<int:article_id>/', views.articles, name='article'),
-    path(r'^getComment/$', views.getComment, name='get_comment'),
+    path('getComment/', views.get_comment, name='get_comment'),
 
 ]

src/blog/views.py

@@ -85,33 +85,12 @@ def archive(request):
     return render(request, 'blog/archive.html', {"data": data})
 
 
-def articles(request, article_id):
-    """
-    博客列表页面
-    :param request:
-    :param pk:
-    :return:
-    """
-    pk = int(article_id)
-    if pk:
-        category_object = get_object_or_404(Category, pk=pk)
-        category = category_object.name
-        article_list = Article.objects.filter(category_id=pk)
-    else:
-        # pk为0时表示全部
-        article_list = Article.objects.all()  # 获取全部文章
-        category = u''
-    return render(request, 'blog/articles.html', {"article_list": article_list,
-                                                  "category": category,
-                                                  })
-
-
 def message(request):
     return render(request, 'blog/message_board.html', {"source_id": "message"})
 
 
 @csrf_exempt
-def getComment(request):
+def get_comment(request):
     """
     接收畅言的评论回推， post方式回推
     :param request:
@@ -140,10 +119,9 @@ def detail(request, pk):
     :param pk:
     :return:
     """
-    article = get_object_or_404(Article, pk=pk)
-    article.viewed()
-    return render(request, 'blog/detail.html', {"article": article,
-                                                "source_id": article.id})
+    blog = get_object_or_404(Article, pk=pk)
+    blog.viewed()
+    return render(request, 'blog/detail.html', {"blog": blog})
 
 
 def search(request):

src/django_blog/urls.py

@@ -15,12 +15,8 @@
 """
 from django.urls import path, include
 from django.contrib import admin
-from blog import views
 
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('blog/', include(('blog.urls', 'blog'), namespace='blog')),
-    # path(r'^blog/$', views.index, name='index'),
-    # url(r'^$', views.index),
-
 ]