Merge pull request #1 from AnthorNet/master

Added commodity name conversion...

Author: Andargor

CHANGELOG

@@ -1,3 +1,6 @@
+1.0.2:
+- Added commodity name conversion before uploading to EDDN
+
 1.0.1:
 - Better ship name retrieval
 - Added player dump utility

edce/eddn.py

@@ -16,6 +16,24 @@
 
 testSchema = True
 
+def convertCommodityEDDN(name):
+    if name == 'Marine Supplies':
+        return 'Marine Equipment'
+        
+    if name == 'Auto Fabricators':
+        return 'Auto-Fabricators'
+    
+    if name == 'Hazardous Environment Suits':
+        return 'H.E. Suits'
+    
+    if name == 'Atmospheric Extractors':
+        return 'Atmospheric Processors'
+    
+    if name == 'Non Lethal Weapons':
+        return 'Non-lethal Weapons'
+        
+    return name
+    
 def submitEDDN(data):
 	if edce.globals.debug:
 		print(">>>>>>>>>>>>>>>> submitEDDN")
@@ -67,7 +85,7 @@ def postMarketData(data):
 			schema = schema + '/test'
 
 		for commodity in data.lastStarport.commodities:
-			message = {"header": {"softwareVersion": edce.globals.version, "softwareName": edce.globals.name, "uploaderID": clientID}, "$schemaRef": schema, "message": {"buyPrice": math.floor(commodity.buyPrice), "timestamp": st, "stationStock": math.floor(commodity.stock), "systemName": system, "stationName": station, "demand":  math.floor(commodity.demand), "sellPrice": math.floor(commodity.sellPrice), "itemName": commodity.name}}
+			message = {"header": {"softwareVersion": edce.globals.version, "softwareName": edce.globals.name, "uploaderID": clientID}, "$schemaRef": schema, "message": {"buyPrice": math.floor(commodity.buyPrice), "timestamp": st, "stationStock": math.floor(commodity.stock), "systemName": system, "stationName": station, "demand":  math.floor(commodity.demand), "sellPrice": math.floor(commodity.sellPrice), "itemName": convertCommodityEDDN(commodity.name)}}
 			if commodity.demandBracket > 0:
 				message['message']['demandLevel'] = getBracket(commodity.demandBracket)
 			elif commodity.stockBracket > 0:

edce/globals.py

@@ -4,7 +4,7 @@
 	exit()
 
 name = "EDCE"
-version = "1.0.1"
+version = "1.0.2"
 
 interactive = False
 debug = False