xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

ignore /subsections/ files

Browse Source
This commit is contained in:
Philip Sargent 2023-07-24 14:24:39 +03:00
parent 9f2b77bf1d
commit 64fa602a07
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
parsers/survex.py
View File

@ -1550,9 +1550,9 @@ class LoadingSurvex:
nonlocal blockcount nonlocal blockcount
blockcount += 1 blockcount += 1
if blockcount % 20 == 0: if blockcount % 40 == 0:
print(".", file=sys.stderr, end="") print(".", file=sys.stderr, end="")
if blockcount % 800 == 0: if blockcount % 1600 == 0:
print("\n", file=sys.stderr, end="") print("\n", file=sys.stderr, end="")
mem = get_process_memory() mem = get_process_memory()
print(f" - MEM: {mem:7.2f} MB in use", file=sys.stderr) print(f" - MEM: {mem:7.2f} MB in use", file=sys.stderr)
@ -2186,7 +2186,7 @@ def FindAndLoadSurvex(survexblockroot):
) )
unseensroot = re.sub(r"\.svx$", "", UNSEENS) unseensroot = re.sub(r"\.svx$", "", UNSEENS)
excpts = ["surface/terrain", "kataster/kataster-boundaries", "template", "docs", unseensroot] excpts = ["surface/terrain", "kataster/kataster-boundaries", "template", "docs", "deprecated", "subsections", unseensroot]
removals = [] removals = []
for x in unseens: for x in unseens:
for o in excpts: for o in excpts:
@ -2202,7 +2202,8 @@ def FindAndLoadSurvex(survexblockroot):
file=sys.stderr, file=sys.stderr,
) )
check_team_cache() check_team_cache()
print(" -- Now loading the previously-omitted survex files.", file=sys.stderr) print(f" -- Now loading the previously-omitted survex files.", file=sys.stderr)
print(f" - (except the exceptions: {excpts})", file=sys.stderr)
with open(Path(settings.SURVEX_DATA, UNSEENS), "w") as u: with open(Path(settings.SURVEX_DATA, UNSEENS), "w") as u:
u.write( u.write(
@ -2498,7 +2499,11 @@ def MakeFileRoot(fn):
print(f" - Making/finding a new root survexfile for this import: {fn}") print(f" - Making/finding a new root survexfile for this import: {fn}")
fileroot = SurvexFile(path=fn, cave=cave) fileroot = SurvexFile(path=fn, cave=cave)
fileroot.survexdirectory = SurvexDirectory.objects.get(id=1) # default try:
fileroot.survexdirectory = SurvexDirectory.objects.get(id=1) # default
except:
fileroot.survexdirectory = None
if cave: if cave:
# But setting the SurvexDirectory does work ! # But setting the SurvexDirectory does work !