Merge pull request #1 from NativeScript/fatme/improvements

Fix quotes and lastKnownFileType

Author: Fatme

lib/pbxFile.js

@@ -6,6 +6,7 @@ var path = require('path'),
     DYLIB_EXTENSION = /[.]dylib$/, DYLIB = '"compiled.mach-o.dylib"',
     FRAMEWORK_EXTENSION = /[.]framework/, FRAMEWORK = 'wrapper.framework',
     ARCHIVE_EXTENSION = /[.]a$/, ARCHIVE = 'archive.ar',
+    PNG_EXTENSION = /[.]png/, PNG_IMAGE = "image.png",
     DEFAULT_SOURCE_TREE = '"<group>"',
     DEFAULT_FILE_ENCODING = 4;
 
@@ -30,13 +31,16 @@ function detectLastType(path) {
 
     if (ARCHIVE_EXTENSION.test(path))
         return ARCHIVE;
-
+        
+    if (PNG_EXTENSION.test(path))
+        return PNG_IMAGE;
+        
     // dunno
     return 'unknown';
 }
 
 function fileEncoding(file) {
-    if (file.lastType != BUNDLE && !file.customFramework) {
+    if (file.lastType != BUNDLE && file.lastType !== PNG_IMAGE &&  !file.customFramework) {
         return DEFAULT_FILE_ENCODING;
     }
 }

lib/pbxProject.js

@@ -709,9 +709,18 @@ function pbxFileReferenceObj(file) {
 
     obj.isa = 'PBXFileReference';
     obj.lastKnownFileType = file.lastType;
+    obj.name = file.basename;
+    obj.path = file.path;
 
-    obj.name = "\"" + file.basename + "\"";
-    obj.path = "\"" + file.path + "\"";
+    if(obj.name.indexOf("\"") !== -1) {
+        obj.name = obj.name.replace(/\"/g, "\\\"");
+        obj.path = obj.path.replace(/\"/g, "\\\"");
+    }
+    
+    if(!file.basename.match(/^[a-zA-Z0-9_\.\$]+\.[a-zA-Z]+$/)) {
+         obj.name = "\"" + obj.name + "\"";
+    	 obj.path = "\"" + obj.path + "\"";
+    }
 
     obj.sourceTree = file.sourceTree;