1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-18 09:57:40 +03:00

Filter out bogus commodities not listed in the in-game market.

Fixes #2.
This commit is contained in:
Jonathan Harris 2015-06-07 18:19:08 +01:00
parent 7a77f00cce
commit 35d57c6192
3 changed files with 6 additions and 3 deletions

3
bpc.py
View File

@ -3,6 +3,7 @@
from os.path import join from os.path import join
import codecs import codecs
import numbers
import time import time
from config import config from config import config
@ -25,7 +26,7 @@ def export(data, csv=False):
h.write(header) h.write(header)
for commodity in data['lastStarport']['commodities']: for commodity in data['lastStarport']['commodities']:
if commodity.get('categoryname') and categorymap.get(commodity['categoryname'], True): if isinstance(commodity.get('demandBracket'), numbers.Integral) and commodity.get('categoryname') and categorymap.get(commodity['categoryname'], True):
h.write(('%s;%s;%s;%s;%s;%s;%s;%s;%s;\n' % ( h.write(('%s;%s;%s;%s;%s;%s;%s;%s;%s;\n' % (
rowheader, rowheader,
commoditymap.get(commodity['name'].strip(), commodity['name'].strip()), commoditymap.get(commodity['name'].strip(), commodity['name'].strip()),

View File

@ -2,6 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import json import json
import numbers
import requests import requests
from platform import system from platform import system
from sys import platform from sys import platform
@ -35,7 +36,7 @@ def export(data, callback):
for commodity in commodities: for commodity in commodities:
i = i+1 i = i+1
callback('Sending %d/%d' % (i, len(commodities))) callback('Sending %d/%d' % (i, len(commodities)))
if commodity.get('categoryname') and categorymap.get(commodity['categoryname'], True): if isinstance(commodity.get('demandBracket'), numbers.Integral) and commodity.get('categoryname') and categorymap.get(commodity['categoryname'], True):
msg = { '$schemaRef': schema, msg = { '$schemaRef': schema,
'header': header, 'header': header,
'message': { 'message': {

3
td.py
View File

@ -3,6 +3,7 @@
from os.path import join from os.path import join
from collections import defaultdict from collections import defaultdict
import codecs import codecs
import numbers
from platform import system from platform import system
from sys import platform from sys import platform
import time import time
@ -26,7 +27,7 @@ def export(data):
# sort commodities by category # sort commodities by category
bycategory = defaultdict(list) bycategory = defaultdict(list)
for commodity in data['lastStarport']['commodities']: for commodity in data['lastStarport']['commodities']:
if commodity.get('categoryname') and categorymap.get(commodity['categoryname'], True): if isinstance(commodity.get('demandBracket'), numbers.Integral) and commodity.get('categoryname') and categorymap.get(commodity['categoryname'], True):
bycategory[categorymap.get(commodity['categoryname'], commodity['categoryname'])].append(commodity) bycategory[categorymap.get(commodity['categoryname'], commodity['categoryname'])].append(commodity)
for category in sorted(bycategory): for category in sorted(bycategory):