잉여개발기 (SPDV) 3 tahun lalu
induk
melakukan
c38e96f56c
3 mengubah file dengan 34 tambahan dan 16 penghapusan
  1. 1 6
      emergency_tool.py
  2. 7 1
      route/tool/func_render.py
  3. 26 9
      route/tool/func_render_namumark.py

+ 1 - 6
emergency_tool.py

@@ -99,12 +99,7 @@ if what_i_do == '1':
         curs.execute(db_change("select data from data where title = ?"), [name[0]])
         data = curs.fetchall()
 
-        render_lang_data = {
-            'toc' : load_lang('toc'),
-            'category' : load_lang('category')
-        }
-
-        class_do_render(conn, render_lang_data).do_render(name[0], data[0][0], 'backlink', '')
+        class_do_render(conn).do_render(name[0], data[0][0], 'backlink', '')
 elif what_i_do == '2':
     curs.execute(db_change("delete from other where name = 'recaptcha'"))
     curs.execute(db_change("delete from other where name = 'sec_re'"))

+ 7 - 1
route/tool/func_render.py

@@ -3,9 +3,15 @@ from .func_render_namumark import *
 # 커스텀 마크 언젠간 다시 추가 예정
 
 class class_do_render:
-    def __init__(self, conn, lang_data):
+    def __init__(self, conn, lang_data = {}):
         self.conn = conn
 
+        if lang_data == '{}':
+            lang_data = {
+                'toc' : 'toc',
+                'category' : 'category'
+            }
+
         self.lang_data = lang_data
 
     def do_render(self, doc_name, doc_data, data_type, data_in):

+ 26 - 9
route/tool/func_render_namumark.py

@@ -10,7 +10,24 @@ class class_do_render_namumark:
         self.doc_include = self.doc_set['doc_include'] if 'doc_include' in self.doc_set else ''
 
         self.lang_data = lang_data
-        self.ip = ip_check()
+        try:
+            self.ip = ip_check()
+        except:
+            self.ip = '0.0.0.0'
+
+        try:
+            if 'main_css_bold' in self.flask_session:
+                pass    
+                
+            self.flask_session = flask.session
+        except:
+            self.flask_session = ''
+
+        try:
+            self.darkmode = flask.request.cookies.get('main_css_darkmode', '0')
+        except:
+            self.darkmode = '0'
+
 
         self.data_temp_storage = {}
         self.data_temp_storage_count = 0
@@ -164,7 +181,7 @@ class class_do_render_namumark:
         if len(data) == 1:
             return data[0]
         else:
-            if flask.request.cookies.get('main_css_darkmode', '0') == '0':
+            if self.darkmode == '0':
                 return data[0]
             else:
                 return data[1]
@@ -176,7 +193,7 @@ class class_do_render_namumark:
             db_data = self.curs.fetchall()
             bold_user_set = db_data[0][0] if db_data else 'normal'
         else:
-            bold_user_set = flask.session['main_css_bold'] if 'main_css_bold' in flask.session else 'normal'
+            bold_user_set = self.flask_session['main_css_bold'] if 'main_css_bold' in self.flask_session else 'normal'
 
         def do_render_text_bold(match):
             data = match.group(1)
@@ -242,7 +259,7 @@ class class_do_render_namumark:
             db_data = self.curs.fetchall()
             strike_user_set = db_data[0][0] if db_data else 'normal'
         else:
-            strike_user_set = flask.session['main_css_strike'] if 'main_css_strike' in flask.session else 'normal'
+            strike_user_set = self.flask_session['main_css_strike'] if 'main_css_strike' in self.flask_session else 'normal'
 
         def do_render_text_strike(match):
             data = match.group(1)
@@ -787,9 +804,9 @@ class class_do_render_namumark:
                     else:
                         file_pass = 0
                         if file_turn != '':
-                            if file_turn == 'dark' and flask.request.cookies.get('main_css_darkmode', '0') == '1':
+                            if file_turn == 'dark' and self.darkmode == '1':
                                 file_pass = 1
-                            elif file_turn == 'light' and flask.request.cookies.get('main_css_darkmode', '0') == '0':
+                            elif file_turn == 'light' and self.darkmode == '0':
                                 file_pass = 1
                         else:
                             file_pass = 1
@@ -1110,7 +1127,7 @@ class class_do_render_namumark:
                             db_data = self.curs.fetchall()
                             include_set_data = db_data[0][0] if db_data else 'normal'
                         else:
-                            include_set_data = flask.session['main_css_include_link'] if 'main_css_include_link' in flask.session else 'normal'
+                            include_set_data = self.flask_session['main_css_include_link'] if 'main_css_include_link' in self.flask_session else 'normal'
 
                         include_link = ''
                         if include_set_data == 'use':
@@ -1761,7 +1778,7 @@ class class_do_render_namumark:
                     db_data = self.curs.fetchall()
                     category_set_data = db_data[0][0] if db_data else 'normal'
                 else:
-                    category_set_data = flask.session['main_css_category_set'] if 'main_css_category_set' in flask.session else 'normal'
+                    category_set_data = self.flask_session['main_css_category_set'] if 'main_css_category_set' in self.flask_session else 'normal'
 
                 if category_set_data == 'normal':
                     if re.search(r'<footnote_category>', self.render_data):
@@ -1843,7 +1860,7 @@ class class_do_render_namumark:
                 db_data = self.curs.fetchall()
                 toc_set_data = db_data[0][0] if db_data else 'normal'
             else:
-                toc_set_data = flask.session['main_css_toc_set'] if 'main_css_toc_set' in flask.session else 'normal'
+                toc_set_data = self.flask_session['main_css_toc_set'] if 'main_css_toc_set' in self.flask_session else 'normal'
 
             self.render_data = re.sub(toc_search_regex, '', self.render_data)
             if toc_set_data != 'off':