dday 문법 추가

app.py

@@ -1,12 +1,10 @@
 from bottle import *
 from bottle.ext import beaker
+import json
+import sqlite3
 import bcrypt
 import os
 import difflib
-import hashlib
-import json
-import sqlite3
-import html
 from css_html_js_minify import html_minify
 
 try:
@@ -38,12 +36,12 @@ session_opts = {
 
 app = beaker.middleware.SessionMiddleware(app(), session_opts)
 
+from func import *
+
 BaseRequest.MEMFILE_MAX = 1000 ** 4
 
 def redirect(data):
     return('<meta http-equiv="refresh" content="0;url=' + data + '" />')
-    
-from func import *
 
 r_ver = '2.3.2'
 p_ver = ''

func.py

@@ -1,12 +1,7 @@
 from bottle import request, app
 from bottle.ext import beaker
-from urllib import parse
 import json
 import sqlite3
-import time
-import re
-import hashlib
-import html
 
 json_data = open('set.json').read()
 set_data = json.loads(json_data)

mark.py

@@ -7,6 +7,7 @@ import time
 import re
 import hashlib
 import html
+import datetime
 
 json_data = open('set.json').read()
 set_data = json.loads(json_data)
@@ -801,6 +802,19 @@ def namumark(title, data, num, in_c):
                 year -= 1
                 
         data = re.sub('\[age\(([0-9]{4})-([0-9]{2})-([0-9]{2})\)\]', str(year), data, 1)
+
+    dday_data = re.findall('\[dday\(([0-9]{4}-[0-9]{2}-[0-9]{2})\)\]', data)
+    for dday in dday_data:
+        old = datetime.datetime.strptime(time[0] + '-' + time[1] + '-' + time[2], '%Y-%m-%d')
+        will = datetime.datetime.strptime(dday, '%Y-%m-%d')
+        e_data = old - will
+
+        if(re.search('^-', str(e_data.days))):
+            e_day = str(e_data.days)
+        else:
+            e_day = '+' + str(e_data.days)
+
+        data = re.sub('\[dday\(([0-9]{4}-[0-9]{2}-[0-9]{2})\)\]', e_day, data, 1)
     
     data = re.sub("-{4,11}", "<hr>", data)