torizon-templates-utils 0.0.3__tar.gz → 0.0.5__tar.gz

{torizon_templates_utils-0.0.3 → torizon_templates_utils-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: torizon_templates_utils
-Version: 0.0.3
+Version: 0.0.5
 Summary: Package with utilities for Torizon Templates scripts
 Author-email: Matheus Castello <matheus.castello@toradex.com>
 Project-URL: Homepage, https://github.com/torizon/vscode-torizon-templates

{torizon_templates_utils-0.0.3 → torizon_templates_utils-0.0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "torizon_templates_utils"
-version = "0.0.3"
+version = "0.0.5"
 authors = [
   { name="Matheus Castello", email="matheus.castello@toradex.com" },
 ]

torizon_templates_utils-0.0.5/torizon_templates_utils/network.py

@@ -0,0 +1,35 @@
+
+import os
+import re
+import subprocess
+
+
+def get_host_ip():
+    if 'WSL_DISTRO_NAME' in os.environ:
+        command = ["/mnt/c/Windows/System32/Wbem/WMIC.exe", "NICCONFIG", "WHERE", "IPEnabled=true", "GET", "IPAddress"]
+
+        # if inside a container we need to run the command in the host
+        if "APOLLOX_CONTAINER" in os.environ:
+            command = [
+                "sudo", "nsenter", "-t", "1", "-m", "-u", "-n", "-i",
+                "--",
+                "/mnt/c/Windows/System32/Wbem/WMIC.exe", "NICCONFIG", "WHERE", "IPEnabled=true", "GET", "IPAddress"
+            ]
+
+        result = subprocess.run(command, capture_output=True, text=True)
+        ip_address = re.search(r'((1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])', result.stdout)
+        if ip_address:
+            return ip_address.group(0)
+    else:
+        command = ["hostname", "-I"]
+
+        # if inside a container we need to run the command in the host
+        if "APOLLOX_CONTAINER" in os.environ:
+            command = [
+                "sudo", "nsenter", "-t", "1", "-m", "-u", "-n", "-i",
+                "--",
+                "hostname", "-I"
+            ]
+
+        result = subprocess.run(command, capture_output=True, text=True)
+        return result.stdout.split()[0]

{torizon_templates_utils-0.0.3 → torizon_templates_utils-0.0.5}/torizon_templates_utils/tasks.py

@@ -604,7 +604,7 @@ class TaskRunner:
 
 
     def __contains_special_chars(self, str: str) -> bool:
-        _pattern = r"[^a-zA-Z0-9\.\-_|>\/=]"
+        _pattern = r"[^a-zA-Z0-9\.\-_|>\/=+&_]"
         return re.search(_pattern, str) is not None
 
 

{torizon_templates_utils-0.0.3 → torizon_templates_utils-0.0.5}/torizon_templates_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: torizon_templates_utils
-Version: 0.0.3
+Version: 0.0.5
 Summary: Package with utilities for Torizon Templates scripts
 Author-email: Matheus Castello <matheus.castello@toradex.com>
 Project-URL: Homepage, https://github.com/torizon/vscode-torizon-templates

torizon_templates_utils-0.0.3/torizon_templates_utils/network.py

@@ -1,17 +0,0 @@
-
-import os
-import re
-import subprocess
-
-
-def get_host_ip():
-    if 'WSL_DISTRO_NAME' in os.environ:
-        command = ["/mnt/c/Windows/System32/Wbem/WMIC.exe", "NICCONFIG", "WHERE", "IPEnabled=true", "GET", "IPAddress"]
-        result = subprocess.run(command, capture_output=True, text=True)
-        ip_address = re.search(r'((1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])', result.stdout)
-        if ip_address:
-            return ip_address.group(0)
-    else:
-        command = ["hostname", "-I"]
-        result = subprocess.run(command, capture_output=True, text=True)
-        return result.stdout.split()[0]