From 98235ebddd16df0294f113c544fa4daa079ffcdd Mon Sep 17 00:00:00 2001 From: Adam Byczkowski <38091261+qduk@users.noreply.github.com> Date: Thu, 29 Jan 2026 14:33:26 -0600 Subject: [PATCH 1/3] Updated OUI parsing regex string --- flat_postprocess/oui_postprocess.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flat_postprocess/oui_postprocess.py b/flat_postprocess/oui_postprocess.py index 19a905af..8c913514 100644 --- a/flat_postprocess/oui_postprocess.py +++ b/flat_postprocess/oui_postprocess.py @@ -4,7 +4,7 @@ import subprocess import sys -HEX_RE = r"^(?P[0-9A-Fa-f]{6})\s*\(base 16\)\s+(?P.+?)\s*$" +HEX_RE = r"^MA-L,(?P[0-9A-Fa-f]{6}),\"(?P[^\"]+)\",.*$" OUI_MAPPINGS = {} URL = "https://standards-oui.ieee.org/oui/oui.txt" @@ -36,6 +36,7 @@ def download_csv_text(url: str = URL) -> str: with open(output_path, "r", encoding="utf-8", newline="") as oui_file: for line in oui_file: if re.search(HEX_RE, line): + print() group_regex_values = re.search(HEX_RE, line).groupdict() if group_regex_values.get("hex") and group_regex_values.get("company"): OUI_MAPPINGS.update({group_regex_values.get("hex").lower(): group_regex_values.get("company")}) From 2b2396b2c101b61dff58d7f5ff6b3c1ea800c39f Mon Sep 17 00:00:00 2001 From: Adam Byczkowski <38091261+qduk@users.noreply.github.com> Date: Thu, 29 Jan 2026 14:34:17 -0600 Subject: [PATCH 2/3] Removed print() --- flat_postprocess/oui_postprocess.py | 1 - 1 file changed, 1 deletion(-) diff --git a/flat_postprocess/oui_postprocess.py b/flat_postprocess/oui_postprocess.py index 8c913514..1ba6fd25 100644 --- a/flat_postprocess/oui_postprocess.py +++ b/flat_postprocess/oui_postprocess.py @@ -36,7 +36,6 @@ def download_csv_text(url: str = URL) -> str: with open(output_path, "r", encoding="utf-8", newline="") as oui_file: for line in oui_file: if re.search(HEX_RE, line): - print() group_regex_values = re.search(HEX_RE, line).groupdict() if group_regex_values.get("hex") and group_regex_values.get("company"): OUI_MAPPINGS.update({group_regex_values.get("hex").lower(): group_regex_values.get("company")}) From b507a88cbef7d76bb1f7e7271c6f8c4a8c79747f Mon Sep 17 00:00:00 2001 From: Adam Byczkowski <38091261+qduk@users.noreply.github.com> Date: Thu, 29 Jan 2026 15:06:33 -0600 Subject: [PATCH 3/3] Updated ref branch in CI for testing --- .github/workflows/oui_filepull.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/oui_filepull.yml b/.github/workflows/oui_filepull.yml index aac03fc6..1bef5bed 100644 --- a/.github/workflows/oui_filepull.yml +++ b/.github/workflows/oui_filepull.yml @@ -15,7 +15,7 @@ jobs: - name: "Check out code" uses: "actions/checkout@v4" with: - ref: "develop" + ref: "ab_oui_updates" fetch-depth: 0 - name: "Authenticate git remote"