minify 폐기

requirements.txt

@@ -3,6 +3,4 @@ bcrypt
 flask
 flask-Reggie
 flask-compress
-pysha3; python_version < "3.6"
-css-html-js-minify==2.2.2; python_version < "3.6"
-css-html-js-minify; python_version >= "3.6"
+pysha3; python_version < "3.6"

route/main_views.py

@@ -3,30 +3,29 @@ from .tool.func import *
 def main_views_2(conn, name):
     curs = conn.cursor()
 
-    if re.search('\/', name):
-        m = re.search('^(.*)\/(.*)$', name)
-        if m:
-            n = m.groups()
-            plus = '/' + n[0]
-            rename = n[1]
-        else:
-            plus = ''
-            rename = name
-    else:
-        plus = ''
-        rename = name
-
-    m = re.search('\.(.+)$', name)
+    m = re.search('\.([^.]+)$', name)
     if m:
         g = m.groups()
     else:
         g = ['']
 
-    if g == 'css':
-        return easy_minify(flask.send_from_directory('./views' + plus, rename), 'css')   
-    elif g == 'js':
-        return easy_minify(flask.send_from_directory('./views' + plus, rename), 'js')
-    elif g == 'html':
-        return easy_minify(flask.send_from_directory('./views' + plus, rename))   
+    if g[0] == 'css':
+        c_open = open('./views/' + name, encoding='utf-8')
+        f_open = c_open.read()
+        c_open.close()
+        return flask.Response(easy_minify(f_open, 'css'), mimetype="text/css")
+    elif g[0] == 'js':
+        c_open = open('./views/' + name, encoding='utf-8')
+        f_open = c_open.read()
+        c_open.close()
+        return flask.Response(easy_minify(f_open, 'js'), mimetype="text/js")
+    elif g[0] == 'html':
+        c_open = open('./views/' + name, encoding='utf-8')
+        f_open = c_open.read()
+        c_open.close()
+        return flask.Response(easy_minify(f_open), mimetype="text/html")
     else:
-        return flask.send_from_directory('./views' + plus, rename)
+        c_open = open('./views/' + name, encoding='utf-8')
+        f_open = c_open.read()
+        c_open.close()
+        return flask.Response(f_open, mimetype="text/plain")

route/tool/func.py

@@ -28,11 +28,6 @@ for i in range(0, 2):
         import html
         import re
 
-        try:
-            import css_html_js_minify
-        except:
-            pass
-
         if sys.version_info < (3, 6):
             import sha3
 
@@ -136,19 +131,7 @@ def last_change(data):
 
     return data
 
-def easy_minify(data, tool = None):
-    try:
-        if not tool:
-            data = css_html_js_minify.html_minify(data)
-        else:
-            if tool == 'css':
-                data = css_html_js_minify.css_minify(data)
-            elif tool == 'js':
-                data = css_html_js_minify.js_minify(data)
-    except:
-        data = re.sub('\n +<', '\n<', data)
-        data = re.sub('>(\n| )+<', '> <', data)
-    
+def easy_minify(data, tool = None):    
     return last_change(data)
 
 def render_set(title = '', data = '', num = 0, s_data = 0):
@@ -412,7 +395,7 @@ def other2(data):
         <script src="https://cdn.jsdelivr.net/npm/katex@0.10.1/dist/katex.min.js"
                 integrity="sha384-2BKqo+exmr9su6dir+qCw08N2ZKRucY4PrGQPPWU1A7FtlCGjmEGFqXCv5nyM5Ij"
                 crossorigin="anonymous"></script>
-        <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
     ''' + req_list]
 
     return data

route/tool/set_mark/namu.py

@@ -1027,6 +1027,7 @@ def namu(conn, data, title, main_num):
     data = re.sub('(?P<in><td(((?!>).)*)>)\n', '\g<in>', data)
     data = re.sub('(\n)?<hr>(\n)?', '<hr>', data)
     data = re.sub('<\/ul>\n\n<ul>', '</ul>\n<ul>', data)
+
     data = re.sub('\n', '<br>', data)
 
     return [data, plus_data, backlink]

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.2-master-22",
+        "r_ver" : "v3.1.2-master-23",
         "c_ver" : "400002",
         "s_ver" : "2"
     }, "stable" : {