fix.

Author: bukun

admin_torcms/tests.py

@@ -2,5 +2,6 @@
 
 # Create your tests here.
 
+
 def test_foo():
-    assert 1 == 1
+    assert 1 == 1

application.py

@@ -4,6 +4,7 @@
 
 
 from pathlib import Path
+
 import router as app_router
 import torcms.core.router
 import torcms.core.uifunction as uifuncs

config.py

@@ -3,6 +3,8 @@
 """
 Config for the website.
 """
+from pathlib import Path
+
 import tornado.web
 
 from torcms.core.tools import get_cfg
@@ -14,6 +16,8 @@
 
 DB_CON, SMTP_CFG, SITE_CFG, ROLE_CFG, REDIS_CFG = get_cfg()
 
+BaseDir = Path(__file__).resolve().parent
+
 CMS_CFG = {
     "list_num": 10,
     "redis_kw": "lsadfkj",

script_faker.py

@@ -3,21 +3,20 @@
 '''
 
 import os
-import bs4
+import pathlib
 import re
-import django
-import os
 import sys
-import pathlib
-from torcms.model.category_model import MCategory
-from torcms.model.post_model import MPost
-from torcms.handlers.post_handler import update_category
-from torcms.model.wiki_model import MWiki
 
+import bs4
+import django
 from faker import Faker
 
 from config import post_cfg
 from torcms.core.tools import get_uu4d, get_uuid
+from torcms.handlers.post_handler import update_category
+from torcms.model.category_model import MCategory
+from torcms.model.post_model import MPost
+from torcms.model.wiki_model import MWiki
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "administor.settings")
 django.setup()
@@ -37,6 +36,8 @@
 rest_regs = [
     '\<img.+?\/\>',
 ]
+
+
 def update_label(post_id, post_data):
     '''
     Update the label when updating.
@@ -69,18 +70,23 @@ def update_label(post_id, post_data):
         else:
             MPost2Label.remove_relation(post_id, cur_info.tag_id)
 
+
 def gen_post(tag_uid):
     dt = datetime.now()
     post_uid = f'{key}{get_uu4d()}'
     extinfo = {}
     # 增加地图缺少的信息
     if key == 'm':
         extinfo = {
-            'ext_lon':fak.pyfloat(left_digits=3, right_digits=3,min_value=0,max_value=180),
-            'ext_lat':fak.pyfloat(left_digits=2, right_digits=3,min_value=0,max_value=90),
-            'ext_zoom_current':'4',
-            'ext_zoom_max':'7',
-            'ext_zoom_min':'1',
+            'ext_lon': fak.pyfloat(
+                left_digits=3, right_digits=3, min_value=0, max_value=180
+            ),
+            'ext_lat': fak.pyfloat(
+                left_digits=2, right_digits=3, min_value=0, max_value=90
+            ),
+            'ext_zoom_current': '4',
+            'ext_zoom_max': '7',
+            'ext_zoom_min': '1',
         }
     dict_info = {
         'uid': post_uid,
@@ -91,13 +97,19 @@ def gen_post(tag_uid):
         'time_create': dt.timestamp(),
         'time_update': dt.timestamp(),
         'kind': key,
-        'extinfo':extinfo
+        'extinfo': extinfo,
     }
     uu = TabPost.objects.get_or_create(uid=post_uid, defaults=dict_info)
     return post_uid
-def gen_label(post_uid,kind):
-    post_data = {'tags': '{},{}'.format(fak.text(max_nb_chars=5), fak.text(max_nb_chars=5))}
+
+
+def gen_label(post_uid, kind):
+    post_data = {
+        'tags': '{},{}'.format(fak.text(max_nb_chars=5), fak.text(max_nb_chars=5))
+    }
     update_label(post_uid, post_data)
+
+
 pwd = os.getcwd()
 
 
@@ -133,7 +145,7 @@ def filter_reg_text(inws, out_reg_arr):
                 img_path = pathlib.Path(inws)
                 for wfile in img_path.rglob('*'):
                     if img == wfile.name:
-                        img = str(wfile.resolve())[len(pwd):]
+                        img = str(wfile.resolve())[len(pwd) :]
                 tt.append('src="{}"'.format(img))
             else:
                 tt.append(bb)
@@ -142,8 +154,6 @@ def filter_reg_text(inws, out_reg_arr):
     return outarr
 
 
-
-
 def do_for_chapter(cat_id, ch_path):
     file_path = []
     idx = 1
@@ -174,7 +184,6 @@ def do_for_chapter(cat_id, ch_path):
 
 def do_for_page(cat_id, ch_path, filename, idx):
     for x in ch_path.rglob('*.html'):
-
         if x.name.startswith(filename):
             pass
         else:
@@ -188,7 +197,6 @@ def do_for_page(cat_id, ch_path, filename, idx):
 
 
 def get_page_meta(catid, the_file, idx):
-
     print(the_file.name)
     File = open(str(the_file.resolve()))
     Soup = bs4.BeautifulSoup(File.read(), features="html.parser")
@@ -208,7 +216,6 @@ def get_page_meta(catid, the_file, idx):
 
 
 def get_meta(catid, sig, the_file, idx):
-
     File = open(str(the_file.resolve()))
     Soup = bs4.BeautifulSoup(File.read(), features="html.parser")
     title = Soup.select('h1')[0].getText()
@@ -219,7 +226,6 @@ def get_meta(catid, sig, the_file, idx):
     result[1::2] = vv
     content = ' '.join(result)
 
-
     pp_data = {}
     pp_data['uid'] = sig
     pp_data['title'] = str(title)[:-1]
@@ -240,7 +246,6 @@ def get_meta(catid, sig, the_file, idx):
 
 def get_catname(ch_path, filename):
     for x in ch_path.rglob('*.html'):
-
         if x.name.startswith(filename):
             pass
         else:
@@ -271,7 +276,6 @@ def bianli(inws):
         idx = max_order + 1
 
         for wdir in wdirs:
-
             if wdir.startswith('ch') and len(wdir.split('_')) > 2:
                 pass
             else:
@@ -298,41 +302,29 @@ def bianli(inws):
             else:
                 cat_name = cat_slug
 
-            post_data = {'name': cat_name,
-                         'slug': cat_slug.lower(),
-                         'order': idx,
-                         'kind': 'k',
-                         'pid': pid}
+            post_data = {
+                'name': cat_name,
+                'slug': cat_slug.lower(),
+                'order': idx,
+                'kind': 'k',
+                'pid': pid,
+            }
 
             try:
                 MCategory.add_or_update(cat_id, post_data)
             except Exception:
                 pass
 
-            do_for_chapter(
-                cat_id,
-                pathlib.Path(os.path.join(wroot, wdir))
-            )
+            do_for_chapter(cat_id, pathlib.Path(os.path.join(wroot, wdir)))
 
             #  将 chapter.html 内容存入数据库， page/catid 形式访问
-            do_for_page(
-                cat_id,
-                pathlib.Path(os.path.join(wroot, wdir)),
-                'chapter',
-                idx
-            )
+            do_for_page(cat_id, pathlib.Path(os.path.join(wroot, wdir)), 'chapter', idx)
             #  将 index.html 内容存入数据库， page/catid 形式访问
-            do_for_page(
-                pid,
-                pathlib.Path(os.path.join(wroot)),
-                'index',
-                idx
-            )
+            do_for_page(pid, pathlib.Path(os.path.join(wroot)), 'index', idx)
 
             idx = idx + 1
 
 
-
 if __name__ == '__main__':
     # gen()
 
@@ -354,10 +346,12 @@ def bianli(inws):
         else:
             tag_recs = TabTag.objects.filter(kind=key).all()
             for tag_rec in tag_recs:
+                if tag_rec.uid.endswith('00'):
+                    continue
                 for ii in range(10):
                     post_uid = gen_post(tag_rec.uid)
                     print(post_uid)
-                    gen_label(post_uid,key)
+                    gen_label(post_uid, key)
                     post2tag = TabPost2Tag(
                         uid=get_uuid(),
                         par_id=f'{tag_rec.uid[:2]}00',
@@ -367,7 +361,6 @@ def bianli(inws):
                     )
                     post2tag.save()
 
-
     #
     # recs = TabPost.objects.filter().all()
     # for rec in recs:

tests/test_http/test_db_postinfo.py

@@ -7,20 +7,19 @@
 '''
 
 import os
+from datetime import datetime
+
 import requests
+from faker import Faker
 from tornado.testing import AsyncHTTPSTestCase
+
+from cfg import SITE_CFG
+from config import post_cfg
 from server import APP
+from torcms.core.tools import get_uu4d, get_uuid
 from torcms.model.category_model import MCategory
 from torcms.model.post_model import MPost
 
-from faker import Faker
-from datetime import datetime
-from torcms.core.tools import get_uu4d, get_uuid
-
-from config import post_cfg
-from cfg import SITE_CFG
-
-
 fak = Faker('zh_CN')
 domain = SITE_CFG['site_url']
 
@@ -31,13 +30,15 @@ def get_app(self):
 
     def test_posthandler_view_edit_delete(self):
         for key in post_cfg:
-            if key != '2':
+            if key not in  ['2', 's']:
                 postinfos = MPost.query_all(kind=key)
                 for post in postinfos:
                     pass
                     # # Todo：app类型数据报错信息tornado.general:web.py:3118 Could not open static file '/gitee/TorCMS/static/f2elib/bootstrap-star-rating-master/css/star-rating.css'
-                    print('/{0}/{1}'.format(post_cfg[key]['router'],post.uid))
-                    response = self.fetch('/{0}/{1}'.format(post_cfg[key]['router'],post.uid))
+                    print('/{0}/{1}'.format(post_cfg[key]['router'], post.uid))
+                    response = self.fetch(
+                        '/{0}/{1}'.format(post_cfg[key]['router'], post.uid)
+                    )
                     self.assertEqual(response.code, 200)
                     # response_edit = self.fetch('/{0}/_edit/{1}'.format(post_cfg[key]['router'],post.uid))
                     # self.assertEqual(response_edit.code, 200)

tests/test_http/test_reply.py

@@ -4,7 +4,6 @@
 from tornado.testing import AsyncHTTPTestCase
 
 from server import APP
-
 from torcms.model.reply_model import MReply
 
 reply_list = MReply.query_all()

tests/test_http/test_tags.py

@@ -2,9 +2,10 @@
 import unittest
 
 from tornado.testing import AsyncHTTPTestCase
-from torcms.model.category_model import MCategory
-from server import APP
+
 from config import post_cfg
+from server import APP
+from torcms.model.category_model import MCategory
 
 tags = MCategory.query_all()
 

tests/test_http/test_wiki.py

@@ -4,7 +4,6 @@
 from tornado.testing import AsyncHTTPTestCase
 
 from server import APP
-
 from torcms.model.wiki_model import MWiki
 
 wiki_list = MWiki.query_all(limit=None)

tests/test_requests/test_post.py

@@ -1,23 +1,22 @@
-
 import os
+from datetime import datetime
+
 import requests
+from faker import Faker
 from tornado.testing import AsyncHTTPSTestCase
+
+from cfg import SITE_CFG
+from config import post_cfg
 from server import APP
+from torcms.core.tools import get_uu4d, get_uuid
 from torcms.model.category_model import MCategory
 from torcms.model.post_model import MPost
 
-from faker import Faker
-from datetime import datetime
-from torcms.core.tools import get_uu4d, get_uuid
-
-from config import post_cfg
-from cfg import SITE_CFG
-
-
 fak = Faker('zh_CN')
 
 domain = SITE_CFG['site_url']
 
+
 class TestPostHandler(AsyncHTTPSTestCase):
     def get_app(self):
         return APP
@@ -28,16 +27,23 @@ def test_posthandler_view_edit_delete(self):
                 print(key)
                 postinfos = MPost.query_all(kind=key)
                 for post in postinfos:
-                    response = requests.get(os.path.join(domain,'{0}/{1}'.format(post_cfg[key]['router'], post.uid)))
+                    response = requests.get(
+                        os.path.join(
+                            domain, '{0}/{1}'.format(post_cfg[key]['router'], post.uid)
+                        )
+                    )
                     self.assertEqual(response.status_code, 200)
 
-
     def test_posthandler_add(self):
         for k in post_cfg:
             for ii in range(3):
                 postuid = f'{k}{get_uu4d()}'
                 while MPost.get_by_uid(postuid):
                     postuid = f'{k}{get_uu4d()}'
 
-                response = requests.get(os.path.join(domain,'{0}/_add/{1}'.format(post_cfg[k]['router'], postuid)))
+                response = requests.get(
+                    os.path.join(
+                        domain, '{0}/_add/{1}'.format(post_cfg[k]['router'], postuid)
+                    )
+                )
                 self.assertEqual(response.status_code, 200)