.fab exclusion scoping: classes in the manual export (Task 4, v0.136.0)
SQ6 over-capture FIXED for classified apps: the userdata root tar is exclude-scoped (keeps only ancestors/descendants of a SELECTED bind relpath — R1-C, the tier2Reconcile keep-rule); no selected userdata bind → no root tar (radarr state-only). New appbackup.ComputeFabBuckets (shared resolveGuardCollapse pipeline; class buckets; guards over ALL classes; no cross-bucket containment). appexport/fabplan.go: computeFabPlan + tarDirectoryExcluding + fabEstimateSplit. ExportRequest gains DeselectOptional/OptInExcluded (both start handlers — two-call-site); mandatory is a server-side floor. Manifest v1 + import UNTOUCHED; legacy apps byte-identical to v0.130.0. Estimate additive class split; export UI: locked-mandatory/optional-checkboxes/excluded-opt-in + two-number warning. All 6 §10 red-proofs verified. 6D Accept #1 now runs against this shape.
This commit is contained in:
@@ -37,6 +37,23 @@
|
||||
<div id="estWarning" style="display:none;color:var(--crit);margin-top:.5rem;font-weight:600"></div>
|
||||
</div>
|
||||
|
||||
<div id="classSelect" style="display:none;margin-bottom:1.5rem">
|
||||
<div id="mandBox" style="display:none;margin-bottom:1rem">
|
||||
<div style="font-weight:600;margin-bottom:.25rem">Mindig része a mentésnek:</div>
|
||||
<div id="mandList" style="color:var(--text-3);font-size:.9rem"></div>
|
||||
</div>
|
||||
<div id="optBox" style="display:none;margin-bottom:1rem">
|
||||
<div style="font-weight:600;margin-bottom:.25rem">Választható tartalom:</div>
|
||||
<div id="optList"></div>
|
||||
</div>
|
||||
<div id="exclBox" style="display:none">
|
||||
<div id="exclSummary" style="margin-bottom:.25rem"></div>
|
||||
<div style="color:var(--text-3);font-size:.85rem;margin-bottom:.5rem">A kihagyott mappák tartalma a Fájlkezelőben bármikor elérhető, és külön is lementhető.</div>
|
||||
<button type="button" class="btn btn-xs btn-outline" onclick="toggleExcl()" id="exclToggle">Kihagyott tartalom megjelenítése</button>
|
||||
<div id="exclList" style="display:none;margin-top:.5rem"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3>Jelszó (opcionális)</h3>
|
||||
<div style="display:flex;gap:.5rem;margin-bottom:1rem">
|
||||
<input type="password" id="exportPassword" placeholder="Titkosítási jelszó" style="flex:1;padding:.5rem">
|
||||
@@ -122,11 +139,84 @@ async function loadEstimate() {
|
||||
btn.disabled = false;
|
||||
}
|
||||
box.style.display = 'block';
|
||||
renderClassSelect(est);
|
||||
} catch(e) {
|
||||
console.error('Estimate error:', e);
|
||||
}
|
||||
}
|
||||
|
||||
// Task 4: the class-scoped selection UI (classified apps only; legacy apps see the plain estimate).
|
||||
var lastEst = null;
|
||||
function humanBytes(b) {
|
||||
if (b >= 1073741824) return (b/1073741824).toFixed(1) + ' GB';
|
||||
if (b >= 1048576) return (b/1048576).toFixed(1) + ' MB';
|
||||
if (b >= 1024) return (b/1024).toFixed(1) + ' KB';
|
||||
return b + ' B';
|
||||
}
|
||||
function renderClassSelect(est) {
|
||||
lastEst = est;
|
||||
var wrap = document.getElementById('classSelect');
|
||||
if (!est.has_classification) { wrap.style.display = 'none'; return; }
|
||||
wrap.style.display = 'block';
|
||||
|
||||
var mand = est.mandatory_items || [], opt = est.optional_items || [], excl = est.excluded_items || [];
|
||||
// Mandatory (locked).
|
||||
var mb = document.getElementById('mandBox');
|
||||
if (mand.length) {
|
||||
mb.style.display = 'block';
|
||||
document.getElementById('mandList').innerHTML = mand.map(function(i){
|
||||
return '<div>' + esc(i.rel_path) + ' <span style="opacity:.7">(' + i.human + ')</span></div>';
|
||||
}).join('');
|
||||
} else { mb.style.display = 'none'; }
|
||||
// Optional (pre-selected checkboxes).
|
||||
var ob = document.getElementById('optBox');
|
||||
if (opt.length) {
|
||||
ob.style.display = 'block';
|
||||
document.getElementById('optList').innerHTML = opt.map(function(i){
|
||||
return '<label style="display:flex;gap:.5rem;align-items:center;cursor:pointer;padding:.15rem 0">' +
|
||||
'<input type="checkbox" class="fab-opt" checked data-key="' + esc(i.key) + '" data-bytes="' + i.bytes + '" onchange="recomputeTotal()">' +
|
||||
'<span>' + esc(i.rel_path) + ' <span style="opacity:.7">(' + i.human + ')</span></span></label>';
|
||||
}).join('');
|
||||
} else { ob.style.display = 'none'; }
|
||||
// Excluded (opt-in, collapsed, behind the two-number warning).
|
||||
var eb = document.getElementById('exclBox');
|
||||
if (excl.length) {
|
||||
eb.style.display = 'block';
|
||||
document.getElementById('exclList').innerHTML = excl.map(function(i){
|
||||
return '<label style="display:flex;gap:.5rem;align-items:center;cursor:pointer;padding:.15rem 0">' +
|
||||
'<input type="checkbox" class="fab-excl" data-key="' + esc(i.key) + '" data-bytes="' + i.bytes + '" onchange="recomputeTotal()">' +
|
||||
'<span>' + esc(i.rel_path) + ' <span style="opacity:.7">(' + i.human + ')</span></span></label>';
|
||||
}).join('');
|
||||
} else { eb.style.display = 'none'; }
|
||||
recomputeTotal();
|
||||
}
|
||||
function recomputeTotal() {
|
||||
if (!lastEst) return;
|
||||
var base = lastEst.base_bytes || 0;
|
||||
var optSum = 0, exclSum = 0, exclAll = 0;
|
||||
document.querySelectorAll('.fab-opt').forEach(function(cb){ if (cb.checked) optSum += parseInt(cb.dataset.bytes,10)||0; });
|
||||
document.querySelectorAll('.fab-excl').forEach(function(cb){ var b = parseInt(cb.dataset.bytes,10)||0; exclAll += b; if (cb.checked) exclSum += b; });
|
||||
var alap = base + optSum;
|
||||
var full = alap + exclAll;
|
||||
var s = document.getElementById('exclSummary');
|
||||
if ((lastEst.excluded_items||[]).length) {
|
||||
s.innerHTML = 'Alap mentés: ~' + humanBytes(alap) + '. A kihagyott, nagy méretű tartalommal együtt: ~' + humanBytes(full) + '.';
|
||||
}
|
||||
}
|
||||
function toggleExcl() {
|
||||
var l = document.getElementById('exclList');
|
||||
var shown = l.style.display !== 'none';
|
||||
l.style.display = shown ? 'none' : 'block';
|
||||
document.getElementById('exclToggle').textContent = shown ? 'Kihagyott tartalom megjelenítése' : 'Kihagyott tartalom elrejtése';
|
||||
}
|
||||
function gatherSelections() {
|
||||
var deselect = [], optIn = [];
|
||||
document.querySelectorAll('.fab-opt').forEach(function(cb){ if (!cb.checked) deselect.push(cb.dataset.key); });
|
||||
document.querySelectorAll('.fab-excl').forEach(function(cb){ if (cb.checked) optIn.push(cb.dataset.key); });
|
||||
return { deselect_optional: deselect, opt_in_excluded: optIn };
|
||||
}
|
||||
function esc(s) { return String(s).replace(/[&<>"]/g, function(c){ return {'&':'&','<':'<','>':'>','"':'"'}[c]; }); }
|
||||
|
||||
async function startExport() {
|
||||
var drive = document.getElementById('destDrive').value;
|
||||
var password = document.getElementById('exportPassword').value;
|
||||
@@ -137,6 +227,7 @@ async function startExport() {
|
||||
document.getElementById('doneCard').style.display = 'none';
|
||||
|
||||
try {
|
||||
var sel = gatherSelections();
|
||||
var resp = await fetch('/api/export/start', {
|
||||
method: 'POST',
|
||||
headers: csrfH(),
|
||||
@@ -144,7 +235,9 @@ async function startExport() {
|
||||
stack_name: stackName,
|
||||
dest_drive: drive,
|
||||
password: password,
|
||||
stop_app: stopApp
|
||||
stop_app: stopApp,
|
||||
deselect_optional: sel.deselect_optional,
|
||||
opt_in_excluded: sel.opt_in_excluded
|
||||
})
|
||||
});
|
||||
var data = await resp.json();
|
||||
|
||||
Reference in New Issue
Block a user