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

Groups drones before generating DNA
pyfa-org · Dec 2, 2016 · bb96b0a · bb96b0a
2 parents 34e3aa2 + e6dead2
commit bb96b0a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/service/port.py b/service/port.py
@@ -792,8 +792,13 @@ def exportDna(fit):
         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