ae-base 0.3.49__py3-none-any.whl → 0.3.50__py3-none-any.whl

ae/base.py

@@ -160,7 +160,7 @@ from types import ModuleType
 from typing import Any, Callable, Dict, Generator, Iterable, List, Optional, Tuple, Union, cast
 
 
-__version__ = '0.3.49'
+__version__ = '0.3.50'
 
 
 os_path_abspath = os.path.abspath
@@ -1066,15 +1066,17 @@ def sys_env_dict() -> Dict[str, Any]:
     .. hint:: see also https://pyinstaller.readthedocs.io/en/stable/runtime-information.html
     """
     sed: Dict[str, Any] = {
-        'python_ver': sys.version.replace('\n', ' '),
+        'python ver': sys.version.replace('\n', ' '),
         'platform': os_platform,
         'argv': sys.argv,
         'executable': sys.executable,
         'cwd': os.getcwd(),
         'frozen': getattr(sys, 'frozen', False),
-        'user_name': os_user_name(),
-        'host_name': os_host_name(),
+        'user name': os_user_name(),
+        'host name': os_host_name(),
+        'device id': os_device_id,
         'app_name_guess': app_name_guess(),
+        'os env': os.environ.copy(),
     }
 
     if sed['frozen']:
@@ -1220,7 +1222,39 @@ class ErrorMsgMixin:
             self._err_msg = ""
 
 
-if os_platform == 'android':                                    # pragma: no cover
+# platform-specific patches
+os_device_id = os_host_name()
+""" user-definable id/name of the device, defaults to os_host_name() on most platforms, alternatives are:
+
+on all platforms:
+    - socket.gethostname()
+on Android (check with adb shell 'settings get global device_name' and adb shell 'settings list global'):
+    - Settings.Global.DEVICE_NAME (Settings.Global.getString(context.getContentResolver(), "device_name"))
+    - android.os.Build.DEVICE/.MANUFACTURER/.BRAND/.HOST
+    - DeviceName.getDeviceName()
+on MS Windows:
+    - os.environ['COMPUTERNAME']
+"""
+if os_platform == 'android':                                        # pragma: no cover
+    # determine Android device id because os_host_name() returns mostly 'localhost' and not the user-definable device id
+    from jnius import autoclass                                     # type: ignore
+
+    # noinspection PyBroadException
+    try:
+        Settings = autoclass('android.provider.Settings$Global')
+        PythonActivity = autoclass('org.kivy.android.PythonActivity')
+
+        # mActivity inherits from Context so no need to cast('android.content.Context',..) neither get app context
+        # _Context = autoclass('android.content.Context')
+        # context = cast('android.content.Context', PythonActivity.mActivity)
+        # context = PythonActivity.mActivity.getApplicationContext()
+        context = PythonActivity.mActivity
+        if _dev_id := Settings.getString(context.getContentResolver(), 'device_name'):
+            os_device_id = defuse(_dev_id)
+
+    except Exception:
+        pass
+
     # monkey patch the :func:`shutil.copystat` and :func:`shutil.copymode` helper functions, which are crashing on
     # 'android' (see # `<https://bugs.python.org/issue28141>`__ and `<https://bugs.python.org/issue32073>`__). these
     # functions are used by shutil.copy2/copy/copytree/move to copy OS-specific file attributes.
@@ -1229,3 +1263,8 @@ if os_platform == 'android':                                    # pragma: no cov
     # on the destination root directory.
     shutil.copymode = dummy_function
     shutil.copystat = dummy_function
+
+
+elif os_platform in ('win32', 'cygwin'):                            # pragma: no cover
+    if _dev_id := os.environ.get('COMPUTERNAME'):
+        os_device_id = defuse(_dev_id)

{ae_base-0.3.49.dist-info → ae_base-0.3.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ae_base
-Version: 0.3.49
+Version: 0.3.50
 Summary: ae namespace module portion base: basic constants, helper functions and context manager
 Home-page: https://gitlab.com/ae-group/ae_base
 Author: AndiEcker
@@ -68,17 +68,17 @@ Dynamic: summary
 
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae V0.3.95 -->
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.tpl_namespace_root V0.3.14 -->
-# base 0.3.49
+# base 0.3.50
 
 [![GitLab develop](https://img.shields.io/gitlab/pipeline/ae-group/ae_base/develop?logo=python)](
     https://gitlab.com/ae-group/ae_base)
 [![LatestPyPIrelease](
-    https://img.shields.io/gitlab/pipeline/ae-group/ae_base/release0.3.48?logo=python)](
-    https://gitlab.com/ae-group/ae_base/-/tree/release0.3.48)
+    https://img.shields.io/gitlab/pipeline/ae-group/ae_base/release0.3.49?logo=python)](
+    https://gitlab.com/ae-group/ae_base/-/tree/release0.3.49)
 [![PyPIVersions](https://img.shields.io/pypi/v/ae_base)](
     https://pypi.org/project/ae-base/#history)
 
->ae_base module 0.3.49.
+>ae_base module 0.3.50.
 
 [![Coverage](https://ae-group.gitlab.io/ae_base/coverage.svg)](
     https://ae-group.gitlab.io/ae_base/coverage/index.html)

ae_base-0.3.50.dist-info/RECORD

@@ -0,0 +1,7 @@
+ae/base.py,sha256=1me3TvKdrXFKVDI9qqXYzJ52d0d3qVw21rY643gymY0,62992
+ae_base-0.3.50.dist-info/LICENSE.md,sha256=uoIIfORuk4V8ZeNh6SN0EUhiU79RC-indIMFqePKVhY,35002
+ae_base-0.3.50.dist-info/METADATA,sha256=1YUr5FieYlbsSE_1atpH6N0uJmYfTRd4tcpxrtqmJRQ,5636
+ae_base-0.3.50.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+ae_base-0.3.50.dist-info/top_level.txt,sha256=vUdgAslSmhZLXWU48fm8AG2BjVnkOWLco8rzuW-5zY0,3
+ae_base-0.3.50.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+ae_base-0.3.50.dist-info/RECORD,,

{ae_base-0.3.49.dist-info → ae_base-0.3.50.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

ae_base-0.3.49.dist-info/RECORD

@@ -1,7 +0,0 @@
-ae/base.py,sha256=V0wU87UunINFILcnar0HlBvF6gB8nLnj1tfQ-uXoCiY,61257
-ae_base-0.3.49.dist-info/LICENSE.md,sha256=uoIIfORuk4V8ZeNh6SN0EUhiU79RC-indIMFqePKVhY,35002
-ae_base-0.3.49.dist-info/METADATA,sha256=Ezl-iNQcsr9r0ssjPJAVgVTvZcQZDbHIqno7of0zTos,5636
-ae_base-0.3.49.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ae_base-0.3.49.dist-info/top_level.txt,sha256=vUdgAslSmhZLXWU48fm8AG2BjVnkOWLco8rzuW-5zY0,3
-ae_base-0.3.49.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-ae_base-0.3.49.dist-info/RECORD,,