Erweitere die USB-Port-Konfiguration mit Bezeichnungen und verbessere das Layout der Benutzeroberfläche
This commit is contained in:
403
app.py
403
app.py
@@ -35,7 +35,8 @@ WIFI_BOOT_WAIT = 25 # Sekunden warten beim Start bevor AP gestartet wird
|
||||
|
||||
DEFAULT_CONFIG = {
|
||||
# USB
|
||||
'source_port': None, 'dest_port': None,
|
||||
'source_port': None, 'source_label': '',
|
||||
'dest_port': None, 'dest_label': '',
|
||||
'folder_format': '%Y-%m-%d', 'add_time': True,
|
||||
'subfolder': True, 'auto_copy': True,
|
||||
# WiFi
|
||||
@@ -522,6 +523,8 @@ def r_wifi_status():
|
||||
|
||||
# ── HTML Template ─────────────────────────────────────────────────────────────
|
||||
|
||||
# ── HTML Template ─────────────────────────────────────────────────────────────
|
||||
|
||||
HTML = r"""<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
<head>
|
||||
@@ -534,11 +537,10 @@ HTML = r"""<!DOCTYPE html>
|
||||
body{background:var(--bg);color:var(--txt);font-family:system-ui,sans-serif;padding:1rem 1rem 4rem;min-height:100vh}
|
||||
h1{font-size:1.35rem;font-weight:700;display:flex;align-items:center;gap:.5rem;margin-bottom:1.25rem}
|
||||
h2{font-size:.72rem;font-weight:700;text-transform:uppercase;letter-spacing:.08em;color:var(--mut);margin-bottom:.8rem}
|
||||
.wrap{max-width:940px;margin:0 auto;display:grid;gap:.85rem;grid-template-columns:1fr}
|
||||
.wrap{max-width:960px;margin:0 auto;display:grid;gap:.85rem;grid-template-columns:1fr}
|
||||
@media(min-width:600px){.wrap{grid-template-columns:1fr 1fr}}
|
||||
.card{background:var(--s1);border:1px solid var(--brd);border-radius:.8rem;padding:1.1rem}
|
||||
.span2{grid-column:1/-1}
|
||||
/* Buttons */
|
||||
.btn{display:inline-flex;align-items:center;gap:.3rem;padding:.38rem .82rem;border:1px solid var(--brd);border-radius:.4rem;background:transparent;color:var(--txt);font-size:.84rem;cursor:pointer;transition:.15s;white-space:nowrap}
|
||||
.btn:hover{border-color:var(--acc);color:var(--acc)}
|
||||
.btn:disabled{opacity:.4;cursor:default}
|
||||
@@ -550,27 +552,10 @@ h2{font-size:.72rem;font-weight:700;text-transform:uppercase;letter-spacing:.08e
|
||||
.btn.danger:hover{background:rgba(239,68,68,.1)}
|
||||
.btn.sm{padding:.25rem .55rem;font-size:.75rem}
|
||||
.btn-row{display:flex;flex-wrap:wrap;gap:.5rem;margin-top:.8rem}
|
||||
/* Progress */
|
||||
.prog-wrap{margin:.6rem 0 .3rem;height:6px;background:var(--bg);border-radius:3px;overflow:hidden}
|
||||
.prog-bar{height:100%;background:var(--acc);border-radius:3px;transition:width .4s ease}
|
||||
.prog-info{font-size:.78rem;color:var(--mut);min-height:1.1rem}
|
||||
/* Status */
|
||||
.st-ok{color:var(--grn)}.st-run{color:var(--acc)}.st-err{color:var(--red)}.st-idle{color:var(--mut)}
|
||||
/* Devices */
|
||||
.dev-list{display:flex;flex-direction:column;gap:.5rem}
|
||||
.dev{padding:.65rem .85rem;border:1px solid var(--brd);border-radius:.5rem;transition:.15s}
|
||||
.dev:hover{border-color:var(--acc)}
|
||||
.dev.src{border-color:var(--grn);background:rgba(34,197,94,.06)}
|
||||
.dev.dst{border-color:var(--acc);background:rgba(59,130,246,.06)}
|
||||
.dev-top{display:flex;align-items:center;gap:.5rem;flex-wrap:wrap}
|
||||
.dev-name{font-weight:600;font-size:.9rem}
|
||||
.badge{font-size:.65rem;font-weight:700;text-transform:uppercase;padding:.12rem .42rem;border-radius:.25rem}
|
||||
.b-src{background:rgba(34,197,94,.15);color:var(--grn)}
|
||||
.b-dst{background:rgba(59,130,246,.15);color:var(--acc)}
|
||||
.dev-meta{font-size:.74rem;color:var(--mut);display:flex;gap:.4rem;flex-wrap:wrap;margin:.25rem 0}
|
||||
.dev-meta span{background:var(--bg);padding:.1rem .35rem;border-radius:.2rem}
|
||||
.dev-acts{display:flex;gap:.4rem;margin-top:.35rem}
|
||||
/* Form fields */
|
||||
.field{margin-bottom:.8rem}
|
||||
.field label{display:block;font-size:.81rem;color:var(--mut);margin-bottom:.3rem}
|
||||
.field input,.field select{width:100%;padding:.44rem .65rem;background:var(--bg);border:1px solid var(--brd);border-radius:.4rem;color:var(--txt);font-size:.88rem}
|
||||
@@ -578,31 +563,40 @@ h2{font-size:.72rem;font-weight:700;text-transform:uppercase;letter-spacing:.08e
|
||||
.field input[type=password]{letter-spacing:.05em}
|
||||
.tog{display:flex;align-items:center;gap:.5rem;margin-bottom:.65rem;cursor:pointer;user-select:none;font-size:.88rem}
|
||||
.tog input{accent-color:var(--acc);width:16px;height:16px;cursor:pointer}
|
||||
/* Log */
|
||||
.log-box{font-family:ui-monospace,monospace;font-size:.76rem;max-height:220px;overflow-y:auto}
|
||||
.log-entry{display:flex;gap:.5rem;padding:.2rem 0;border-bottom:1px solid rgba(51,65,85,.5)}
|
||||
.log-t{color:var(--mut);flex-shrink:0}
|
||||
.empty{color:var(--mut);font-size:.86rem;padding:.25rem 0}
|
||||
/* WiFi status bar */
|
||||
.wifi-bar{display:flex;align-items:center;gap:.6rem;padding:.55rem .85rem;border-radius:.5rem;border:1px solid var(--brd);background:var(--s2);font-size:.84rem;flex-wrap:wrap}
|
||||
.wifi-dot{width:8px;height:8px;border-radius:50%;flex-shrink:0}
|
||||
.wifi-dot.green{background:var(--grn)}
|
||||
.wifi-dot.blue{background:var(--pur)}
|
||||
.wifi-dot.grey{background:var(--mut)}
|
||||
.wifi-info{flex:1;min-width:0}
|
||||
.wifi-dot.green{background:var(--grn)}.wifi-dot.blue{background:var(--pur)}.wifi-dot.grey{background:var(--mut)}
|
||||
.wifi-ip{font-family:monospace;font-size:.8rem;color:var(--mut)}
|
||||
/* Tab strip for config */
|
||||
.tabs{display:flex;gap:.25rem;margin-bottom:.9rem;border-bottom:1px solid var(--brd);padding-bottom:.5rem}
|
||||
.tab{padding:.3rem .7rem;border-radius:.35rem;font-size:.82rem;cursor:pointer;color:var(--mut);transition:.15s}
|
||||
.tab.active{background:var(--acc);color:#fff}
|
||||
.tab-pane{display:none}.tab-pane.active{display:block}
|
||||
/* Network list */
|
||||
.net-list{display:flex;flex-direction:column;gap:.35rem;max-height:220px;overflow-y:auto;margin-top:.5rem}
|
||||
.net-list{display:flex;flex-direction:column;gap:.35rem;max-height:200px;overflow-y:auto;margin-top:.5rem}
|
||||
.net-item{display:flex;align-items:center;gap:.5rem;padding:.35rem .55rem;border:1px solid var(--brd);border-radius:.4rem;cursor:pointer;transition:.15s;font-size:.84rem}
|
||||
.net-item:hover{border-color:var(--acc);background:rgba(59,130,246,.05)}
|
||||
.net-signal{font-size:.72rem;color:var(--mut);margin-left:auto}
|
||||
.flash{font-size:.78rem;padding:.25rem 0;min-height:1.2rem}
|
||||
.flash.ok{color:var(--grn)}.flash.err{color:var(--red)}
|
||||
/* Port Slots */
|
||||
.port-grid{display:grid;grid-template-columns:1fr 1fr;gap:.85rem}
|
||||
@media(max-width:599px){.port-grid{grid-template-columns:1fr}}
|
||||
.port-slot{border:2px solid var(--brd);border-radius:.7rem;padding:1rem;transition:border-color .2s}
|
||||
.port-slot.has-src{border-color:var(--grn)}
|
||||
.port-slot.has-dst{border-color:var(--acc)}
|
||||
.port-role{font-size:.65rem;font-weight:800;text-transform:uppercase;letter-spacing:.1em;padding:.18rem .5rem;border-radius:.25rem;display:inline-block;margin-bottom:.65rem}
|
||||
.port-role.src{background:rgba(34,197,94,.15);color:var(--grn)}
|
||||
.port-role.dst{background:rgba(59,130,246,.15);color:var(--acc)}
|
||||
.port-status{display:flex;align-items:center;gap:.65rem;padding:.65rem .8rem;background:var(--bg);border-radius:.5rem;margin-bottom:.8rem;min-height:54px}
|
||||
.pdot{width:10px;height:10px;border-radius:50%;flex-shrink:0;transition:.3s}
|
||||
.pdot.on{background:var(--grn);box-shadow:0 0 6px var(--grn)}
|
||||
.pdot.off{background:var(--brd)}
|
||||
.port-dev-name{font-weight:600;font-size:.9rem;line-height:1.3}
|
||||
.port-dev-sub{font-size:.73rem;color:var(--mut);font-family:monospace;margin-top:.1rem}
|
||||
.port-hint{font-size:.73rem;color:var(--mut);margin-top:.65rem;padding:.5rem .65rem;background:var(--bg);border-radius:.4rem;border-left:3px solid var(--brd)}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
@@ -611,12 +605,12 @@ h2{font-size:.72rem;font-weight:700;text-transform:uppercase;letter-spacing:.08e
|
||||
<!-- Header -->
|
||||
<div class="span2" style="display:flex;align-items:center;justify-content:space-between;flex-wrap:wrap;gap:.5rem">
|
||||
<h1 style="margin:0">
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#3b82f6" stroke-width="2.5"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg>
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#3b82f6" stroke-width="2.5"><path d="M5 12h14M12 5l7 7-7 7"/></svg>
|
||||
PiCopy
|
||||
</h1>
|
||||
<div id="wifi-bar" class="wifi-bar" style="max-width:340px">
|
||||
<div class="wifi-bar" style="max-width:340px">
|
||||
<div class="wifi-dot grey" id="wifi-dot"></div>
|
||||
<div class="wifi-info">
|
||||
<div style="flex:1;min-width:0">
|
||||
<div id="wifi-mode-txt" style="font-weight:600">Verbinde…</div>
|
||||
<div id="wifi-ip" class="wifi-ip"></div>
|
||||
</div>
|
||||
@@ -639,10 +633,69 @@ h2{font-size:.72rem;font-weight:700;text-transform:uppercase;letter-spacing:.08e
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- USB Geräte -->
|
||||
<!-- USB Port Konfiguration -->
|
||||
<div class="card span2">
|
||||
<h2>Verbundene USB-Geräte</h2>
|
||||
<div id="dev-list" class="dev-list"><div class="empty">Lade…</div></div>
|
||||
<h2>USB Port Konfiguration</h2>
|
||||
|
||||
<div class="port-grid">
|
||||
|
||||
<!-- QUELLE -->
|
||||
<div class="port-slot" id="slot-src">
|
||||
<div class="port-role src">Quelle</div>
|
||||
<div class="port-status">
|
||||
<div class="pdot off" id="src-dot"></div>
|
||||
<div style="min-width:0">
|
||||
<div class="port-dev-name" id="src-dev-name">Nicht verbunden</div>
|
||||
<div class="port-dev-sub" id="src-dev-sub">Kein Port konfiguriert</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>Bezeichnung (frei wählbar)</label>
|
||||
<input type="text" id="src-label" placeholder="z.B. Kamera-Stick">
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>Port zuweisen — verbundenes Gerät wählen</label>
|
||||
<select id="src-select">
|
||||
<option value="">— Gerät einstecken & hier wählen —</option>
|
||||
</select>
|
||||
</div>
|
||||
<button class="btn sec" style="width:100%" onclick="assignPort('source')">✓ Als feste Quelle speichern</button>
|
||||
<div id="src-flash" class="flash" style="margin-top:.4rem"></div>
|
||||
<div class="port-hint">Stecke den USB-Stick in den gewünschten Port, wähle ihn hier aus und klicke Speichern. PiCopy merkt sich diesen physischen Port dauerhaft.</div>
|
||||
</div>
|
||||
|
||||
<!-- ZIEL -->
|
||||
<div class="port-slot" id="slot-dst">
|
||||
<div class="port-role dst">Ziel</div>
|
||||
<div class="port-status">
|
||||
<div class="pdot off" id="dst-dot"></div>
|
||||
<div style="min-width:0">
|
||||
<div class="port-dev-name" id="dst-dev-name">Nicht verbunden</div>
|
||||
<div class="port-dev-sub" id="dst-dev-sub">Kein Port konfiguriert</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>Bezeichnung (frei wählbar)</label>
|
||||
<input type="text" id="dst-label" placeholder="z.B. Backup-Laufwerk">
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>Port zuweisen — verbundenes Gerät wählen</label>
|
||||
<select id="dst-select">
|
||||
<option value="">— Gerät einstecken & hier wählen —</option>
|
||||
</select>
|
||||
</div>
|
||||
<button class="btn pri" style="width:100%" onclick="assignPort('dest')">✓ Als festes Ziel speichern</button>
|
||||
<div id="dst-flash" class="flash" style="margin-top:.4rem"></div>
|
||||
<div class="port-hint">Stecke das Ziel-Laufwerk in den gewünschten Port, wähle es aus und klicke Speichern. Ab dann wird dieser Port immer als Ziel verwendet.</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<!-- Weitere verbundene Geräte (nicht zugewiesen) -->
|
||||
<div id="unassigned-wrap" style="margin-top:.85rem;display:none">
|
||||
<div style="font-size:.72rem;font-weight:700;text-transform:uppercase;letter-spacing:.08em;color:var(--mut);margin-bottom:.5rem">Weitere verbundene Geräte (noch nicht zugewiesen)</div>
|
||||
<div id="unassigned-list" style="display:flex;flex-direction:column;gap:.35rem"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Kopier-Einstellungen -->
|
||||
@@ -651,15 +704,15 @@ h2{font-size:.72rem;font-weight:700;text-transform:uppercase;letter-spacing:.08e
|
||||
<div class="field">
|
||||
<label>Ordner-Datumsformat</label>
|
||||
<select id="c-fmt">
|
||||
<option value="%Y-%m-%d">JJJJ-MM-TT (2024-01-15)</option>
|
||||
<option value="%Y%m%d">JJJJMMTT (20240115)</option>
|
||||
<option value="%d-%m-%Y">TT-MM-JJJJ (15-01-2024)</option>
|
||||
<option value="%Y/%m/%d">JJJJ/MM/TT (Unterordner)</option>
|
||||
<option value="%Y-%m-%d">JJJJ-MM-TT (2024-01-15)</option>
|
||||
<option value="%Y%m%d">JJJJMMTT (20240115)</option>
|
||||
<option value="%d-%m-%Y">TT-MM-JJJJ (15-01-2024)</option>
|
||||
<option value="%Y/%m/%d">JJJJ/MM/TT (Unterordner)</option>
|
||||
</select>
|
||||
</div>
|
||||
<label class="tog"><input type="checkbox" id="c-time"><span>Uhrzeit im Ordnernamen</span></label>
|
||||
<label class="tog"><input type="checkbox" id="c-sub"><span>Unterordner pro Quelle</span></label>
|
||||
<label class="tog"><input type="checkbox" id="c-auto"><span>Automatisch kopieren bei USB-Verbindung</span></label>
|
||||
<label class="tog"><input type="checkbox" id="c-sub"><span>Unterordner pro Quelle (nach Gerätebezeichnung)</span></label>
|
||||
<label class="tog"><input type="checkbox" id="c-auto"><span>Automatisch kopieren wenn Quelle & Ziel verbunden</span></label>
|
||||
<button class="btn pri" onclick="saveCopyCfg()">✓ Speichern</button>
|
||||
<div id="copy-cfg-msg" class="flash ok" style="display:none">Gespeichert!</div>
|
||||
</div>
|
||||
@@ -668,20 +721,16 @@ h2{font-size:.72rem;font-weight:700;text-transform:uppercase;letter-spacing:.08e
|
||||
<div class="card">
|
||||
<h2>WiFi-Einstellungen</h2>
|
||||
<div class="tabs">
|
||||
<div class="tab active" onclick="showTab('tab-client')">Heimnetz</div>
|
||||
<div class="tab" onclick="showTab('tab-ap')">Hotspot (AP)</div>
|
||||
<div class="tab active" onclick="switchTab('tab-client','tab-ap')">Heimnetz</div>
|
||||
<div class="tab" onclick="switchTab('tab-ap','tab-client')">Hotspot (AP)</div>
|
||||
</div>
|
||||
|
||||
<!-- Client WiFi Tab -->
|
||||
<div id="tab-client" class="tab-pane active">
|
||||
<div style="font-size:.8rem;color:var(--mut);margin-bottom:.75rem">
|
||||
WLAN für die Verbindung mit deinem Router. Wenn nicht erreichbar, startet PiCopy automatisch einen eigenen Hotspot.
|
||||
</div>
|
||||
<div style="font-size:.8rem;color:var(--mut);margin-bottom:.75rem">Heimnetz für die Router-Verbindung. Wenn nicht erreichbar, startet PiCopy automatisch einen Hotspot.</div>
|
||||
<div class="field">
|
||||
<label>Netzwerk (SSID)</label>
|
||||
<div style="display:flex;gap:.4rem">
|
||||
<input type="text" id="w-ssid" placeholder="WLAN-Name">
|
||||
<button class="btn sm" onclick="scanNetworks()" title="Netzwerke suchen">🔌</button>
|
||||
<button class="btn sm" onclick="scanNetworks()">🔌</button>
|
||||
</div>
|
||||
</div>
|
||||
<div id="net-list" class="net-list" style="display:none"></div>
|
||||
@@ -692,13 +741,8 @@ h2{font-size:.72rem;font-weight:700;text-transform:uppercase;letter-spacing:.08e
|
||||
<button class="btn pri" onclick="connectWifi()">🔌 Verbinden & Speichern</button>
|
||||
<div id="wifi-flash" class="flash" style="margin-top:.4rem"></div>
|
||||
</div>
|
||||
|
||||
<!-- AP Tab -->
|
||||
<div id="tab-ap" class="tab-pane">
|
||||
<div style="font-size:.8rem;color:var(--mut);margin-bottom:.75rem">
|
||||
Der Hotspot wird automatisch gestartet wenn kein Heimnetz erreichbar ist.<br>
|
||||
IP: <b>10.42.0.1</b> · Port: <b>8080</b>
|
||||
</div>
|
||||
<div style="font-size:.8rem;color:var(--mut);margin-bottom:.75rem">Dieser Hotspot startet automatisch wenn kein Heimnetz erreichbar ist.<br>IP des Pi im Hotspot-Modus: <b>10.42.0.1:8080</b></div>
|
||||
<div class="field">
|
||||
<label>Hotspot-Name (SSID)</label>
|
||||
<input type="text" id="ap-ssid" placeholder="PiCopy">
|
||||
@@ -712,77 +756,130 @@ h2{font-size:.72rem;font-weight:700;text-transform:uppercase;letter-spacing:.08e
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Log -->
|
||||
<!-- Protokoll -->
|
||||
<div class="card span2">
|
||||
<h2>Protokoll</h2>
|
||||
<div id="log-box" class="log-box"><div class="empty">Noch keine Einträge</div></div>
|
||||
</div>
|
||||
|
||||
</div><!-- /wrap -->
|
||||
|
||||
</div>
|
||||
<script>
|
||||
let cfg = {}, devs = [];
|
||||
|
||||
const $ = id => document.getElementById(id);
|
||||
const api = async (path, method='GET', body=null) => {
|
||||
const o = {method, headers:{'Content-Type':'application/json'}};
|
||||
if (body) o.body = JSON.stringify(body);
|
||||
const r = await fetch('/api'+path, o);
|
||||
return r.json();
|
||||
return (await fetch('/api'+path, o)).json();
|
||||
};
|
||||
|
||||
// ── Tab navigation ───────────────────────────────────────────────────────
|
||||
function showTab(id) {
|
||||
document.querySelectorAll('.tab-pane').forEach(p => p.classList.remove('active'));
|
||||
document.querySelectorAll('.tab').forEach(t => t.classList.remove('active'));
|
||||
$(id).classList.add('active');
|
||||
const idx = ['tab-client','tab-ap'].indexOf(id);
|
||||
document.querySelectorAll('.tab')[idx]?.classList.add('active');
|
||||
// ── Tabs ──────────────────────────────────────────────────────────────────
|
||||
function switchTab(show, hide) {
|
||||
$(show).classList.add('active'); $(hide).classList.remove('active');
|
||||
document.querySelectorAll('.tab').forEach(t =>
|
||||
t.classList.toggle('active', t.textContent.trim() === (show==='tab-client' ? 'Heimnetz' : 'Hotspot (AP)'))
|
||||
);
|
||||
}
|
||||
|
||||
// ── Devices ──────────────────────────────────────────────────────────────
|
||||
// ── Port Slots ────────────────────────────────────────────────────────────
|
||||
async function refreshDevices() {
|
||||
devs = await api('/devices');
|
||||
renderDevs();
|
||||
renderPortSlots();
|
||||
renderUnassigned();
|
||||
populateSelects();
|
||||
}
|
||||
|
||||
function renderDevs() {
|
||||
const el = $('dev-list');
|
||||
if (!devs.length) {
|
||||
el.innerHTML = '<div class="empty">Keine USB-Speichergeräte gefunden. Gerät einstecken und "Neu laden" klicken.</div>';
|
||||
return;
|
||||
}
|
||||
el.innerHTML = devs.map(d => {
|
||||
const isSrc = d.usb_port === cfg.source_port;
|
||||
const isDst = d.usb_port === cfg.dest_port;
|
||||
const cls = isSrc ? 'src' : isDst ? 'dst' : '';
|
||||
const badge = isSrc ? '<span class="badge b-src">✓ Quelle</span>'
|
||||
: isDst ? '<span class="badge b-dst">✓ Ziel</span>' : '';
|
||||
return `<div class="dev ${cls}">
|
||||
<div class="dev-top">
|
||||
<span class="dev-name">${d.label||d.device}</span>${badge}
|
||||
</div>
|
||||
<div class="dev-meta">
|
||||
<span>${d.device}</span>
|
||||
<span>Port: <b>${d.usb_port||'?'}</b></span>
|
||||
<span>${d.size}</span>
|
||||
${d.mount?'<span>'+d.mount+'</span>':''}
|
||||
</div>
|
||||
<div class="dev-acts">
|
||||
<button class="btn sm sec" onclick="assign('${d.usb_port}','source')">Als Quelle</button>
|
||||
<button class="btn sm" onclick="assign('${d.usb_port}','dest')">Als Ziel</button>
|
||||
</div>
|
||||
</div>`;
|
||||
}).join('');
|
||||
function renderPortSlots() {
|
||||
renderSlot('src', cfg.source_port, cfg.source_label);
|
||||
renderSlot('dst', cfg.dest_port, cfg.dest_label);
|
||||
}
|
||||
|
||||
async function assign(port, role) {
|
||||
if (role === 'source') cfg.source_port = port;
|
||||
else cfg.dest_port = port;
|
||||
function renderSlot(role, port, label) {
|
||||
const isSrc = role === 'src';
|
||||
const dev = devs.find(d => d.usb_port === port);
|
||||
const dot = $(role+'-dot');
|
||||
const nameEl = $(role+'-dev-name');
|
||||
const subEl = $(role+'-dev-sub');
|
||||
const slotEl = $('slot-'+role);
|
||||
const lblEl = $(role+'-label');
|
||||
|
||||
slotEl.classList.toggle('has-src', isSrc && !!port);
|
||||
slotEl.classList.toggle('has-dst', !isSrc && !!port);
|
||||
|
||||
if (dev) {
|
||||
dot.className = 'pdot on';
|
||||
nameEl.textContent = dev.label || dev.device;
|
||||
subEl.textContent = 'Port ' + port + (dev.size ? ' · ' + dev.size : '') + (dev.mount ? ' · ' + dev.mount : '');
|
||||
} else if (port) {
|
||||
dot.className = 'pdot off';
|
||||
nameEl.textContent = label || 'Nicht verbunden';
|
||||
subEl.textContent = 'Konfigurierter Port: ' + port + (label ? ' · ' + label : '');
|
||||
} else {
|
||||
dot.className = 'pdot off';
|
||||
nameEl.textContent = 'Nicht verbunden';
|
||||
subEl.textContent = 'Kein Port konfiguriert';
|
||||
}
|
||||
|
||||
if (lblEl && !lblEl.dataset.dirty) lblEl.value = label || '';
|
||||
}
|
||||
|
||||
function populateSelects() {
|
||||
const opts = devs.map(d =>
|
||||
`<option value="${d.usb_port}">${d.label||d.device} — Port ${d.usb_port||'?'} (${d.size})</option>`
|
||||
).join('');
|
||||
['src-select','dst-select'].forEach(id => {
|
||||
const el = $(id), prev = el.value;
|
||||
el.innerHTML = '<option value="">— Gerät einstecken & hier wählen —</option>' + opts;
|
||||
if (prev && devs.find(d => d.usb_port === prev)) el.value = prev;
|
||||
});
|
||||
}
|
||||
|
||||
function renderUnassigned() {
|
||||
const list = devs.filter(d => d.usb_port !== cfg.source_port && d.usb_port !== cfg.dest_port);
|
||||
const wrap = $('unassigned-wrap');
|
||||
if (!list.length) { wrap.style.display = 'none'; return; }
|
||||
wrap.style.display = 'block';
|
||||
$('unassigned-list').innerHTML = list.map(d => `
|
||||
<div style="display:flex;align-items:center;gap:.65rem;padding:.5rem .75rem;background:var(--bg);border-radius:.45rem;font-size:.84rem">
|
||||
<div style="width:8px;height:8px;border-radius:50%;background:var(--ylw);flex-shrink:0"></div>
|
||||
<span style="font-weight:600">${d.label||d.device}</span>
|
||||
<span style="color:var(--mut);font-size:.74rem">${d.device} · Port ${d.usb_port||'?'} · ${d.size}</span>
|
||||
</div>`).join('');
|
||||
}
|
||||
|
||||
// ── Assign port ───────────────────────────────────────────────────────────
|
||||
async function assignPort(role) {
|
||||
const isSrc = role === 'source';
|
||||
const selId = isSrc ? 'src-select' : 'dst-select';
|
||||
const lblId = isSrc ? 'src-label' : 'dst-label';
|
||||
const flashId = isSrc ? 'src-flash' : 'dst-flash';
|
||||
const portKey = isSrc ? 'source_port' : 'dest_port';
|
||||
const labelKey = isSrc ? 'source_label': 'dest_label';
|
||||
const port = $(selId).value;
|
||||
const label = $(lblId).value.trim();
|
||||
|
||||
if (!port) { flash(flashId,'err','Bitte zuerst ein Gerät aus der Liste wählen.'); return; }
|
||||
|
||||
const otherPort = isSrc ? cfg.dest_port : cfg.source_port;
|
||||
if (port === otherPort) {
|
||||
flash(flashId,'err','Dieser Port ist bereits als '+(isSrc?'Ziel':'Quelle')+' konfiguriert!'); return;
|
||||
}
|
||||
|
||||
cfg[portKey] = port;
|
||||
cfg[labelKey] = label;
|
||||
$(lblId).dataset.dirty = '';
|
||||
await api('/config','POST',cfg);
|
||||
renderDevs();
|
||||
flash(flashId,'ok','Gespeichert — Port '+port+' ist jetzt feste '+(isSrc?'Quelle':'Ziel')+'.');
|
||||
renderPortSlots();
|
||||
renderUnassigned();
|
||||
}
|
||||
|
||||
['src-label','dst-label'].forEach(id => {
|
||||
window.addEventListener('DOMContentLoaded', () => {
|
||||
const el = $(id);
|
||||
if (el) el.addEventListener('input', () => { el.dataset.dirty = '1'; });
|
||||
});
|
||||
});
|
||||
|
||||
// ── Copy ──────────────────────────────────────────────────────────────────
|
||||
async function startCopy() {
|
||||
const r = await api('/copy/start','POST');
|
||||
@@ -790,7 +887,7 @@ async function startCopy() {
|
||||
}
|
||||
async function cancelCopy() { await api('/copy/cancel','POST'); }
|
||||
|
||||
// ── Config ────────────────────────────────────────────────────────────────
|
||||
// ── Settings ──────────────────────────────────────────────────────────────
|
||||
async function loadCfg() {
|
||||
cfg = await api('/config');
|
||||
$('c-fmt').value = cfg.folder_format || '%Y-%m-%d';
|
||||
@@ -815,38 +912,25 @@ async function scanNetworks() {
|
||||
$('net-list').style.display='flex';
|
||||
$('net-list').innerHTML='<div class="empty">Suche Netzwerke…</div>';
|
||||
const nets = await api('/wifi/scan');
|
||||
if (!nets.length) {
|
||||
$('net-list').innerHTML = '<div class="empty">Keine Netzwerke gefunden</div>';
|
||||
return;
|
||||
}
|
||||
if (!nets.length) { $('net-list').innerHTML='<div class="empty">Keine Netzwerke gefunden</div>'; return; }
|
||||
$('net-list').innerHTML = nets.map(n => {
|
||||
const bars = n.signal > 66 ? '▂▄▆█' : n.signal > 33 ? '▂▄▆░' : '▂▄░░';
|
||||
return `<div class="net-item" onclick="selectNet('${n.ssid.replace(/'/g,"\\'")}')">
|
||||
<span>${n.ssid}</span>
|
||||
<span class="net-signal">${bars} ${n.signal}%</span>
|
||||
</div>`;
|
||||
const b = n.signal>66?'▂▄▆█':n.signal>33?'▂▄▆░':'▂▄░░';
|
||||
return `<div class="net-item" onclick="selectNet('${n.ssid.replace(/'/g,"\\'")}')"><span>${n.ssid}</span><span class="net-signal">${b} ${n.signal}%</span></div>`;
|
||||
}).join('');
|
||||
}
|
||||
|
||||
function selectNet(ssid) {
|
||||
$('w-ssid').value = ssid;
|
||||
$('net-list').style.display = 'none';
|
||||
$('w-pw').focus();
|
||||
}
|
||||
function selectNet(ssid) { $('w-ssid').value=ssid; $('net-list').style.display='none'; $('w-pw').focus(); }
|
||||
|
||||
async function connectWifi() {
|
||||
const ssid = $('w-ssid').value.trim();
|
||||
const pw = $('w-pw').value;
|
||||
const ssid=$('w-ssid').value.trim(), pw=$('w-pw').value;
|
||||
if (!ssid) { flash('wifi-flash','err','Bitte SSID eingeben'); return; }
|
||||
flash('wifi-flash','ok','Verbinde… (kann 30s dauern)');
|
||||
const r = await api('/wifi/connect','POST',{ssid,password:pw});
|
||||
if (r.error) flash('wifi-flash','err',r.error);
|
||||
else flash('wifi-flash','ok','Verbindungsversuch gestartet. Bei Erfolg erscheint neue IP oben.');
|
||||
else flash('wifi-flash','ok','Gestartet. Bei Erfolg erscheint oben die neue IP.');
|
||||
}
|
||||
|
||||
async function saveAP() {
|
||||
const ssid = $('ap-ssid').value.trim();
|
||||
const pw = $('ap-pw').value;
|
||||
const ssid=$('ap-ssid').value.trim(), pw=$('ap-pw').value;
|
||||
if (!ssid) { flash('ap-flash','err','SSID fehlt'); return; }
|
||||
if (pw.length<8) { flash('ap-flash','err','Passwort min. 8 Zeichen'); return; }
|
||||
const r = await api('/wifi/ap','POST',{ssid,password:pw});
|
||||
@@ -854,82 +938,59 @@ async function saveAP() {
|
||||
else flash('ap-flash','ok','Gespeichert! Hotspot wird neu gestartet.');
|
||||
}
|
||||
|
||||
// ── Poll status ────────────────────────────────────────────────────────────
|
||||
// ── Poll ──────────────────────────────────────────────────────────────────
|
||||
async function poll() {
|
||||
try {
|
||||
const s = await api('/status');
|
||||
const c = s.copy, w = s.wifi;
|
||||
const {copy:c, wifi:w} = await api('/status');
|
||||
|
||||
// WiFi bar
|
||||
const dot = $('wifi-dot');
|
||||
const modeTxt = $('wifi-mode-txt');
|
||||
const ipTxt = $('wifi-ip');
|
||||
const dot=$('wifi-dot'), mTxt=$('wifi-mode-txt'), ip=$('wifi-ip');
|
||||
if (w.mode==='client'){
|
||||
dot.className='wifi-dot green';
|
||||
modeTxt.textContent = '🔌 ' + (w.ssid || 'Verbunden');
|
||||
modeTxt.innerHTML = '🔌 ' + (w.ssid || 'Verbunden');
|
||||
ipTxt.textContent = w.ip || '';
|
||||
mTxt.innerHTML='🔌 '+(w.ssid||'Verbunden');
|
||||
ip.textContent=w.ip||'';
|
||||
} else if (w.mode==='ap'){
|
||||
dot.className='wifi-dot blue';
|
||||
modeTxt.innerHTML = '📶 Hotspot: ' + (w.ssid || 'PiCopy');
|
||||
ipTxt.textContent = '10.42.0.1 (Direkt verbinden)';
|
||||
mTxt.innerHTML='📶 Hotspot: '+(w.ssid||'PiCopy');
|
||||
ip.textContent='10.42.0.1 · Port 8080';
|
||||
} else {
|
||||
dot.className='wifi-dot grey';
|
||||
modeTxt.textContent = 'Kein WLAN';
|
||||
ipTxt.textContent = '';
|
||||
mTxt.textContent='Kein WLAN'; ip.textContent='';
|
||||
}
|
||||
|
||||
// Copy status
|
||||
const txt=$('st-text'), bar=$('prog-bar'), wrap=$('prog-wrap');
|
||||
const info=$('prog-info'), sum=$('st-summary');
|
||||
const bStart = $('btn-start'), bCancel = $('btn-cancel');
|
||||
|
||||
const bS=$('btn-start'), bC=$('btn-cancel');
|
||||
if (c.running){
|
||||
txt.className = 'st-run';
|
||||
txt.textContent = 'Kopiert… ' + c.progress + '%';
|
||||
wrap.style.display = 'block';
|
||||
bar.style.width = c.progress + '%';
|
||||
info.textContent = c.current ? c.done + ' / ' + c.total + ' — ' + c.current : '';
|
||||
sum.textContent = '';
|
||||
bStart.style.display = 'none';
|
||||
bCancel.style.display = '';
|
||||
txt.className='st-run'; txt.textContent='Kopiert… '+c.progress+'%';
|
||||
wrap.style.display='block'; bar.style.width=c.progress+'%';
|
||||
info.textContent=c.current?c.done+' / '+c.total+' — '+c.current:'';
|
||||
sum.textContent=''; bS.style.display='none'; bC.style.display='';
|
||||
} else {
|
||||
bStart.style.display = '';
|
||||
bCancel.style.display = 'none';
|
||||
info.textContent = '';
|
||||
bS.style.display=''; bC.style.display='none'; info.textContent='';
|
||||
if (c.error){
|
||||
txt.className = 'st-err';
|
||||
txt.textContent = 'Fehler: ' + c.error;
|
||||
wrap.style.display = 'none';
|
||||
sum.textContent = '';
|
||||
txt.className='st-err'; txt.textContent='Fehler: '+c.error;
|
||||
wrap.style.display='none'; sum.textContent='';
|
||||
} else if (c.last_copy){
|
||||
txt.className = 'st-ok';
|
||||
txt.textContent = '✓ Abgeschlossen';
|
||||
wrap.style.display = 'block';
|
||||
bar.style.width = '100%';
|
||||
sum.textContent = c.total + ' Dateien kopiert · ' + new Date(c.last_copy).toLocaleString('de-DE');
|
||||
txt.className='st-ok'; txt.textContent='✓ Abgeschlossen';
|
||||
wrap.style.display='block'; bar.style.width='100%';
|
||||
sum.textContent=c.total+' Dateien · '+new Date(c.last_copy).toLocaleString('de-DE');
|
||||
} else {
|
||||
txt.className = 'st-idle';
|
||||
txt.textContent = 'Bereit';
|
||||
wrap.style.display = 'none';
|
||||
sum.textContent = '';
|
||||
txt.className='st-idle'; txt.textContent='Bereit';
|
||||
wrap.style.display='none'; sum.textContent='';
|
||||
}
|
||||
}
|
||||
|
||||
// Log
|
||||
if (c.logs && c.logs.length) {
|
||||
if (c.logs&&c.logs.length)
|
||||
$('log-box').innerHTML=c.logs.slice().reverse().map(l=>
|
||||
`<div class="log-entry"><span class="log-t">${l.t}</span><span>${l.m}</span></div>`
|
||||
).join('');
|
||||
}
|
||||
`<div class="log-entry"><span class="log-t">${l.t}</span><span>${l.m}</span></div>`).join('');
|
||||
} catch(e){}
|
||||
}
|
||||
|
||||
function flash(id, cls, msg) {
|
||||
const el = $(id);
|
||||
el.className = 'flash ' + cls;
|
||||
el.textContent = msg;
|
||||
el.style.display = 'block';
|
||||
const el=$(id); el.className='flash '+cls; el.textContent=msg; el.style.display='block';
|
||||
if (cls==='ok') setTimeout(()=>el.style.display='none',3500);
|
||||
}
|
||||
|
||||
@@ -937,7 +998,7 @@ function flash(id, cls, msg) {
|
||||
await loadCfg();
|
||||
await refreshDevices();
|
||||
setInterval(poll, 1500);
|
||||
setInterval(refreshDevices, 12000);
|
||||
setInterval(refreshDevices, 8000);
|
||||
poll();
|
||||
})();
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user