Core API initialization routine

Setting up the core API routine to check for cloud API availability. Also cleaned up template files for IO and set up initial string contents.

19 files changed, 79 insertions, 15 deletions

diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index a10063f5..33c7bc28 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -24,7 +24,7 @@ exports.CoreIoApi = Montage.create(Component, {
                                 //Getting URL from local storage
                                 this.rootUrl = window.localStorage['ioRootUrl'];
                                 //Checks for IO API to be active
-                                this.ioServiceDetected = this.isIoServiceActive();
+                                this.ioServiceDetected = this.cloudAvailable();
                                 //
                                 console.log('FileIO: localStorage URL detected | IO Service Detected: '+ this.ioServiceDetected);
                                 //
@@ -32,7 +32,7 @@ exports.CoreIoApi = Montage.create(Component, {
                                 //TODO: Remove, automatically prompt user on welcome
                                 this.rootUrl = 'http://localhost:16380';
                                 //TODO: Changed to false, welcome screen prompts user
-                                this.ioServiceDetected = this.isIoServiceActive();
+                                this.ioServiceDetected = this.cloudAvailable();
                                 //
                                 console.log('FileIO: localStorage URL NOT detected | IO Service Detected: '+ this.ioServiceDetected);
                                 //
@@ -41,13 +41,16 @@ exports.CoreIoApi = Montage.create(Component, {
         },
         ////////////////////////////////////////////////////////////////////
     //Method to check status of I/O API, will return false if not active
-        isIoServiceActive: {
+        cloudAvailable: {
                 enumerable: false,
                 value: function () {
-                        //Doing a directory root check, a 200 status means running
-                        if (this.getDirectoryContents({uri:'/'}).status === 200) {
+                        //
+                        if (this.getCloudStatus().status === 200) {
+                                //Active
                                 return true;
                         } else {
+                                //Inactive
+                                //TODO: Logic to prompt the user for cloud, otherwise return false
                                 return false;
                         }
                 }
@@ -83,22 +86,21 @@ exports.CoreIoApi = Montage.create(Component, {
             return this._rootUrl;
         },
         set: function(value) {
-                this._rootUrl = value;
-                window.localStorage["ioRootUrl"] = value;
+                this._rootUrl = window.localStorage["ioRootUrl"] = value;
         }
     },
         ////////////////////////////////////////////////////////////////////
     //API service URL
     _apiServiceURL: {
         enumerable: false,
-        value: '/'
+        value: '/cloudstatus'
     },
     ////////////////////////////////////////////////////////////////////
     //
     apiServiceURL: {
         enumerable: false,
         get: function() {
-            return this.rootUrl+this._apiServiceURL;
+            return String(this.rootUrl+this._apiServiceURL);
         },
         set: function(value) {
                 this._apiServiceURL = value;
@@ -115,7 +117,7 @@ exports.CoreIoApi = Montage.create(Component, {
     fileServiceURL: {
         enumerable: false,
         get: function() {
-            return this.rootUrl+this._fileServiceURL;
+            return String(this.rootUrl+this._fileServiceURL);
         },
         set: function(value) {
                 this._fileServiceURL = value;
@@ -132,7 +134,7 @@ exports.CoreIoApi = Montage.create(Component, {
     directoryServiceURL: {
         enumerable: false,
         get: function() {
-            return this.rootUrl+this._directoryServiceURL;
+            return String(this.rootUrl+this._directoryServiceURL);
         },
         set: function(value) {
                 this._directoryServiceURL = value;
@@ -921,10 +923,38 @@ exports.CoreIoApi = Montage.create(Component, {
             }
             return retValue;
         }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+        getCloudStatus: {
+        enumerable: false,
+        writable:false,
+        value: function() {
+                //
+            var retValue = {success:null, status:null};
+            //
+            try {
+                        var serviceURL = this._prepareServiceURL(this.apiServiceURL, '/'),
+                                xhr = new XMLHttpRequest();
+                //
+                xhr.open("GET", serviceURL, false);
+                xhr.send();
+                                //
+                if (xhr.readyState === 4) {
+                        retValue.status = xhr.status;
+                        retValue.success = true;
+                }
+                }
+            catch(error) {
+                        xhr = null;
+                retValue.success = false;
+            }
+                        //
+            return retValue;
+        }
     }
-
-
-
+        ////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/js/io/system/fileio.js b/js/io/system/fileio.js
index b3158a68..38ab05e8 100755
--- a/js/io/system/fileio.js
+++ b/js/io/system/fileio.js
@@ -28,7 +28,7 @@ exports.FileIo = Montage.create(Object.prototype, {
         enumerable: true,
         value: function(file) {
                 //Checking for API to be available
-                if (!CoreIoApi.isIoServiceActive()) {
+                if (!CoreIoApi.cloudAvailable()) {
                         //API not available, no IO action taken
                         return null;
                 }
@@ -78,6 +78,12 @@ exports.FileIo = Montage.create(Object.prototype, {
         value: function() {
                 //
         }
+    },
+    infoFile: {
+        enumerable: true,
+        value: function() {
+                //
+        }
     }
     
     
diff --git a/js/io/templates/files/template.css b/js/io/templates/files/_bin/template.css
index e69de29b..e69de29b 100755
--- a/js/io/templates/files/template.css
+++ b/js/io/templates/files/_bin/template.css
diff --git a/js/io/templates/files/template.html b/js/io/templates/files/_bin/template.html
index e69de29b..e69de29b 100755
--- a/js/io/templates/files/template.html
+++ b/js/io/templates/files/_bin/template.html
diff --git a/js/io/templates/files/template.js b/js/io/templates/files/_bin/template.js
index e69de29b..e69de29b 100755
--- a/js/io/templates/files/template.js
+++ b/js/io/templates/files/_bin/template.js
diff --git a/js/io/templates/files/template.json b/js/io/templates/files/_bin/template.json
index e69de29b..e69de29b 100755
--- a/js/io/templates/files/template.json
+++ b/js/io/templates/files/_bin/template.json
diff --git a/js/io/templates/files/template.php b/js/io/templates/files/_bin/template.php
index e69de29b..e69de29b 100755
--- a/js/io/templates/files/template.php
+++ b/js/io/templates/files/_bin/template.php
diff --git a/js/io/templates/files/template.pl b/js/io/templates/files/_bin/template.pl
index e69de29b..e69de29b 100755
--- a/js/io/templates/files/template.pl
+++ b/js/io/templates/files/_bin/template.pl
diff --git a/js/io/templates/files/template.py b/js/io/templates/files/_bin/template.py
index e69de29b..e69de29b 100755
--- a/js/io/templates/files/template.py
+++ b/js/io/templates/files/_bin/template.py
diff --git a/js/io/templates/files/template.rb b/js/io/templates/files/_bin/template.rb
index e69de29b..e69de29b 100755
--- a/js/io/templates/files/template.rb
+++ b/js/io/templates/files/_bin/template.rb
diff --git a/js/io/templates/files/template.xml b/js/io/templates/files/_bin/template.xml
index e69de29b..e69de29b 100755
--- a/js/io/templates/files/template.xml
+++ b/js/io/templates/files/_bin/template.xml
diff --git a/js/io/templates/files/xml.txt b/js/io/templates/files/_bin/xml.txt
index e69de29b..e69de29b 100755
--- a/js/io/templates/files/xml.txt
+++ b/js/io/templates/files/_bin/xml.txt