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

Simple renaming too-similar variables

Browse Source
This commit is contained in:
Philip Sargent
2020-06-24 00:18:01 +01:00
parent 9cd70b31ac
commit c91aa4be47
10 changed files with 36 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
parsers/surveys.py
View File

@@ -14,7 +14,7 @@ from functools import reduce
import settings
#from troggle.core.models import *
#from troggle.core.models_caves import *
from troggle.core.models_survex import SurvexScanSingle, ScansFolder, TunnelFile
from troggle.core.models_survex import SingleScan, ScansFolder, TunnelFile
def get_or_create_placeholder(year):
""" All surveys must be related to a logbookentry. We don't have a way to
@@ -65,8 +65,8 @@ def LoadListScansFile(scansfolder):
for (fyf, ffyf, fisdiryf) in gld:
#assert not fisdiryf, ffyf
if re.search(r"\.(?:png|jpg|jpeg|pdf|svg|gif)(?i)$", fyf):
survexscansingle = SurvexScanSingle(ffile=ffyf, name=fyf, scansfolder=scansfolder)
survexscansingle.save()
singlescan = SingleScan(ffile=ffyf, name=fyf, scansfolder=scansfolder)
singlescan.save()
c+=1
if c>=10:
print(".", end='')
@@ -79,7 +79,7 @@ def LoadListScans():
print(' - Loading Survey Scans')
SurvexScanSingle.objects.all().delete()
SingleScan.objects.all().delete()
ScansFolder.objects.all().delete()
print(' - deleting all scansFolder and scansSingle objects')
@@ -123,7 +123,7 @@ def FindTunnelScan(tunnelfile, path):
assert len(scansfolderl) == 1
scansfolder = scansfolderl[0]
if scansfolder:
scansfilel = scansfolder.survexscansingle_set.filter(name=mscansdir.group(2))
scansfilel = scansfolder.singlescan_set.filter(name=mscansdir.group(2))
if len(scansfilel):
if len(scansfilel) > 1:
print("BORK more than one image filename matches filter query. ", scansfilel[0])