Merge pull request #44 from euforic/TIMOB-14644

[TIMOB-14644] Liveview does not read files from platform specific folder.
tidev · Jul 25, 2013 · 1d38821 · 1d38821
2 parents d3e20ca + 0a97ad7
commit 1d38821
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/build/liveview.js b/build/liveview.js
@@ -17,7 +17,7 @@ function Process() {
   this.moduleLoadList = [];
   this.versions = {};
   this.arch = Ti.Platform.architecture;
-  this.platform = Ti.Platform.name;
+  this.platform = Ti.Platform.osname;
   this.hardware = ('' + Ti.Platform.model).replace('google_');
 }
 
@@ -468,7 +468,7 @@ Module.connectServer = function() {
 
 Module.include = function(ctx,id) {
   var file = id.replace('.js', '');
-  var src = Module.prototype._getRemoteSource(file,10000);
+  var src = Module.prototype._getRemoteSource(file,1000);
   eval.call(ctx,src);
 };
 
@@ -538,6 +538,7 @@ Module.prototype._getRemoteSource = function(file,timeout){
   var file = 'http://' + Module._url + ':' + Module._port + '/' + (file || this.id) + '.js';
   request.cache = false;
   request.open("GET", file);
+  request.setRequestHeader('x-platform', process.platform);
   request.send();
   while(!rsp){
     if (request.readyState === 4 ) {

diff --git a/build/liveview.min.js b/build/liveview.min.js
diff --git a/lib/fserver.js b/lib/fserver.js
@@ -143,6 +143,8 @@ FServer.start = function(opts) {
 	// create static file server
 	var fServer = http.createServer(function(request, response) {
 		var uri = url.parse(request.url).pathname;
+		var requestPlatform = request.headers['x-platform'];
+		var platformFilepath = join(RESOURCE_DIR, requestPlatform, uri);
 		var filename = join(RESOURCE_DIR, uri);
 
 		if (uri === '/') {
@@ -155,6 +157,12 @@ FServer.start = function(opts) {
 			return;
 		}
 
+		debug(util.inspect(request.headers));
+
+		filename = (fs.existsSync(platformFilepath))
+			? platformFilepath
+		 	: filename;
+
 		fs.exists(filename, function(exists) {
 			fileCount[filename] = (fileCount[filename] || 0) + 1;
 

diff --git a/lib/platform/process.js b/lib/platform/process.js
@@ -12,7 +12,7 @@ function Process() {
   this.moduleLoadList = [];
   this.versions = {};
   this.arch = Ti.Platform.architecture;
-  this.platform = Ti.Platform.name;
+  this.platform = Ti.Platform.osname;
   this.hardware = ('' + Ti.Platform.model).replace('google_');
 }
 

diff --git a/lib/platform/require.js b/lib/platform/require.js
@@ -154,7 +154,7 @@ Module.connectServer = function() {
 
 Module.include = function(ctx,id) {
   var file = id.replace('.js', '');
-  var src = Module.prototype._getRemoteSource(file,10000);
+  var src = Module.prototype._getRemoteSource(file,1000);
   eval.call(ctx,src);
 };
 
@@ -224,6 +224,7 @@ Module.prototype._getRemoteSource = function(file,timeout){
   var file = 'http://' + Module._url + ':' + Module._port + '/' + (file || this.id) + '.js';
   request.cache = false;
   request.open("GET", file);
+  request.setRequestHeader('x-platform', process.platform);
   request.send();
   while(!rsp){
     if (request.readyState === 4 ) {