support converting from cson

This commit is contained in:
nightwing 2015-04-16 16:50:20 +04:00
commit ecb699aa11
2 changed files with 12 additions and 8 deletions

View file

@ -1,6 +1,7 @@
var plist = require("plist"); var plist = require("plist");
var util = require("util"); var util = require("util");
var url = require("url"); var url = require("url");
var cson = require("cson");
var https = require("https"); var https = require("https");
var http = require("http"); var http = require("http");
@ -11,9 +12,11 @@ exports.parsePlist = function(xmlOrJSON, callback) {
plist.parseString(xmlOrJSON, function(_, result) { plist.parseString(xmlOrJSON, function(_, result) {
json = result[0]; json = result[0];
}); });
} else { } else try {
xmlOrJSON = xmlOrJSON.replace(/^\s*\/\/.*/gm, ""); xmlOrJSON = xmlOrJSON.replace(/^\s*\/\/.*/gm, "");
json = JSON.parse(xmlOrJSON) json = JSON.parse(xmlOrJSON)
} catch(e) {
json = cson.parse(xmlOrJSON);
} }
callback && callback(json); callback && callback(json);
return json; return json;

View file

@ -1,9 +1,10 @@
{ {
"name": "ace-tools", "name": "ace-tools",
"version": "0.1.0", "version": "0.1.0",
"dependencies": { "dependencies": {
"plist": "", "cson": "^3.0.1",
"css-parse": "1.0.3", "css-parse": "1.0.3",
"css-stringify": "1.0.3" "css-stringify": "1.0.3",
} "plist": ""
}
} }