Surplus_Up (2DU) 6 лет назад
Родитель
Сommit
734cb3e36a
2 измененных файлов с 14 добавлено и 5 удалено
  1. 3 2
      app.py
  2. 11 3
      route/api_skin_info.py

+ 3 - 2
app.py

@@ -589,8 +589,9 @@ def api_version():
     return api_version_2(conn, r_ver, c_ver)
 
 @app.route('/api/skin_info')
-def api_skin_info():
-    return api_skin_info_2(conn)
+@app.route('/api/skin_info/<name>')
+def api_skin_info(name = ''):
+    return api_skin_info_2(conn, name)
 
 @app.route('/api/topic/<everything:name>/sub/<sub>')
 def api_topic_sub(name = '', sub = '', time = ''):

+ 11 - 3
route/api_skin_info.py

@@ -1,15 +1,23 @@
 from .tool.func import *
 
-def api_skin_info_2(conn):
+def api_skin_info_2(conn, name):
     curs = conn.cursor()
 
-    json_address = re.sub("(((?!\.|\/).)+)\.html$", "info.json", skin_check())
+    if name == '':
+        name = skin_check()
+    else:
+        name = './views/' + name + '/index.html'
+
+    print(skin_check())
+    print(name)
+
+    json_address = re.sub("(((?!\.|\/).)+)\.html$", "info.json", name)
     try:
         json_data = json.loads(open(json_address).read())
     except:
         json_data = None
 
-    if json_data:    
+    if json_data:
         return flask.jsonify(json_data)
     else:
         return flask.jsonify({}), 404