dev #1

Merged
alientim merged 145 commits from dev into main 2025-10-12 13:44:14 +02:00
Showing only changes of commit 2c9a715d37 - Show all commits

View File

@@ -16,14 +16,10 @@
<script> <script>
document.addEventListener("DOMContentLoaded", () => { document.addEventListener("DOMContentLoaded", () => {
// --- Seitentitel setzen --- // --- Intervall aus Datenbank (Jinja Variable) ---
const baseTitle = document.title.split(" - ")[0];
document.title = baseTitle + " - Live Log";
// --- Intervallwerte ---
const intervalMinutes = {{ interval | int }}; const intervalMinutes = {{ interval | int }};
const intervalMilliseconds = intervalMinutes * 60 * 1000; const intervalMilliseconds = intervalMinutes * 60 * 1000;
let lastUpdateTime = Date.now(); let lastUpdateTime = Date.now(); // wird nach Log-Auswertung gesetzt
// --- Log laden --- // --- Log laden ---
function fetchLog() { function fetchLog() {
@@ -31,13 +27,36 @@ document.addEventListener("DOMContentLoaded", () => {
.then(response => response.text()) .then(response => response.text())
.then(data => { .then(data => {
const box = document.getElementById("log-box"); const box = document.getElementById("log-box");
// Zeilen filtern
const filteredLines = data const filteredLines = data
.split("\n") .split("\n")
.filter(line => !line.includes("ist erreichbar!")) .filter(line => !line.includes("ist erreichbar!"));
.join("\n");
box.innerText = filteredLines; box.innerText = filteredLines.join("\n");
box.scrollTop = box.scrollHeight; box.scrollTop = box.scrollHeight;
// --- Timer: letzte "----" Linie finden ---
let lastSeparatorIndex = -1;
for (let i = filteredLines.length - 1; i >= 0; i--) {
if (filteredLines[i].startsWith("--------------------------------------------------------------------")) {
lastSeparatorIndex = i;
break;
}
}
// ersten Zeitstempel nach Separator nehmen
if (lastSeparatorIndex >= 0 && lastSeparatorIndex + 1 < filteredLines.length) {
const firstLine = filteredLines[lastSeparatorIndex + 1];
const match = firstLine.match(/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/);
if (match) {
lastUpdateTime = new Date(match[1]).getTime();
} else {
lastUpdateTime = Date.now(); lastUpdateTime = Date.now();
}
} else {
lastUpdateTime = Date.now();
}
}) })
.catch(err => console.error("Fehler beim Laden der Logs:", err)); .catch(err => console.error("Fehler beim Laden der Logs:", err));
} }
@@ -54,9 +73,9 @@ document.addEventListener("DOMContentLoaded", () => {
document.getElementById("refresh-btn").addEventListener("click", fetchLog); document.getElementById("refresh-btn").addEventListener("click", fetchLog);
// --- Initial starten --- // --- Initial starten ---
setInterval(updateTimer, 1000); fetchLog(); // zuerst laden
fetchLog(); setInterval(fetchLog, intervalMilliseconds); // automatische Updates nach DB-Intervall
setInterval(fetchLog, intervalMilliseconds); setInterval(updateTimer, 1000); // Timer jede Sekunde
}); });
</script> </script>