From e6c9916a126b2361379123ae64c207f5edd93f9c Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sun, 13 Sep 2015 11:47:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                 |  3 ++-
 oj/local_settings.py       |  2 +-
 template/src/oj/index.html |  2 +-
 template/src/oj_base.html  |  4 ----
 tools/static_md5.py        | 30 +++++++++++++++++++-----------
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1fbe8ef2..31d22157 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,4 +61,5 @@ static/release/img
 static/src/upload_image/*
 build.txt
 tmp/
-test_case/
\ No newline at end of file
+test_case/
+release/
\ No newline at end of file
diff --git a/oj/local_settings.py b/oj/local_settings.py
index 51e9095e..e61ec9c7 100644
--- a/oj/local_settings.py
+++ b/oj/local_settings.py
@@ -34,7 +34,7 @@ REDIS_CACHE = {
 DEBUG = True
 
 # 同理 这是 web 服务器的上传路径
-TEST_CASE_DIR =    os.path.join(BASE_DIR, 'test_case/')
+TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case/')
 
 ALLOWED_HOSTS = []
 
diff --git a/template/src/oj/index.html b/template/src/oj/index.html
index c8c1d8f1..41f5d23a 100644
--- a/template/src/oj/index.html
+++ b/template/src/oj/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title>青岛大学在线评测平台 - 首页</title>
 
-    <link rel="stylesheet" type="text/css" href="/static/css/fullpage/jquery.fullPage.css">
+    <link href="/static/css/fullpage/jquery.fullPage.css" rel="stylesheet">
     <link rel="shortcut icon" href="/static/img/favicon.ico">
     <style>
         html, textarea, input, option, select, button {
diff --git a/template/src/oj_base.html b/template/src/oj_base.html
index 0b69c633..b3989765 100644
--- a/template/src/oj_base.html
+++ b/template/src/oj_base.html
@@ -86,10 +86,6 @@
 <script src="/static/js/require.js"></script>
 <script>
     require(["bootstrap"]);
-
-
-
-
 </script>
 {% block js_block %}{% endblock %}
 <!-- footer begin -->
diff --git a/tools/static_md5.py b/tools/static_md5.py
index db1b2811..618863f3 100644
--- a/tools/static_md5.py
+++ b/tools/static_md5.py
@@ -20,32 +20,40 @@ shutil.rmtree(static_release_path)
 # 复制一份静态文件文件夹到 release
 shutil.copytree(static_src_path, static_release_path)
 
-r = re.compile(r'<script src="(.+)"></script>')
+js_re = re.compile(r'<script src="(.+)"></script>')
+css_re = re.compile(r'<link href="(.+)" rel="stylesheet">')
 
 name_map = {}
 
 
-def do(match):
-    js_path = match.group(1).lstrip("/static/")
+def process(match):
+    file_path = match.group(1).replace("/static/", "")
+    # print file_path, match.group(), match.group(1)
 
-    if not os.path.exists(static_release_path + js_path):
+    if not os.path.exists(static_release_path + file_path):
         return match.group(0)
 
-    if js_path in name_map:
-        md5 = name_map[js_path]
+    if file_path in name_map:
+        md5 = name_map[file_path]
     else:
         # rename
-        md5 = hashlib.md5(open(static_release_path + js_path, "r").read()).hexdigest()
-        os.rename(static_release_path + js_path, static_release_path + js_path + "?v=" + md5)
-    return '<script src="%s"></script>' % (js_path + "?v=" + md5,)
+        md5 = hashlib.md5(open(static_release_path + file_path, "r").read()).hexdigest()
+        # os.rename(static_release_path + js_path, static_release_path + js_path + "?v=" + md5)
+    if ".js" in file_path:
+        return '<script src="/static/%s"></script>' % (file_path + "?v=" + md5[:6], )
+    elif ".css" in file_path:
+        return '<link rel="stylesheet" type="text/css" href="/static/%s">' % (file_path + "?v=" + md5[:6], )
+    else:
+        return match.group(0)
 
 
 for root, dirs, files in os.walk(template_release_path):
     for name in files:
         html_path = os.path.join(root, name)
         html_content = open(html_path, "r").read()
-        replaced_html_content = re.sub(r, do, html_content)
+        js_replaced_html_content = re.sub(js_re, process, html_content)
+        css_replaced_html_content = re.sub(css_re, process, js_replaced_html_content)
 
         f = open(html_path, "w")
-        f.write(replaced_html_content)
+        f.write(css_replaced_html_content)
         f.close()