atomicshop 3.1.7__py3-none-any.whl → 3.1.9__py3-none-any.whl

atomicshop/__init__.py

@@ -1,4 +1,4 @@
 """Atomic Basic functions and classes to make developer life easier"""
 
 __author__ = "Den Kras"
-__version__ = '3.1.7'
+__version__ = '3.1.9'

atomicshop/dns.py

@@ -1,3 +1,4 @@
+import socket
 import argparse
 
 # noinspection PyPackageRequirements
@@ -6,7 +7,7 @@ import dns.resolver
 from . import print_api
 from .permissions import permissions
 from .wrappers.pywin32w.wmis import win32networkadapter
-from .wrappers.winregw import winreg_network
+from .wrappers import netshw
 
 
 # Defining Dictionary of Numeric to String DNS Query Types.
@@ -73,7 +74,16 @@ def get_default_dns_gateway() -> tuple[bool, list[str]]:
     :return: tuple(is dynamic boolean, list of DNS server IPv4s).
     """
 
-    is_dynamic, dns_servers = winreg_network.get_default_dns_gateway()
+    interfaces_with_dns_settings: list[dict] = netshw.get_netsh_ipv4()
+
+    default_interface_ipv4 = socket.gethostbyname(socket.gethostname())
+    is_dynamic, dns_servers = None, None
+    for interface in interfaces_with_dns_settings:
+        if default_interface_ipv4 in interface['ip_addresses']:
+            is_dynamic = interface['dns_mode']
+            dns_servers = interface['dns_servers']
+            break
+
     return is_dynamic, dns_servers
 
 

atomicshop/networks.py

@@ -273,6 +273,9 @@ def generate_unused_ipv4_addresses_from_ip(
     if not skip_ips:
         skip_ips = []
 
+    # Remove duplicate IPs from the skip_ips list, loses order.
+    skip_ips = list(set(skip_ips))
+
     # Add the IP address to the list of IPs to skip.
     if ip_address not in skip_ips:
         skip_ips = [ip_address] + skip_ips
@@ -356,6 +359,9 @@ def add_virtual_ips_to_default_adapter_by_current_setting(
     will be generated from it. Unused addresses decided by pinging them.
     Same for the subnet mask.
 
+    While generating the IPs, the function will skip the already existing IPs in the adapter, like default gateway
+    and DNS servers.
+
     :param number_of_ips: int, number of IPs to generate in addition to the IPv4s that already exist in the adapter.
         Or you add the IPs and masks to the adapter with the parameters virtual_ipv4s_to_add and virtual_ipv4_masks_to_add.
 
@@ -409,7 +415,7 @@ def add_virtual_ips_to_default_adapter_by_current_setting(
             ip_address=current_ipv4s[0],
             mask=current_ipv4_masks[0],
             number_of_ips=number_of_ips,
-            skip_ips=current_ipv4s
+            skip_ips=current_ipv4s + default_adapter_info['default_gateways'] + default_adapter_info['dns_gateways']
         )
     elif virtual_ipv4s_to_add and virtual_ipv4_masks_to_add:
         ips_to_assign = virtual_ipv4s_to_add

atomicshop/wrappers/netshw.py

@@ -0,0 +1,150 @@
+import subprocess
+import re
+from typing import List, Dict, Any
+
+# ── regex helpers ─────────────────────────────────────────────────────────
+IP_PATTERN        = r'(?:\d{1,3}\.){3}\d{1,3}'
+RE_ADAPTER_HEADER = re.compile(r'Configuration for interface +"([^"]+)"', re.I)
+RE_NUMERIC        = re.compile(r'\d+')
+RE_SUBNET         = re.compile(rf'(?P<prefix>{IP_PATTERN}/\d+)\s+\(mask\s+(?P<mask>{IP_PATTERN})', re.I)
+RE_IP             = re.compile(IP_PATTERN)
+
+
+def _get_netsh_show_config() -> str:
+    """Run `netsh interface ipv4 show config` and return the raw text."""
+    return subprocess.check_output(
+        ["netsh", "interface", "ipv4", "show", "config"],
+        text=True, encoding="utf-8", errors="ignore"
+    )
+
+
+def get_netsh_ipv4() -> List[Dict[str, Any]]:
+    """
+    Parse *all* data from `netsh interface ipv4 show config`.
+
+    Returns a list of dicts – one per adapter – with keys:
+        interface, dhcp_enabled, ip_addresses, subnet_prefixes, subnet_masks,
+        default_gateways, gateway_metric, interface_metric,
+        dns_mode, dns_servers, wins_mode, wins_servers
+    """
+    config_text = _get_netsh_show_config()
+
+    adapters: List[Dict[str, Any]] = []
+    adapter: Dict[str, Any] | None = None
+
+    # Track whether we’re in continuation lines of DNS / WINS lists
+    dns_list_type: str | None  = None   # 'static' | 'dynamic' | None
+    wins_list_type: str | None = None
+
+    for raw_line in config_text.splitlines():
+        line = raw_line.strip()
+
+        # 1) New adapter block ------------------------------------------------
+        header_match = RE_ADAPTER_HEADER.search(line)
+        if header_match:
+            # Flush the previous adapter, if any
+            if adapter:
+                adapters.append(adapter)
+
+            iface_name = header_match.group(1)
+            adapter = {
+                'interface_name'   : iface_name,
+                'dhcp_enabled'     : None,
+                'gateway_metric'   : None,
+                'interface_metric' : None,
+                'dns_mode'         : 'unknown',
+                'wins_mode'        : 'unknown',
+                'dns_servers'      : [],
+                'wins_servers'     : [],
+                'ip_addresses'     : [],
+                'subnet_prefixes'  : [],
+                'subnet_masks'     : [],
+                'default_gateways' : [],
+            }
+            dns_list_type = wins_list_type = None
+            continue
+
+        if adapter is None:                 # skip prologue lines
+            continue
+
+        # 2) DHCP flag -------------------------------------------------------
+        if line.startswith("DHCP enabled"):
+            adapter['dhcp_enabled'] = "yes" in line.lower()
+            continue
+
+        # 3) IP addresses ----------------------------------------------------
+        if line.startswith("IP Address"):
+            adapter['ip_addresses'].extend(RE_IP.findall(line))
+            continue
+
+        # 4) Subnet prefix & mask -------------------------------------------
+        if line.startswith("Subnet Prefix"):
+            subnet_match = RE_SUBNET.search(line)
+            if subnet_match:
+                adapter['subnet_prefixes'].append(subnet_match.group('prefix'))
+                adapter['subnet_masks'].append(subnet_match.group('mask'))
+            continue
+
+        # 5) Gateway & metrics ----------------------------------------------
+        if line.startswith("Default Gateway"):
+            adapter['default_gateways'].extend(RE_IP.findall(line))
+            continue
+        if line.startswith("Gateway Metric"):
+            metric = RE_NUMERIC.search(line)
+            if metric:
+                adapter['gateway_metric'] = int(metric.group())
+            continue
+        if line.startswith("InterfaceMetric"):
+            metric = RE_NUMERIC.search(line)
+            if metric:
+                adapter['interface_metric'] = int(metric.group())
+            continue
+
+        # 6) DNS header lines -----------------------------------------------
+        if "DNS servers configured through DHCP" in line:
+            adapter['dns_mode'] = 'dynamic'
+            adapter['dns_servers'].extend(RE_IP.findall(line))
+            dns_list_type = 'dynamic'
+            continue
+        if "Statically Configured DNS Servers" in line:
+            adapter['dns_mode'] = 'static'
+            adapter['dns_servers'].extend(RE_IP.findall(line))
+            dns_list_type = 'static'
+            continue
+
+        # 7) WINS header lines ----------------------------------------------
+        if "WINS servers configured through DHCP" in line:
+            adapter['wins_mode'] = 'dynamic'
+            adapter['wins_servers'].extend(RE_IP.findall(line))
+            wins_list_type = 'dynamic'
+            continue
+        if line.startswith(("Primary WINS Server", "Secondary WINS Server")):
+            adapter['wins_mode'] = 'static'
+            adapter['wins_servers'].extend(RE_IP.findall(line))
+            wins_list_type = 'static'
+            continue
+
+        # 8) Continuation lines for DNS / WINS -------------------------------
+        if dns_list_type and RE_IP.search(line):
+            adapter['dns_servers'].extend(RE_IP.findall(line))
+            continue
+        if wins_list_type and RE_IP.search(line):
+            adapter['wins_servers'].extend(RE_IP.findall(line))
+            continue
+
+    # Flush the final adapter block
+    if adapter:
+        adapters.append(adapter)
+
+    # # ── post-process: detect “mixed” modes ----------------------------------
+    # NOT SURE THIS PART WORKS AS INTENDED!!!
+    # for ad in adapters:
+    #     if ad['dns_mode'] == 'dynamic' and ad['dns_servers']:
+    #         # If both headers appeared the last one wins; treat that as mixed
+    #         if any(k in ad['dns_servers'] for k in ad['default_gateways']):
+    #             ad['dns_mode'] = 'mixed'
+    #     if ad['wins_mode'] == 'dynamic' and ad['wins_servers']:
+    #         if any(ip not in ad['wins_servers'] for ip in ad['wins_servers']):
+    #             ad['wins_mode'] = 'mixed'
+
+    return adapters

atomicshop/wrappers/pywin32w/wmis/win32_networkadapterconfiguration.py

@@ -3,6 +3,7 @@ import socket
 import time
 
 from win32com.client import CDispatch
+import pywintypes
 
 from . import wmi_helpers, win32networkadapter
 from ...psutilw import psutil_networks
@@ -137,7 +138,18 @@ def set_static_ips(
     if not masks or len(ips) != len(masks):
         raise ValueError("ipv4 and masks must be lists of equal length")
 
-    in_params = network_config.Methods_("EnableStatic").InParameters.SpawnInstance_()
+    # # refresh the instance – state may have changed after the previous call
+    # network_config = network_config.Path_.GetObject_()
+
+    try:
+        in_params = network_config.Methods_("EnableStatic").InParameters.SpawnInstance_()
+    except pywintypes.com_error as e:
+        if e.excepinfo[1] == 'SWbemMethodSet' and 'Not found' in e.excepinfo[2]:
+            raise RuntimeError(f"Probably the adapter is already set to static non-DHCP.\n"
+                               f"Failed to get [EnableStatic] method parameters: {e}\n")
+        else:
+            raise
+
     in_params.IPAddress  = ips
     in_params.SubnetMask = masks
 

atomicshop/wrappers/pywin32w/wmis/wmi_helpers.py

@@ -142,7 +142,8 @@ def call_method(
     :return: WMI method object.
     """
 
-    if not (isinstance(value, EmptyValue) and isinstance(value, tuple) and isinstance(value, dict)):
+    # Assign the single value to a tuple if it is not already a tuple or dict and not an EmptyValue.
+    if not isinstance(value, EmptyValue) and not (isinstance(value, tuple) and isinstance(value, dict)):
         value = (value,)
 
     # Get the method instance out of the WMI object.

atomicshop/wrappers/winregw/winreg_network.py

@@ -137,8 +137,13 @@ def get_network_connections_details(get_enum_info: bool = True) -> dict:
     return adapter_details
 
 
-def get_default_dns_gateway() -> tuple[bool, list[str]]:
+def _get_default_dns_gateway() -> tuple[bool, list[str]]:
     """
+    NOTICE: This stopped working from the last Windows update on 11.06.2025.
+    They moved it to 'ProfileNameServer', anyway Since Windows 8 the recommended API has been the WMI
+    NetTCPIP CIM provider (MSFT_DNSClientServerAddress) - didn't test it though.
+    Just moved to netsh wrapping for now.
+
     Get the default DNS gateway from the Windows registry.
 
     :return: tuple(is dynamic boolean, list of DNS server IPv4s).

{atomicshop-3.1.7.dist-info → atomicshop-3.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 3.1.7
+Version: 3.1.9
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License

{atomicshop-3.1.7.dist-info → atomicshop-3.1.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=kQEi2B2TC6t8SrtWizdi3xNq0Bk0eCdVFgVx0yYYTAA,122
+atomicshop/__init__.py,sha256=EQJIgq1QRIHAmPvbH_Qo_f07M3JEn4xL2sUgoWRi8Q4,122
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -10,7 +10,7 @@ atomicshop/console_output.py,sha256=AOSJjrRryE97PAGtgDL03IBtWSi02aNol8noDnW3k6M,
 atomicshop/console_user_response.py,sha256=OHcjuzWAys6WmfRnMIU_nkJA634kKmJh6T8w1VtUTJM,2714
 atomicshop/datetimes.py,sha256=IQZ66lmta-ZqxYbyHzm_9eugbJFSilXK1e0kfMgoXGg,18371
 atomicshop/diff_check.py,sha256=vxTDccVbGZHEge6Ja9_ArLWwslOUgIoJAdYPylh4cZg,27176
-atomicshop/dns.py,sha256=FVrXYk-r3zH6HbUyB3wvhhWM-J0RKmd_CCO50TXVq1A,6831
+atomicshop/dns.py,sha256=XB0tijVi1bxWLWKV9hPzpt75jK4SrGbZCV5VJbiiQ74,7185
 atomicshop/domains.py,sha256=Rxu6JhhMqFZRcoFs69IoEd1PtYca0lMCG6F1AomP7z4,3197
 atomicshop/emails.py,sha256=I0KyODQpIMEsNRi9YWSOL8EUPBiWyon3HRdIuSj3AEU,1410
 atomicshop/file_types.py,sha256=-0jzQMRlmU1AP9DARjk-HJm1tVE22E6ngP2mRblyEjY,763
@@ -23,7 +23,7 @@ atomicshop/http_parse.py,sha256=1Tna9YbOM0rE3t6i_M-klBlwd1KNSA9skA_BqKGXDFc,1186
 atomicshop/inspect_wrapper.py,sha256=sGRVQhrJovNygHTydqJj0hxES-aB2Eg9KbIk3G31apw,11429
 atomicshop/ip_addresses.py,sha256=penRFeJ1-LDVTko4Q0EwK4JiN5cU-KzCBR2VXg9qbUY,1238
 atomicshop/keyboard_press.py,sha256=1W5kRtOB75fulVx-uF2yarBhW0_IzdI1k73AnvXstk0,452
-atomicshop/networks.py,sha256=OSFaEUu8otxCkNq9oMbYQpj5SLzHie2r5uJDiyLR19U,18685
+atomicshop/networks.py,sha256=xOU_lDf6Rct178W7EB80-AFMgu9Nnh6l7GgjA9z9Jtg,19010
 atomicshop/on_exit.py,sha256=9XlOnzoAG8zlI8wBF4AB8hyrC6Q1b84gkhqpAhhdN9g,6977
 atomicshop/pbtkmultifile_argparse.py,sha256=aEk8nhvoQVu-xyfZosK3ma17CwIgOjzO1erXXdjwtS4,4574
 atomicshop/print_api.py,sha256=SJNQIMqSLlYaPtjHnALySAI-jQYuYHOCGgfP7oe96fU,10957
@@ -199,6 +199,7 @@ atomicshop/wrappers/cryptographyw.py,sha256=LfzTnwvJE03G6WZryOOf43VKhhnyMakzHpn8
 atomicshop/wrappers/ffmpegw.py,sha256=wcq0ZnAe0yajBOuTKZCCaKI7CDBjkq7FAgdW5IsKcVE,6031
 atomicshop/wrappers/githubw.py,sha256=vaVQg0pkHY63_TfIbCoWmHDPtI2rDPAqMYwsOl3GN78,22559
 atomicshop/wrappers/msiw.py,sha256=GQLqud72nfex3kvO1bJSruNriCYTYX1_G1gSf1MPkIA,6118
+atomicshop/wrappers/netshw.py,sha256=8WE_576XiiHykwFuE-VkCx5CydMpFlztX4frlEteCtI,6350
 atomicshop/wrappers/numpyw.py,sha256=sBV4gSKyr23kXTalqAb1oqttzE_2XxBooCui66jbAqc,1025
 atomicshop/wrappers/olefilew.py,sha256=biD5m58rogifCYmYhJBrAFb9O_Bn_spLek_9HofLeYE,2051
 atomicshop/wrappers/pipw.py,sha256=mu4jnHkSaYNfpBiLZKMZxEX_E2LqW5BVthMZkblPB_c,1317
@@ -313,10 +314,10 @@ atomicshop/wrappers/pywin32w/win_event_log/subscribes/process_terminate.py,sha25
 atomicshop/wrappers/pywin32w/win_event_log/subscribes/schannel_logging.py,sha256=8nxIcNcbeEuvoBwhujgh7-oIpL9A6J-gg1NM8hOGAVA,3442
 atomicshop/wrappers/pywin32w/wmis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/pywin32w/wmis/msft_netipaddress.py,sha256=Kn2gQsyEquM5QQkdF2Vtr1MqK5D7uo6EFi-cxt52Q0g,4800
-atomicshop/wrappers/pywin32w/wmis/win32_networkadapterconfiguration.py,sha256=Iz-p--cE2iP6wyD9ceSF3scMMvdXC5fF-VKP1v-iIDo,10813
+atomicshop/wrappers/pywin32w/wmis/win32_networkadapterconfiguration.py,sha256=CnHFac1FT6cnH1VwHUyD6vZr6FKPxY8fpbj-1s2_Mzg,11327
 atomicshop/wrappers/pywin32w/wmis/win32networkadapter.py,sha256=iao4OK6u097uRacw6vQuya1kOtJzLA1IM4cgo6UCWLM,3941
 atomicshop/wrappers/pywin32w/wmis/win32process.py,sha256=qMzXtJ5hBZ5ydAyqpDbSx0nO2RJQL95HdmV5SzNKMhk,6826
-atomicshop/wrappers/pywin32w/wmis/wmi_helpers.py,sha256=H8QIiHlm9ei8GSudKECFpEc1qny_1PNnVxZuIDK9xfU,8604
+atomicshop/wrappers/pywin32w/wmis/wmi_helpers.py,sha256=3SA6hNgw-iBWYl3l1t3RBxRYB4BH-FbTs9gzmcg_Q8w,8710
 atomicshop/wrappers/socketw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/socketw/accepter.py,sha256=4I9ORugRDvwaqSzm_gWSjZnRwQGY8hDTlCdsYHwH_ZE,2377
 atomicshop/wrappers/socketw/base.py,sha256=EcosGkD8VzgBY3GeIHDSG29ThQfXwg3-GQPmBTAqTdw,3048
@@ -335,9 +336,9 @@ atomicshop/wrappers/socketw/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0L
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=WcNyaqEZ82S5-f3kzqi1nllNT2Nd2P_zg8HqCc7vW4s,4120
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_installed_software.py,sha256=Qzmyktvob1qp6Tjk2DjLfAqr_yXV0sgWzdMW_9kwNjY,2345
-atomicshop/wrappers/winregw/winreg_network.py,sha256=3Ts1sVqSUiCDsHRHwJCbiZ9EYvv2ELGxF0Y_pibGU4k,9596
-atomicshop-3.1.7.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.1.7.dist-info/METADATA,sha256=lpnnJWxz69LaEjSCOjW-sp7tPzkbK3Ee2xefjakUyDI,10662
-atomicshop-3.1.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-3.1.7.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.1.7.dist-info/RECORD,,
+atomicshop/wrappers/winregw/winreg_network.py,sha256=ih0BVNwByLvf9F_Lac4EdmDYYJA3PzMvmG0PieDZrsE,9905
+atomicshop-3.1.9.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.1.9.dist-info/METADATA,sha256=-CO4-bPxF4SKM5Gi0aC0Sbqkl0s974zx0o5bR5gnBWE,10662
+atomicshop-3.1.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-3.1.9.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.1.9.dist-info/RECORD,,