캐시 관련 대개편

route/main_view.py

@@ -8,7 +8,9 @@ def main_view(name = ''):
             return main_func_error_404()
         else:
             file_name = file_name.group(1)
-            dir_name = './views/' + re.sub(r'\.{2,}', '', re.sub(r'([^/]+)$', '', name))
+            dir_name = './views/' + re.sub(r'\.{2,}', '', name[:-len(file_name)])
+
+            file_name = re.sub(r'\.cache_v(?:[0-9]+)$', '', file_name)
 
             mime_type = file_name.split('.')
             if len(mime_type) < 2:

route/tool/func.py

@@ -1038,30 +1038,33 @@ def wiki_css(data):
     data_css = ''
     data_css_add = ''
 
+    data_css_ver = '182'
+    data_css_ver = '.cache_v' + data_css_ver
+
     if 'main_css' in global_wiki_set:
         data_css = global_wiki_set['main_css']
     else:
         data_css += '<meta http-equiv="Cache-Control" content="max-age=3600">'
 
         # Func JS
-        data_css += '<script src="/views/main_css/js/func/func.js"></script>'
+        data_css += '<script src="/views/main_css/js/func/func.js' + data_css_ver + '"></script>'
         
-        data_css += '<script defer src="/views/main_css/js/func/insert_version.js"></script>'
-        data_css += '<script defer src="/views/main_css/js/func/insert_user_info.js"></script>'
-        data_css += '<script defer src="/views/main_css/js/func/insert_version_skin.js"></script>'
-        data_css += '<script defer src="/views/main_css/js/func/insert_http_warning_text.js"></script>'
+        data_css += '<script defer src="/views/main_css/js/func/insert_version.js' + data_css_ver + '"></script>'
+        data_css += '<script defer src="/views/main_css/js/func/insert_user_info.js' + data_css_ver + '"></script>'
+        data_css += '<script defer src="/views/main_css/js/func/insert_version_skin.js' + data_css_ver + '"></script>'
+        data_css += '<script defer src="/views/main_css/js/func/insert_http_warning_text.js' + data_css_ver + '"></script>'
         
-        data_css += '<script defer src="/views/main_css/js/func/ie_end_of_life.js"></script>'
-        data_css += '<script defer src="/views/main_css/js/func/shortcut.js"></script>'
+        data_css += '<script defer src="/views/main_css/js/func/ie_end_of_life.js' + data_css_ver + '"></script>'
+        data_css += '<script defer src="/views/main_css/js/func/shortcut.js' + data_css_ver + '"></script>'
         
         # Route JS
-        data_css += '<script src="/views/main_css/js/route/editor.js"></script>'
-        data_css += '<script src="/views/main_css/js/route/editor_sub.js"></script>'
-        data_css += '<script src="/views/main_css/js/route/render.js"></script>'
-        data_css += '<script src="/views/main_css/js/route/topic.js"></script>'
+        data_css += '<script src="/views/main_css/js/route/editor.js' + data_css_ver + '"></script>'
+        data_css += '<script src="/views/main_css/js/route/editor_sub.js' + data_css_ver + '"></script>'
+        data_css += '<script src="/views/main_css/js/route/render.js' + data_css_ver + '"></script>'
+        data_css += '<script src="/views/main_css/js/route/topic.js' + data_css_ver + '"></script>'
         
         # Main CSS
-        data_css += '<link rel="stylesheet" href="/views/main_css/css/main.css">'
+        data_css += '<link rel="stylesheet" href="/views/main_css/css/main.css' + data_css_ver + '">'
 
         # External
         data_css += '<script src="https://cdn.jsdelivr.net/npm/katex@0.16.8/dist/katex.min.js" integrity="sha384-cpW21h6RZv/phavutF+AuVYrr+dA8xD9zs6FwLpaCct6O9ctzYFfFr4dgmgccOTx" crossorigin="anonymous"></script>'

version.json

@@ -1,7 +1,7 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC5-dev18",
+        "r_ver" : "v3.4.6-RC5-dev19",
         "c_ver" : "3500373",
-        "s_ver" : "3500111"
+        "s_ver" : "3500112"
     }
 }

views/ringo/index.html

@@ -10,15 +10,15 @@
         {{imp[3][3]|safe}}
         <link href="https://cdn.jsdelivr.net/gh/sunn-us/SUIT/fonts/static/woff2/SUIT.css" rel="stylesheet">
         <script src="https://code.iconify.design/1/1.0.3/iconify.min.js"></script>
-        <script src="/views/ringo/js/main.js"></script>
-        <script src="/views/ringo/js/sidebar.js"></script>
-        <script src="/views/ringo/js/skin_set.js"></script>
-        <link rel="stylesheet" href="/views/ringo/css/main.css">
+        <script src="/views/ringo/js/main.js.cache_v2"></script>
+        <script src="/views/ringo/js/sidebar.js.cache_v1"></script>
+        <script src="/views/ringo/js/skin_set.js.cache_v1"></script>
+        <link rel="stylesheet" href="/views/ringo/css/main.css.cache_v4">
         {% if request.cookies.get('main_css_darkmode', '') == '1' %}
-            <link rel="stylesheet" href="/views/main_css/css/sub/dark.css">
-            <link rel="stylesheet" href="/views/ringo/css/dark.css">
+            <link rel="stylesheet" href="/views/main_css/css/sub/dark.css.cache_v1">
+            <link rel="stylesheet" href="/views/ringo/css/dark.css.cache_v1">
         {% endif %}
-        <link rel="shortcut icon" href="/views/main_css/file/favicon.ico">
+        <link rel="shortcut icon" href="/views/main_css/file/favicon.ico.cache_v1">
         {{imp[1][5]|safe}}
         {{imp[2][3]|safe}}
         {% if imp[3][0] != 0 %}

views/ringo/info.json

@@ -1,5 +1,5 @@
 {
     "name" : "Ringo",
-    "skin_ver" : "v1.0.3",
-    "require_ver" : "3500111"
+    "skin_ver" : "v1.0.4",
+    "require_ver" : "3500112"
 }