From 6122ff9cc05fdd2bf54550ab548823ed450c496b Mon Sep 17 00:00:00 2001
From: John Truckenbrodt <john.truckenbrodt@posteo.de>
Date: Tue, 17 Sep 2024 15:33:27 +0200
Subject: [PATCH] [DEMHandler] apply file lock to VRTs

---
 pyroSAR/auxdata.py | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/pyroSAR/auxdata.py b/pyroSAR/auxdata.py
index 422f3426..e2c28801 100644
--- a/pyroSAR/auxdata.py
+++ b/pyroSAR/auxdata.py
@@ -478,7 +478,7 @@ def __find_first(self, dem_type, product):
     @staticmethod
     def __buildvrt(tiles, vrtfile, pattern, vsi, extent, src_nodata=None,
                    dst_nodata=None, hide_nodata=False, resolution=None,
-                   tap=True, dst_datatype=None):
+                   tap=True, dst_datatype=None, lock_timeout=600):
         """
         Build a VRT mosaic from DEM tiles. The VRT is cropped to the specified `extent` but the pixel grid
         of the source files is preserved and no resampling/shifting is applied.
@@ -510,6 +510,8 @@ def __buildvrt(tiles, vrtfile, pattern, vsi, extent, src_nodata=None,
         dst_datatype: int or str or None
             the VRT data type as supported by :class:`spatialist.raster.Dtype`.
             Default None: use the same data type as the source files.
+        lock_timeout: int
+            how long to wait to acquire a lock on `vrtfile`?
         
         Returns
         -------
@@ -534,14 +536,16 @@ def __buildvrt(tiles, vrtfile, pattern, vsi, extent, src_nodata=None,
             opts['VRTNodata'] = dst_nodata
         opts['outputBounds'] = (extent['xmin'], extent['ymin'],
                                 extent['xmax'], extent['ymax'])
-        gdalbuildvrt(src=locals, dst=vrtfile, **opts)
-        if dst_datatype is not None:
-            datatype = Dtype(dst_datatype).gdalstr
-            tree = etree.parse(source=vrtfile)
-            band = tree.find(path='VRTRasterBand')
-            band.attrib['dataType'] = datatype
-            tree.write(file=vrtfile, pretty_print=True,
-                       xml_declaration=False, encoding='utf-8')
+        with Lock(vrtfile, timeout=lock_timeout):
+            if not os.path.isfile(vrtfile):
+                gdalbuildvrt(src=locals, dst=vrtfile, **opts)
+                if dst_datatype is not None:
+                    datatype = Dtype(dst_datatype).gdalstr
+                    tree = etree.parse(source=vrtfile)
+                    band = tree.find(path='VRTRasterBand')
+                    band.attrib['dataType'] = datatype
+                    tree.write(file=vrtfile, pretty_print=True,
+                               xml_declaration=False, encoding='utf-8')
     
     def __commonextent(self, buffer=None):
         """
@@ -1057,7 +1061,7 @@ def load(self, dem_type, vrt=None, buffer=None, username=None,
             bounding box of the geometries is expanded so that the coordinates are
             multiples of the tile size of the respective DEM option.
         lock_timeout: int
-            how long to wait to acquire a lock on downloaded files?
+            how long to wait to acquire a lock on the downloaded files and `vrt`?
         
         Returns
         -------
@@ -1153,7 +1157,8 @@ def load(self, dem_type, vrt=None, buffer=None, username=None,
                             src_nodata=src_nodata, dst_nodata=dst_nodata,
                             hide_nodata=True,
                             resolution=resolution,
-                            tap=tap, dst_datatype=datatype)
+                            tap=tap, dst_datatype=datatype,
+                            lock_timeout=lock_timeout)
         else:
             return locals