diff options
| author | Rad <radost.waszkiewicz@gmail.com> | 2019-02-25 21:02:30 +0000 |
|---|---|---|
| committer | Rad <radost.waszkiewicz@gmail.com> | 2019-02-25 21:02:30 +0000 |
| commit | 6e238537595124d123b3e11ea883677a16010597 (patch) | |
| tree | 354e496a58a19ac4fefb49c7012ae85b5404de99 /parsers/surveys.py | |
| parent | becfaa15044a4a8a615f8d351471f2b832008e5e (diff) | |
| parent | 77a6015ad641b3824c6943a0d6d52f6aded7e0a5 (diff) | |
| download | troggle-6e238537595124d123b3e11ea883677a16010597.tar.gz troggle-6e238537595124d123b3e11ea883677a16010597.tar.bz2 troggle-6e238537595124d123b3e11ea883677a16010597.zip | |
merge
Diffstat (limited to 'parsers/surveys.py')
| -rw-r--r-- | parsers/surveys.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/parsers/surveys.py b/parsers/surveys.py index 777e04f..72a05f3 100644 --- a/parsers/surveys.py +++ b/parsers/surveys.py @@ -235,7 +235,7 @@ def LoadListScans(): def FindTunnelScan(tunnelfile, path): scansfolder, scansfile = None, None - mscansdir = re.search(r"(\d\d\d\d#\d+\w?|1995-96kh|92-94Surveybookkh|1991surveybook|smkhs)/(.*?(?:png|jpg))$", path) + mscansdir = re.search(r"(\d\d\d\d#X?\d+\w?|1995-96kh|92-94Surveybookkh|1991surveybook|smkhs)/(.*?(?:png|jpg))$", path) if mscansdir: scansfolderl = SurvexScansFolder.objects.filter(walletname=mscansdir.group(1)) if len(scansfolderl): @@ -244,6 +244,7 @@ def FindTunnelScan(tunnelfile, path): if scansfolder: scansfilel = scansfolder.survexscansingle_set.filter(name=mscansdir.group(2)) if len(scansfilel): + print(scansfilel, len(scansfilel)) assert len(scansfilel) == 1 scansfile = scansfilel[0] @@ -252,7 +253,7 @@ def FindTunnelScan(tunnelfile, path): if scansfile: tunnelfile.survexscans.add(scansfile) - elif path and not re.search(r"\.(?:png|jpg)$(?i)", path): + elif path and not re.search(r"\.(?:png|jpg|jpeg)$(?i)", path): name = os.path.split(path)[1] print("ttt", tunnelfile.tunnelpath, path, name) rtunnelfilel = TunnelFile.objects.filter(tunnelname=name) |