refactor: startup scripts refactor and cleanup

Author: loiccoyle

tinyticker/web/__main__.py

@@ -15,7 +15,7 @@
 )
 from . import logger
 from .app import create_app
-from .startup import STARTUP_DIR, run_scripts
+from .startup import STARTUP_DIR, get_scripts, run_scripts
 
 
 def parse_args(args: List[str]) -> argparse.Namespace:
@@ -82,8 +82,13 @@ def main():
     if not STARTUP_DIR.is_dir():
         STARTUP_DIR.mkdir(parents=True)
 
-    logger.info("Running startup scripts.")
-    processes = run_scripts()
+    scripts = get_scripts()
+    if scripts:
+        logger.info("Running startup scripts.")
+        logger.debug("Startup scripts: %s", [script.name for script in scripts])
+        processes = run_scripts(scripts)
+    else:
+        processes = []
 
     if args.show_qrcode:
         logger.info("Generating qrcode.")

tinyticker/web/app.py

@@ -22,7 +22,7 @@
 from ..tickers._base import INTERVAL_LOOKBACKS
 from ..waveshare_lib.models import MODELS
 from .command import COMMANDS, reboot
-from .startup import STARTUP_DIR
+from .startup import STARTUP_DIR, get_scripts
 
 LOGGER = logging.getLogger(__name__)
 TEMPLATE_PATH = str(Path(__file__).parent / "templates")
@@ -208,8 +208,8 @@ def get_startup_script(filename):
         return send_from_directory(STARTUP_DIR, filename, mimetype="text/plain")
 
     @app.route("/startup")
-    def startup_scippts():
-        files = sorted([path.name for path in STARTUP_DIR.glob("*")])
+    def startup_scripts():
+        files = sorted([script.name for script in get_scripts()])
         return render_template("startup.html", files=files)
 
     return app

tinyticker/web/startup.py

@@ -1,20 +1,33 @@
 import logging
+import os
 import subprocess
 from pathlib import Path
+from typing import List
 
 LOGGER = logging.getLogger(__name__)
 STARTUP_DIR = Path.home() / ".config" / "tinyticker" / "startup"
 
 
-def run_scripts():
-    scripts = [
+def get_scripts() -> List[Path]:
+    """Get the startup scripts."""
+    return [
         file
-        for file in STARTUP_DIR.glob("*")
-        if file.is_file() and not file.name.startswith(".")
+        for file in STARTUP_DIR.iterdir()
+        if file.is_file() and not file.name.startswith(".") and os.access(file, os.X_OK)
     ]
-    LOGGER.debug("Running startup scripts: %s", [file.name for file in scripts])
+
+
+def run_scripts(scripts: List[Path]) -> List[subprocess.Popen]:
+    """Run the startup scripts. The scripts must be executable.
+
+    Args:
+        scripts: The scripts to run.
+
+    Returns:
+        The processes running the scripts.
+    """
     processes = []
     for file in scripts:
         LOGGER.debug("Running startup script: %s", file.name)
-        processes.append(subprocess.Popen(f"{file}", shell=True))
+        processes.append(subprocess.Popen(str(file), shell=True))
     return processes