Merge pull request #8 from OpenIPC/improvements

Improvements

Author: mikecarr

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Build and Release
 on:
   push:
     tags:
-      - 'v*.*.*'
+      - 'v*.*.*'  # This triggers the workflow on tags following semantic versioning
 
 jobs:
   build:
@@ -22,7 +22,7 @@ jobs:
 
       - name: Get version from tag
         id: vars
-        run: echo "VERSION=${GITHUB_REF#refs/tags/} >> $GITHUB_ENV"
+        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
 
       - name: Install dependencies
         run: |
@@ -33,9 +33,25 @@ jobs:
         run: |
           python setup.py sdist bdist_wheel
 
+      - name: Create Release
+        id: create_release
+        run: |
+          if [[ "${GITHUB_REF}" == "refs/tags/v"* ]]; then
+            TAG_NAME=${GITHUB_REF#refs/tags/}
+            if [[ "${GITHUB_REF}" == "refs/tags/v"* ]]; then
+              echo "Creating release for tag $TAG_NAME"
+              echo "GITHUB_REF=$GITHUB_REF" >> $GITHUB_ENV
+            fi
+          else
+            echo "Not a valid tag, skipping release creation."
+            exit 0
+          fi
+
       - name: Upload Package to Release
+        if: steps.create_release.outputs.tag_name != ''
         uses: softprops/action-gh-release@v1
         with:
+          tag_name: ${{ steps.create_release.outputs.tag_name }}
           files: |
             dist/*
         env:

py_config_gs/.vscode/sftp.json

@@ -0,0 +1,18 @@
+{
+    "name": "Radxa",
+    "host": "10.0.1.14",
+    "protocol": "sftp",
+    "port": 22,
+    "username": "root",
+    "remotePath": "/root/workspace/py_config_gs/py_config_gs",
+    "uploadOnSave": false,
+    "useTempFile": false,
+    "openSsh": false,
+    "ignore": [
+        "**/*.log",       
+        "**/*.tmp",       
+        ".venv/**", 
+        "**/*.env"
+
+    ]
+}

py_config_gs/app.py

@@ -2,16 +2,14 @@
 from flask import Flask, render_template, request, Response, redirect, url_for, send_from_directory, flash
 import json
 import os
+import sys
 import subprocess
 from importlib.metadata import version
 
-
-# read version for footer
-#app_version = version('py-config-gs')
+# Read version for footer
 with open('version.txt', 'r') as f:
     app_version = f.read().strip()
 
-
 # Configure logging
 logging.basicConfig(level=logging.DEBUG,  # Set the log level to DEBUG
                     format='%(asctime)s - %(levelname)s - %(message)s')
@@ -34,6 +32,7 @@
 
 # Log the SETTINGS_FILE path
 logger.info(f'Settings file path: {SETTINGS_FILE}')
+
 logger.info(f'App version: {app_version}')
 
 # Load settings.json
@@ -49,21 +48,25 @@
 logger.debug(f'VIDEO_DIR is set to: {VIDEO_DIR}')
 
 def stream_journal():
-    """Stream journalctl output in real-time."""
-    process = subprocess.Popen(
-        ['journalctl', '-f'],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        text=True
-    )
-    
-    while True:
-        output = process.stdout.readline()
-        if output:
-            yield f"data: {output}\n\n"
-        else:
-            break
-
+    if os.getenv('FLASK_ENV') != 'development':
+        """Stream journalctl output in real-time."""
+        process = subprocess.Popen(
+            ['journalctl', '-f'],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True
+        )
+        
+        while True:
+            output = process.stdout.readline()
+            if output:
+                yield f"data: {output}\n\n"
+            else:
+                break
+    else:
+        logger.info('No data in DEVELOPMENT mode')
+        yield "data: No data in DEVELOPMENT mode\n\n"  # Send as part of stream instead of flashing
+        
 @app.route('/journal')
 def journal():
     return render_template('journal.html', version=app_version)
@@ -74,18 +77,18 @@ def stream():
 
 @app.route('/')
 def home():
-    # List of services that you want to control
-    services = ['openipc',"wifibroadcast.service"]
+    services = ['openipc', "wifibroadcast.service"]
     service_statuses = {}
+
+    # flash(f'Starting up...', 'info')
 
-    # Fetches the current status (enabled/disabled) for each service.
-    for service in services:
-        # Check if the service is enabled or disabled
-        result = subprocess.run(['systemctl', 'is-enabled', service], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        status = result.stdout.decode('utf-8').strip()
-        service_statuses[service] = status
+    if os.getenv('FLASK_ENV') != 'development':
+        for service in services:
+            result = subprocess.run(['systemctl', 'is-enabled', service], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            status = result.stdout.decode('utf-8').strip()
+            service_statuses[service] = status
 
-    return render_template('home.html', config_files=config_files, version=app_version, services=service_statuses )
+    return render_template('home.html', config_files=config_files, version=app_version, services=service_statuses)
 
 @app.route('/edit/<filename>', methods=['GET', 'POST'])
 def edit(filename):
@@ -117,13 +120,12 @@ def videos():
     video_files = [f for f in os.listdir(VIDEO_DIR) if f.endswith(('.mp4', '.mkv', '.avi'))]
     logger.debug(f'VIDEO_DIR: {VIDEO_DIR}')
     logger.debug(f'Video files found: {video_files}')
+    flash(f'Loading from VIDEO_DIR: {VIDEO_DIR}','info')
     return render_template('videos.html', video_files=video_files, version=app_version)
 
-
 @app.route('/play/<filename>')
 def play(filename):
     try:
-        # Ensure the file exists in the VIDEO_DIR and is served from there
         return send_from_directory(VIDEO_DIR, filename)
     except FileNotFoundError:
         logger.error(f'Video file not found: {filename}')
@@ -132,11 +134,17 @@ def play(filename):
 @app.route('/temperature')
 def get_temperature():
     try:
-        soc_temp = int(open('/sys/class/thermal/thermal_zone0/temp').read().strip()) / 1000.0  # Convert to °C
-        gpu_temp = int(open('/sys/class/thermal/thermal_zone1/temp').read().strip()) / 1000.0  # Convert to °C
-        soc_temp_f = (soc_temp * 9/5) + 32
-        gpu_temp_f = (gpu_temp * 9/5) + 32
-        
+        soc_temp = 0
+        gpu_temp = 0
+        soc_temp_f = 0
+        gpu_temp_f = 0
+
+        if os.getenv('FLASK_ENV') != 'development':
+            soc_temp = int(open('/sys/class/thermal/thermal_zone0/temp').read().strip()) / 1000.0  # Convert to °C
+            gpu_temp = int(open('/sys/class/thermal/thermal_zone1/temp').read().strip()) / 1000.0  # Convert to °C
+            soc_temp_f = (soc_temp * 9/5) + 32
+            gpu_temp_f = (gpu_temp * 9/5) + 32
+            
         return {
             'soc_temperature': f"{soc_temp:.1f}",
             'soc_temperature_f': f"{soc_temp_f:.1f}",
@@ -164,16 +172,13 @@ def backup():
 def run_command():
     selected_command = request.form.get('command')
 
-    # Construct the first command based on the dropdown value
     cli_command = f"echo cli -s {selected_command} > /dev/udp/localhost/14550"
     logger.debug(f'Running command: {cli_command}')
     flash(f'Running command: {cli_command}', 'info')
 
-    # Run the commands
     subprocess.run(cli_command, shell=True)
     subprocess.run("echo killall -1 majestic > /dev/udp/localhost/14550", shell=True)
 
-    # Redirect back to the home page after the commands are run
     return redirect(url_for('home'))
 
 @app.route('/service_action', methods=['POST'])
@@ -199,7 +204,6 @@ def service_action():
 
     return redirect(url_for('home'))
 
-# Function to check allowed file extensions
 def allowed_file(filename):
     return '.' in filename and filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS
 
@@ -220,8 +224,50 @@ def upload_file():
             return redirect(url_for('home'))
     return render_template('upload.html')  # A separate template for file upload
 
-def main():
-    app.run(host='0.0.0.0', port=SERVER_PORT)
+@app.route('/settings', methods=['GET', 'POST'])
+def settings():
+    # Load settings
+    with open(SETTINGS_FILE, 'r') as f:
+        settings = json.load(f)
+
+    # Initialize config_files from the loaded settings
+    config_files = settings['config_files']
+
+    if request.method == 'POST':
+        # Get data from the form
+        config_files = request.form.getlist('config_files')
+        video_dir = request.form.get('VIDEO_DIR')
+        server_port = request.form.get('SERVER_PORT')
+
+        # Create a structured dictionary for saving
+        settings_data = {
+            "config_files": [
+                {"name": config_files[i], "path": request.form[f'path_{i}']}
+                for i in range(len(config_files))
+            ],
+            "VIDEO_DIR": video_dir,
+            "SERVER_PORT": int(server_port)  # Ensure it's an integer
+        }
+
+        # Save the settings to JSON
+        with open(SETTINGS_FILE, 'w') as f:
+            json.dump(settings_data, f, indent=4)
+        logger.debug('Updated settings saved.')
+
+        # Restart the Flask app
+        os.execv(sys.executable, ['python'] + sys.argv)
+
+        return redirect(url_for('home'))
+
+    return render_template('settings.html', config_files=config_files, settings=settings, version=app_version)
+
+
 
 if __name__ == '__main__':
-    main()
+        # Load settings to get SERVER_PORT and debug mode from the settings file.
+    with open(SETTINGS_FILE, 'r') as f:
+        settings = json.load(f)
+
+    SERVER_PORT = settings['SERVER_PORT']
+    DEBUG_MODE = os.getenv('FLASK_ENV') == 'development'
+    app.run(port=SERVER_PORT, debug=DEBUG_MODE, host='0.0.0.0')

py_config_gs/static/css/styles.css

@@ -252,4 +252,72 @@ form {
     .config-content {
         gap: 10px; /* Reduce gap on smaller screens */
     }
-}
+}
+
+
+
+/* Header container to hold the logo on the left and center the heading */
+.header-container {
+    display: flex;
+    align-items: center; /* Vertically center the logo and heading */
+    justify-content: center; /* Initially center everything */
+    position: relative; /* For the absolute positioning of the logo */
+    margin-bottom: 20px;
+}
+
+/* Logo styling */
+.header-logo {
+    position: absolute;
+    left: 0; /* Align the logo to the left */
+    max-width: 60px; /* Set the logo size */
+    height: auto;
+    margin-left: 20px; /* Add space from the left edge */
+}
+
+/* Center the heading */
+.header-container h1 {
+    margin: 0;
+    text-align: center;
+    font-size: 24px;
+    color: #333;
+    flex-grow: 1; /* Let the heading take up the remaining space */
+}
+
+/* Adjust the layout on smaller screens */
+@media (max-width: 768px) {
+    .header-container {
+        flex-direction: column; /* Stack the logo and heading vertically */
+    }
+
+    .header-logo {
+        position: static;
+        margin-left: 0;
+        margin-bottom: 10px; /* Add space below the logo when stacked */
+    }
+}
+
+/* Flash Message Styles */
+.flash-message {
+    background-color: #d1ecf1; /* Light blue background */
+    color: #0c5460; /* Dark blue text */
+    
+    border: 1px solid #4046ed; /* Border to define the area */
+    border-radius: 5px; /* Rounded corners */
+    margin-bottom: 20px; /* Space below the flash message */
+    
+    width: 100%; /* Fill the width of the container */
+    max-width: 100%; /* Ensure it doesn't exceed the viewport width */
+    height: 50px; /* Fixed height */
+    overflow-y: auto; /* Allow vertical scrolling */
+    
+    padding: 10px; /* Padding for inner content */
+    box-sizing: border-box; /* Include padding in the height and width */
+}
+
+/* Additional styles for message list */
+.flash-message ul {
+    list-style-type: none; /* Remove default list styling */
+    padding: 0; /* Remove padding */
+    margin: 0; /* Remove margin */
+}
+