사소한 수정들

app.py

@@ -177,26 +177,6 @@ for i in range(len(server_set_key)):
     
     server_set[server_set_key[i]] = server_set_val
 
-try:
-    if not os.path.exists('robots.txt'):
-        curs.execute('select data from other where name = "robot"')
-        robot_test = curs.fetchall()
-        if robot_test:
-            fw_test = open('./robots.txt', 'w')
-            fw_test.write(re.sub('\r\n', '\n', robot_test[0][0]))
-            fw_test.close()
-        else:
-            fw_test = open('./robots.txt', 'w')
-            fw_test.write('User-agent: *\nDisallow: /\nAllow: /$\nAllow: /w/')
-            fw_test.close()
-
-            curs.execute('insert into other (name, data) values ("robot", "User-agent: *\nDisallow: /\nAllow: /$\nAllow: /w/")')
-        
-        print('----')
-        print('Engine made robots.txt')
-except:
-    pass
-
 curs.execute('select data from other where name = "key"')
 rep_data = curs.fetchall()
 if not rep_data:

language/en-US.json

@@ -93,6 +93,7 @@
         "title" : "Title",
         "reference" : "Reference",
         "icon" : "Icon",
+        "view" : "View",
         "_comment_1.1_" : "Time",
             "second" : "Second(s)",
             "hour" : "Hour(s)",

language/ko-KR.json

@@ -56,6 +56,7 @@
     "connect": "연결",
     "edit_record": "편집 기록",
     "preview": "미리보기",
+    "view" : "보기",
     "no_login_error": "비로그인 상태입니다.",
     "upload": "업로드",
     "user_name": "사용자 이름",

route/func_upload.py

@@ -87,8 +87,9 @@ def func_upload_2(conn):
             file_d,
             get_time(), 
             ip, 
-            '(upload)',
-            '0'
+            ip,
+            '0',
+            'upload'
         )
         
         conn.commit()

route/main_file.py

@@ -4,6 +4,9 @@ def main_file_2(conn, data):
     curs = conn.cursor()
 
     if re.search('\.txt$', data):
-        return flask.send_from_directory('./', data)
+        if data == 'robots.txt' and not os.path.exists('robots.txt'):
+            return flask.Response('User-agent: *\nDisallow: /\nAllow: /$\nAllow: /w/', mimetype='text/plain')
+        else:
+            return flask.send_from_directory('./', data)
     else:
         return redirect('/w/' + url_pas(wiki_set(2)))

route/setting.py

@@ -396,6 +396,20 @@ def setting_2(conn, num):
 
             return redirect('/setting/4')
         else:
+            if not os.path.exists('robots.txt'):
+                curs.execute('select data from other where name = "robot"')
+                robot_test = curs.fetchall()
+                if robot_test:
+                    fw_test = open('./robots.txt', 'w')
+                    fw_test.write(re.sub('\r\n', '\n', robot_test[0][0]))
+                    fw_test.close()
+                else:
+                    fw_test = open('./robots.txt', 'w')
+                    fw_test.write('User-agent: *\nDisallow: /\nAllow: /$\nAllow: /w/')
+                    fw_test.close()
+
+                    curs.execute('insert into other (name, data) values ("robot", "User-agent: *\nDisallow: /\nAllow: /$\nAllow: /w/")')
+
             curs.execute("select data from other where name = 'robot'")
             robot = curs.fetchall()
             if robot:
@@ -413,7 +427,7 @@ def setting_2(conn, num):
             return easy_minify(flask.render_template(skin_check(), 
                 imp = ['robots.txt', wiki_set(), custom(), other2([0, 0])],
                 data = '''
-                    <a href="/robots.txt">(view)</a>
+                    <a href="/robots.txt">(''' + load_lang('view') + ''')</a>
                     <hr class=\"main_hr\">
                     <form method="post">
                         <textarea rows="25" name="content">''' + html.escape(data) + '''</textarea>

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.4-master-09",
+        "r_ver" : "v3.1.4-master-10",
         "c_ver" : "400004",
         "s_ver" : "3"
     }, "stable" : {

views/marisa/css/main.css

@@ -3,7 +3,7 @@ body {
     word-break: break-all;
     word-wrap: break-word;
     margin: 0;
-    font-family: 'Noto Sans KR', '나눔고딕', 'Nanum Gothic', 'Malgun Gothic', '맑은 고딕', sans-serif;
+    font-family: '나눔고딕', 'Nanum Gothic', 'Noto Sans KR', 'Malgun Gothic', '맑은 고딕', sans-serif;
 }
 
 ul {

views/marisa/index.html

@@ -10,7 +10,6 @@
         <script src="/views/marisa/js/main.js?ver=1"></script>
         <script>window.onload = function () { search_do(); skin_set(); }</script>
         <script src="https://code.iconify.design/1/1.0.3/iconify.min.js"></script>
-        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Noto+Sans+KR&display=swap">
         <link rel="shortcut icon" href="/views/main_css/file/favicon.ico?ver=1">
         {{imp[1][5]|safe}}
         {{imp[2][3]|safe}}