2du 5 лет назад
Родитель
Сommit
1a91522039
3 измененных файлов с 34 добавлено и 49 удалено
  1. 31 46
      route/tool/func.py
  2. 1 1
      version.json
  3. 2 2
      views/main_css/js/load_editor.js

+ 31 - 46
route/tool/func.py

@@ -1,4 +1,5 @@
 # Init
+import os
 import sys
 import platform
 import json
@@ -8,63 +9,47 @@ import shutil
 import logging
 import random
 
-from .func_mark import *
+import email.mime.text
+import email.utils
+import email.header
 
-for i in range(0, 2):
-    try:
-        from diff_match_patch import diff_match_patch
-        import werkzeug.routing
-        import werkzeug.debug
+import wsgiref.simple_server
         
-        import flask
-        import flask_reggie
-        
-        import wsgiref.simple_server
+import urllib.request
+
+if platform.system() == 'Linux' or platform.system() == 'Windows':
+    os.system(
+        'python' + ('3' if platform.system() != 'Windows' else '') + ' ' + \
+        '-m pip install --upgrade --user -r requirements.txt'
+    )
+else:
+    print('Error : automatic installation is not supported.')
+    print('Help : try "python3 -m pip install -r requirements.txt"')
+
+print('----')
+
+from .func_mark import *
+
+from diff_match_patch import diff_match_patch
         
-        import urllib.request
+import werkzeug.routing
+import werkzeug.debug
         
-        import email.mime.text
-        import email.utils
-        import email.header
+import flask
+import flask_reggie
         
-        import requests
+import requests
 
-        import pymysql
+import pymysql
 
-        import PIL
+import PIL
 
-        if sys.version_info < (3, 6):
-            import sha3
-    except ImportError as e:
-        if i == 0:
-            print(e)
-            print('----')
-            if platform.system() == 'Linux' or platform.system() == 'Windows':
-                sys_pip_ins = os.system(
-                    'python' + ('3' if platform.system() != 'Windows' else '') + ' ' + \
-                    '-m pip install --user -r requirements.txt'
-                )
-                if sys_pip_ins == 0:
-                    print('----')
-                    try:
-                        os.execl(sys.executable, sys.executable, *sys.argv)
-                    except:
-                        try:
-                            os.execl(sys.executable, '"' + sys.executable + '"', *sys.argv)
-                        except:
-                            print('Error : restart failed')
-                            raise
-                else:
-                    print('Error : library install failed')
-                    raise
-            
-        print('----')
-        print(e)
-        raise
+if sys.version_info < (3, 6):
+    import sha3
         
 global_lang = {}
 
-data_css_ver = '88'
+data_css_ver = '89'
 data_css = ''
 
 conn = ''

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.3.0-stable-01b (beta-03b) (dev-2021-05-23-01)",
+        "r_ver" : "v3.3.0-stable-01b (beta-03b) (dev-2021-05-25-01)",
         "c_ver" : "3300101",
         "s_ver" : "12"
     }

+ 2 - 2
views/main_css/js/load_editor.js

@@ -160,7 +160,7 @@ function section_edit_init() {
                 }
                 
                 data = data.replace(re_heading, function(x) {
-                    return '.'.repeat(x.length);
+                    return '.'.repeat(x.length - 1) + '\n';
                 });
                 
                 var end_point = data.search(re_heading);
@@ -181,7 +181,7 @@ function section_edit_init() {
                 break;
             } else {
                 data = data.replace(re_heading, function(x) {
-                    return '.'.repeat(x.length);
+                    return '.'.repeat(x.length - 1) + '\n';
                 });
             }
         }