Support import of E:D shipyard text exports

2025-12-09 22:55:35 +00:00 · 2015-08-13 23:22:13 -07:00
parent 1edacf3eba
commit 0728af14dd
9 changed files with 304 additions and 81 deletions
--- a/app/js/controllers/controller-import.js
+++ b/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) {
--- a/app/js/controllers/controller-outfit.js
+++ b/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') {
--- a/app/js/directives/directive-loader.js
+++ b/app/js/directives/directive-loader.js
@@ -3,7 +3,7 @@ angular.module('app').directive('loader', function() {
    restrict: 'A',
    link: function(scope, element) {
      element.addClass('loader');
-      element.html('<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 40 40" width="100%" height="100%"><!-- Outer Ring --><path d="m5,8l5,8l5,-8z" class="l1 d1" /><path d="m5,8l5,-8l5,8z" class="l1 d2" /><path d="m10,0l5,8l5,-8z" class="l1 d3" /><path d="m15,8l5,-8l5,8z" class="l1 d4" /><path d="m20,0l5,8l5,-8z" class="l1 d5" /><path d="m25,8l5,-8l5,8z" class="l1 d6" /><path d="m25,8l5,8l5,-8z" class="l1 d7" /><path d="m30,16l5,-8l5,8z" class="l1 d8" /><path d="m30,16l5,8l5,-8z" class="l1 d9" /><path d="m25,24l5,-8l5,8z" class="l1 d10" /><path d="m25,24l5,8l5,-8z" class="l1 d11" /><path d="m20,32l5,-8l5,8z" class="l1 d13" /><path d="m15,24l5,8l5,-8z" class="l1 d14" /><path d="m10,32l5,-8l5,8z" class="l1 d15" /><path d="m5,24l5,8l5,-8z" class="l1 d16" /><path d="m5,24l5,-8l5,8z" class="l1 d17" /><path d="m0,16l5,8l5,-8z" class="l1 d18" /><path d="m0,16l5,-8l5,8z" class="l1 d20" /><!-- Inner Ring --><path d="m10,16l5,-8l5,8z" class="l2 d0" /><path d="m15,8l5,8l5,-8z" class="l2 d3" /><path d="m20,16l5,-8l5,8z" class="l2 d6" /><path d="m20,16l5,8l5,-8z" class="l2 d9" /><path d="m15,24l5,-8l5,8z" class="l2 d12" /><path d="m10,16l5,8l5,-8z" class="l2 d15" /></svg>');
+      element.html('<svg viewbox="0 0 40 40" width="100%" height="100%"><path d="m5,8l5,8l5,-8z" class="l1 d1" /><path d="m5,8l5,-8l5,8z" class="l1 d2" /><path d="m10,0l5,8l5,-8z" class="l1 d3" /><path d="m15,8l5,-8l5,8z" class="l1 d4" /><path d="m20,0l5,8l5,-8z" class="l1 d5" /><path d="m25,8l5,-8l5,8z" class="l1 d6" /><path d="m25,8l5,8l5,-8z" class="l1 d7" /><path d="m30,16l5,-8l5,8z" class="l1 d8" /><path d="m30,16l5,8l5,-8z" class="l1 d9" /><path d="m25,24l5,-8l5,8z" class="l1 d10" /><path d="m25,24l5,8l5,-8z" class="l1 d11" /><path d="m20,32l5,-8l5,8z" class="l1 d13" /><path d="m15,24l5,8l5,-8z" class="l1 d14" /><path d="m10,32l5,-8l5,8z" class="l1 d15" /><path d="m5,24l5,8l5,-8z" class="l1 d16" /><path d="m5,24l5,-8l5,8z" class="l1 d17" /><path d="m0,16l5,8l5,-8z" class="l1 d18" /><path d="m0,16l5,-8l5,8z" class="l1 d20" /><path d="m10,16l5,-8l5,8z" class="l2 d0" /><path d="m15,8l5,8l5,-8z" class="l2 d3" /><path d="m20,16l5,-8l5,8z" class="l2 d6" /><path d="m20,16l5,8l5,-8z" class="l2 d9" /><path d="m15,24l5,-8l5,8z" class="l2 d12" /><path d="m10,16l5,8l5,-8z" class="l2 d15" /></svg>');
    }
 };
 });
--- a/app/js/shipyard/factory-ship.js
+++ b/app/js/shipyard/factory-ship.js
@@ -95,7 +95,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
    this.totalDps = 0;

    this.bulkheads.c = null;
-    this.useBulkhead(comps.bulkheads || 0, true);
+    this.useBulkhead(comps && comps.bulkheads ? comps.bulkheads : 0, true);
    this.cargoScoop.priority = priorities ? priorities[0] * 1 : 0;
    this.cargoScoop.enabled = enabled ? enabled[0] * 1 : true;

@@ -116,7 +116,10 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
      common[i].type = 'SYS';
      common[i].c = common[i].id = null; // Resetting 'old' component if there was one
      common[i].discountedCost = 0;
-      this.use(common[i], comps.common[i], Components.common(i, comps.common[i]), true);
+
+      if (comps) {
+        this.use(common[i], comps.common[i], Components.common(i, comps.common[i]), true);
+      }
    }

    common[1].type = 'ENG'; // Thrusters
@@ -131,7 +134,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
      hps[i].c = hps[i].id = null; // Resetting 'old' component if there was one
      hps[i].discountedCost = 0;

-      if (comps.hardpoints[i] !== 0) {
+      if (comps && comps.hardpoints[i] !== 0) {
        this.use(hps[i], comps.hardpoints[i], Components.hardpoints(comps.hardpoints[i]), true);
      }
    }
@@ -146,15 +149,17 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
      internal[i].id = internal[i].c = null; // Resetting 'old' component if there was one
      internal[i].discountedCost = 0;

-      if (comps.internal[i] !== 0) {
+      if (comps && comps.internal[i] !== 0) {
        this.use(internal[i], comps.internal[i], Components.internal(comps.internal[i]), true);
      }
    }

    // Update aggragated stats
-    this.updatePower();
-    this.updateJumpStats();
-    this.updateShieldStrength();
+    if (comps) {
+      this.updatePower();
+      this.updateJumpStats();
+      this.updateShieldStrength();
+    }
  };

  Ship.prototype.useBulkhead = function(index, preventUpdate) {
--- a/app/js/shipyard/service-components.js
+++ b/app/js/shipyard/service-components.js
@@ -33,15 +33,25 @@ angular.module('shipyard').service('Components', ['lodash', 'ComponentsDB', 'Shi
  };

  this.findInternalId = function(groupName, clss, rating, name) {
-    var group = C.internal[groupName];
+    var groups = {};

-    if (!group) {
-      throw 'Invalid internal group: ' + groupName;
+    if (groupName) {
+      if (!C.internal[groupName]) {
+        throw 'Invalid internal group: ' + groupName;
+      }
+      groups[groupName] = C.internal[groupName];
+    } else if (name) {
+      groups = C.internal;
+    } else {
+      throw 'Invalid group or name not provided';
    }

-    for (var i = 0, l = group.length; i < l; i++) {
-      if (group[i].class == clss && group[i].rating == rating && ((!name && !group[i].name) || group[i].name == name)) {
-        return group[i].id;
+    for (var g in groups) {
+      var group = groups[g];
+      for (var i = 0, l = group.length; i < l; i++) {
+        if (group[i].class == clss && group[i].rating == rating && ((!name && !group[i].name) || group[i].name == name)) {
+          return group[i].id;
+        }
      }
    }

@@ -49,18 +59,28 @@ angular.module('shipyard').service('Components', ['lodash', 'ComponentsDB', 'Shi
  };

  this.findHardpointId = function(groupName, clss, rating, name, mode, missile) {
-    var group = C.hardpoints[groupName];
+    var groups = {};

-    if (!group) {
-      throw 'Invalid hardpoint group: ' + groupName;
+    if (groupName) {
+      if (!C.hardpoints[groupName]) {
+        throw 'Invalid internal group: ' + groupName;
+      }
+      groups[groupName] = C.hardpoints[groupName];
+    } else if (name) {
+      groups = C.hardpoints;
+    } else {
+      throw 'Invalid group or name not provided';
    }

-    for (var i = 0, l = group.length; i < l; i++) {
-      if (group[i].class == clss && group[i].rating == rating && group[i].mode == mode
-          && ((!name && !group[i].name) || group[i].name == name)
-          && ((!missile && !group[i].missile) || group[i].missile == missile)
-          ) {
-        return group[i].id;
+    for (var g in groups) {
+      var group = groups[g];
+      for (var i = 0, l = group.length; i < l; i++) {
+        if (group[i].class == clss && group[i].rating == rating && group[i].mode == mode
+            && ((!name && !group[i].name) || group[i].name == name)
+            && ((!missile && !group[i].missile) || group[i].missile == missile)
+            ) {
+          return group[i].id;
+        }
      }
    }

--- a/app/views/modal-import.html
+++ b/app/views/modal-import.html
@@ -1,7 +1,7 @@
 <h2>Import</h2>
 <div ng-show="!processed">
-  <textarea class="cb json"  ng-model="importJSON" ng-change="validateJson()" placeholder="Paste JSON Here"></textarea>
-  <button class="l" ng-click="process()" ng-disabled="!jsonValid">Proceed</button>
+  <textarea class="cb json"  ng-model="importString" ng-change="validateImport()" placeholder="Paste JSON or Build text Here"></textarea>
+  <button class="l" ng-click="process()" ng-disabled="!importValid">Proceed</button>
  <div class="l warning" style="margin-left:3em;">{{errorMsg}}</div>
 </div>

@@ -34,7 +34,7 @@
  </table>

  <button class="cl l" ng-click="import()"><svg class="icon"><use xlink:href="#download"></use></svg> Import</button>
-  <button class="l" style="margin-left: 2em;" ng-click="processed = false" ng-show="canEdit">Edit JSON</button>
+  <button class="l" style="margin-left: 2em;" ng-click="processed = false" ng-show="canEdit">Edit Data</button>
 </div>

 <button class="r dismiss" ng-click="dismiss()">Cancel</button>