From ecb699aa1131052640b122bc1f0f2385bfdb137e Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 16 Apr 2015 16:50:20 +0400 Subject: [PATCH] support converting from cson --- tool/lib.js | 5 ++++- tool/package.json | 15 ++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tool/lib.js b/tool/lib.js index e72194d7..53f38a75 100644 --- a/tool/lib.js +++ b/tool/lib.js @@ -1,6 +1,7 @@ var plist = require("plist"); var util = require("util"); var url = require("url"); +var cson = require("cson"); var https = require("https"); var http = require("http"); @@ -11,9 +12,11 @@ exports.parsePlist = function(xmlOrJSON, callback) { plist.parseString(xmlOrJSON, function(_, result) { json = result[0]; }); - } else { + } else try { xmlOrJSON = xmlOrJSON.replace(/^\s*\/\/.*/gm, ""); json = JSON.parse(xmlOrJSON) + } catch(e) { + json = cson.parse(xmlOrJSON); } callback && callback(json); return json; diff --git a/tool/package.json b/tool/package.json index 2d33713a..974673c6 100644 --- a/tool/package.json +++ b/tool/package.json @@ -1,9 +1,10 @@ { - "name": "ace-tools", - "version": "0.1.0", - "dependencies": { - "plist": "", - "css-parse": "1.0.3", - "css-stringify": "1.0.3" - } + "name": "ace-tools", + "version": "0.1.0", + "dependencies": { + "cson": "^3.0.1", + "css-parse": "1.0.3", + "css-stringify": "1.0.3", + "plist": "" + } }