Merge pull request #52 from OpenAstroTech/feature/js/macos-platform-detection

MacOS platform detection

Author: julianneswinoga

OATFWGUI/anon_usage_data.py

@@ -143,6 +143,7 @@ def get_computer_uuid() -> str:
     machine_id_fn = {
         PlatformEnum.WINDOWS: get_uuid_windows,
         PlatformEnum.LINUX: get_uuid_linux,
+        PlatformEnum.MACOS: get_uuid_macos,
         PlatformEnum.UNKNOWN: lambda: 'unknown platform',
     }.get(get_platform(), lambda: 'unknown, unhandled platform')
     machine_id_str = machine_id_fn()
@@ -178,6 +179,20 @@ def get_uuid_linux() -> str:
     return machine_id_contents
 
 
+def get_uuid_macos() -> str:
+    sub_proc = subprocess.run(
+        ['ioreg',
+         '-rd1',
+         '-c',
+         'IOPlatformExpertDevice',
+         ],
+        capture_output=True)
+    if sub_proc.returncode != 0:
+        return 'unknown-macos'
+    ioreg_output = sub_proc.stdout.decode('UTF-8')
+    return windows_uuid
+
+
 def to_nearest_half(num: float) -> float:
     return round(num * 2, 0) / 2
 

OATFWGUI/platform_check.py

@@ -9,6 +9,7 @@
 class PlatformEnum(enum.Enum):
     LINUX = enum.auto()
     WINDOWS = enum.auto()
+    MACOS = enum.auto()
     UNKNOWN = enum.auto()
 
 
@@ -25,6 +26,8 @@ def get_platform() -> PlatformEnum:
         platform_lookup = PlatformEnum.WINDOWS
     elif 'linux' in platform_str:
         platform_lookup = PlatformEnum.LINUX
+    elif 'darwin' in platform_str:
+        platform_lookup = PlatformEnum.MACOS
     else:
         platform_lookup = PlatformEnum.UNKNOWN
     platform_lookup_cache = platform_lookup  # Cache return