Browse Source

파일 정리

Surplus_Up (2DU) 6 years ago
parent
commit
202b962a0b
6 changed files with 22 additions and 69 deletions
  1. 0 3
      app.py
  2. 0 10
      route/main_easter_egg.py
  3. 7 2
      route/main_file.py
  4. 1 1
      route/tool/func.py
  5. 0 53
      views/easter_egg.html
  6. 14 0
      views/main_css/file/easter_egg.html

+ 0 - 3
app.py

@@ -653,9 +653,6 @@ def api_recent_change():
     return api_recent_change_2(conn)
     
 # File
-@app.route('/views/easter_egg.html')
-def main_easter_egg():
-    return main_easter_egg_2(conn)
 
 @app.route('/views/<everything:name>')
 def main_views(name = None):

+ 0 - 10
route/main_easter_egg.py

@@ -1,10 +0,0 @@
-from .tool.func import *
-
-def main_easter_egg_2(conn):
-    curs = conn.cursor()
-
-    return easy_minify(flask.render_template(skin_check(), 
-        imp = ['easter_egg.html', wiki_set(), custom(), other2([0, 0])],
-        data = open('./views/easter_egg.html', 'r').read(),
-        menu = 0
-    ))

+ 7 - 2
route/main_file.py

@@ -4,8 +4,13 @@ from . import main_error_404
 def main_file_2(conn, data):
     curs = conn.cursor()
 
-    print(data)
-    if re.search('\.txt$', data) or data == 'sitemap.xml':
+    if data == 'easter_egg.html':
+        return easy_minify(flask.render_template(skin_check(), 
+            imp = ['easter_egg.html', wiki_set(), custom(), other2([0, 0])],
+            data = open('./views/main_css/file/easter_egg.html', 'r').read(),
+            menu = 0
+        ))
+    elif re.search('\.txt$', data) or data == 'sitemap.xml':
         if data == 'robots.txt' and not os.path.exists('robots.txt'):
             return flask.Response('User-agent: *\nDisallow: /\nAllow: /$\nAllow: /w/', mimetype='text/plain')
         elif os.path.exists(data):

+ 1 - 1
route/tool/func.py

@@ -714,7 +714,7 @@ def custom():
 def load_skin(data = '', set_n = 0):
     div2 = ''
     div3 = []
-    system_file = ['main_css', 'easter_egg.html']
+    system_file = ['main_css']
 
     if data == '':
         ip = ip_check()

+ 0 - 53
views/easter_egg.html

@@ -1,53 +0,0 @@
-<iframe width="560" height="315" src="https://www.youtube.com/embed/7wzZbLKnUuA" allowfullscreen></iframe>
-<hr class="main_hr">
-<pre>
-    Nagareteku toki no naka de demo kedarusa ga hora guruguru mawatte
-    Watashi kara hanareru kokoro mo mienai wa sou shiranai
-    
-    Jibun kara ugoku koto mo naku toki no sukima ni nagasare tsuzukete
-    Shiranai wa mawari no koto nado watashi wa watashi sore dake
-    
-    Yume miteru? Nani mo mitenai? Kataru mo muda na jibun no kotoba
-    Kanashimu nante tsukareru dake yo nani mo kanjizu sugoseba ii no
-    
-    Tomadou kotoba ataerarete mo jibun no kokoro tada uwa no sora
-    Moshi watashi kara ugoku no naraba subete kaeru no nara kuro ni suru
-    
-    Konna jibun ni mirai wa aru no? Konna sekai ni watashi wa iru no?
-    Ima setsunai no? Ima kanashii no? Jibun no koto mo wakaranai mama
-    
-    Ayumu koto sae tsukareru dake yo hito no koto nado shiri mo shinaiwa
-    Konna watashi mo kawareru no nara moshi kawareru no nara shiro ni naru?
-    
-    Nagareteku toki no naka de demo kedarusa ga hora guruguru mawatte
-    Watashi kara hanareru kokoro mo mienaiwa sou shiranai
-    
-    Jibun kara ugoku koto mo naku toki no sukima ni nagasare tsuzukete
-    Shiranai wa mawari no koto nado watashi wa watashi sore dake
-    
-    Yume miteru? Nani mo mitenai? Kataru mo muda na jibun no kotoba
-    Kanashimu nante tsukareru dake yo nani mo kanjizu sugoseba ii no
-    
-    Tomadou kotoba ataerarete mo jibun no kokoro tada uwa no sora
-    Moshi watashi kara ugoku no naraba subete kaeru no nara kuro ni suru
-    
-    Muda na jikan ni mirai wa aru no? Konna tokoro ni watashi wa iru no?
-    Watashi no koto o iitai naraba kotoba ni suru no nara "roku de nashi"
-    
-    Konna tokoro ni watashi wa iru no? Konna jikan ni watashi wa iru no?
-    Konna watashi mo kawareru no nara moshi kawareru no nara shiro ni naru?
-    
-    Ima yume miteru? Nani mo mitenai? Kataru mo muda na jibun no kotoba?
-    Kanashimu nante tsukareru dake yo nani mo kanjizu sugoseba ii no
-    
-    Tomadou kotoba ataerarete mo jibun no kokoro tada uwa no sora
-    Moshi watashi kara ugoku no naraba subete kaeru no nara kuro ni suru
-    
-    Ugoku no naraba ugoku no naraba subete kowasu wa subete kowasu wa
-    Kanashimu naraba kanashimu naraba watashi no kokoro shiroku kawareru?
-    
-    Anata no koto mo watashi no koto mo subete no koto mo mada shiranai no
-    Omoi mabuta wo aketa no naraba subete kowasu no nara kuro ni nare!!!
-
-    <a href="https://touhou.fandom.com/wiki/Lyrics:_Bad_Apple!!">Ref - Touhou wiki</a>
-</pre>    

+ 14 - 0
views/main_css/file/easter_egg.html

@@ -0,0 +1,14 @@
+<div id="easter_egg"></div>
+<script>
+    var random_num = String(Math.floor(Math.random() * 3));
+    var random_code = '';
+    if(random_num === '2') {
+        random_code = 'Fsppuynb440';
+    } else if(random_num === '1') {
+        random_code = 'DbTIoBK9Wvo';
+    } else {
+        random_code = 'nytZOF0hp_c'
+    }
+
+    document.getElementById('easter_egg').innerHTML = '<iframe style="width: 560px; height: 315px;" src="https://www.youtube.com/embed/' + random_code + '" allowfullscreen></iframe>';
+</script>