mirror of
https://expo.survex.com/repositories/troggle/.git
synced 2026-02-08 11:28:23 +00:00
refactoring
This commit is contained in:
@@ -14,10 +14,6 @@ for tunnel and therion files
|
||||
todo = """
|
||||
- Rename functions more consistently between tunnel and therion variants
|
||||
|
||||
- Refactor to use pathlib instead of whacky resetting of loop variable inside loop
|
||||
to scan sub-folders. This will definitely break at some point..
|
||||
|
||||
- Recode rx_valid_ext to use pathlib suffix() function
|
||||
|
||||
- implement: findimportinsert(therionfile, imp)
|
||||
Tries to link the scrap (Therion format) to the referenced therion scrap
|
||||
@@ -115,17 +111,30 @@ def parse_tnl_file(dwgfile, path):
|
||||
This is used to tie drawings to the wallet, and thus the original survey data. Tunnel files
|
||||
contain a centreline which is an embedded survex file.
|
||||
"""
|
||||
wallet, scansfile = None, None
|
||||
if mscansdir := rx_wallet.search(path): # walrus
|
||||
# print(f"{path} -- {mscansdir.group(1)=} -- {mscansdir.group(2)=}")
|
||||
# Delegate to the unified reference processor for consistent behaviour
|
||||
_process_reference(dwgfile, path, parser_label="Tunnel")
|
||||
|
||||
|
||||
def _process_reference(dwgfile, path, parser_label="Tunnel"):
|
||||
"""Unified processor to link drawing files to wallets/scans or referenced drawings.
|
||||
|
||||
- If `path` matches a wallet pattern (rx_wallet), link the wallet and try to find the scan file in the wallet.
|
||||
- If `path` looks like an image, do nothing (images are not treated as references here).
|
||||
- Otherwise, treat `path` as a possible reference to another drawing (by name) and link via `dwgcontains`.
|
||||
"""
|
||||
|
||||
wallet, scansfile = None, None
|
||||
if not path:
|
||||
return None, None
|
||||
|
||||
if mscansdir := rx_wallet.search(path):
|
||||
scanswalletl = Wallet.objects.filter(walletname=mscansdir.group(1))
|
||||
# This should be changed to properly detect if a list of folders is returned and do something sensible, not just pick the first. e.g. use the __in Django idiom
|
||||
if len(scanswalletl):
|
||||
wallet = scanswalletl[0]
|
||||
if len(scanswalletl) > 1:
|
||||
message = f"! More than one scan FOLDER matches filter query. [{scanswalletl[0]}]: {mscansdir.group(1)} {mscansdir.group(2)} {dwgfile.dwgpath} {path}"
|
||||
print(message)
|
||||
DataIssue.objects.create(parser="Tunnel", message=message)
|
||||
DataIssue.objects.create(parser=parser_label, message=message)
|
||||
|
||||
if wallet:
|
||||
scansfilel = wallet.singlescan_set.filter(name=mscansdir.group(2))
|
||||
@@ -134,31 +143,57 @@ def parse_tnl_file(dwgfile, path):
|
||||
plist = [sf.ffile for sf in scansfilel]
|
||||
message = f"! More than one image FILENAME matches filter query. [{scansfilel[0]}]: {mscansdir.group(1)} {mscansdir.group(2)} {dwgfile.dwgpath} {path} {plist}"
|
||||
print(message)
|
||||
DataIssue.objects.create(parser="Tunnel", message=message)
|
||||
DataIssue.objects.create(parser=parser_label, message=message)
|
||||
scansfile = scansfilel[0]
|
||||
|
||||
if wallet:
|
||||
dwgfile.dwgwallets.add(wallet)
|
||||
if scansfile:
|
||||
dwgfile.scans.add(scansfile)
|
||||
return wallet, scansfile
|
||||
|
||||
elif path:
|
||||
suffix = Path(path).suffix.lower()
|
||||
if suffix in IMAGE_EXTS:
|
||||
# It's an image/scanned file type; we don't treat it as a referenced drawing
|
||||
return
|
||||
# Not an image file: perhaps a reference to another drawing (no ext or other ext)
|
||||
name = Path(path).name
|
||||
rdwgfilel = DrawingFile.objects.filter(dwgname=name) # Check if it is another drawing file we have already seen
|
||||
if len(rdwgfilel):
|
||||
if len(rdwgfilel) > 1:
|
||||
plist = []
|
||||
for df in rdwgfilel:
|
||||
plist.append(df.dwgpath)
|
||||
message = f"- Warning {len(rdwgfilel)} files named '{name}' {plist}" # should not be a problem?
|
||||
print(message)
|
||||
DataIssue.objects.create(parser="Tunnel", message=message, url=f"/dwgdataraw/{path}")
|
||||
rdwgfile = rdwgfilel[0]
|
||||
# Not a wallet reference; check image extension and possibly drawing-to-drawing reference
|
||||
suffix = Path(path).suffix.lower()
|
||||
if suffix in IMAGE_EXTS:
|
||||
# It's an image/scanned file type; we don't treat it as a referenced drawing
|
||||
return
|
||||
|
||||
# Not an image file: perhaps a reference to another drawing (no ext or other ext)
|
||||
name = Path(path).name
|
||||
rdwgfilel = DrawingFile.objects.filter(dwgname=name) # Check if it is another drawing file we have already seen
|
||||
if len(rdwgfilel):
|
||||
if len(rdwgfilel) > 1:
|
||||
plist = [df.dwgpath for df in rdwgfilel]
|
||||
message = f"- Warning {len(rdwgfilel)} files named '{name}' {plist}"
|
||||
print(message)
|
||||
DataIssue.objects.create(parser=parser_label, message=message, url=f"/dwgdataraw/{path}")
|
||||
rdwgfile = rdwgfilel[0]
|
||||
if hasattr(dwgfile, 'dwgcontains'):
|
||||
dwgfile.dwgcontains.add(rdwgfile)
|
||||
|
||||
dwgfile.save()
|
||||
return None, None
|
||||
|
||||
|
||||
# Not a wallet reference; check image extension and possibly drawing-to-drawing reference
|
||||
suffix = Path(path).suffix.lower()
|
||||
if suffix in IMAGE_EXTS:
|
||||
# It's an image/scanned file type; we don't treat it as a referenced drawing
|
||||
return
|
||||
|
||||
# Not an image file: perhaps a reference to another drawing (no ext or other ext)
|
||||
name = Path(path).name
|
||||
rdwgfilel = DrawingFile.objects.filter(dwgname=name) # Check if it is another drawing file we have already seen
|
||||
if len(rdwgfilel):
|
||||
if len(rdwgfilel) > 1:
|
||||
plist = []
|
||||
for df in rdwgfilel:
|
||||
plist.append(df.dwgpath)
|
||||
message = f"- Warning {len(rdwgfilel)} files named '{name}' {plist}" # should not be a problem?
|
||||
print(message)
|
||||
DataIssue.objects.create(parser="Tunnel", message=message, url=f"/dwgdataraw/{path}")
|
||||
rdwgfile = rdwgfilel[0]
|
||||
if hasattr(dwgfile, 'dwgcontains'):
|
||||
dwgfile.dwgcontains.add(rdwgfile)
|
||||
|
||||
dwgfile.save()
|
||||
@@ -166,38 +201,16 @@ def parse_tnl_file(dwgfile, path):
|
||||
|
||||
def findwalletimage(therionfile, foundpath):
|
||||
"""Tries to link the drawing file (Therion format) to the referenced image (scan) file"""
|
||||
wallet, scansfile = None, None
|
||||
# Delegate to the unified reference processor for consistent behaviour
|
||||
foundpath = foundpath.strip("{}")
|
||||
mscansdir = rx_wallet.search(foundpath)
|
||||
if mscansdir:
|
||||
scanswalletl = Wallet.objects.filter(walletname=mscansdir.group(1))
|
||||
# This should be changed to properly detect if a list of folders is returned and do something sensible, not just pick the first. Use the __in idom
|
||||
if len(scanswalletl):
|
||||
wallet = scanswalletl[0]
|
||||
if len(scanswalletl) > 1:
|
||||
message = f"! More than one scan FOLDER matches filter query. [{therionfile}]: {mscansdir.group(1)} {foundpath}"
|
||||
print(message)
|
||||
DataIssue.objects.create(parser="Therion", message=message)
|
||||
if wallet:
|
||||
therionfile.dwgwallets.add(wallet)
|
||||
wallet, scansfile = _process_reference(therionfile, foundpath, parser_label="Therion")
|
||||
|
||||
scanfilename = Path(foundpath).name
|
||||
scansfilel = wallet.singlescan_set.filter(name=scanfilename, wallet=wallet)
|
||||
if len(scansfilel):
|
||||
# message = f'! {len(scansfilel)} {scansfilel} = {scanfilename} found in the wallet specified {wallet.walletname}'
|
||||
# print(message)
|
||||
if len(scansfilel) > 1:
|
||||
plist = [sf.ffile for sf in scansfilel]
|
||||
message = f"! More than one image FILENAME matches filter query. [{scansfilel[0]}]: {mscansdir.group(1)} {foundpath} {plist}"
|
||||
print(message)
|
||||
DataIssue.objects.create(parser="Therion", message=message)
|
||||
scansfile = scansfilel[0]
|
||||
therionfile.scans.add(scansfile)
|
||||
else:
|
||||
message = f'! In {wallet.walletname} scanned file is not actually found {scanfilename} mentioned in "{therionfile.dwgpath}"'
|
||||
wurl = f"/survey_scans/{wallet.walletname}/".replace("#", ":")
|
||||
# print(message)
|
||||
DataIssue.objects.create(parser="Therion", message=message, url=wurl)
|
||||
# If a wallet was found but no scan was associated from the wallet, record a DataIssue
|
||||
if wallet and not scansfile:
|
||||
scanfilename = Path(foundpath).name
|
||||
message = f'! In {wallet.walletname} scanned file is not actually found {scanfilename} mentioned in "{therionfile.dwgpath}"'
|
||||
wurl = f"/survey_scans/{wallet.walletname}/".replace("#", ":")
|
||||
DataIssue.objects.create(parser="Therion", message=message, url=wurl)
|
||||
|
||||
|
||||
def findimportinsert(therionfile, imp):
|
||||
|
||||
Reference in New Issue
Block a user