mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-08-21 02:19:07 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f0efdafbdb |
@@ -1,84 +0,0 @@
|
|||||||
"""A pull that changed nothing on the running system is not an applied update.
|
|
||||||
|
|
||||||
git_pull replaces files on disk and restarts nothing -- there is no systemctl
|
|
||||||
call anywhere in the handler. The display and web services keep running the
|
|
||||||
code they loaded at boot, so the user is told "Code updated successfully" and
|
|
||||||
sees no change until they happen to reboot. The response now says whether a
|
|
||||||
restart is owed, and the UI raises the existing restart-pending banner.
|
|
||||||
"""
|
|
||||||
import subprocess
|
|
||||||
import sys
|
|
||||||
from pathlib import Path
|
|
||||||
from unittest.mock import patch
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
from flask import Flask
|
|
||||||
|
|
||||||
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
|
||||||
|
|
||||||
from web_interface.blueprints import api_v3 as mod # noqa: E402
|
|
||||||
from web_interface.blueprints.api_v3 import api_v3 # noqa: E402
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def client():
|
|
||||||
app = Flask(__name__)
|
|
||||||
app.config['TESTING'] = True
|
|
||||||
app.register_blueprint(api_v3, url_prefix='/api/v3')
|
|
||||||
# The handler consults these after a successful pull; None is the
|
|
||||||
# "not wired up" case it already guards for.
|
|
||||||
api_v3.plugin_store_manager = None
|
|
||||||
api_v3.config_manager = None
|
|
||||||
return app.test_client()
|
|
||||||
|
|
||||||
|
|
||||||
def _git(heads, pull_rc=0, pull_out='Updating a1b2c3..d4e5f6\n'):
|
|
||||||
"""Fake git. `heads` are the successive answers to rev-parse HEAD."""
|
|
||||||
seq = list(heads)
|
|
||||||
|
|
||||||
def run(args, **kwargs):
|
|
||||||
def ok(stdout='', rc=0, b=False):
|
|
||||||
return subprocess.CompletedProcess(
|
|
||||||
args, rc, stdout=(stdout.encode() if b else stdout),
|
|
||||||
stderr=(b'' if b else ''))
|
|
||||||
if args[:2] == ['git', 'rev-parse'] and args[-1] == 'HEAD':
|
|
||||||
return ok(seq.pop(0) + '\n' if seq else 'deadbeef\n')
|
|
||||||
if 'symbolic-full-name' in args or '@{u}' in args:
|
|
||||||
return ok('origin/main\n')
|
|
||||||
if args[:2] == ['git', 'status']:
|
|
||||||
return ok('')
|
|
||||||
if args[:2] == ['git', 'diff']:
|
|
||||||
return ok('')
|
|
||||||
if args[:2] == ['git', 'pull']:
|
|
||||||
return ok(pull_out, pull_rc)
|
|
||||||
return ok('')
|
|
||||||
return run
|
|
||||||
|
|
||||||
|
|
||||||
def _pull(client):
|
|
||||||
return client.post('/api/v3/system/action',
|
|
||||||
json={'action': 'git_pull'}).get_json()
|
|
||||||
|
|
||||||
|
|
||||||
class TestRestartIsRequestedWhenCodeChanged:
|
|
||||||
def test_a_pull_that_moved_head_asks_for_a_restart(self, client):
|
|
||||||
with patch.object(mod.subprocess, 'run', _git(['aaa111', 'bbb222'])):
|
|
||||||
data = _pull(client)
|
|
||||||
assert data['status'] == 'success'
|
|
||||||
assert data['restart_required'] is True, (
|
|
||||||
"new code on disk, services still running the old code, and "
|
|
||||||
"nothing told the user to restart")
|
|
||||||
|
|
||||||
def test_already_up_to_date_does_not(self, client):
|
|
||||||
with patch.object(mod.subprocess, 'run',
|
|
||||||
_git(['aaa111', 'aaa111'], pull_out='Already up to date.\n')):
|
|
||||||
data = _pull(client)
|
|
||||||
assert data['status'] == 'success'
|
|
||||||
assert data['restart_required'] is False, (
|
|
||||||
"prompting after a no-op update trains users to ignore the prompt")
|
|
||||||
|
|
||||||
def test_a_failed_pull_does_not(self, client):
|
|
||||||
with patch.object(mod.subprocess, 'run', _git(['aaa111'], pull_rc=1)):
|
|
||||||
data = _pull(client)
|
|
||||||
assert data['status'] == 'error'
|
|
||||||
assert data['restart_required'] is False
|
|
||||||
@@ -715,10 +715,12 @@ def save_main_config():
|
|||||||
if not data:
|
if not data:
|
||||||
return jsonify({'status': 'error', 'message': 'No data provided'}), 400
|
return jsonify({'status': 'error', 'message': 'No data provided'}), 400
|
||||||
|
|
||||||
import logging
|
# What arrives here is the config itself, and the headers carry the
|
||||||
logging.error(f"DEBUG: save_main_config received data: {data}")
|
# session cookie -- neither belongs in the journal, least of all at
|
||||||
logging.error(f"DEBUG: Content-Type header: {request.content_type}")
|
# ERROR on every save. The shape of the request is the part with
|
||||||
logging.error(f"DEBUG: Headers: {dict(request.headers)}")
|
# diagnostic value, so log that, at the level it deserves.
|
||||||
|
logger.debug("save_main_config: %s, %d top-level key(s)",
|
||||||
|
request.content_type or 'no content-type', len(data))
|
||||||
|
|
||||||
# Merge with existing config (similar to original implementation)
|
# Merge with existing config (similar to original implementation)
|
||||||
current_config = api_v3.config_manager.load_config()
|
current_config = api_v3.config_manager.load_config()
|
||||||
@@ -1996,11 +1998,6 @@ def execute_system_action():
|
|||||||
except subprocess.TimeoutExpired:
|
except subprocess.TimeoutExpired:
|
||||||
logger.warning("git rev-parse timed out before pull")
|
logger.warning("git rev-parse timed out before pull")
|
||||||
|
|
||||||
# Whether the pull actually brought new code in. "Already up to
|
|
||||||
# date" is a success too, and prompting for a restart then would
|
|
||||||
# train users to ignore the prompt.
|
|
||||||
code_changed = False
|
|
||||||
|
|
||||||
# Perform the git pull. Branches without an upstream were given
|
# Perform the git pull. Branches without an upstream were given
|
||||||
# an explicit "origin <branch>" above so the update still works.
|
# an explicit "origin <branch>" above so the update still works.
|
||||||
result = subprocess.run(
|
result = subprocess.run(
|
||||||
@@ -2044,7 +2041,6 @@ def execute_system_action():
|
|||||||
capture_output=True, text=True, timeout=10, cwd=project_dir)
|
capture_output=True, text=True, timeout=10, cwd=project_dir)
|
||||||
new_head = _post.stdout.strip() if _post.returncode == 0 else None
|
new_head = _post.stdout.strip() if _post.returncode == 0 else None
|
||||||
if old_head and new_head and old_head != new_head:
|
if old_head and new_head and old_head != new_head:
|
||||||
code_changed = True
|
|
||||||
diff = subprocess.run(
|
diff = subprocess.run(
|
||||||
['git', 'diff', '--name-only', f'{old_head}..{new_head}'],
|
['git', 'diff', '--name-only', f'{old_head}..{new_head}'],
|
||||||
capture_output=True, text=True, timeout=15, cwd=project_dir)
|
capture_output=True, text=True, timeout=15, cwd=project_dir)
|
||||||
@@ -2104,14 +2100,9 @@ def execute_system_action():
|
|||||||
if ln.strip()), '')
|
if ln.strip()), '')
|
||||||
pull_message = f"Update failed: {detail}" if detail else "Update failed; check logs for details"
|
pull_message = f"Update failed: {detail}" if detail else "Update failed; check logs for details"
|
||||||
|
|
||||||
# Nothing here restarts anything: the pull replaces files on
|
|
||||||
# disk while the display and web services keep running the code
|
|
||||||
# they loaded at boot. Without this the user is told the update
|
|
||||||
# succeeded and sees no change until they happen to reboot.
|
|
||||||
return jsonify({
|
return jsonify({
|
||||||
'status': 'success' if result.returncode == 0 else 'error',
|
'status': 'success' if result.returncode == 0 else 'error',
|
||||||
'message': pull_message,
|
'message': pull_message,
|
||||||
'restart_required': bool(result.returncode == 0 and code_changed),
|
|
||||||
})
|
})
|
||||||
elif action == 'checkout_branch':
|
elif action == 'checkout_branch':
|
||||||
# Switch branches from the Tools tab. Needed because a checkout
|
# Switch branches from the Tools tab. Needed because a checkout
|
||||||
|
|||||||
@@ -116,25 +116,14 @@ document.body.addEventListener('htmx:afterRequest', function(event) {
|
|||||||
// ===== Restart-pending banner =====
|
// ===== Restart-pending banner =====
|
||||||
// Shown after restart-requiring saves; persists across tab switches (and
|
// Shown after restart-requiring saves; persists across tab switches (and
|
||||||
// reloads, via sessionStorage) until the display restarts or it's dismissed.
|
// reloads, via sessionStorage) until the display restarts or it's dismissed.
|
||||||
window.showRestartPending = function(message) {
|
window.showRestartPending = function() {
|
||||||
try {
|
try { sessionStorage.setItem('ledmatrix-restart-pending', '1'); } catch { /* private browsing */ }
|
||||||
sessionStorage.setItem('ledmatrix-restart-pending', '1');
|
|
||||||
// Persisted alongside the flag: a code update and a config save want
|
|
||||||
// different wording, and the banner outlives the page that raised it.
|
|
||||||
if (message) sessionStorage.setItem('ledmatrix-restart-pending-text', message);
|
|
||||||
else sessionStorage.removeItem('ledmatrix-restart-pending-text');
|
|
||||||
} catch { /* private browsing */ }
|
|
||||||
const banner = document.getElementById('restart-pending-banner');
|
const banner = document.getElementById('restart-pending-banner');
|
||||||
const text = document.getElementById('restart-pending-text');
|
|
||||||
if (text && message) text.textContent = message;
|
|
||||||
if (banner) banner.style.display = 'block';
|
if (banner) banner.style.display = 'block';
|
||||||
};
|
};
|
||||||
|
|
||||||
window.dismissRestartPending = function() {
|
window.dismissRestartPending = function() {
|
||||||
try {
|
try { sessionStorage.removeItem('ledmatrix-restart-pending'); } catch { /* no-op */ }
|
||||||
sessionStorage.removeItem('ledmatrix-restart-pending');
|
|
||||||
sessionStorage.removeItem('ledmatrix-restart-pending-text');
|
|
||||||
} catch { /* no-op */ }
|
|
||||||
const banner = document.getElementById('restart-pending-banner');
|
const banner = document.getElementById('restart-pending-banner');
|
||||||
if (banner) banner.style.display = 'none';
|
if (banner) banner.style.display = 'none';
|
||||||
};
|
};
|
||||||
@@ -162,9 +151,6 @@ document.addEventListener('DOMContentLoaded', function() {
|
|||||||
try {
|
try {
|
||||||
if (sessionStorage.getItem('ledmatrix-restart-pending') === '1') {
|
if (sessionStorage.getItem('ledmatrix-restart-pending') === '1') {
|
||||||
const banner = document.getElementById('restart-pending-banner');
|
const banner = document.getElementById('restart-pending-banner');
|
||||||
const saved = sessionStorage.getItem('ledmatrix-restart-pending-text');
|
|
||||||
const text = document.getElementById('restart-pending-text');
|
|
||||||
if (text && saved) text.textContent = saved;
|
|
||||||
if (banner) banner.style.display = 'block';
|
if (banner) banner.style.display = 'block';
|
||||||
}
|
}
|
||||||
} catch { /* no-op */ }
|
} catch { /* no-op */ }
|
||||||
|
|||||||
@@ -413,8 +413,7 @@
|
|||||||
<div class="flex items-center justify-between">
|
<div class="flex items-center justify-between">
|
||||||
<div class="flex items-center space-x-3">
|
<div class="flex items-center space-x-3">
|
||||||
<i class="fas fa-rotate text-lg"></i>
|
<i class="fas fa-rotate text-lg"></i>
|
||||||
<span class="text-sm font-medium" aria-live="polite"
|
<span class="text-sm font-medium" aria-live="polite">
|
||||||
id="restart-pending-text">
|
|
||||||
Configuration saved — restart the display to apply the changes
|
Configuration saved — restart the display to apply the changes
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -1147,13 +1146,6 @@
|
|||||||
if (data.status === 'success') {
|
if (data.status === 'success') {
|
||||||
document.getElementById('update-banner').style.display = 'none';
|
document.getElementById('update-banner').style.display = 'none';
|
||||||
try { sessionStorage.removeItem('update-sha-dismissed'); } catch(e) {}
|
try { sessionStorage.removeItem('update-sha-dismissed'); } catch(e) {}
|
||||||
// The pull replaced files on disk; the running services still
|
|
||||||
// hold the code they loaded at boot. Ask for the restart that
|
|
||||||
// makes the update actually take effect.
|
|
||||||
if (data.restart_required && typeof window.showRestartPending === 'function') {
|
|
||||||
window.showRestartPending(
|
|
||||||
'Update installed \u2014 restart the display to run the new code');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (typeof showNotification === 'function') {
|
if (typeof showNotification === 'function') {
|
||||||
showNotification(data.message || 'Update complete', data.status || 'success');
|
showNotification(data.message || 'Update complete', data.status || 'success');
|
||||||
|
|||||||
Reference in New Issue
Block a user