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

htmlgen: Update directory to fabric 

Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
This commit is contained in:
Daniel Schultz 2021-01-09 20:44:06 +01:00
parent 6856651990
commit e986737252
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htmlgen/htmlgen.py
View File

@ -14,6 +14,7 @@
import os, sys, json, re import os, sys, json, re
from io import StringIO from io import StringIO
from prjxray.util import get_fabric_for_part
def mk_get_setting(settings_filename): def mk_get_setting(settings_filename):
@ -234,9 +235,9 @@ class Tweaks():
pass pass
def load_tilegrid(db_dir, part, verbose=False, allow_fake=False): def load_tilegrid(db_dir, fabric, verbose=False, allow_fake=False):
print("Loading tilegrid.") print("Loading tilegrid.")
with db_open(os.path.join(part, "tilegrid.json"), db_dir) as f: with db_open(os.path.join(fabric, "tilegrid.json"), db_dir) as f:
data = f.read() data = f.read()
if not data: if not data:
assert allow_fake, 'No tilegrid.json found' assert allow_fake, 'No tilegrid.json found'
@ -983,11 +984,9 @@ def run(settings, output, verbose=False, allow_fake=False):
# Load source data # Load source data
dbstate = DBState() dbstate = DBState()
fabric = get_fabric_for_part(db_dir, get_setting("XRAY_PART"))
grid = load_tilegrid( grid = load_tilegrid(
db_dir, db_dir, fabric, verbose=verbose, allow_fake=allow_fake)
get_setting("XRAY_PART"),
verbose=verbose,
allow_fake=allow_fake)
db_reads(dbstate, db_dir) db_reads(dbstate, db_dir)
# Create pages # Create pages