From f10fe2e0bf91ce945c30bc08a869dd9a47a2a268 Mon Sep 17 00:00:00 2001 From: DarkWanderer Date: Sat, 14 Jul 2018 17:08:09 +0300 Subject: [PATCH] Made outfitting schema tolerant to all-lowercase data coming from outfitting.json --- schemas/{outfitting-v2.0.json => outfitting-v2.1.json} | 2 +- src/eddn/conf/Settings.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename schemas/{outfitting-v2.0.json => outfitting-v2.1.json} (96%) diff --git a/schemas/outfitting-v2.0.json b/schemas/outfitting-v2.1.json similarity index 96% rename from schemas/outfitting-v2.0.json rename to schemas/outfitting-v2.1.json index 8ca5951..4340658 100644 --- a/schemas/outfitting-v2.0.json +++ b/schemas/outfitting-v2.1.json @@ -56,7 +56,7 @@ "items" : { "type" : "string", "minLength" : 1, - "pattern" : "(^Hpt_|^Int_|_Armour_)", + "pattern" : "(^Hpt_|^hpt_|^Int_|^int_|_Armour_|_armour_)", "description" : "Module symbolic name. e.g. Hpt_ChaffLauncher_Tiny, Int_Engine_Size3_Class5_Fast, Independant_Trader_Armour_Grade1, etc. Modules that depend on the Cmdr's purchases (e.g. bobbleheads, paintjobs) or rank (e.g. decals and PowerPlay faction-specific modules) should be omitted." } } diff --git a/src/eddn/conf/Settings.py b/src/eddn/conf/Settings.py index 0109583..095d20d 100644 --- a/src/eddn/conf/Settings.py +++ b/src/eddn/conf/Settings.py @@ -51,8 +51,8 @@ class _Settings(object): "https://eddn.edcd.io/schemas/shipyard/2" : "schemas/shipyard-v2.0.json", "https://eddn.edcd.io/schemas/shipyard/2/test" : "schemas/shipyard-v2.0.json", - "https://eddn.edcd.io/schemas/outfitting/2" : "schemas/outfitting-v2.0.json", - "https://eddn.edcd.io/schemas/outfitting/2/test" : "schemas/outfitting-v2.0.json", + "https://eddn.edcd.io/schemas/outfitting/2" : "schemas/outfitting-v2.1.json", + "https://eddn.edcd.io/schemas/outfitting/2/test" : "schemas/outfitting-v2.1.json", "https://eddn.edcd.io/schemas/blackmarket/1" : "schemas/blackmarket-v1.0.json", "https://eddn.edcd.io/schemas/blackmarket/1/test" : "schemas/blackmarket-v1.0.json",