Merge pull request liangliangyy#394 from liangliangyy/dev

格式化代码&&增加es配置文档

Author: liangliangyy

DjangoBlog/admin_site.py

@@ -5,7 +5,7 @@
 """
 @version: ??
 @author: liangliangyy
-@license: MIT Licence 
+@license: MIT Licence
 @contact: liangliangyy@gmail.com
 @site: https://www.lylinux.net/
 @software: PyCharm

DjangoBlog/blog_signals.py

@@ -5,7 +5,7 @@
 """
 @version: ??
 @author: liangliangyy
-@license: MIT Licence 
+@license: MIT Licence
 @contact: liangliangyy@gmail.com
 @site: https://www.lylinux.net/
 @software: PyCharm
@@ -34,7 +34,8 @@
 logger = logging.getLogger(__name__)
 
 oauth_user_login_signal = django.dispatch.Signal(providing_args=['id'])
-send_email_signal = django.dispatch.Signal(providing_args=['emailto', 'title', 'content'])
+send_email_signal = django.dispatch.Signal(
+    providing_args=['emailto', 'title', 'content'])
 
 
 @receiver(send_email_signal)
@@ -43,7 +44,11 @@ def send_email_signal_handler(sender, **kwargs):
     title = kwargs['title']
     content = kwargs['content']
 
-    msg = EmailMultiAlternatives(title, content, from_email=settings.DEFAULT_FROM_EMAIL, to=emailto)
+    msg = EmailMultiAlternatives(
+        title,
+        content,
+        from_email=settings.DEFAULT_FROM_EMAIL,
+        to=emailto)
     msg.content_subtype = "html"
 
     from servermanager.models import EmailSendLog
@@ -77,7 +82,14 @@ def oauth_user_login_signal_handler(sender, **kwargs):
 
 
 @receiver(post_save)
-def model_post_save_callback(sender, instance, created, raw, using, update_fields, **kwargs):
+def model_post_save_callback(
+        sender,
+        instance,
+        created,
+        raw,
+        using,
+        update_fields,
+        **kwargs):
     clearcache = False
     if isinstance(instance, LogEntry):
         return
@@ -98,10 +110,15 @@ def model_post_save_callback(sender, instance, created, raw, using, update_field
         if site.find(':') > 0:
             site = site[0:site.find(':')]
 
-        expire_view_cache(path, servername=site, serverport=80, key_prefix='blogdetail')
+        expire_view_cache(
+            path,
+            servername=site,
+            serverport=80,
+            key_prefix='blogdetail')
         if cache.get('seo_processor'):
             cache.delete('seo_processor')
-        comment_cache_key = 'article_comments_{id}'.format(id=instance.article.id)
+        comment_cache_key = 'article_comments_{id}'.format(
+            id=instance.article.id)
         cache.delete(comment_cache_key)
         delete_sidebar_cache(instance.author.username)
         delete_view_cache('article_comments', [str(instance.article.pk)])

DjangoBlog/elasticsearch_backend.py

@@ -29,7 +29,11 @@
 
 class ElasticSearchBackend(BaseSearchBackend):
     def __init__(self, connection_alias, **connection_options):
-        super(ElasticSearchBackend, self).__init__(connection_alias, **connection_options)
+        super(
+            ElasticSearchBackend,
+            self).__init__(
+            connection_alias,
+            **connection_options)
         self.manager = ArticleDocumentManager()
         # try:
         #     self._rebuild(None)
@@ -75,16 +79,14 @@ def search(self, query_string, **kwargs):
         start_offset = kwargs.get('start_offset')
         end_offset = kwargs.get('end_offset')
 
-        q = Q('bool',
-              should=[Q('match', body=query_string), Q('match', title=query_string)],
-              minimum_should_match="70%"
-              )
+        q = Q('bool', should=[Q('match', body=query_string), Q(
+            'match', title=query_string)], minimum_should_match="70%")
 
         search = ArticleDocument.search() \
-                     .query('bool', filter=[q]) \
-                     .filter('term', status='p') \
-                     .filter('term', type='a') \
-                     .source(False)[start_offset: end_offset]
+            .query('bool', filter=[q]) \
+            .filter('term', status='p') \
+            .filter('term', type='a') \
+            .source(False)[start_offset: end_offset]
 
         results = search.execute()
         hits = results['hits'].total
@@ -99,8 +101,12 @@ def search(self, query_string, **kwargs):
 
             result_class = SearchResult
 
-            result = result_class(app_label, model_name, raw_result['_id'], raw_result['_score'],
-                                  **additional_fields)
+            result = result_class(
+                app_label,
+                model_name,
+                raw_result['_id'],
+                raw_result['_score'],
+                **additional_fields)
             raw_results.append(result)
         facets = {}
         spelling_suggestion = None

DjangoBlog/logentryadmin.py

@@ -5,7 +5,7 @@
 """
 @version: ??
 @author: liangliangyy
-@license: MIT Licence 
+@license: MIT Licence
 @contact: liangliangyy@gmail.com
 @site: https://www.lylinux.net/
 @software: PyCharm
@@ -83,9 +83,9 @@ def has_add_permission(self, request):
 
     def has_change_permission(self, request, obj=None):
         return (
-                       request.user.is_superuser or
-                       request.user.has_perm('admin.change_logentry')
-               ) and request.method != 'POST'
+            request.user.is_superuser or
+            request.user.has_perm('admin.change_logentry')
+        ) and request.method != 'POST'
 
     def has_delete_permission(self, request, obj=None):
         return False

DjangoBlog/settings.py

@@ -26,7 +26,8 @@ def env_to_bool(env, default):
 # See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY') or 'n9ceqv38)#&mwuat@(mjb_p%em$e8$qyr#fw9ot!=ba6lijx-6'
+SECRET_KEY = os.environ.get(
+    'DJANGO_SECRET_KEY') or 'n9ceqv38)#&mwuat@(mjb_p%em$e8$qyr#fw9ot!=ba6lijx-6'
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = env_to_bool('DJANGO_DEBUG', True)
 # DEBUG = False
@@ -108,10 +109,11 @@ def env_to_bool(env, default):
         'USER': os.environ.get('DJANGO_MYSQL_USER') or 'root',
         'PASSWORD': os.environ.get('DJANGO_MYSQL_PASSWORD') or 'djangoblog_123',
         'HOST': os.environ.get('DJANGO_MYSQL_HOST') or '127.0.0.1',
-        'PORT': int(os.environ.get('DJANGO_MYSQL_PORT') or 3306),
-        'OPTIONS': {'charset': 'utf8mb4'},
-    }
-}
+        'PORT': int(
+            os.environ.get('DJANGO_MYSQL_PORT') or 3306),
+        'OPTIONS': {
+            'charset': 'utf8mb4'},
+    }}
 
 # Password validation
 # https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators
@@ -157,7 +159,8 @@ def env_to_bool(env, default):
 # Automatically update searching index
 HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'
 # Allow user login with username and password
-AUTHENTICATION_BACKENDS = ['accounts.user_login_backend.EmailOrUsernameModelBackend']
+AUTHENTICATION_BACKENDS = [
+    'accounts.user_login_backend.EmailOrUsernameModelBackend']
 
 STATIC_ROOT = os.path.join(SITE_ROOT, 'collectedstatic')
 
@@ -195,7 +198,7 @@ def env_to_bool(env, default):
 
 SITE_ID = 1
 BAIDU_NOTIFY_URL = os.environ.get('DJANGO_BAIDU_NOTIFY_URL') \
-                   or 'http://data.zz.baidu.com/urls?site=https://www.lylinux.net&token=1uAOGrMsUm5syDGn'
+    or 'http://data.zz.baidu.com/urls?site=https://www.lylinux.net&token=1uAOGrMsUm5syDGn'
 
 # Email:
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
@@ -210,7 +213,8 @@ def env_to_bool(env, default):
 # Setting debug=false did NOT handle except email notifications
 ADMINS = [('admin', os.environ.get('DJANGO_ADMIN_EMAIL') or 'admin@admin.com')]
 # WX ADMIN password(Two times md5)
-WXADMIN = os.environ.get('DJANGO_WXADMIN_PASSWORD') or '995F03AC401D6CABABAEF756FC4D43C7'
+WXADMIN = os.environ.get(
+    'DJANGO_WXADMIN_PASSWORD') or '995F03AC401D6CABABAEF756FC4D43C7'
 
 LOGGING = {
     'version': 1,

DjangoBlog/spider_notify.py

@@ -5,7 +5,7 @@
 """
 @version: ??
 @author: liangliangyy
-@license: MIT Licence 
+@license: MIT Licence
 @contact: liangliangyy@gmail.com
 @site: https://www.lylinux.net/
 @software: PyCharm

DjangoBlog/tests.py

@@ -5,7 +5,7 @@
 """
 @version: ??
 @author: liangliangyy
-@license: MIT Licence 
+@license: MIT Licence
 @contact: liangliangyy@gmail.com
 @site: https://www.lylinux.net/
 @software: PyCharm
@@ -30,17 +30,17 @@ def test_utils(self):
         md5 = get_md5('test')
         self.assertIsNotNone(md5)
         c = CommonMarkdown.get_markdown('''
-        # Title1  
-        
+        # Title1
+
         ```python
         import os
-        ```  
-        
-        [url](https://www.lylinux.net/)  
-          
-        [ddd](http://www.baidu.com)  
-        
-        
+        ```
+
+        [url](https://www.lylinux.net/)
+
+        [ddd](http://www.baidu.com)
+
+
         ''')
         self.assertIsNotNone(c)
         d = {

DjangoBlog/urls.py

@@ -37,19 +37,20 @@
 handler500 = 'blog.views.server_error_view'
 handle403 = 'blog.views.permission_denied_view'
 urlpatterns = [
-                  url(r'^admin/', admin_site.urls),
-                  url(r'', include('blog.urls', namespace='blog')),
-                  url(r'mdeditor/', include('mdeditor.urls')),
-                  url(r'', include('comments.urls', namespace='comment')),
-                  url(r'', include('accounts.urls', namespace='account')),
-                  url(r'', include('oauth.urls', namespace='oauth')),
-                  url(r'^sitemap\.xml$', sitemap, {'sitemaps': sitemaps},
-                      name='django.contrib.sitemaps.views.sitemap'),
-                  url(r'^feed/$', DjangoBlogFeed()),
-                  url(r'^rss/$', DjangoBlogFeed()),
-                  url(r'^search', include('haystack.urls'), name='search'),
-                  url(r'', include('servermanager.urls', namespace='servermanager')),
-                  url(r'', include('owntracks.urls', namespace='owntracks'))
-              ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
+    url(r'^admin/', admin_site.urls),
+    url(r'', include('blog.urls', namespace='blog')),
+    url(r'mdeditor/', include('mdeditor.urls')),
+    url(r'', include('comments.urls', namespace='comment')),
+    url(r'', include('accounts.urls', namespace='account')),
+    url(r'', include('oauth.urls', namespace='oauth')),
+    url(r'^sitemap\.xml$', sitemap, {'sitemaps': sitemaps},
+        name='django.contrib.sitemaps.views.sitemap'),
+    url(r'^feed/$', DjangoBlogFeed()),
+    url(r'^rss/$', DjangoBlogFeed()),
+    url(r'^search', include('haystack.urls'), name='search'),
+    url(r'', include('servermanager.urls', namespace='servermanager')),
+    url(r'', include('owntracks.urls', namespace='owntracks'))
+] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 if settings.DEBUG:
-    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    urlpatterns += static(settings.MEDIA_URL,
+                          document_root=settings.MEDIA_ROOT)

DjangoBlog/utils.py

@@ -45,7 +45,7 @@ def news(*args, **kwargs):
             try:
                 view = args[0]
                 key = view.get_cache_key()
-            except:
+            except BaseException:
                 key = None
             if not key:
                 unique_str = repr((func, args, kwargs))
@@ -60,7 +60,9 @@ def news(*args, **kwargs):
                 else:
                     return value
             else:
-                logger.info('cache_decorator set cache:%s key:%s' % (func.__name__, key))
+                logger.info(
+                    'cache_decorator set cache:%s key:%s' %
+                    (func.__name__, key))
                 value = func(*args, **kwargs)
                 if value is None:
                     cache.set(key, '__default_cache_value__', expiration)
@@ -120,7 +122,7 @@ def block_code(text, lang, inlinestyles=False, linenos=False):
         if linenos:
             return '<div class="highlight">%s</div>\n' % code
         return code
-    except:
+    except BaseException:
         return '<pre class="%s"><code>%s</code></pre>\n' % (
             lang, mistune.escape(text)
         )
@@ -163,7 +165,8 @@ def link(self, link, title, text):
         if not title:
             return '<a href="%s" %s>%s</a>' % (link, nofollow, text)
         title = escape(title, quote=True)
-        return '<a href="%s" title="%s" %s>%s</a>' % (link, title, nofollow, text)
+        return '<a href="%s" title="%s" %s>%s</a>' % (
+            link, title, nofollow, text)
 
 
 class CommonMarkdown():
@@ -177,7 +180,11 @@ def get_markdown(value):
 
 def send_email(emailto, title, content):
     from DjangoBlog.blog_signals import send_email_signal
-    send_email_signal.send(send_email.__class__, emailto=emailto, title=title, content=content)
+    send_email_signal.send(
+        send_email.__class__,
+        emailto=emailto,
+        title=title,
+        content=content)
 
 
 def parse_dict_to_url(dict):
@@ -225,15 +232,17 @@ def save_user_avatar(url):
     try:
         imgname = url.split('/')[-1]
         if imgname:
-            path = r'{basedir}/avatar/{img}'.format(basedir=setting.resource_path, img=imgname)
+            path = r'{basedir}/avatar/{img}'.format(
+                basedir=setting.resource_path, img=imgname)
             if os.path.exists(path):
                 os.remove(path)
-    except:
+    except BaseException:
         pass
     try:
         rsp = requests.get(url, timeout=2)
         if rsp.status_code == 200:
-            basepath = r'{basedir}/avatar/'.format(basedir=setting.resource_path)
+            basepath = r'{basedir}/avatar/'.format(
+                basedir=setting.resource_path)
             if not os.path.exists(basepath):
                 os.makedirs(basepath)
 
@@ -253,7 +262,10 @@ def save_user_avatar(url):
 def delete_sidebar_cache(username):
     from django.core.cache.utils import make_template_fragment_key
     from blog.models import LINK_SHOW_TYPE
-    keys = (make_template_fragment_key('sidebar', [username + x[0]]) for x in LINK_SHOW_TYPE)
+    keys = (
+        make_template_fragment_key(
+            'sidebar', [
+                username + x[0]]) for x in LINK_SHOW_TYPE)
     for k in keys:
         logger.info('delete sidebar key:' + k)
         cache.delete(k)