revert: #24 CB-14108: fix incorrect count in config_munge (#89)
* Revert "CB-14108: fix incorrect count in config_munge in ios.json and android.json"
This reverts commit ce3801a184d34cc4c3ea08aeecd159227c6ae9e9.
* chore: eslint object-curly-spacing fix
* add CordovaError spec
* chore: fix eslint warnings for CordovaError spec
* fix CordovaError spec test
* chore: added additional AS project path check
diff --git a/spec/ConfigChanges/ConfigChanges.spec.js b/spec/ConfigChanges/ConfigChanges.spec.js
index 1e4f0e3..d8cebe2 100644
--- a/spec/ConfigChanges/ConfigChanges.spec.js
+++ b/spec/ConfigChanges/ConfigChanges.spec.js
@@ -46,9 +46,6 @@
var xml = path.join(__dirname, '../fixtures/test-config.xml');
var editconfig_xml = path.join(__dirname, '../fixtures/test-editconfig.xml');
var configfile_xml = path.join(__dirname, '../fixtures/test-configfile.xml');
-var configfile0_xml = path.join(__dirname, '../fixtures/test-configfile0.xml');
-var configfile1_xml = path.join(__dirname, '../fixtures/test-configfile1.xml');
-var configfile2_xml = path.join(__dirname, '../fixtures/test-configfile2.xml');
var cfg = new ConfigParser(xml);
// TODO: dont do fs so much
@@ -389,31 +386,6 @@
expect(sdk.attrib['android:minSdkVersion']).toEqual('5');
expect(sdk.attrib['android:maxSdkVersion']).toBeUndefined();
});
- it('should recover AndroidManifest after removing editconfig', function () {
- var editconfig_cfg = new ConfigParser(editconfig_xml);
- var platformJson = PlatformJson.load(plugins_dir, 'android');
- var munger = new configChanges.PlatformMunger('android', temp, platformJson, pluginInfoProvider);
-
- // once add editconfig
- munger.add_config_changes(cfg, true).save_all();
- munger.add_config_changes(editconfig_cfg, true).save_all();
-
- var am_xml = new et.ElementTree(et.XML(fs.readFileSync(path.join(temp, 'AndroidManifest.xml'), 'utf-8')));
- var sdk = am_xml.find('./uses-sdk');
- expect(sdk).toBeDefined();
- expect(sdk.attrib['android:targetSdkVersion']).toEqual('23');
- expect(sdk.attrib['android:minSdkVersion']).toEqual('5');
- expect(sdk.attrib['android:maxSdkVersion']).toBeUndefined();
-
- // should recover
- munger.add_config_changes(cfg, true).save_all();
- am_xml = new et.ElementTree(et.XML(fs.readFileSync(path.join(temp, 'AndroidManifest.xml'), 'utf-8')));
- sdk = am_xml.find('./uses-sdk');
- expect(sdk).toBeDefined();
- expect(sdk.attrib['android:targetSdkVersion']).toEqual('24');
- expect(sdk.attrib['android:minSdkVersion']).toEqual('14');
- expect(sdk.attrib['android:maxSdkVersion']).toBeUndefined();
- });
it('should append new children to XML document tree', function () {
var configfile_cfg = new ConfigParser(configfile_xml);
var platformJson = PlatformJson.load(plugins_dir, 'android');
@@ -433,47 +405,6 @@
var am_file = fs.readFileSync(path.join(temp, 'AndroidManifest.xml'), 'utf-8');
expect(am_file.indexOf('android:name="zoo"')).toBeLessThan(am_file.indexOf('android:name="com.foo.Bar"'));
});
- // testing removing <config-file> tag in config.xml
- it('should recover AndroidManifest after removing config-file tag', function () {
- // add config-file same as previous
- var configfile_cfg = new ConfigParser(configfile_xml);
- var platformJson = PlatformJson.load(plugins_dir, 'android');
- var munger = new configChanges.PlatformMunger('android', temp, platformJson, pluginInfoProvider);
- munger.add_config_changes(configfile_cfg, true).save_all();
- var am_xml = new et.ElementTree(et.XML(fs.readFileSync(path.join(temp, 'AndroidManifest.xml'), 'utf-8')));
- var activity = am_xml.find('./application/activity[@android:name="com.foo.Bar"]');
- expect(activity).not.toBeNull();
- // add removing config-file
- var configfile0_cfg = new ConfigParser(configfile0_xml); // removing config-file tag
- munger.add_config_changes(configfile0_cfg, true).save_all();
- am_xml = new et.ElementTree(et.XML(fs.readFileSync(path.join(temp, 'AndroidManifest.xml'), 'utf-8')));
- activity = am_xml.find('./application/activity[@android:name="com.foo.Bar"]');
- expect(activity).toBeNull();
- });
- it('should recover AndroidManifest if one of permission tags is removed', function () {
- fs.copySync(android_two_no_perms_project, temp);
- var configfile2_cfg = new ConfigParser(configfile2_xml);
- var platformJson = PlatformJson.load(plugins_dir, 'android');
- var munger = new configChanges.PlatformMunger('android', temp, platformJson, pluginInfoProvider);
- munger.add_config_changes(configfile2_cfg, true).save_all();
- var am_xml = new et.ElementTree(et.XML(fs.readFileSync(path.join(temp, 'AndroidManifest.xml'), 'utf-8')));
- var permission_vibrate = am_xml.find('./uses-permission[@android:name="android.permission.VIBRATE"]');
- var permission_write = am_xml.find('./uses-permission[@android:name="android.permission.WRITE_EXTERNAL_STORAGE"]');
- var permission_contacts = am_xml.find('./uses-permission[@android:name="android.permission.READ_CONTACTS"]');
- expect(permission_vibrate).not.toBeNull();
- expect(permission_write).not.toBeNull();
- expect(permission_contacts).toBeNull();
- // add removing of of permission tag
- var configfile1_cfg = new ConfigParser(configfile1_xml); // removing one of permission tag
- munger.add_config_changes(configfile1_cfg, true).save_all();
- am_xml = new et.ElementTree(et.XML(fs.readFileSync(path.join(temp, 'AndroidManifest.xml'), 'utf-8')));
- permission_vibrate = am_xml.find('./uses-permission[@android:name="android.permission.VIBRATE"]');
- permission_write = am_xml.find('./uses-permission[@android:name="android.permission.WRITE_EXTERNAL_STORAGE"]');
- permission_contacts = am_xml.find('./uses-permission[@android:name="android.permission.READ_CONTACTS"]');
- expect(permission_vibrate).not.toBeNull();
- expect(permission_write).toBeNull();
- expect(permission_contacts).toBeNull();
- });
it('should throw error for conflicting plugin config munge with config.xml config munge', function () {
install_plugin(editconfigplugin_two);
@@ -506,24 +437,6 @@
expect(fs.readFileSync(path.join(temp, 'SampleApp', 'SampleApp-Info.plist'), 'utf-8')).toMatch(/<string>schema-b<\/string>/);
expect(fs.readFileSync(path.join(temp, 'SampleApp', 'SampleApp-Info.plist'), 'utf-8')).not.toMatch(/(<string>schema-a<\/string>[^]*){2,}/);
});
- it('should recover Info.plist after removing config-file tag', function () {
- fs.copySync(ios_config_xml, temp);
- var configfile2_cfg = new ConfigParser(configfile2_xml);
- var platformJson = PlatformJson.load(plugins_dir, 'ios');
- var munger = new configChanges.PlatformMunger('ios', temp, platformJson, pluginInfoProvider);
- munger.add_config_changes(configfile2_cfg, true).save_all();
- var info_plist = fs.readFileSync(path.join(temp, 'SampleApp', 'SampleApp-Info.plist'), 'utf-8');
- expect(info_plist).toMatch(/<key>NSCameraUsageDescription<\/key>\s*<string>Please permit Camera<\/string>/);
- expect(info_plist).toMatch(/<key>NSPhotoLibraryUsageDescription<\/key>\s*<string>Please permit PhotoLibrary<\/string>/);
- expect(info_plist).toMatch(/<key>LSApplicationQueriesSchemes<\/key>\s*<array>\s*<string>twitter<\/string>\s*<string>fb<\/string>\s*<\/array>/);
- var configfile1_cfg = new ConfigParser(configfile1_xml);
- munger.add_config_changes(configfile1_cfg, true).save_all();
- info_plist = fs.readFileSync(path.join(temp, 'SampleApp', 'SampleApp-Info.plist'), 'utf-8');
- expect(info_plist).toMatch(/<key>NSCameraUsageDescription<\/key>\s*<string>This app uses Camera<\/string>/);
- expect(info_plist).not.toMatch(/<key>NSPhotoLibraryUsageDescription<\/key>\s*<string>Please permit PhotoLibrary<\/string>/);
- expect(info_plist).not.toMatch(/<key>LSApplicationQueriesSchemes<\/key>\s*<array>\s*<string>twitter<\/string>\s*<string>fb<\/string>\s*<\/array>/);
- expect(info_plist).toMatch(/<key>LSApplicationQueriesSchemes<\/key>\s*<array>\s*<string>twitter<\/string>\s*<\/array>/);
- });
});
describe('of binary plist config files', function () {
it('should merge dictionaries and arrays, removing duplicates', function () {
diff --git a/spec/CordovaError/CordovaError.spec.js b/spec/CordovaError/CordovaError.spec.js
index 590644d..56e3e24 100644
--- a/spec/CordovaError/CordovaError.spec.js
+++ b/spec/CordovaError/CordovaError.spec.js
@@ -34,7 +34,7 @@
it('Test 003 : toString works', function () {
var error003_1 = new CordovaError('error', 0);
expect(error003_1.toString(false)).toEqual('error');
- expect(error003_1.toString(true)).toContain(error003_1.stack);
+ expect(error003_1.toString(true).substring(0, 12)).toEqual('CordovaError');
var error003_2 = new CordovaError('error', 1);
expect(error003_2.toString(false)).toEqual('External tool failed with an error: error');
});
diff --git a/spec/fixtures/test-configfile0.xml b/spec/fixtures/test-configfile0.xml
deleted file mode 100644
index 680c18c..0000000
--- a/spec/fixtures/test-configfile0.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="io.cordova.hellocordova.android" id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
- <name>Hello Cordova</name>
- <description>
- A sample Apache Cordova application that responds to the deviceready event.
- </description>
- <author email="dev@cordova.apache.org" href="http://cordova.io">
- Apache Cordova Team
- </author>
- <content src="index.html" />
- <access origin="*" />
- <platform name="android">
- </platform>
-</widget>
diff --git a/spec/fixtures/test-configfile1.xml b/spec/fixtures/test-configfile1.xml
deleted file mode 100644
index 8c7dee2..0000000
--- a/spec/fixtures/test-configfile1.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="io.cordova.hellocordova.android" id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
- <name>Hello Cordova</name>
- <description>
- A sample Apache Cordova application that responds to the deviceready event.
- </description>
- <author email="dev@cordova.apache.org" href="http://cordova.io">
- Apache Cordova Team
- </author>
- <content src="index.html" />
- <access origin="*" />
- <platform name="android">
- <config-file parent="/manifest" target="AndroidManifest.xml">
- <uses-permission android:name="android.permission.VIBRATE" />
- </config-file>
- </platform>
- <platform name="ios">
- <allow-intent href="itms:*" />
- <allow-intent href="itms-apps:*" />
- <config-file parent="NSCameraUsageDescription" target="*-Info.plist">
- <string>This app uses Camera</string>
- </config-file>
- <config-file parent="LSApplicationQueriesSchemes" target="*-Info.plist">
- <array>
- <string>twitter</string>
- </array>
- </config-file>
- </platform>
-</widget>
diff --git a/spec/fixtures/test-configfile2.xml b/spec/fixtures/test-configfile2.xml
deleted file mode 100644
index 86e503d..0000000
--- a/spec/fixtures/test-configfile2.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="io.cordova.hellocordova.android" id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
- <name>Hello Cordova</name>
- <description>
- A sample Apache Cordova application that responds to the deviceready event.
- </description>
- <author email="dev@cordova.apache.org" href="http://cordova.io">
- Apache Cordova Team
- </author>
- <content src="index.html" />
- <access origin="*" />
- <platform name="android">
- <config-file parent="/manifest" target="AndroidManifest.xml">
- <uses-permission android:name="android.permission.VIBRATE" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- </config-file>
- </platform>
- <platform name="ios">
- <allow-intent href="itms:*" />
- <allow-intent href="itms-apps:*" />
- <config-file parent="NSCameraUsageDescription" target="*-Info.plist">
- <string>Please permit Camera</string>
- </config-file>
- <config-file target="*-Info.plist" parent="NSPhotoLibraryUsageDescription">
- <string>Please permit PhotoLibrary</string>
- </config-file>
- <config-file parent="LSApplicationQueriesSchemes" target="*-Info.plist">
- <array>
- <string>twitter</string>
- <string>fb</string>
- </array>
- </config-file>
- </platform>
-</widget>
diff --git a/src/ConfigChanges/ConfigChanges.js b/src/ConfigChanges/ConfigChanges.js
index 7849403..27c2d9e 100644
--- a/src/ConfigChanges/ConfigChanges.js
+++ b/src/ConfigChanges/ConfigChanges.js
@@ -169,6 +169,7 @@
var self = this;
var platform_config = self.platformJson.root;
+ var config_munge;
var changes = [];
if (config.getEditConfigs) {
@@ -185,47 +186,33 @@
}
}
- var platform_config_munge = platform_config.config_munge;
-
- var differs = (function (changes) {
- if (changes && changes.length >= 0) {
- var isConflictingInfo = is_conflicting(changes, platform_config_munge, self, true /* always force overwrite other edit-config */);
+ if (changes && changes.length > 0) {
+ var isConflictingInfo = is_conflicting(changes, platform_config.config_munge, self, true /* always force overwrite other edit-config */);
+ if (isConflictingInfo.conflictFound) {
var conflict_munge;
var conflict_file;
- // remove unused config munge.
- if (Object.keys(isConflictingInfo.unusedConfigMunge.files).length !== 0) {
- conflict_munge = mungeutil.decrement_munge(platform_config_munge, isConflictingInfo.unusedConfigMunge);
+
+ if (Object.keys(isConflictingInfo.configxmlMunge.files).length !== 0) {
+ // silently remove conflicting config.xml munges so new munges can be added
+ conflict_munge = mungeutil.decrement_munge(platform_config.config_munge, isConflictingInfo.configxmlMunge);
for (conflict_file in conflict_munge.files) {
self.apply_file_munge(conflict_file, conflict_munge.files[conflict_file], /* remove = */ true);
}
}
- // check override conflicting munge.
- if (isConflictingInfo.conflictFound) {
- if (Object.keys(isConflictingInfo.configxmlMunge.files).length !== 0) {
- // silently remove conflicting config.xml munges so new munges can be added
- conflict_munge = mungeutil.decrement_munge(platform_config_munge, isConflictingInfo.configxmlMunge);
- for (conflict_file in conflict_munge.files) {
- self.apply_file_munge(conflict_file, conflict_munge.files[conflict_file], /* remove = */ true);
- }
- }
- if (Object.keys(isConflictingInfo.conflictingMunge.files).length !== 0) {
- events.emit('warn', 'Conflict found, edit-config changes from config.xml will overwrite plugin.xml changes');
+ if (Object.keys(isConflictingInfo.conflictingMunge.files).length !== 0) {
+ events.emit('warn', 'Conflict found, edit-config changes from config.xml will overwrite plugin.xml changes');
- // remove conflicting plugin.xml munges
- conflict_munge = mungeutil.decrement_munge(platform_config_munge, isConflictingInfo.conflictingMunge);
- for (conflict_file in conflict_munge.files) {
- self.apply_file_munge(conflict_file, conflict_munge.files[conflict_file], /* remove = */ true);
- }
+ // remove conflicting plugin.xml munges
+ conflict_munge = mungeutil.decrement_munge(platform_config.config_munge, isConflictingInfo.conflictingMunge);
+ for (conflict_file in conflict_munge.files) {
+ self.apply_file_munge(conflict_file, conflict_munge.files[conflict_file], /* remove = */ true);
}
- // skip no chnages
- return changes.filter(function (x) { return isConflictingInfo.noChanges.indexOf(x) === -1; });
}
}
- return changes;
- })(changes);
+ }
// Add config.xml edit-config and config-file munges
- var config_munge = self.generate_config_xml_munge(config, differs, 'config.xml');
+ config_munge = self.generate_config_xml_munge(config, changes, 'config.xml');
self = munge_helper(should_increment, self, platform_config, config_munge);
// Move to installed/dependent_plugins
@@ -270,7 +257,7 @@
return self;
}
-// generate_config_xml_munge
+// generate_plugin_config_munge
// Generate the munge object from config.xml
PlatformMunger.prototype.generate_config_xml_munge = generate_config_xml_munge;
function generate_config_xml_munge (config, config_changes, type) {
@@ -295,7 +282,7 @@
if (change.mode) {
mungeutil.deep_add(munge, change.file, change.target, { xml: stringified, count: 1, mode: change.mode, id: id });
} else {
- mungeutil.deep_add(munge, change.target, change.parent, { xml: stringified, count: 1, after: change.after, id: id });
+ mungeutil.deep_add(munge, change.target, change.parent, { xml: stringified, count: 1, after: change.after });
}
});
});
@@ -348,80 +335,43 @@
var configxmlMunge = { files: {} };
var conflictingParent;
var conflictingPlugin;
- var noChanges = [];
-
- var unusedConfigMunge = mungeutil.filterClone(config_munge, function (x) { return x.id === 'config.xml'; });
editchanges.forEach(function (editchange) {
- var change_file, change_target, change_id;
- if (editchange.file) { // for edit_config
- change_file = editchange.file;
- change_target = editchange.target;
- change_id = editchange.id;
- } else { // for config_file
- change_file = editchange.target;
- change_target = editchange.parent;
- change_id = editchange.id;
- }
-
- if (files[change_file]) {
- var parents = files[change_file].parents;
- var target = parents[change_target];
+ if (files[editchange.file]) {
+ var parents = files[editchange.file].parents;
+ var target = parents[editchange.target];
// Check if the edit target will resolve to an existing target
if (!target || target.length === 0) {
- var configFile = self.config_keeper.get(self.project_dir, self.platform, change_file);
- var file_type = configFile.type;
- if (file_type === 'xml') {
- var file_xml = configFile.data;
- var resolveEditTarget = xml_helpers.resolveParent(file_xml, change_target);
- var resolveTarget;
+ var file_xml = self.config_keeper.get(self.project_dir, self.platform, editchange.file).data;
+ var resolveEditTarget = xml_helpers.resolveParent(file_xml, editchange.target);
+ var resolveTarget;
- if (resolveEditTarget) {
- for (var parent in parents) {
- resolveTarget = xml_helpers.resolveParent(file_xml, parent);
- if (resolveEditTarget === resolveTarget) {
- conflictingParent = parent;
- target = parents[parent];
- break;
- }
+ if (resolveEditTarget) {
+ for (var parent in parents) {
+ resolveTarget = xml_helpers.resolveParent(file_xml, parent);
+ if (resolveEditTarget === resolveTarget) {
+ conflictingParent = parent;
+ target = parents[parent];
+ break;
}
}
- } else {
- conflictingParent = change_target;
}
} else {
- conflictingParent = change_target;
+ conflictingParent = editchange.target;
}
if (target && target.length !== 0) {
// conflict has been found
conflictFound = true;
- if (change_id === 'config.xml') {
- target.forEach(function (target_elem) {
- mungeutil.deep_remove(unusedConfigMunge, change_file, conflictingParent, target_elem);
- });
- }
-
- var xmlStrList, isSameAll;
- if (change_id === 'config.xml') {
+ if (editchange.id === 'config.xml') {
if (target[0].id === 'config.xml') {
- xmlStrList = changedXmlStrList(editchange);
- isSameAll = compareChangedXmlsAndTarget(xmlStrList, target);
- if (isSameAll) {
- noChanges.push(editchange);
- } else {
- // Keep track of config.xml/config.xml edit-config conflicts
- target.forEach(function (target_elem) {
- mungeutil.deep_add(configxmlMunge, change_file, conflictingParent, target_elem);
- });
- }
+ // Keep track of config.xml/config.xml edit-config conflicts
+ mungeutil.deep_add(configxmlMunge, editchange.file, conflictingParent, target[0]);
} else {
// Keep track of config.xml x plugin.xml edit-config conflicts
- target.forEach(function (target_elem) {
- mungeutil.deep_add(conflictingMunge, change_file, conflictingParent, target_elem);
- });
+ mungeutil.deep_add(conflictingMunge, editchange.file, conflictingParent, target[0]);
}
} else {
if (target[0].id === 'config.xml') {
@@ -431,17 +381,8 @@
}
if (force) {
- xmlStrList = changedXmlStrList(editchange);
- isSameAll = compareChangedXmlsAndTarget(xmlStrList, target);
-
- if (isSameAll) {
- noChanges.push(editchange);
- } else {
- // Need to find all conflicts when --force is used, track conflicting munges
- target.forEach(function (target_elem) {
- mungeutil.deep_add(conflictingMunge, change_file, conflictingParent, target_elem);
- });
- }
+ // Need to find all conflicts when --force is used, track conflicting munges
+ mungeutil.deep_add(conflictingMunge, editchange.file, conflictingParent, target[0]);
} else {
// plugin cannot overwrite other plugin changes without --force
conflictingPlugin = target[0].plugin;
@@ -455,35 +396,8 @@
conflictingPlugin: conflictingPlugin,
conflictingMunge: conflictingMunge,
configxmlMunge: configxmlMunge,
- conflictWithConfigxml: conflictWithConfigxml,
- noChanges: noChanges,
- unusedConfigMunge: unusedConfigMunge };
-}
-
-function changedXmlStrList (editchange) {
- var xmlStrList = [];
- editchange.xmls.forEach(function (xml) {
- var stringified = (new et.ElementTree(xml)).write({ xml_declaration: false });
- xmlStrList.push(stringified);
- });
- return xmlStrList;
-}
-
-// if all elements of target are same as xmlStrList, return true;
-// otherwise return false;
-function compareChangedXmlsAndTarget (xmlStrList, target) {
- if (xmlStrList.length !== target.length) {
- return false;
- }
- var isSame = target.reduce(function (acc, elem) {
- var found1 = xmlStrList.find(function (x) { return x === elem.xml && elem.id === 'config.xml'; });
- if (found1) {
- return acc;
- } else {
- return false;
- }
- }, true);
- return isSame;
+ conflictWithConfigxml: conflictWithConfigxml
+ };
}
// Go over the prepare queue and apply the config munges for each plugin
diff --git a/src/ConfigChanges/ConfigFile.js b/src/ConfigChanges/ConfigFile.js
index 0bebf05..d48b29d 100644
--- a/src/ConfigChanges/ConfigFile.js
+++ b/src/ConfigChanges/ConfigFile.js
@@ -189,6 +189,7 @@
// TODO: Move this out of cordova-common and into the platforms somehow
if (platform === 'android' && !fs.existsSync(filepath)) {
var config_file;
+
if (file === 'AndroidManifest.xml') {
filepath = path.join(project_dir, 'app', 'src', 'main', 'AndroidManifest.xml');
} else if (file.endsWith('config.xml')) {
diff --git a/src/ConfigChanges/munge-util.js b/src/ConfigChanges/munge-util.js
index 3c3854e..62648d8 100644
--- a/src/ConfigChanges/munge-util.js
+++ b/src/ConfigChanges/munge-util.js
@@ -86,29 +86,6 @@
// When createParents is true, add the file and parent items they are missing
// When createParents is false, stop and return undefined if the file and/or parent items are missing
-exports.filterClone = function filterClone (obj, func) {
- var result = { files: {} };
- for (var file in obj.files) {
- var parents = {};
- // result.files[file] = { parents:{} };
- for (var target in obj.files[file].parents) {
- var list = [];
- obj.files[file].parents[target].forEach(function (target_elem) {
- if (func(target_elem)) {
- list.push(_.clone(target_elem, true));
- }
- });
- if (list.length > 0) {
- parents[target] = list;
- }
- }
- if (Object.keys(parents).length > 0) {
- result.files[file] = { parents: parents };
- }
- }
- return result;
-};
-
exports.process_munge = function process_munge (obj, createParents, func, keys /* or key1, key2 .... */) {
if (!Array.isArray(keys)) {
keys = Array.prototype.slice.call(arguments, 1);
diff --git a/src/ConfigParser/ConfigParser.js b/src/ConfigParser/ConfigParser.js
index a5efccf..dc1b66d 100644
--- a/src/ConfigParser/ConfigParser.js
+++ b/src/ConfigParser/ConfigParser.js
@@ -588,8 +588,7 @@
xmls: tag.getchildren(),
// To support demuxing via versions
versions: tag.attrib['versions'],
- deviceTarget: tag.attrib['device-target'],
- id: 'config.xml'
+ deviceTarget: tag.attrib['device-target']
};
return configFile;
});
