Merge pull request #166 from liangliangyy/dev

部分代码功能优化 close #165

DjangoBlog/blog_signals.py

@@ -16,9 +16,11 @@
 import django.dispatch
 from django.dispatch import receiver
 from django.conf import settings
-from DjangoBlog.utils import cache, send_email, expire_view_cache
+from DjangoBlog.utils import cache, send_email, expire_view_cache, get_blog_setting
 from DjangoBlog.spider_notify import SpiderNotify
 from django.contrib.sites.models import Site
+from oauth.models import OAuthUser
+from django.core.mail import EmailMultiAlternatives
 
 import logging
 
@@ -27,6 +29,43 @@ logger = logging.getLogger(__name__)
 comment_save_signal = django.dispatch.Signal(providing_args=["comment_id", "username", "serverport"])
 article_save_signal = django.dispatch.Signal(providing_args=['id', 'is_update_views'])
 user_login_logout_signal = django.dispatch.Signal(providing_args=['id', 'type'])
+oauth_user_login_signal = django.dispatch.Signal(providing_args=['id'])
+send_email_signal = django.dispatch.Signal(providing_args=['emailto', 'title', 'content'])
+
+
+@receiver(send_email_signal)
+def send_email_callback(sender, **kwargs):
+    emailto = kwargs['emailto']
+    title = kwargs['title']
+    content = kwargs['content']
+
+    msg = EmailMultiAlternatives(title, content, from_email=settings.DEFAULT_FROM_EMAIL, to=emailto)
+    msg.content_subtype = "html"
+
+    from servermanager.models import EmailSendLog
+    log = EmailSendLog()
+    log.title = title
+    log.content = content
+    log.emailto = ','.join(emailto)
+
+    try:
+        result = msg.send()
+        log.send_result = result > 0
+    except Exception as e:
+        logger.error(e)
+        log.send_result = False
+    log.save()
+
+
+@receiver(oauth_user_login_signal)
+def oauth_user_login_callback(sender, **kwargs):
+    id = kwargs['id']
+    oauthuser = OAuthUser.objects.get(id=id)
+    setting = get_blog_setting()
+    if oauthuser.picture and not oauthuser.picture.startswith(setting.resource_path):
+        from DjangoBlog.utils import save_user_avatar
+        oauthuser.picture = save_user_avatar(oauthuser.picture)
+        oauthuser.save()
 
 
 @receiver(article_save_signal)
@@ -49,14 +88,14 @@ def article_save_callback(sender, **kwargs):
                 SpiderNotify.baidu_notify([notify_url])
             except Exception as ex:
                 logger.error("notify sipder", ex)
-                print(ex)
+
+    from DjangoBlog.utils import cache
+    cache.clear()
 
 
 @receiver(comment_save_signal)
 def comment_save_callback(sender, **kwargs):
     from comments.models import Comment
-    if settings.DEBUG:
-        return
 
     serverport = kwargs['serverport']
     username = kwargs['username']
@@ -103,4 +142,5 @@ def comment_save_callback(sender, **kwargs):
     from django.core.cache.utils import make_template_fragment_key
 
     key = make_template_fragment_key('sidebar', [username])
+    logger.info('delete sidebar key:' + key)
     cache.delete(key)

DjangoBlog/spider_notify.py

@@ -16,6 +16,9 @@
 from django.contrib.sitemaps import ping_google
 import requests
 from django.conf import settings
+import logging
+
+logger = logging.getLogger(__name__)
 
 
 class SpiderNotify():
@@ -26,14 +29,14 @@ class SpiderNotify():
             result = requests.post(settings.BAIDU_NOTIFY_URL, data=data)
             print(result.text)
         except Exception as e:
-            print(e)
+            logger.error(e)
 
     @staticmethod
     def __google_notify():
         try:
             ping_google('/sitemap.xml')
         except Exception as e:
-            print(e)
+            logger.error(e)
 
     @staticmethod
     def notify(url):

DjangoBlog/utils.py

@@ -150,25 +150,27 @@ class CommonMarkdown():
 
 
 def send_email(emailto, title, content):
-    msg = EmailMultiAlternatives(title, content, from_email=settings.DEFAULT_FROM_EMAIL, to=emailto)
-    msg.content_subtype = "html"
-
-    def sendmsg_withlog():
-        from servermanager.models import EmailSendLog
-        log = EmailSendLog()
-        log.title = title
-        log.content = content
-        log.emailto = ','.join(emailto)
-
-        try:
-            result = msg.send()
-            log.send_result = result > 0
-        except Exception as e:
-            logger.error(e)
-            log.send_result = False
-        log.save()
-
-    _thread.start_new_thread(sendmsg_withlog, ())
+    from DjangoBlog.blog_signals import send_email_signal
+    send_email_signal.send(send_email.__class__, emailto=emailto, title=title, content=content)
+    # msg = EmailMultiAlternatives(title, content, from_email=settings.DEFAULT_FROM_EMAIL, to=emailto)
+    # msg.content_subtype = "html"
+    #
+    # def sendmsg_withlog():
+    #     from servermanager.models import EmailSendLog
+    #     log = EmailSendLog()
+    #     log.title = title
+    #     log.content = content
+    #     log.emailto = ','.join(emailto)
+    #
+    #     try:
+    #         result = msg.send()
+    #         log.send_result = result > 0
+    #     except Exception as e:
+    #         logger.error(e)
+    #         log.send_result = False
+    #     log.save()
+    #
+    # _thread.start_new_thread(sendmsg_withlog, ())
 
 
 def parse_dict_to_url(dict):

blog/admin.py

@@ -58,7 +58,7 @@ open_article_commentstatus.short_description = '打开文章评论'
 
 class ArticlelAdmin(admin.ModelAdmin):
     list_per_page = 20
-    search_fields = ('body','title')
+    search_fields = ('body', 'title')
     form = ArticleForm
     list_display = (
         'id', 'title', 'author', 'link_to_category', 'created_time', 'views', 'status', 'type', 'article_order')
@@ -83,8 +83,6 @@ class ArticlelAdmin(admin.ModelAdmin):
 
     def save_model(self, request, obj, form, change):
         super(ArticlelAdmin, self).save_model(request, obj, form, change)
-        from DjangoBlog.utils import cache
-        cache.clear()
 
     def get_view_on_site_url(self, obj=None):
         if obj:

oauth/views.py

@@ -16,6 +16,8 @@ from django.contrib.sites.models import Site
 from django.core.exceptions import ObjectDoesNotExist
 from django.http import HttpResponseForbidden
 from .oauthmanager import get_manager_by_type
+from DjangoBlog.blog_signals import oauth_user_login_signal
+
 import logging
 
 logger = logging.getLogger(__name__)
@@ -52,8 +54,6 @@ def authorize(request):
         return HttpResponseRedirect(manager.get_authorization_url(nexturl))
     user = manager.get_oauth_userinfo()
     if user:
-        if user.picture:
-            user.picture = save_user_avatar(user.picture)
         if not user.nikename:
             import datetime
             user.nikename = "djangoblog" + datetime.datetime.now().strftime('%y%m%d%I%M%S')
@@ -80,7 +80,10 @@ def authorize(request):
 
             user.author = author
             user.save()
+
+            oauth_user_login_signal.send(sender=authorize.__class__, id=user.id)
             login(request, author)
+
             return HttpResponseRedirect(nexturl)
         if not email:
             user.save()
@@ -108,13 +111,9 @@ def emailconfirm(request, id, sign):
         if result[1]:
             author.username = oauthuser.nikename
             author.save()
-    """
-    if oauthuser.email and author.email:
-        login(request, author)
-        return HttpResponseRedirect('/')
-    """
     oauthuser.author = author
     oauthuser.save()
+    oauth_user_login_signal.send(sender=emailconfirm.__class__, id=oauthuser.id)
     login(request, author)
 
     site = Site.objects.get_current().domain

templates/blog/article_index.html

@@ -31,20 +31,6 @@
             {% endfor %}
             {% if is_paginated %}
                 {% load_pagination_info page_obj page_type tag_name %}
-                {% comment %} <nav id="nav-below" class="navigation" role="navigation">
-                    <h3 class="assistive-text">文章导航</h3>
-                    {% if page_obj.has_next %}
-                        <div class="nav-previous"><a
-                                href="{{ SITE_BASE_URL }}page/{{ page_obj.next_page_number }}"><span
-                                class="meta-nav">&larr;</span> 早期文章</a></div>
-                    {% endif %}
-                    {% if page_obj.has_previous %}
-                        <div class="nav-next"><a href="{{ SITE_BASE_URL }}page/{{ page_obj.previous_page_number }}">较新文章
-                            <span
-                                    class="meta-nav">→</span></a>
-                        </div>
-                    {% endif %}
-                </nav><!-- .navigation -->{% endcomment %}
 
             {% endif %}
         </div><!-- #content -->