[TIC-Web] add getAppConfig API and fix the mic option

- add getAppConfig API
- fix the mic option(loop to auto)

Change-Id: Id56d5f846831f401a5a6d889e7e61daf6995509f
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

diff --git a/app.js b/app.js
index 2afb24d..4e24bea 100644 (file)
--- a/app.js
+++ b/app.js
@@ -111,6 +111,9 @@ app.post('/exports', function(req, res) {
 io.on('connection', function (socket) {
     console.log('socket connection');
 
+    /**
+     * SocketEvent.FS_IMAGE_LIST_FROM = 'ws/fs/image/list/from'
+     */
     socket.on(SocketEvent.FS_IMAGE_LIST_FROM, function (data) {
         var msgData, fileList, targetDirectory;
 
@@ -128,34 +131,47 @@ io.on('connection', function (socket) {
         socket.emit(SocketEvent.FS_IMAGE_LIST_TO, msgData);
     });
 
+    /**
+     * SocketEvent.FS_IMAGE_ADD_FROM = 'ws/fs/image/add/from'
+     */
     socket.on(SocketEvent.FS_IMAGE_ADD_FROM, function (data) {
         Mic.create(data, io);
 
         io.sockets.emit(SocketEvent.MIC_AVAILABLE_TO, Mic.isAvailable());
     });
 
+    /**
+     * SocketEvent.FS_IMAGE_ADD_KILL = 'ws/fs/image/add/kill'
+     */
     socket.on(SocketEvent.FS_IMAGE_ADD_KILL, function () {
         Mic.kill();
 
         io.sockets.emit(SocketEvent.MIC_AVAILABLE_TO, Mic.isAvailable());
     });
 
-    socket.on(SocketEvent.FS_IMAGE_DOWNLOAD_FROM, function (data) {
-        console.log(data);
-        // TODO: Implement or Remove
-    });
-
+    /**
+     * SocketEvent.MIC_AVAILABLE_FROM = 'ws/mic/available/from'
+     */
     socket.on(SocketEvent.MIC_AVAILABLE_FROM, function () {
         console.log('mic available: ' + Mic.isAvailable());
         io.sockets.emit(SocketEvent.MIC_AVAILABLE_TO, Mic.isAvailable());
     });
 
+    /**
+     * SocketEvent.APP_CONFIG_FROM = 'ws/app/config/from'
+     */
+    socket.on(SocketEvent.APP_CONFIG_FROM, function () {
+        socket.emit(SocketEvent.APP_CONFIG_TO, Config);
+    });
+
     socket.on('disconnect', function () {
         console.log('socket disconnect');
+        // TODO
     });
 
     socket.on('message', function (msg) {
         console.log('socket message');
+        // TODO
     });
 
 });

diff --git a/config.json b/config.json
index 63ef823..3fc5b36 100644 (file)
--- a/config.json
+++ b/config.json
@@ -3,6 +3,10 @@
         "PORT" : 8081
     },
     "TIC_CORE": {
-        "PORT" : 8082
+        "PORT" : 8082,
+        "KS_OUT_DIR" : "/tmp/tic/ks/"
+    },
+    "MIC" : {
+        "OUT_DIR" : "/tmp/tic/images/"
     }
 }
\ No newline at end of file

diff --git a/public/src/js/main.js b/public/src/js/main.js
index f8d1609..8e29528 100644 (file)
--- a/public/src/js/main.js
+++ b/public/src/js/main.js
@@ -17,21 +17,9 @@ define([
 ) {
     'use strict';
 
-    var socket;
-
     function init() {
         console.log("main: init")
 
-        /* client */
-        socket = io.connect();
-    }
-
-    $(document).ready(function () {
-        init();
-
-        Image.initSocket(socket);
-        Image.updateList(); // Image - the list of images
-
         Util.showLoadingDialog(true);
 
         Settings.updatePackage()
@@ -44,6 +32,10 @@ define([
             Util.showLoadingDialog(false);
             Util.showAlertDialog('Failed to load package list.<br>Please check the tic-core.');
         });
+    }
+
+    $(document).ready(function () {
+        init();
     });
 
 });

diff --git a/public/src/js/page/image.js b/public/src/js/page/image.js
index 1630866..c26cc76 100644 (file)
--- a/public/src/js/page/image.js
+++ b/public/src/js/page/image.js
@@ -9,6 +9,8 @@ define([
 ) {
     'use strict';
 
+    var AppConfig = null;
+
     // connected socket object
     var client;
 
@@ -18,12 +20,6 @@ define([
     // template for the URL
     var URL_EXPORTS = '<%= url %>/exports';
 
-    // the path for ks
-    var PATH_TIC_KS = '/tmp/tic/ks/';
-
-    // the path for images
-    var PATH_TIC_IMAGES = '/tmp/tic/images/';
-
     // template
     var IMAGE_LOG = '<p><%= log %></p>';
     var IMAGE_ITEM = '<li class="list-group-item image-item">' +
@@ -33,11 +29,10 @@ define([
                         '<a class="image-list-btndownload" href="<%= hrefPath %>" date-name="<%= fileName %>" download="download">Download</a>' +
                      '</li>';
 
-    function initSocket(socket) {
+    function _initSocket(socket) {
         client = socket;
 
         client.emit('ws/mic/available/from');
-
         client.on('ws/mic/available/to', function (data) {
             $('#tic-image-create').prop('disabled', !data);
         });
@@ -87,7 +82,7 @@ define([
 
     function updateList() {
         var msgData = {
-            path: PATH_TIC_IMAGES
+            path: AppConfig.MIC.OUT_DIR
         };
         client.emit('ws/fs/image/list/from', msgData);
     }
@@ -121,6 +116,7 @@ define([
         }
 
         $('#tic-image-create').prop('disabled', count === 0);
+        client.emit('ws/mic/available/from');
     }
 
     function confirmCreateImage() {
@@ -139,7 +135,7 @@ define([
              */
             var msgData = {
                 pathKsFile: pathKsFile,
-                pathOutput: PATH_TIC_IMAGES
+                pathOutput: AppConfig.MIC.OUT_DIR
             };
             client.emit('ws/fs/image/add/from', msgData);
         }
@@ -156,7 +152,7 @@ define([
                     name: 'default'
                 },
                 packages: _.map(checkedPackagesList, 'name'),
-                output: PATH_TIC_KS
+                output: AppConfig.TIC_CORE.KS_OUT_DIR
             };
             return Util.POST(getExportsUrl(), msgData)
             .then(function (result) {
@@ -201,17 +197,19 @@ define([
         console.log('image: init');
 
         _initWidgets();
+        _initSocket(Util.getWebSocket());
+
+        Util.getAppConfig()
+        .then(function (data) {
+            AppConfig = data;
+            updateList();
+        });
     }
 
     init();
 
     return {
         /**
-         * Initialize listener of socket
-         * @method initSocket
-         */
-        initSocket: initSocket,
-        /**
          * Update summary in image page
          * @method updateSummary
          */

diff --git a/public/src/js/util.js b/public/src/js/util.js
index 0e4d2a9..b390453 100644 (file)
--- a/public/src/js/util.js
+++ b/public/src/js/util.js
@@ -5,6 +5,8 @@ define([
 ) {
     'use strict';
 
+    var socket = null;
+
     function setAnimateScroll() {
         $('a.tic-page-scroll').bind('click', function(event) {
             var body = $('html, body');
@@ -73,6 +75,25 @@ define([
         })
     }
 
+    function getAppConfig() {
+        return new Promise(function (resolve, reject) {
+            socket.emit('ws/app/config/from');
+            socket.on('ws/app/config/to', function (data) {
+                resolve(data);
+            });
+        })
+    }
+
+    function getWebSocket() {
+        return socket;
+    }
+
+    function _init() {
+        socket = io.connect();
+    }
+
+    _init();
+
     return {
         /**
          * Set smooth scrolling, one page websites
@@ -125,7 +146,21 @@ define([
          * @param {object} data - A plain object or string that is sent to the server with the request.
          * @return {Promise}
          */
-        POST: POST
+        POST: POST,
+
+         /**
+         * Get WebSocket client
+         * @method getWebSocket
+         * @return {object} socket
+         */
+        getWebSocket: getWebSocket,
+
+        /**
+         * Load app configuration from config.json of root
+         * @method getAppConfig
+         * @return {Promise}
+         */
+        getAppConfig: getAppConfig,
     }
 
 });

diff --git a/server/fs/mic.js b/server/fs/mic.js
index 44a78d2..fcf6657 100644 (file)
--- a/server/fs/mic.js
+++ b/server/fs/mic.js
@@ -39,7 +39,7 @@ Mic.process = function (command, callback) {
 Mic.create = function (paramObj, io) {
     console.log('MIC Create');
 
-    var micCommand = 'sudo mic cr loop ' + paramObj.pathKsFile + util.format(' -A %s', 'x86_64') + util.format(' -o %s', paramObj.pathOutput);
+    var micCommand = 'sudo mic cr auto ' + paramObj.pathKsFile + util.format(' -A %s', 'x86_64') + util.format(' -o %s', paramObj.pathOutput);
 
     function sendMsg(path, msg) {
         io.sockets.emit(path, msg);

diff --git a/server/fs/socketEvent.js b/server/fs/socketEvent.js
index c84ca66..72c895c 100644 (file)
--- a/server/fs/socketEvent.js
+++ b/server/fs/socketEvent.js
@@ -2,12 +2,14 @@
 
 var SocketEvent = {};
 
+SocketEvent.APP_CONFIG_TO = 'ws/app/config/to';
+SocketEvent.APP_CONFIG_FROM = 'ws/app/config/from';
+
 SocketEvent.MIC_AVAILABLE_TO = 'ws/mic/available/to';
 SocketEvent.MIC_AVAILABLE_FROM = 'ws/mic/available/from';
 
 SocketEvent.FS_IMAGE_LIST_TO = 'ws/fs/image/list/to';
 SocketEvent.FS_IMAGE_LIST_FROM = 'ws/fs/image/list/from';
-SocketEvent.FS_IMAGE_DOWNLOAD_FROM = 'ws/fs/image/download/from';
 
 SocketEvent.FS_IMAGE_ADD_TO = 'ws/fs/image/add/to';
 SocketEvent.FS_IMAGE_ADD_FROM = 'ws/fs/image/add/from';