Check platform

Author: zeroby0

picsi/commands/build.py

@@ -1,13 +1,17 @@
 __all__ = ["build"]
 
-from halo import Halo
+
 from pathlib import Path
+from sys import exit as sys_exit
+
+from halo import Halo
 
 from picsi.vendored.mkmanifest import mkmanifest
 from picsi.vendored.run_commands import run_commands
 from picsi.vendored.get_output import get_output
 from picsi.vendored.get_uname import get_uname
 from picsi.vendored.ci_resolve_proxy import ci_resolve_proxy
+from picsi.vendored.check_platform import check_platform
 
 
 def build(
@@ -20,6 +24,11 @@ def build(
     Build Nexmon_CSI from source
     """
 
+    if not check_platform():
+        confirmation = input("Unsupported platform. Do you want to continue? [Y/n]: ")
+        if confirmation.lower() in ["n", "no"]:
+            sys_exit(1)
+
     Path("/home/pi/.picsi/").mkdir(exist_ok=True)
 
     path_nexmon = Path("/home/pi/.picsi/nexmon")

picsi/config.py

@@ -0,0 +1,7 @@
+from pathlib import Path
+from tomli import load
+
+path_config = Path(__file__).parent / "config.toml"
+
+with open(path_config, "rb") as config_file:
+    config = load(config_file)

picsi/config.toml

@@ -0,0 +1,3 @@
+supported_kernels = ["4.19", "5.4", "5.10"]
+supported_archs = ["armv7l"]
+

picsi/picsi.py

@@ -1,65 +1,26 @@
 #!/usr/bin/env python3
+from os import getuid
+from sys import argv
+from sys import exit as sys_exit
+from subprocess import run
+from importlib import import_module
 
-import os
-import sys
-
-# Elevate picsi to root if not running as root
-if os.getuid() != 0:
-    import subprocess
-    from picsi.vendored.get_output import get_output
-
-    executable = get_output(["which", "picsi"])
-    arguments = sys.argv[1:]
-
-    p = subprocess.run(["sudo", "-E", executable] + sys.argv[1:])
-
-    sys.exit(p.returncode)
-else:
-    from picsi.vendored.get_output import get_output
-
-    get_output(["chown", "-R", "pi:pi", "/home/pi/.picsi"])
-
-# ---------------------------------------------------------------
-
-import typer
+from typer import Typer
 from click import Group
 
-from picsi.commands.install import install
-from picsi.commands.uninstall import uninstall
-from picsi.commands.enable import enable
-from picsi.commands.disable import disable
-from picsi.commands.build import build
-from picsi.commands.up import up
-from picsi.commands.down import down
-from picsi.commands.status import status
-from picsi.vendored.get_uname import get_uname
+from picsi.vendored.get_output import get_output
 
-# Check if picsi can run on this kernel
-supported_kernel_versions = ["4.19", "5.4", "5.10"]
-current_kernel_version = ".".join(get_uname("-r").split(".")[:2])
 
-if current_kernel_version not in supported_kernel_versions:
-    print(
-        "Warning: Nexmon_csi is only available for kernel versions: "
-        + ", ".join(supported_kernel_versions)
-        + ".\n"
-        + "You are running Kernel version "
-        + current_kernel_version
-        + "."
-    )
+if getuid() != 0:
+    # If not running as root
+    executable = get_output(["which", "picsi"])
 
-supported_cpu_architectures = ["armv7l", "armv7l+"]
-current_cpu_architecture = get_uname("-m")
+    # Start picsi as root
+    p = run(["sudo", "-E", executable] + argv[1:])
 
-if current_cpu_architecture not in supported_cpu_architectures:
-    print(
-        "Warning: Nexmon_csi is only available for architectures: "
-        + ", ".join(supported_cpu_architectures)
-        + ".\n"
-        + "You are running Kernel version "
-        + current_kernel_version
-        + "."
-    )
+    sys_exit(p.returncode)
+# else:
+#     get_output(["chown", "-R", "pi:pi", "/home/pi/.picsi"])
 
 
 # Typer prints commands in the help menu
@@ -70,16 +31,22 @@ def list_commands(self, ctx):
         return self.commands.keys()
 
 
-app = typer.Typer(cls=NaturalOrderGroup)
+commands = [
+    "install",
+    "uninstall",
+    "enable",
+    "disable",
+    "up",
+    "down",
+    "status",
+    "build",
+]
+
+app = Typer(cls=NaturalOrderGroup)
+for command in commands:
+    module = import_module(f"picsi.commands.{command}")
 
-app.command()(install)
-app.command()(uninstall)
-app.command()(enable)
-app.command()(disable)
-app.command()(up)
-app.command()(down)
-app.command()(status)
-app.command()(build)
+    app.command()(getattr(module, command))
 
 if __name__ == "__main__":
     app()

picsi/vendored/check_platform.py

@@ -0,0 +1,42 @@
+from picsi.vendored.get_uname import get_uname
+from picsi.config import config
+
+
+def check_kernel_version():
+    current_kernel_version = ".".join(get_uname("-r").split(".")[:2])
+
+    if current_kernel_version in config.supported_kernels:
+        return True
+
+    print(
+        "Warning: Nexmon_csi is only available for kernel versions: "
+        + ", ".join(config.supported_kernels)
+        + ".\n"
+        + "You are running Kernel version "
+        + current_kernel_version
+        + "."
+    )
+
+    return False
+
+
+def check_cpu_arch():
+    current_cpu_architecture = get_uname("-m")
+
+    if current_cpu_architecture in config.supported_archs:
+        return True
+
+    print(
+        "Warning: Nexmon_csi is only available for architectures: "
+        + ", ".join(config.supported_archs)
+        + ".\n"
+        + "Your current architecture is "
+        + current_cpu_architecture
+        + "."
+    )
+
+    return False
+
+
+def check_platform():
+    return check_cpu_arch() and check_kernel_version()