os-normalizer 0.3.3__py3-none-any.whl → 0.4.0__py3-none-any.whl

os_normalizer/parsers/windows.py

@@ -26,6 +26,7 @@ WIN_SP_RE = re.compile(r"\bSP\s?([0-9]+)\b", re.IGNORECASE)
 WIN_BUILD_RE = re.compile(r"\bbuild\s?(\d{4,6})\b", re.IGNORECASE)
 WIN_NT_RE = re.compile(r"\bnt\s?(\d+)\.(\d+)\b", re.IGNORECASE)
 WIN_FULL_NT_BUILD_RE = re.compile(r"\b(10)\.(0)\.(\d+)(?:\.(\d+))?\b")
+WIN_GENERIC_VERSION_RE = re.compile(r"\b(\d+)\.(\d+)\.(\d{3,6})(?:\.(\d+))?\b")
 WIN_CHANNEL_RE = re.compile(
     r"\b(24H2|23H2|22H2|21H2|21H1|20H2|2004|1909|1903|1809|1803|1709|1703|1607|1511|1507)\b",
     re.IGNORECASE,
@@ -63,6 +64,9 @@ def parse_windows(text: str, data: dict[str, Any], p: OSData) -> OSData:
 
 
 def _detect_product_from_text(t: str) -> str:
+    # Normalize common typos before matching
+    t = t.replace("windws", "windows")
+
     if "windows 11" in t or "win11" in t:
         return "Windows 11"
     if "windows 10" in t or "win10" in t:
@@ -79,23 +83,23 @@ def _detect_product_from_text(t: str) -> str:
         return "Windows 98"
 
     # Server explicit names
-    if "windows server 2012 r2" in t:
+    if "windows server 2012 r2" in t or "windows 2012 r2" in t or "win2k12r2" in t or "win2012r2" in t:
         return "Windows Server 2012 R2"
-    if "windows server 2022" in t or "win2k22" in t or "win2022" in t:
+    if "windows server 2022" in t or "windows 2022" in t or "win2k22" in t or "win2022" in t:
         return "Windows Server 2022"
-    if "windows server 2019" in t or "win2k19" in t or "win2019" in t:
+    if "windows server 2019" in t or "windows 2019" in t or "win2k19" in t or "win2019" in t:
         return "Windows Server 2019"
-    if "windows server 2016" in t or "win2k16" in t or "win2016" in t:
+    if "windows server 2016" in t or "windows 2016" in t or "win2k16" in t or "win2016" in t:
         return "Windows Server 2016"
-    if "windows server 2012" in t or "win2k12" in t or "win2012" in t:
+    if "windows server 2012" in t or "windows 2012" in t or "win2k12" in t or "win2012" in t:
         return "Windows Server 2012"
-    if "windows server 2008 r2" in t:
+    if "windows server 2008 r2" in t or "windows 2008 r2" in t or "win2k8r2" in t or "win2008r2" in t:
         return "Windows Server 2008 R2"
-    if "windows server 2008" in t or "win2k8" in t or "win2008" in t:
+    if "windows server 2008" in t or "windows 2008" in t or "win2k8" in t or "win2008" in t:
         return "Windows Server 2008"
-    if "windows server 2003" in t or "win2k3" in t or "win2003" in t:
+    if "windows server 2003" in t or "windows 2003" in t or "win2k3" in t or "win2003" in t:
         return "Windows Server 2003"
-    if "windows server 2000" in t or "win2k" in t or "win2000" in t:
+    if "windows server 2000" in t or "windows 2000" in t or "win2k" in t or "win2000" in t:
         return "Windows Server 2000"
 
     if "windows" in t:
@@ -214,6 +218,14 @@ def _apply_full_kernel_and_channel(text: str, p: OSData) -> None:
     if ch and not p.channel:
         p.channel = ch.group(1).upper()
 
+    if not p.kernel_version:
+        m2 = WIN_GENERIC_VERSION_RE.search(text)
+        if m2:
+            major, minor, build, suffix = m2.groups()
+            p.kernel_version = f"{major}.{minor}.{build}{('.' + suffix) if suffix else ''}"
+            p.version_build = p.version_build or build
+            p.evidence.setdefault("nt_version", f"{major}.{minor}")
+
 
 def _finalize_precision_and_version(p: OSData) -> None:
     if p.version_build:

{os_normalizer-0.3.3.dist-info → os_normalizer-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: os-normalizer
-Version: 0.3.3
+Version: 0.4.0
 Summary: Normalize raw OS strings/metadata into structured data (family, product, version, arch).
 Project-URL: Homepage, https://github.com/johnscillieri/os-normalizer
 Project-URL: Repository, https://github.com/johnscillieri/os-normalizer

{os_normalizer-0.3.3.dist-info → os_normalizer-0.4.0.dist-info}/RECORD

@@ -9,14 +9,14 @@ os_normalizer/parsers/bsd.py,sha256=Umm7RSXjQfv6pfziJ8BYlmOc80VlLRueTrYw1iR-UjY,
 os_normalizer/parsers/linux.py,sha256=kSIYZ_hRJxJieV21u8TRcWfAjYOIXlCLBSwyINkuyA4,3867
 os_normalizer/parsers/macos.py,sha256=fU1YyiijzBdDAxUBSL2EQLhUu3JbOSx-N_KYvOg0XsI,3627
 os_normalizer/parsers/mobile.py,sha256=Ca864JhrO9zW5fs0zbs2VcMypKIkFHqZtxpJDbi12q0,1033
-os_normalizer/parsers/windows.py,sha256=RQ_DJ3OjG70g_vwIaX9UrH2ADKzTEzF-R4ID2YSlAS0,7972
+os_normalizer/parsers/windows.py,sha256=2nIRMz98f2MBMKSjhVPU4nNwTlsvKBVxyacDTV4Nj10,8792
 os_normalizer/parsers/network/__init__.py,sha256=TvRz08lNDZbr6yG8O3M7cLNu0hWAbtE1y7_9SwhP4g4,1596
 os_normalizer/parsers/network/cisco.py,sha256=ivhw85IHnHVT4sW-65F-ZGCR7yvu0mMMBfXRT4EzUfc,3203
 os_normalizer/parsers/network/fortinet.py,sha256=i6PVRxzO_onaCvo3_eI4csXFwGp4ZpQY0d1y2-Wodn0,1783
 os_normalizer/parsers/network/huawei.py,sha256=Su3eCRlmOCmpOPA_TGeH8gHY3-ZdXKFW4O3_W0SOPmk,1158
 os_normalizer/parsers/network/juniper.py,sha256=gskbaY4-LYWauM9yrvGMuCxPrNBKmUfIRPd1zsUUY7w,1275
 os_normalizer/parsers/network/netgear.py,sha256=idVD7VTxb07LdhFPwb-sT3586ARoBrd1OmWpADAZUVc,1190
-os_normalizer-0.3.3.dist-info/METADATA,sha256=aUqJk1GKj_dHxjHRbR4C79UTNi5zc_HjnRqfzK-fVkc,6421
-os_normalizer-0.3.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-os_normalizer-0.3.3.dist-info/licenses/LICENSE,sha256=DN0enoiHxVkJ-hxmIchPaCQWrDsZwva5LY8XvG3UK8w,1083
-os_normalizer-0.3.3.dist-info/RECORD,,
+os_normalizer-0.4.0.dist-info/METADATA,sha256=-HlNH57xDmctT1Ul8K4wB5598EC0-1GaJgv-h3zSuAo,6421
+os_normalizer-0.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+os_normalizer-0.4.0.dist-info/licenses/LICENSE,sha256=DN0enoiHxVkJ-hxmIchPaCQWrDsZwva5LY8XvG3UK8w,1083
+os_normalizer-0.4.0.dist-info/RECORD,,