Merge pull request #152 from KaartGroup/variable_lines

Handle variable numbers of lines in Overpass status page

Author: mvexel

overpass/api.py

@@ -148,9 +148,13 @@ def _api_status() -> dict:
 
         available_re = re.compile(r'\d(?= slots? available)')
         available_slots = int(
-            available_re.search(lines[3]).group()
-            if available_re.search(lines[3])
-            else 0
+            next(
+                (
+                    available_re.search(line).group()
+                    for line in lines 
+                    if available_re.search(line)
+                ), 0
+            )
         )
 
         waiting_re = re.compile(r'(?<=Slot available after: )[\d\-TZ:]{20}')

tests/overpass_status/no_slots_waiting_six_lines.txt

@@ -0,0 +1,6 @@
+Connected as: 0123456789
+Current time: 2022-06-15T22:13:27Z
+Announced endpoint: lz4.overpass-api.de/api/
+Rate limit: 2
+2 slots available now.
+Currently running queries (pid, space limit, time limit, start time):

tests/test_api.py

@@ -89,6 +89,12 @@ def test_geojson_live():
 @pytest.mark.parametrize(
     "response,slots_available,slots_running,slots_waiting",
     [
+        (
+            "tests/overpass_status/no_slots_waiting_six_lines.txt",
+            2,
+            (),
+            ()
+        ),
         (
             "tests/overpass_status/no_slots_waiting.txt",
             2,