Surplus_Up (2DU) 6 лет назад
Родитель
Сommit
8f9f155c4c
2 измененных файлов с 12 добавлено и 5 удалено
  1. 9 2
      emergency_tool.py
  2. 3 3
      route/tool/set_mark/namumark.py

+ 9 - 2
emergency_tool.py

@@ -218,14 +218,21 @@ if what_i_do == '1':
     curs.execute(db_change("delete from back"))
     conn.commit()
 
+    print('----')
+    print('Num (100) : ', end = '')
+    try:
+        go_num = int(input())
+    except:
+        go_num = 100
+
     num = 0
     while 1:
         curs.execute(db_change("select title, data from data d where not exists (select title from back where link = d.title) limit 1"))
         data = curs.fetchall()
         if data:
             num += 1
-            if num % 100 == 0:
-                print(num)
+            if num % go_num == 0:
+                print(str(num) + ' : ' + data[0][0])
 
             render_do(data[0][0], data[0][1], 1, None)
         else:

+ 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>|<span id="syntax_)).)+\n*)+)<\/code>', data)
+        syntax_data = re.search('<code class="((?:(?!").)+)">((?:(?:(?:(?!<\/code>)).)+\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>|<span id="syntax_)).)+\n*)+)<\/code>',
-                '<code class="' + syntax_data[0] + '"><span id="syntax_' + str(num) + '"></span></code>',
+                '<code class="((?:(?!").)+)">((?:(?:(?:(?!<\/code>)).)+\n*)+)<\/code>',
+                '<code class="' + syntax_data[0] + '" id="syntax_' + str(num) + '"></code>',
                 data,
                 1
             )