Support import of E:D shipyard text exports

app/js/controllers/controller-import.js

@@ -1,11 +1,25 @@
-angular.module('app').controller('ImportController', ['lodash', '$rootScope', '$scope', '$stateParams', 'ShipsDB', 'Ship', 'Persist', 'Serializer', function(_, $rootScope, $scope, $stateParams, Ships, Ship, Persist, Serializer) {
-  $scope.jsonValid = false;
-  $scope.importJSON = null;
+angular.module('app').controller('ImportController', ['lodash', '$rootScope', '$scope', '$stateParams', 'ShipsDB', 'Ship', 'Components', 'GroupMap', 'Persist', 'Serializer', function(_, $rootScope, $scope, $stateParams, Ships, Ship, Components, GroupMap, Persist, Serializer) {
+  $scope.importValid = false;
+  $scope.importString = null;
   $scope.errorMsg = null;
   $scope.canEdit = true;
   $scope.builds = $stateParams.obj || null;
   $scope.ships = Ships;
 
+  var textBuildRegex = new RegExp('^\\[([\\w \\-]+)\\]\n');
+  var lineRegex = new RegExp('^([\\dA-Z]{1,2}): (\\d)([A-I])[/]?([FGT])?([SD])? ([\\w\\- ]+)');
+  var mountMap = { 'H': 4, 'L': 3, 'M': 2, 'S': 1, 'U': 0 };
+  var commonMap = { 'RB': 0, 'TM': 1, 'FH': 2, 'EC': 3, 'PC': 4, 'SS': 5, 'FS': 6 };
+  var bhMap = { 'lightweight alloy': 0, 'reinforced alloy': 1, 'military grade composite': 2, 'mirrored surface composite': 3, 'reactive surface composite': 4 };
+
+  function isEmptySlot(slot) {
+    return slot.maxClass == this && slot.c === null;
+  }
+
+  function equalsIgnoreCase(str) {
+    return str.toLowerCase() == this.toLowerCase();
+  }
+
   function validateBuild(shipId, code, name) {
     var shipData = Ships[shipId];
 
@@ -83,40 +97,134 @@ angular.module('app').controller('ImportController', ['lodash', '$rootScope', '$
     $scope.builds = builds;
   }
 
-  $scope.validateJson = function() {
+  function importTextBuild(buildStr) {
+    var buildName = textBuildRegex.exec(buildStr)[1].trim();
+    var shipName = buildName.toLowerCase();
+    var shipId = null;
+
+    for (var sId in Ships) {
+      if (Ships[sId].properties.name.toLowerCase() == shipName) {
+        shipId = sId;
+        break;
+      }
+    }
+
+    if (!shipId) { throw 'No such ship found: "' + buildName + '"'; }
+
+    var lines = buildStr.split('\n');
+    var ship = new Ship(shipId, Ships[shipId].properties, Ships[shipId].slots);
+    ship.buildWith(null);
+
+    for (var i = 1; i < lines.length; i++) {
+      var line = lines[i].trim();
+
+      if (!line) { continue; }
+      if (line.substring(0, 3) == '---') { break; }
+
+      var parts = lineRegex.exec(line);
+
+      if (!parts) { throw 'Error parsing: "' + line + '"'; }
+
+      var typeSize = parts[1];
+      var cl = parts[2];
+      var rating = parts[3];
+      var mount = parts[4];
+      var missile = parts[5];
+      var name = parts[6].trim();
+      var slot, group;
+
+      if (isNaN(typeSize)) {  // Common or Hardpoint
+        if (typeSize.length == 1) { // Hardpoint
+          var slotClass = mountMap[typeSize];
+
+          if (cl > slotClass) { throw cl + rating + ' ' + name + ' exceeds slot size: "' + line + '"'; }
+
+          slot = _.find(ship.hardpoints, isEmptySlot, slotClass);
+
+          if (!slot) { throw 'No hardpoint slot available for: "' + line + '"'; }
+
+          group = _.find(GroupMap, equalsIgnoreCase, name);
+
+          var hpid = Components.findHardpointId(group, cl, rating, group ? null : name, mount, missile);
+
+          if (!hpid) { throw 'Unknown component: "' + line + '"'; }
+
+          ship.use(slot, hpid, Components.hardpoints(hpid), true);
+
+        } else if (typeSize == 'BH') {
+          var bhId = bhMap[name.toLowerCase()];
+
+          if (bhId === undefined) { throw 'Unknown bulkhead: "' + line + '"'; }
+
+          ship.useBulkhead(bhId, true);
+
+        } else if (commonMap[typeSize] != undefined) {
+          var commonIndex = commonMap[typeSize];
+
+          if (ship.common[commonIndex].maxClass < cl) { throw name + ' exceeds max class for the ' + ship.name; }
+
+          ship.use(ship.common[commonIndex], cl + rating, Components.common(commonIndex, cl + rating), true);
+
+        } else {
+          throw 'Unknown component: "' + line + '"';
+        }
+      } else {
+        if (cl > typeSize) { throw cl + rating + ' ' + name + ' exceeds slot size: "' + line + '"'; }
+
+        slot = _.find(ship.internal, isEmptySlot, typeSize);
+
+        if (!slot) { throw 'No internal slot available for: "' + line + '"'; }
+
+        group = _.find(GroupMap, equalsIgnoreCase, name);
+
+        var intId = Components.findInternalId(group, cl, rating, group ? null : name);
+
+        if (!intId) { throw 'Unknown component: "' + line + '"'; }
+
+        ship.use(slot, intId, Components.internal(intId));
+      }
+    }
+
+    var builds = {};
+    builds[shipId] = {};
+    builds[shipId]['Imported ' + buildName] = Serializer.fromShip(ship);
+    $scope.builds = builds;
+  }
+
+  $scope.validateImport = function() {
     var importData = null;
-    $scope.jsonValid = false;
+    var importString = $scope.importString.trim();
+    $scope.importValid = false;
     $scope.errorMsg = null;
     $scope.builds = $scope.discounts = $scope.comparisons = $scope.insurance = null;
 
-    if (!$scope.importJSON) { return; }
+    if (!importString) { return; }
+
 
     try {
-      importData = angular.fromJson($scope.importJSON);
-    } catch (e) {
-      $scope.errorMsg = 'Cannot Parse JSON!';
-      return;
-    }
+      if (textBuildRegex.test(importString)) {  // E:D Shipyard build text
+        importTextBuild(importString);
+      } else {                                  // JSON Build data
+        importData = angular.fromJson($scope.importString);
 
-    if (!importData || typeof importData != 'object') {
-      $scope.errorMsg = 'Must be an object or array!';
-      return;
-    }
+        if (!importData || typeof importData != 'object') {
+          throw 'Must be an object or array!';
+        }
 
-    try {
-      if (importData instanceof Array) {   // Must be detailed export json
-        importDetailedArray(importData);
-      } else if (importData.ship && importData.name) { // Using JSON from a single ship build export
-        importDetailedArray([importData]); // Convert to array with singleobject
-      } else { // Using Backup JSON
-        importBackup(importData);
+        if (importData instanceof Array) {   // Must be detailed export json
+          importDetailedArray(importData);
+        } else if (importData.ship && importData.name) { // Using JSON from a single ship build export
+          importDetailedArray([importData]); // Convert to array with singleobject
+        } else { // Using Backup JSON
+          importBackup(importData);
+        }
       }
     } catch (e) {
-      $scope.errorMsg = e;
+      $scope.errorMsg = (typeof e == 'string') ? e : 'Cannot Parse the data!';
       return;
     }
 
-    $scope.jsonValid = true;
+    $scope.importValid = true;
   };
 
   $scope.hasBuild = function(shipId, name) {

app/js/controllers/controller-outfit.js

@@ -145,7 +145,14 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
    */
   $scope.select = function(type, slot, e, id) {
     e.stopPropagation();
-    id = id || angular.element(e.target).attr('cpid');  // Get component ID
+
+    if (!id) {  // Find component id if not passed
+      var elem = e.target;
+      while (elem && elem !== e.currentTarget && !elem.getAttribute('cpid')) {
+        elem = elem.parentElement;
+      }
+      id = elem.getAttribute('cpid');
+    }
 
     if (id) {
       if (id == 'empty') {