dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Update to 871030 SISI, also fix prep_data script for changes in Phobos / reverence

Browse Source
This commit is contained in:
blitzmann
2015-03-23 18:00:38 -04:00
parent bb96ecb647
commit 222888984a
20 changed files with 91 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/prep_data.py
View File

@@ -11,6 +11,7 @@ import argparse
parser = argparse.ArgumentParser()
parser.add_argument("-e", "--eve", dest="eve_path", help="Location of EVE directory", required=True)
parser.add_argument("-c", "--cache", dest="cache_path", help="Location of EVE cache directory. If not specified, an attempt will be make to automatically determine path.")
parser.add_argument("-r", "--res", dest="res_path", help="Location of EVE shared resource cache", required=True)
parser.add_argument("-d", "--dump", dest="dump_path", help="Location of Phobos JSON dump directory", required=True)
parser.add_argument("-p", "--phobos", dest="phb_path", help="Location of Phobos, defaults to path noted in script", default=phb_path)
parser.add_argument("-s", "--singularity", action="store_true", help="Singularity build")
@@ -19,6 +20,7 @@ parser.add_argument("-j", "--nojson", dest="nojson", action="store_true", help="
args = parser.parse_args()
eve_path = os.path.expanduser(unicode(args.eve_path, sys.getfilesystemencoding()))
cache_path = os.path.expanduser(unicode(args.cache_path, sys.getfilesystemencoding())) if args.cache_path else None
path_res = os.path.expanduser(unicode(args.res_path, sys.getfilesystemencoding()))
dump_path = os.path.expanduser(unicode(args.dump_path, sys.getfilesystemencoding()))
script_path = os.path.dirname(unicode(__file__, sys.getfilesystemencoding()))
@@ -44,10 +46,10 @@ if not args.nojson:
from translator import Translator
from writer import *
rvr = reverence.blue.EVE(eve_path, cachepath=args.cache_path, server="singularity" if args.singularity else "tranquility")
rvr = reverence.blue.EVE(eve_path, cachepath=args.cache_path, respath=path_res, server="singularity" if args.singularity else "tranquility")
spickle_miner = StuffedPickleMiner(rvr)
trans = Translator(spickle_miner)
pickle_miner = ResourcePickleMiner(rvr)
trans = Translator(pickle_miner)
bulkdata_miner = BulkdataMiner(rvr, trans)
miners = (
@@ -56,7 +58,7 @@ if not args.nojson:
TraitMiner(bulkdata_miner, trans),
SqliteMiner(eve_path, trans),
CachedCallsMiner(rvr, trans),
spickle_miner
pickle_miner
)
writers = (