backlink

app.py

@@ -244,15 +244,8 @@ else:
     rep_key = rep_data[0][0]
 
 if set_data['db_type'] == 'sqlite':
-    def back_up():
+    def back_up(back_time, back_up_where):
         print('----')
-
-        curs.execute(db_change('select data from other where name = "backup_where"'))
-        back_up_where = curs.fetchall()
-        if back_up_where and back_up_where[0][0] != '':
-            back_up_where = back_up_where[0][0]
-        else:
-            back_up_where = 'back_' + set_data['db'] + '.db'
         
         try:
             shutil.copyfile(
@@ -264,30 +257,43 @@ if set_data['db_type'] == 'sqlite':
         except:
             print('Back up : Error')
 
-        threading.Timer(60 * 60 * back_time, back_up).start()
+        threading.Timer(
+            60 * 60 * back_time, 
+            back_up,
+            [back_time, back_up_where]
+        ).start()
 
-    try:
-        curs.execute(db_change('select data from other where name = "back_up"'))
-        back_up_time = curs.fetchall()
+    curs.execute(db_change('select data from other where name = "back_up"'))
+    back_time = curs.fetchall()
+    if back_time:
+        back_time = int(number_check(back_time[0][0]))
 
-        back_time = int(back_up_time[0][0])
-    except:
-        back_time = 0
+        curs.execute(db_change('select data from other where name = "backup_where"'))
+        back_up_where = curs.fetchall()
+        if back_up_where and back_up_where[0][0] != '':
+            back_up_where = back_up_where[0][0]
+        else:
+            back_up_where = 'back_' + set_data['db'] + '.db'
 
-    if back_time != 0:
         print('Back up state : ' + str(back_time) + ' hours')
 
-        back_up()
+        back_up(back_time, back_up_where)
     else:
         print('Back up state : Turn off')
 
-def mysql_dont_off():
-    curs = conn.cursor()
-    curs.execute(db_change("select title from data limit 1"))
+def mysql_dont_off(port):
+    try:
+        urllib.request.urlopen('http://localhost:' + port + '/')
+    except:
+        pass
 
-    threading.Timer(60 * 60 * 1, mysql_dont_off).start()
+    threading.Timer(
+        60 * 60 * 3, 
+        mysql_dont_off,
+        [port]
+    ).start()
 
-mysql_dont_off()
+mysql_dont_off(server_set['port'])
 
 curs.execute(db_change('select data from other where name = "count_all_title"'))
 if not curs.fetchall():

emergency_tool.py

@@ -168,7 +168,7 @@ if what_i_do == '1':
     print('----')
     print('Load...')
 
-    curs.execute(db_change("select title from data d where not exists (select title from back where link = d.title)"))
+    curs.execute(db_change("select title from data d where not exists (select title from back where link = d.title limit 1)"))
     title = curs.fetchall()
 
     print('----')

route/login_register.py

@@ -126,9 +126,11 @@ def login_register_2(conn):
                     ''' + approval_question + '''
                     ''' + captcha_get() + '''
                     
-                    <a href="" id="oauth_google">(Google)</a>         
-                    
+                    <!--
+                    <a href="" id="oauth_google">(Google)</a>     
                     <hr class="main_hr">
+                    -->
+                    
                     <button type="submit">''' + load_lang('save') + '''</button>
                     
                     ''' + http_warring() + '''

route/tool/func.py

@@ -49,7 +49,7 @@ if sys.version_info < (3, 6):
         
 global_lang = {}
 
-data_css_ver = '89'
+data_css_ver = '90'
 data_css = ''
 
 conn = ''

route/tool/func_mark.py

@@ -30,18 +30,20 @@ def backlink_generate(data_markup, doc_data, doc_name):
         data_link_end['file'] = []
         data_link_end['link'] = []
         
+        data_link_end_all = []
+        
         for i in data_link:
             data_link_in = i
             if data_link_in[0] == '#':
                 continue
             elif re.search(r'^(?:분류|category):', data_link_in):
-                data_link_in = re.sub(r'\\(.)', '\1', data_link_in)
+                data_link_in = re.sub(r'\\(.)', r'\1', data_link_in)
                 data_link_end['cat'] += [re.sub(r'^분류:', 'category:', data_link_in)]
             elif re.search(r'^(?:파일|file):', data_link_in):
-                data_link_in = re.sub(r'\\(.)', '\1', data_link_in)
+                data_link_in = re.sub(r'\\(.)', r'\1', data_link_in)
                 data_link_end['file'] += [re.sub(r'^파일:', 'file:', data_link_in)]
             else:
-                data_link_in = re.sub(r'([^/])#(?:[^#]*)$', '\1', data_link_in)
+                data_link_in = re.sub(r'([^\\])#(?:[^#]*)$', r'\1', data_link_in)
                 
                 if data_link_in[0] == ':':
                     data_link_in = re.sub(r'^:', '', data_link_in)
@@ -54,7 +56,7 @@ def backlink_generate(data_markup, doc_data, doc_name):
                         (('/' + data_link_in) if data_link_in != '' else '') + \
                     ''
 
-                data_link_in = re.sub(r'\\(.)', '\1', data_link_in)
+                data_link_in = re.sub(r'\\(.)', r'\1', data_link_in)
                 data_link_end['link'] += [data_link_in]
                 
         if data_link_end != {}:
@@ -62,12 +64,9 @@ def backlink_generate(data_markup, doc_data, doc_name):
             data_link_end['file'] = list(set(data_link_end['file']))
             data_link_end['link'] = list(set(data_link_end['link']))
 
-            data_link_end_all = []
             data_link_end_all += [[doc_name, i, 'cat'] for i in data_link_end['cat']]
             data_link_end_all += [[doc_name, i, 'file'] for i in data_link_end['file']]
             data_link_end_all += [[doc_name, i, ''] for i in data_link_end['link']]
-        else:
-            data_link_end_all = []
             
         # Include
         include_re = re.compile(r'\[include\(((?:(?!\)\]).)+)\)\]', re.I)
@@ -75,10 +74,24 @@ def backlink_generate(data_markup, doc_data, doc_name):
         data_include = include_re.findall(doc_data)
         data_include = list(set(data_include))
         
-        
+        for i in data_include:
+            data_include_in = i
+            data_include_in = re.sub(r'([^\\]),.*$', r'\1', data_include_in)
+            
+            data_link_end_all += [[doc_name, data_include_in, 'include']]
         
         # Redirect
+        redirect_re = re.compile(r'^#(?:redirect|넘겨주기) ([^\n]+)', re.I)
+        
+        data_redirect = redirect_re.search(doc_data)
+        if data_redirect:
+            data_redirect = data_redirect.group(1)
+            
+            data_redirect = re.sub(r'([^\\])#(?:[^#]*)$', r'\1', data_redirect)
+            
+            data_link_end_all += [[doc_name, data_redirect, 'redirect']]
     else:
+        # markup == null
         data_link_end_all = []
             
     return data_link_end_all
@@ -126,7 +139,6 @@ def render_do(doc_name, doc_data, data_type, data_in):
             doc_name
         )
         
-        print(backlink)
         if backlink != []:
             curs.executemany(db_change("insert into back (link, title, type) values (?, ?, ?)"), backlink)
             curs.execute(db_change("delete from back where title = ? and type = 'no'"), [doc_name])

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.3.0-stable-01b (beta-03b) (dev-2021-05-31-01)",
+        "r_ver" : "v3.3.0-stable-01b (beta-04) (dev-2021-06-01-01)",
         "c_ver" : "3300301",
         "s_ver" : "12"
     }

views/main_css/js/render_onmark.js

@@ -983,8 +983,8 @@ function do_onmark_list_render(data) {
        '');
     }
     
-    var list_re = /\n((?:(?:(?: )+)\* ?(?:(?:(?!\n).)+)\n)+)/;
-    var list_short_re = /((?: )+)\* ?((?:(?!\n).)+)\n/g;
+    var list_re = /\n((?:(?:(?: )*)\* ?(?:(?:(?!\n).)+)\n)+)/;
+    var list_short_re = /((?: )*)\* ?((?:(?!\n).)+)\n/g;
     while(1) {
         var list_data = data.match(list_re);
         if(!list_data) {
@@ -1043,7 +1043,7 @@ function do_onmark_hr_render(data) {
 }
 
 function do_onmark_redirect_render(data, data_js, name_doc) {
-    var redirect_re = /^\n#(?:redirect|넘겨주기) ([^\n]+)/;
+    var redirect_re = /^\n#(?:redirect|넘겨주기) ([^\n]+)/i;
     var data_redirect = data.match(redirect_re);
     if(data_redirect) {
         var link_data_var = do_link_change(data_redirect[1], {}, 1);