[TIC-CORE] supports new recipe

[archive/20170607/tools/tic-core.git] / tic / server / tic_server.py

diff --git a/tic/server/tic_server.py b/tic/server/tic_server.py
index a1a6b4c..6b8c58c 100644 (file)
--- a/tic/server/tic_server.py
+++ b/tic/server/tic_server.py
@@ -8,10 +8,8 @@ import os
 import logging
 from tic import command
 from tic.utils import error
-from flask_cors import CORS
 
 app = Flask(__name__)
-CORS(app)
 
 @app.route('/')
 def index():
@@ -25,8 +23,9 @@ def analysis():
     try:
         logger = logging.getLogger(__name__)
         logger.info('%s - %s %s : data=%s' % (request.remote_addr, request.method, request.path, request.data))
-        repo_info = json.loads(request.data)
-        view_data = command.analyze(repo_info.get('repos'), repo_info.get('recipes'))
+        target_info = json.loads(request.data)
+        view_data = command.analyze(target_info.get('recipes'))
+        #view_data = command.analyze(None)
         resp = makeresponse(view_data, None)
     except error.TICError as err:
         logger.error(err)
@@ -34,6 +33,23 @@ def analysis():
     except ValueError as ve:
         logger.error(ve)
         resp = makeresponse(str(ve), ve)
+#     except Exception as ex:
+#         logger.error(ex)
+#         resp = makeresponse(str(ex), ex)
+    
+    return resp
+
+@app.route('/imports', methods=['POST'])
+def imports():
+    try:
+        logger = logging.getLogger(__name__)
+        logger.info('%s - %s %s : data=%s' % (request.remote_addr, request.method, request.path, request.data))
+        repo_info = json.loads(request.data)
+        view_data = command.imports(repo_info.get('recipes'))
+        resp = makeresponse(view_data, None)
+    except error.TICError as err:
+        logger.error(err)
+        resp = makeresponse(str(err), err)
     except Exception as ex:
         logger.error(ex)
         resp = makeresponse(str(ex), ex)
@@ -45,29 +61,34 @@ def exports():
     try:
         logger = logging.getLogger(__name__)
         logger.info('%s - %s %s : data=%s' % (request.remote_addr, request.method, request.path, request.data))
-
+        exportInfo = json.loads(request.data)
+        export_type = request.args.get('format')
+        output = command.exports(export_type, exportInfo.get('recipes'), exportInfo.get('packages'), exportInfo.get('outdir'), exportInfo.get('filename'))
+        resp = makeresponse(output, None)
     except error.TICError as err:
         logger.error(err)
         resp = makeresponse(str(err), err)
     except ValueError as ve:
         logger.error(ve)
         resp = makeresponse(str(ve), ve)
-    except Exception as ex:
-        logger.error(ex)
-        resp = makeresponse(str(ex), ex)
-    
+#     except Exception as ex:
+#         logger.error(ex)
+#         resp = makeresponse(str(ex), ex)
     return resp
 
 
-def start(port_num=59001):
+def start(port_num=8082):
     # cryptographic random generator
     app.secret_key = os.urandom(24) 
     
     with app.test_request_context():
         print(url_for('index'))
         print(url_for('analysis'))
-    app.run(host='0.0.0.0', port=port_num)
-
+        print(url_for('imports'))
+        print(url_for('exports'))
+    if isinstance(port_num, (str, unicode)):
+        port_num = int(port_num)
+    app.run(host='0.0.0.0', threaded=True, port=port_num)
 
 def makeresponse(data, err):
     status = 200
@@ -76,6 +97,7 @@ def makeresponse(data, err):
             status = 400 # Bad Request
         elif isinstance(err, Exception):
             status = 500 # Internal Server Error
+            data='Internal Server Error'
         res_body = json.dumps(ResultInfo('false', None, data)._asdict())
     else:
         res_body = json.dumps(ResultInfo('true', data, None)._asdict())
@@ -91,4 +113,4 @@ def ResultInfo(result='false', data=None, message=None):
     return ResultInfoType(result, data, message)
 
 if __name__ == '__main__':
-    start(59003)
+    start(8082)