From 8f7fb3966cce63d6f32cb67f15f8c5dcc7d163bc Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Wed, 2 Dec 2015 18:22:39 +0000 Subject: [PATCH 1/4] Add E:D 1.5 ships. --- schemas/shipyard-v1.0.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/shipyard-v1.0.json b/schemas/shipyard-v1.0.json index da2bd50a..ed170b1c 100644 --- a/schemas/shipyard-v1.0.json +++ b/schemas/shipyard-v1.0.json @@ -52,7 +52,7 @@ "items" : { "type" : "string", "minLength" : 1, - "description" : "Ship name in English as displayed in-game. i.e. one of: Adder, Anaconda, Asp, Cobra Mk III, DiamondBack Scout, Diamondback Explorer, Eagle, Federal Assault Ship, Federal Dropship, Federal Gunship, Fer-de-Lance, Hauler, Imperial Clipper, Imperial Courier, Imperial Eagle, Orca, Python, Sidewinder, Type-6 Transporter, Type-7 Transporter, Type-9 Heavy, Viper, Vulture" + "description" : "Ship name in English as displayed in-game. i.e. one of: Adder, Anaconda, Asp, Cobra Mk III, Cobra MkIV, DiamondBack Scout, Diamondback Explorer, Eagle, Federal Corvette, Federal Dropship, Fer-de-Lance, Hauler, Imperial Clipper, Imperial Courier, Imperial Cutter, Keelback, Orca, Python, Sidewinder, Type-6 Transporter, Type-7 Transporter, Type-9 Heavy, Viper, Viper MkIV, Vulture" } } } From bd6eef4153b4dccba17b6b8669fa624790052fef Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Wed, 2 Dec 2015 18:31:06 +0000 Subject: [PATCH 2/4] Restore E:D 1.4 ships. --- schemas/shipyard-v1.0.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/shipyard-v1.0.json b/schemas/shipyard-v1.0.json index ed170b1c..a5d9bd80 100644 --- a/schemas/shipyard-v1.0.json +++ b/schemas/shipyard-v1.0.json @@ -52,7 +52,7 @@ "items" : { "type" : "string", "minLength" : 1, - "description" : "Ship name in English as displayed in-game. i.e. one of: Adder, Anaconda, Asp, Cobra Mk III, Cobra MkIV, DiamondBack Scout, Diamondback Explorer, Eagle, Federal Corvette, Federal Dropship, Fer-de-Lance, Hauler, Imperial Clipper, Imperial Courier, Imperial Cutter, Keelback, Orca, Python, Sidewinder, Type-6 Transporter, Type-7 Transporter, Type-9 Heavy, Viper, Viper MkIV, Vulture" + "description" : "Ship name in English as displayed in-game. i.e. one of: Adder, Anaconda, Asp, Cobra Mk III, Cobra MkIV, DiamondBack Scout, Diamondback Explorer, Eagle, Federal Assault Ship, Federal Corvette, Federal Dropship, Federal Gunship, Fer-de-Lance, Hauler, Imperial Clipper, Imperial Courier, Imperial Cutter, Imperial Eagle, Keelback, Orca, Python, Sidewinder, Type-6 Transporter, Type-7 Transporter, Type-9 Heavy, Viper, Viper MkIV, Vulture" } } } From 857c28bbb21bf8bac74d877b1024827f913eed7c Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Wed, 2 Dec 2015 18:32:54 +0000 Subject: [PATCH 3/4] Add Asp Scout. --- schemas/shipyard-v1.0.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/shipyard-v1.0.json b/schemas/shipyard-v1.0.json index a5d9bd80..2ac29969 100644 --- a/schemas/shipyard-v1.0.json +++ b/schemas/shipyard-v1.0.json @@ -52,7 +52,7 @@ "items" : { "type" : "string", "minLength" : 1, - "description" : "Ship name in English as displayed in-game. i.e. one of: Adder, Anaconda, Asp, Cobra Mk III, Cobra MkIV, DiamondBack Scout, Diamondback Explorer, Eagle, Federal Assault Ship, Federal Corvette, Federal Dropship, Federal Gunship, Fer-de-Lance, Hauler, Imperial Clipper, Imperial Courier, Imperial Cutter, Imperial Eagle, Keelback, Orca, Python, Sidewinder, Type-6 Transporter, Type-7 Transporter, Type-9 Heavy, Viper, Viper MkIV, Vulture" + "description" : "Ship name in English as displayed in-game. i.e. one of: Adder, Anaconda, Asp, Asp Scout, Cobra Mk III, Cobra MkIV, DiamondBack Scout, Diamondback Explorer, Eagle, Federal Assault Ship, Federal Corvette, Federal Dropship, Federal Gunship, Fer-de-Lance, Hauler, Imperial Clipper, Imperial Courier, Imperial Cutter, Imperial Eagle, Keelback, Orca, Python, Sidewinder, Type-6 Transporter, Type-7 Transporter, Type-9 Heavy, Viper, Viper MkIV, Vulture" } } } From a70edab1a27d644ae115b63b4ed077c58f4ea9ab Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Sat, 5 Dec 2015 04:39:32 +0000 Subject: [PATCH 4/4] Handle non-ASCII characters in messages, i.e. in the uploaderID field. --- src/eddn/Gateway.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/eddn/Gateway.py b/src/eddn/Gateway.py index 9d7bcb5e..29fbf826 100644 --- a/src/eddn/Gateway.py +++ b/src/eddn/Gateway.py @@ -150,7 +150,7 @@ def parse_and_error_handle(data): # Sends the parsed MarketOrderList or MarketHistoryList to the Announcers # as compressed JSON. - gevent.spawn(push_message, simplejson.dumps(parsed_message), parsed_message['$schemaRef']) + gevent.spawn(push_message, simplejson.dumps(parsed_message, ensure_ascii=False).encode('utf-8'), parsed_message['$schemaRef']) logger.info("Accepted %s upload from %s" % ( parsed_message, get_remote_address() ))