실행 시간 조정 가능하도록

https://github.com/openNAMU/openNAMU/issues/1844

route/edit.py

@@ -94,9 +94,15 @@ def edit(name = 'Test', section = 0, do_type = ''):
             else:
                 leng = '+' + str(len(content))
 
-            
+            curs.execute(db_change("select data from other where name = 'edit_timeout'"))
+            db_data = curs.fetchall()
+            db_data = '' if not db_data else number_check(db_data[0][0])
+
             try:
-                timeout = edit_timeout(edit_render_set, (name, content), timeout = 5)
+                if db_data != '':
+                    timeout = edit_timeout(edit_render_set, (name, content), timeout = int(db_data))
+                else:
+                    timeout = 0
             except Exception as e:
                 print('multiprocessing error : ')
                 print(e)
@@ -105,7 +111,7 @@ def edit(name = 'Test', section = 0, do_type = ''):
 
             if timeout == 1:
                 return re_error('/error/41')
-                
+            
             if db_data:
                 curs.execute(db_change("update data set data = ? where title = ?"), [content, name])
             else:    

route/main_setting_main.py

@@ -39,7 +39,8 @@ def main_setting_main(db_set):
             35 : ['user_name_view', ''],
             36 : ['link_case_insensitive', ''],
             37 : ['move_with_redirect', ''],
-            38 : ['slow_thread', '']
+            38 : ['slow_thread', ''],
+            39 : ['edit_timeout', '5'],
         }
 
         if flask.request.method == 'POST':
@@ -262,6 +263,11 @@ def main_setting_main(db_set):
                         <input name="slow_thread" value="''' + html.escape(d_list[38]) + '''">
                         <hr class="main_hr">
 
+                        <span>''' + load_lang('edit_timeout') + ''' (''' + load_lang('second') + ''') (''' + load_lang('off') + ''' : ''' + load_lang('empty') + ''')</span>
+                        <hr class="main_hr">
+                        <input name="edit_timeout" value="''' + html.escape(d_list[39]) + '''">
+                        <hr class="main_hr">
+
                         <button id="opennamu_save_button" type="submit">''' + load_lang('save') + '''</button>
                     </form>
                 '''),

route/tool/func.py

@@ -103,12 +103,10 @@ conn = ''
 # Func-main
 def load_conn(data):
     global conn
-
     conn = data
     
 def do_db_set(db_set):
     global global_db_set
-    
     global_db_set = db_set
     
 # Func-init
@@ -2709,7 +2707,10 @@ def re_error(data):
                 
             data = load_lang('error_password_length_too_short') + password_min_length
         elif num == 41:
-            data = load_lang('timeout_error') + '5'
+            curs.execute(db_change("select data from other where name = 'edit_timeout'"))
+            db_data = curs.fetchall()
+            db_data = '' if not db_data else db_data[0][0]
+            data = load_lang('timeout_error') + db_data
         else:
             data = '???'
 

route/tool/func_render_namumark.py

@@ -314,14 +314,14 @@ class class_do_render_namumark:
         while 1:
             heading_count += 1
 
-            if not re.search(heading_regex, self.render_data):
+            heading_data = re.search(heading_regex, self.render_data)
+            if not heading_data:
                 break
             elif heading_count_all < 0:
                 print('Error : render heading count overflow')
 
                 break
             else:
-                heading_data = re.search(heading_regex, self.render_data)
                 heading_data_org = heading_data.group(0)
                 heading_data = heading_data.groups()
 
@@ -718,7 +718,8 @@ class class_do_render_namumark:
         image_count = 0
         link_count_all = len(re.findall(link_regex, self.render_data)) * 4
         while 1:
-            if not re.search(link_regex, self.render_data):
+            link_data = re.search(link_regex, self.render_data)
+            if not link_data:
                 break
             elif link_count_all < 0:
                 print('Error : render link count overflow')
@@ -726,7 +727,6 @@ class class_do_render_namumark:
                 break
             else:
                 # link split
-                link_data = re.search(link_regex, self.render_data)
                 link_data_full = link_data.group(0)
                 link_data = link_data.groups()
 

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC3-dev198",
+        "r_ver" : "v3.4.6-RC3-dev199",
         "c_ver" : "3500361",
         "s_ver" : "3500111"
     }