luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1213 from mithro/master 

Fix htmlgen for changing DB structure.
This commit is contained in:
litghost 2020-01-27 19:23:25 -08:00 committed by GitHub
parent d7ff3f25c6 adc297a560
commit e7cdd58162
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htmlgen/htmlgen.py
View File

@ -225,9 +225,9 @@ class Tweaks():
pass
def load_tilegrid(db_dir, verbose=False, allow_fake=False):
def load_tilegrid(db_dir, part, verbose=False, allow_fake=False):
print("Loading tilegrid.")
with db_open("tilegrid.json", db_dir) as f:
with db_open(os.path.join(part, "tilegrid.json"), db_dir) as f:
data = f.read()
if not data:
assert allow_fake, 'No tilegrid.json found'
@ -969,7 +969,11 @@ def run(settings, output, verbose=False, allow_fake=False):
# Load source data
dbstate = DBState()
grid = load_tilegrid(db_dir, verbose=verbose, allow_fake=allow_fake)
grid = load_tilegrid(
db_dir,
get_setting("XRAY_PART"),
verbose=verbose,
allow_fake=allow_fake)
db_reads(dbstate, db_dir)
# Create pages