Ver código fonte

문법 커스텀 기능 추가

Surplus_Up (2DU) 6 anos atrás
pai
commit
6d9c1c135d
4 arquivos alterados com 13 adições e 5 exclusões
  1. 2 0
      .gitignore
  2. 1 4
      route/tool/init.py
  3. 9 0
      route/tool/mark.py
  4. 1 1
      version.json

+ 2 - 0
.gitignore

@@ -5,6 +5,8 @@ data/set.json
 data/mysql.json
 data/oauthsettings.json
 
+route/tool/set_mark/custom.py
+
 images
 .vscode
 

+ 1 - 4
route/tool/init.py

@@ -29,7 +29,7 @@ server_set_var = {
         'display' : 'Markup',
         'require' : 'select',
         'default' : 'namumark',
-        'list' : ['namumark', 'raw']
+        'list' : ['namumark', 'custom', 'raw']
     },
     'encode' : {
         'display' : 'Encryption method',
@@ -43,9 +43,6 @@ def init(key):
     if env_dict[key] != None:
         return env_dict[key]
     else:
-        if key == 'markup':
-            return server_set_var[key]['default']
-
         while 1:
             if server_set_var[key]['require'] == 'select':
                 list_ = '[' + ', '.join(server_set_var[key]['list']) + ']'

+ 9 - 0
route/tool/mark.py

@@ -3,6 +3,7 @@ from .set_mark.namumark import namumark, link_fix
 from .set_mark.tool import *
 
 import re
+import os
 import html
 import sqlite3
 import asyncio
@@ -10,6 +11,12 @@ import threading
 import urllib.parse
 import multiprocessing
 
+if os.path.exists('route/tool/set_mark/custom.py'):
+    from .set_mark.custom import custom_mark
+else:
+    def custom_mark(conn, data, title, num, include):
+        return [data, '', []]
+
 def load_conn2(data):
     global conn
     global curs
@@ -42,6 +49,8 @@ def render_do(title, data, num, include):
     rep_data = curs.fetchall()
     if rep_data[0][0] == 'namumark':
         data = namumark(conn, data, title, num, include)
+    elif rep_data[0][0] == 'custom':
+        data = custom_mark(conn, data, title, num, include)
     elif rep_data[0][0] == 'raw':
         data = [data, '', []]
     else:

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.8-master-12",
+        "r_ver" : "v3.1.8-master-13",
         "c_ver" : "3180200",
         "s_ver" : "8"
     }, "stable" : {