From 20f11241fcd92e45db393c7c5128b320a0a5abb6 Mon Sep 17 00:00:00 2001
From: singlethink <matt-github@singlethink.net>
Date: Sun, 27 Oct 2024 10:47:22 -0700
Subject: [PATCH] Fix tone scraping (#47)

* Add Methow Valley Amateur Radio Club repeaters

* Add WA7SAR repeaters

Trustee confirmed that there is no associated website.

* Allow other tags to preceed uplink tone

Currently, the regex assumes that the uplink tone is the only thing in
the cell. My recent queries include comments and <span> tags in the
uplink tone cell preventing recognition of the tone.  Example:

    <tr>
      <td class="gray" nowrap>Uplink Tone:</td>
      <td>
          <!-- Display the value and the pencil on the same line -->
          <span style="display: inline;">
              131.8      </span>

            </td>
    </tr>

---------

Co-authored-by: Matthew Van Gundy <matt@singlethink.net>
Co-authored-by: Quentin CAUDRON <quentincaudron@gmail.com>
---
 assets/programming_files/all_rr_frequencies.csv | 1 -
 scripts/update.py                               | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/assets/programming_files/all_rr_frequencies.csv b/assets/programming_files/all_rr_frequencies.csv
index 9e34bd3..e585965 100644
--- a/assets/programming_files/all_rr_frequencies.csv
+++ b/assets/programming_files/all_rr_frequencies.csv
@@ -126,4 +126,3 @@
 125,WA7SAR,444.600,+5.0,123.0,476,Yakima,FM,Yakima County Radio Amateurs,46.52220154,-120.33300018,+,5.0
 126,WA7SAR,145.170,-0.6,123.0,,Quartz Mtn.,FM,Yakima County Radio Amateurs,47.073125,-121.07869,-,0.6
 127,WA7SAR,147.080,+0.6,85.4,,Yakima,FM,Yakima County Radio Amateurs,46.6414,-120.3967,+,0.6
-
diff --git a/scripts/update.py b/scripts/update.py
index b653eaa..2b59e3d 100644
--- a/scripts/update.py
+++ b/scripts/update.py
@@ -112,8 +112,8 @@ def repeater_from_repeaterbook(id_code: str) -> dict:
     source = requests.get(url)
 
     # Extract various pieces of information
-    start = r"\:\<\/td\>\s+\<td\>\s*"
-    end = r"\s*\<\/td\>"
+    start = r"\:\<\/td\>\s+\<td\>(?:\s*(?:\<!--.*?--\>|\<span[^\>]*\>))*\s*"
+    end = r"(?:\s*\</span\>)*\s*\<\/td\>"
 
     call = re.search(r"callResult.php\?call=(\w{4,6})", source.text).group(1)