Merge pull request #1978 from 1392-github/dev

백업 기능 개선

app.py

@@ -3,6 +3,7 @@ import os
 import re
 import logging
 import shutil
+import datetime
 
 from route.tool.func import *
 from route import *
@@ -225,7 +226,7 @@ with get_db_connect() as conn:
             try:
                 shutil.copyfile(
                     data_db_set['name'] + '.db', 
-                    back_up_where
+                    back_up_where.replace('%t', datetime.datetime.now().strftime('%Y-%m-%d_%H.%M.%S'))
                 )
 
                 print('Back up : OK')
@@ -240,7 +241,7 @@ with get_db_connect() as conn:
 
         curs.execute(db_change('select data from other where name = "back_up"'))
         back_time = curs.fetchall()
-        back_time = int(number_check(back_time[0][0])) if back_time and back_time[0][0] != '' else 0
+        back_time = float(number_check(back_time[0][0], True)) if back_time and back_time[0][0] != '' else 0
         if back_time != 0:
             curs.execute(db_change('select data from other where name = "backup_where"'))
             back_up_where = curs.fetchall()
@@ -647,4 +648,4 @@ if __name__ == "__main__":
         host = server_set['host'],
         port = int(server_set['port']),
         clear_untrusted_proxy_headers = True
-    )
+    )

route/tool/func.py

@@ -753,9 +753,12 @@ def leng_check(A, B):
     # A -> old
     return '0' if A == B else (('-' + str(A - B)) if A > B else ('+' + str(B - A)))
 
-def number_check(data):
+def number_check(data, f=False):
     try:
-        int(data)
+        if f:
+            float(data)
+        else:
+            int(data)
         return data
     except:
         return '1'
@@ -2773,4 +2776,4 @@ def re_error(data):
                         '</ul>' + \
                     '',
                     menu = 0
-                )), 400
+                )), 400