From afd93d5318bdd0fa0767f3ff123ef6dd670b118b 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/5] 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 1fc93743044c8bd520e4e0e2bddaee474913ef14 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/5] 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 9b08487c54ca94e227123835577e19f0f5f2e5a5 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/5] 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" From 5563fd25a860f818cf3d92b00c87a201eaa45fc5 Mon Sep 17 00:00:00 2001 From: Jeff Kala Date: Fri, 14 Aug 2026 08:54:38 -0600 Subject: [PATCH 4/5] revert ref --- .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 1bef5bed..aac03fc6 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: "ab_oui_updates" + ref: "develop" fetch-depth: 0 - name: "Authenticate git remote" From 2e70ba915834ae9770367f0bb9a551bb89a20887 Mon Sep 17 00:00:00 2001 From: Jeff Kala Date: Fri, 14 Aug 2026 08:58:35 -0600 Subject: [PATCH 5/5] add changefragment --- changes/+oui-regex.housekeeping | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/+oui-regex.housekeeping diff --git a/changes/+oui-regex.housekeeping b/changes/+oui-regex.housekeeping new file mode 100644 index 00000000..b707a49c --- /dev/null +++ b/changes/+oui-regex.housekeeping @@ -0,0 +1 @@ +Update the regex for OUI data file gathering.