Browse Source

다시 원상복구 버그 있음

Surplus_Up (2DU) 6 years ago
parent
commit
c5c2eca85c
2 changed files with 9 additions and 16 deletions
  1. 6 13
      route/tool/mark.py
  2. 3 3
      route/tool/set_mark/namumark.py

+ 6 - 13
route/tool/mark.py

@@ -37,16 +37,6 @@ def send_parser(data):
 
     return data
 
-async def plusing(data_in):
-    try:
-        curs.execute(db_change("insert into back (title, link, type) values (?, ?, ?)"), [data_in[1], data_in[0], data_in[2]])
-    except:
-        pass
-
-async def main_async(data):
-    run_all = [asyncio.ensure_future(plusing(data_in)) for data_in in data]
-    await asyncio.gather(*run_all)
-
 def render_do(title, data, num, include):
     curs.execute(db_change('select data from other where name = "markup"'))
     rep_data = curs.fetchall()
@@ -66,9 +56,12 @@ def render_do(title, data, num, include):
         data = ['', '', []]
 
     if num == 1:
-        loop = asyncio.new_event_loop()
-        loop.run_until_complete(main_async(data[2]))
-        loop.close()
+        for data_in in data[2]:
+            try:
+                curs.execute(db_change("insert into back (title, link, type) values (?, ?, ?)"), [data_in[1], data_in[0], data_in[2]])
+            except:
+                pass
+            
         conn.commit()
 
     if num == 2:

+ 3 - 3
route/tool/set_mark/namumark.py

@@ -432,7 +432,7 @@ def middle_parser(data, fol_num, syntax_num, folding_num, include_num):
 
     num = 0
     while 1:
-        syntax_data = re.search('<code class="((?:(?!").)+)">((?:(?:(?:(?!<\/code>)).)+\n*)+)<\/code>', data)
+        syntax_data = re.search('<code class="((?:(?!").)+)">((?:(?:(?:(?!<\/code>|<span id="syntax_)).)+\n*)+)<\/code>', data)
         if syntax_data:
             syntax_data = syntax_data.groups()
 
@@ -441,8 +441,8 @@ def middle_parser(data, fol_num, syntax_num, folding_num, include_num):
             end_data['syntax_' + str(num)] = [syntax_data[1], 'normal']
 
             data = re.sub(
-                '<code class="((?:(?!").)+)">((?:(?:(?:(?!<\/code>)).)+\n*)+)<\/code>',
-                '<code class="' + syntax_data[0] + '" id="syntax_' + str(num) + '"></code>',
+                '<code class="((?:(?!").)+)">((?:(?:(?:(?!<\/code>|<span id="syntax_)).)+\n*)+)<\/code>',
+                '<code class="' + syntax_data[0] + '"><span id="syntax_' + str(num) + '"></span></code>',
                 data,
                 1
             )