[project] check if file exists before adding

Author: alunny

lib/pbxProject.js

@@ -88,9 +88,7 @@ pbxProject.prototype.addPluginFile = function (path, opt) {
     correctForPluginsPath(file, this);
 
     // null is better for early errors
-    if (this.hasFile(file.path)) {
-        return null;
-    }
+    if (this.hasFile(file.path)) return null;
 
     file.fileRef = this.generateUuid();
 
@@ -103,15 +101,17 @@ pbxProject.prototype.addPluginFile = function (path, opt) {
 pbxProject.prototype.removePluginFile = function (path, opt) {
     var file = new pbxFile(path, opt);
     correctForPluginsPath(file, this);
-    
+
     this.removeFromPbxFileReferenceSection(file);    // PBXFileReference
     this.removeFromPluginsPbxGroup(file);            // PBXGroup
 
     return file;
 }
 
 pbxProject.prototype.addSourceFile = function (path, opt) {
-    var file = this.addPluginFile(path, opt)
+    var file = this.addPluginFile(path, opt);
+
+    if (!file) return false;
 
     file.uuid = this.generateUuid();
 
@@ -144,8 +144,10 @@ pbxProject.prototype.addResourceFile = function (path, opt) {
 
     if (opt.plugin) {
         file = this.addPluginFile(path, opt);
+        if (!file) return false;
     } else {
         file = new pbxFile(path, opt);
+        if (this.hasFile(file.path)) return false;
     }
 
     file.uuid = this.generateUuid();
@@ -182,6 +184,9 @@ pbxProject.prototype.removeResourceFile = function (path, opt) {
 pbxProject.prototype.addFramework = function (path, opt) {
     var file = new pbxFile(path, opt);
 
+    // catch duplicates
+    if (this.hasFile(file.path)) return false;
+
     file.uuid = this.generateUuid();
     file.fileRef = this.generateUuid();
 
@@ -211,8 +216,10 @@ pbxProject.prototype.addStaticLibrary = function (path, opt) {
 
     if (opt.plugin) {
         file = this.addPluginFile(path, opt);
+        if (!file) return false;
     } else {
         file = new pbxFile(path, opt);
+        if (this.hasFile(file.path)) return false;
     }
 
     file.uuid = this.generateUuid();
@@ -309,7 +316,6 @@ pbxProject.prototype.removeFromResourcesPbxGroup = function (file) {
     }
 }
 
-
 pbxProject.prototype.addToFrameworksPbxGroup = function (file) {
     var pluginsGroup = this.pbxGroupByName('Frameworks');
     pluginsGroup.children.push(pbxGroupChild(file));

test/addFramework.js

@@ -133,5 +133,13 @@ exports.addFramework = {
         test.equal(framework.comment, 'libsqlite3.dylib in Frameworks');
         test.equal(framework.value, newFile.uuid);
         test.done();
+    },
+    'duplicate entries': {
+        'should return false': function (test) {
+            var newFile = proj.addFramework('libsqlite3.dylib');
+
+            test.ok(!proj.addFramework('libsqlite3.dylib'));
+            test.done();
+        }
     }
 }

test/addHeaderFile.js

@@ -74,5 +74,25 @@ exports.addHeaderFile = {
         test.equal(pluginObj.comment, 'file.h');
         test.equal(pluginObj.value, newFile.fileRef);
         test.done();
+    },
+    'duplicate entries': {
+        'should return false': function (test) {
+            var newFile = proj.addHeaderFile('Plugins/file.h'); 
+
+            test.ok(!proj.addHeaderFile('Plugins/file.h'));
+            test.done();
+        },
+        'should not add another entry anywhere': function (test) {
+            var newFile = proj.addHeaderFile('Plugins/file.h'),
+                fileRefSection = proj.pbxFileReferenceSection(),
+                frsLength = Object.keys(fileRefSection).length,
+                plugins = proj.pbxGroupByName('Plugins');
+
+            proj.addHeaderFile('Plugins/file.h');
+
+            test.equal(68, frsLength);
+            test.equal(plugins.children.length, 1);
+            test.done();
+        }
     }
 }

test/addResourceFile.js

@@ -210,6 +210,40 @@ exports.addResourceFile = {
             test.done();
         }
     },
+    'duplicate entries': {
+        'should return false': function (test) {
+            var newFile = proj.addResourceFile('Plugins/assets.bundle'); 
+
+            test.ok(!proj.addResourceFile('Plugins/assets.bundle'));
+            test.done();
+        },
+        'should return false (plugin entries)': function (test) {
+            var newFile = proj.addResourceFile('Plugins/assets.bundle',
+                                                { plugin: true }); 
+
+            test.ok(!proj.addResourceFile('Plugins/assets.bundle',
+                                                { plugin: true }));
+            test.done();
+        },
+        'should not add another entry anywhere': function (test) {
+            var newFile = proj.addResourceFile('Plugins/assets.bundle'),
+                buildFileSection = proj.pbxBuildFileSection(),
+                bfsLength = Object.keys(buildFileSection).length,
+                fileRefSection = proj.pbxFileReferenceSection(),
+                frsLength = Object.keys(fileRefSection).length,
+                resources = proj.pbxGroupByName('Resources'),
+                sources = proj.pbxResourcesBuildPhaseObj();
+
+            proj.addResourceFile('Plugins/assets.bundle');
+
+            // check lengths
+            test.equal(60, bfsLength);
+            test.equal(68, frsLength);
+            test.equal(resources.children.length, 10);
+            test.equal(sources.files.length, 13);
+            test.done();
+        }
+    },
     tearDown: function (callback) {
         delete proj.pbxGroupByName('Resources').path;
         callback();

test/addSourceFile.js

@@ -126,6 +126,32 @@ exports.addSourceFile = {
         test.equal(sourceObj.comment, 'file.m in Sources');
         test.equal(sourceObj.value, newFile.uuid);
         test.done();
+    },
+    'duplicate entries': {
+        'should return false': function (test) {
+            var newFile = proj.addSourceFile('Plugins/file.m'); 
+
+            test.ok(!proj.addSourceFile('Plugins/file.m'));
+            test.done();
+        },
+        'should not add another entry anywhere': function (test) {
+            var newFile = proj.addSourceFile('Plugins/file.m'),
+                buildFileSection = proj.pbxBuildFileSection(),
+                bfsLength = Object.keys(buildFileSection).length,
+                fileRefSection = proj.pbxFileReferenceSection(),
+                frsLength = Object.keys(fileRefSection).length,
+                plugins = proj.pbxGroupByName('Plugins'),
+                sources = proj.pbxSourcesBuildPhaseObj();
+
+            // duplicate!
+            proj.addSourceFile('Plugins/file.m');
+
+            test.equal(60, bfsLength);              // BuildFileSection
+            test.equal(68, frsLength);              // FileReferenceSection
+            test.equal(plugins.children.length, 1); // Plugins pbxGroup
+            test.equal(sources.files.length, 3);    // SourcesBuildPhhase
+            test.done();
+        }
     }
 }
 

test/addStaticLibrary.js

@@ -231,5 +231,21 @@ exports.addStaticLibrary = {
 
             test.done();
         }
+    },
+    'duplicate entries': {
+        'should return false': function (test) {
+            var newFile = proj.addStaticLibrary('libGoogleAnalytics.a'); 
+
+            test.ok(!proj.addStaticLibrary('libGoogleAnalytics.a'));
+            test.done();
+        },
+        'should return false (plugin entries)': function (test) {
+            var newFile = proj.addStaticLibrary('Plugins/libGoogleAnalytics.a',
+                                                { plugin: true }); 
+
+            test.ok(!proj.addStaticLibrary('Plugins/libGoogleAnalytics.a',
+                                                { plugin: true }));
+            test.done();
+        },
     }
 }