From f33f5580062fa6edc05c488018b395dd79b9e1c5 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sat, 31 Oct 2015 14:27:43 -0400 Subject: [PATCH] Fix prep_data.py --- scripts/prep_data.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/prep_data.py b/scripts/prep_data.py index 582a8d245..823b4d037 100644 --- a/scripts/prep_data.py +++ b/scripts/prep_data.py @@ -62,27 +62,25 @@ if not args.nojson: pickle_miner = ResourcePickleMiner(rvr) trans = Translator(pickle_miner) bulkdata_miner = BulkdataMiner(rvr, trans) - staticcache_miner = StaticdataCacheMiner(eve_path, trans) - + staticcache_miner = ResourceStaticCacheMiner(rvr, trans) miners = ( MetadataMiner(eve_path), bulkdata_miner, - TraitMiner(staticcache_miner, bulkdata_miner, trans), - SqliteMiner(eve_path, trans), staticcache_miner, - #CachedCallsMiner(rvr, trans), + TraitMiner(staticcache_miner, bulkdata_miner, trans), + SqliteMiner(rvr.paths.root, trans), + CachedCallsMiner(rvr, trans), pickle_miner ) - writers = ( JsonWriter(dump_path, indent=2), ) list = "dgmexpressions,dgmattribs,dgmeffects,dgmtypeattribs,dgmtypeeffects,"\ "dgmunits,icons,invcategories,invgroups,invmetagroups,invmetatypes,"\ - "invtypes,mapbulk_marketGroups,phbmetadata,phbtraits,fsdTypeOverrides"\ - "evegroups,evetypes" + "invtypes,mapbulk_marketGroups,phbmetadata,phbtraits,fsdTypeOverrides,"\ + "evegroups,evetypes,evecategories" FlowManager(miners, writers).run(list, "multi")