simple rename survexscansfolder to scansfolder

This commit is contained in:
Philip Sargent
2020-06-23 23:46:33 +01:00
parent b64c779a58
commit 9cd70b31ac
10 changed files with 41 additions and 41 deletions

View File

@@ -52,10 +52,10 @@ def GetListDir(sdir):
return res
def LoadListScansFile(survexscansfolder):
def LoadListScansFile(scansfolder):
gld = [ ]
# flatten out any directories in these wallet folders - should not be any
for (fyf, ffyf, fisdiryf) in GetListDir(survexscansfolder.fpath):
for (fyf, ffyf, fisdiryf) in GetListDir(scansfolder.fpath):
if fisdiryf:
gld.extend(GetListDir(ffyf))
else:
@@ -65,7 +65,7 @@ def LoadListScansFile(survexscansfolder):
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, survexscansfolder=survexscansfolder)
survexscansingle = SurvexScanSingle(ffile=ffyf, name=fyf, scansfolder=scansfolder)
survexscansingle.save()
c+=1
if c>=10:
@@ -103,15 +103,15 @@ def LoadListScans():
for fy, ffy, fisdiry in GetListDir(ff):
if fisdiry:
assert fisdiry, ffy
survexscansfolder = ScansFolder(fpath=ffy, walletname=fy)
survexscansfolder.save()
LoadListScansFile(survexscansfolder)
scansfolder = ScansFolder(fpath=ffy, walletname=fy)
scansfolder.save()
LoadListScansFile(scansfolder)
# do the
elif f != "thumbs":
survexscansfolder = ScansFolder(fpath=ff, walletname=f)
survexscansfolder.save()
LoadListScansFile(survexscansfolder)
scansfolder = ScansFolder(fpath=ff, walletname=f)
scansfolder.save()
LoadListScansFile(scansfolder)
def FindTunnelScan(tunnelfile, path):