Merge pull request #828 from resinneublem/group-drones-for-dna-export

Groups drones before generating DNA
2016-12-02 01:05:37 -05:00
parent 34e3aa20ba e6dead2e27
commit bb96b0af1a
1 changed files with 6 additions and 1 deletions
--- a/service/port.py
+++ b/service/port.py
@@ -792,8 +792,13 @@ class Port(object):
        for mod in mods:
            dna += ":{0};{1}".format(mod, mods[mod])

+        # drones are known to be in split stacks
+        groupedDrones = OrderedDict()
        for drone in fit.drones:
-            dna += ":{0};{1}".format(drone.itemID, drone.amount)
+            groupedDrones[drone.itemID] = groupedDrones.get(drone.itemID, 0) + drone.amount
+
+        for droneItemID in groupedDrones:
+            dna += ":{0};{1}".format(droneItemID, groupedDrones[droneItemID])

        for cargo in fit.cargo:
            # DNA format is a simple/dumb format. As CCP uses the slot information of the item itself