rick/LEDMatrix
1
0
Fork 0
mirror of https://github.com/ChuckBuilds/LEDMatrix.git synced 2026-04-10 21:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

disable google calendar by default

Browse Source
This commit is contained in:
Chuck
2025-08-13 09:52:53 -05:00
parent 30cf8ee2e8
commit 6c658c23c4
2 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.json
View File

@@ -153,7 +153,7 @@
"duration_buffer": 0.1 "duration_buffer": 0.1
}, },
"calendar": { "calendar": {
"enabled": true, "enabled": false,
"credentials_file": "credentials.json", "credentials_file": "credentials.json",
"token_file": "token.pickle", "token_file": "token.pickle",
"update_interval": 3600, "update_interval": 3600,

57
web_interface_v2.py
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
from flask import Flask, render_template, request, redirect, url_for, flash, jsonify, send_file from flask import Flask, render_template, request, redirect, url_for, flash, jsonify, send_file, Response
from flask_socketio import SocketIO, emit from flask_socketio import SocketIO, emit
import json import json
import os import os
@@ -38,16 +38,14 @@ import logging
app = Flask(__name__) app = Flask(__name__)
app.secret_key = os.urandom(24) app.secret_key = os.urandom(24)
# Use standard threads for background tasks to avoid blocking the web UI when # Prefer eventlet when available to avoid Werkzeug dev server quirks
# running blocking I/O (e.g., requests) inside on-demand update loops.
# We still import eventlet if present so environments with it installed don't break,
# but we intentionally choose 'threading' for async_mode.
try: try:
import eventlet # noqa: F401 import eventlet # noqa: F401
ASYNC_MODE = 'eventlet'
except Exception: except Exception:
pass ASYNC_MODE = 'threading'
socketio = SocketIO(app, cors_allowed_origins="*", async_mode='threading') socketio = SocketIO(app, cors_allowed_origins="*", async_mode=ASYNC_MODE)
# Global variables # Global variables
config_manager = ConfigManager() config_manager = ConfigManager()
@@ -400,18 +398,19 @@ def index():
editor_mode=editor_mode) editor_mode=editor_mode)
except Exception as e: except Exception as e:
flash(f"Error loading configuration: {e}", "error") # Return a minimal, valid response to avoid Werkzeug assertion errors
return render_template('index_v2.html', logger.error(f"Error loading configuration on index: {e}", exc_info=True)
schedule_config={}, return render_template('index_v2.html',
main_config={}, schedule_config={},
main_config_data={}, main_config={},
secrets_config={}, main_config_data={},
main_config_json="{}", secrets_config={},
secrets_config_json="{}", main_config_json="{}",
main_config_path="", secrets_config_json="{}",
secrets_config_path="", main_config_path="",
system_status={}, secrets_config_path="",
editor_mode=False) system_status={'error': str(e)},
editor_mode=False)
def get_system_status(): def get_system_status():
"""Get current system status including display state, performance metrics, and CPU utilization.""" """Get current system status including display state, performance metrics, and CPU utilization."""
@@ -742,7 +741,11 @@ def system_action():
@app.route('/api/system/status') @app.route('/api/system/status')
def get_system_status_api(): def get_system_status_api():
"""Get system status as JSON.""" """Get system status as JSON."""
return jsonify(get_system_status()) try:
return jsonify(get_system_status())
except Exception as e:
# Ensure a valid JSON response is always produced
return jsonify({'status': 'error', 'message': str(e)}), 500
# --- On-Demand Controls --- # --- On-Demand Controls ---
@app.route('/api/ondemand/start', methods=['POST']) @app.route('/api/ondemand/start', methods=['POST'])
@@ -1307,7 +1310,10 @@ def view_logs():
@app.route('/api/display/current') @app.route('/api/display/current')
def get_current_display(): def get_current_display():
"""Get current display image as base64.""" """Get current display image as base64."""
return jsonify(current_display_data) try:
return jsonify(current_display_data)
except Exception as e:
return jsonify({'status': 'error', 'message': str(e), 'image': None}), 500
@app.route('/api/editor/layouts', methods=['GET']) @app.route('/api/editor/layouts', methods=['GET'])
def get_custom_layouts(): def get_custom_layouts():
@@ -1325,7 +1331,11 @@ def get_custom_layouts():
@socketio.on('connect') @socketio.on('connect')
def handle_connect(): def handle_connect():
"""Handle client connection.""" """Handle client connection."""
emit('connected', {'status': 'Connected to LED Matrix Interface'}) try:
emit('connected', {'status': 'Connected to LED Matrix Interface'})
except Exception:
# If emit failed before a response started, just return
return
# Send current display state immediately after connect # Send current display state immediately after connect
try: try:
if display_manager and hasattr(display_manager, 'image'): if display_manager and hasattr(display_manager, 'image'):
@@ -1366,4 +1376,5 @@ if __name__ == '__main__':
# Run the app # Run the app
# In threading mode this uses Werkzeug; allow it explicitly for systemd usage # In threading mode this uses Werkzeug; allow it explicitly for systemd usage
socketio.run(app, host='0.0.0.0', port=5001, debug=False, allow_unsafe_werkzeug=True) # Use eventlet server when available; fall back to Werkzeug in threading mode
socketio.run(app, host='0.0.0.0', port=5001, debug=False, use_reloader=False)