Keep OPML feeds out of config, cap downloads, log daemon work
Writing 82 derived feeds into a hand-edited config.toml made it unreadable. The OPML is the source of truth, so its feeds are re-derived each scan and held in the database, inheriting the subscription's settings; editing one promotes it to a real entry. A migration moves existing children out -- 611 lines to 38 -- keeping all entries and files. max_new_per_check defaulted to unlimited, so subscribing to an OPML of 82 feeds pulled whole back catalogues. It now defaults to 3 via [general], capping every feed that does not set its own, and the pending queue orders by publish date so a cap of 3 means the three newest. Scans and downloads travelled as socket events only, so the log view showed no daemon activity. They are mirrored into tracing, with routine skips at debug -- at 82 feeds those alone would flush the buffer. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AdXho5tTkjFLeUXKbEjKBh
This commit is contained in:
108
web/index.html
108
web/index.html
@@ -94,7 +94,21 @@ input:focus,select:focus{outline:0;border-color:var(--accent)}
|
||||
.feed.sel{background:var(--raise)}
|
||||
.feed.child{margin-left:14px}
|
||||
.feed.child .art{width:28px;height:28px;font-size:11px}
|
||||
.feed.group>.txt>b::after{content:" ⌄";color:var(--faint);font-weight:400}
|
||||
.chev{
|
||||
flex:none;width:18px;height:18px;display:grid;place-items:center;border-radius:4px;
|
||||
color:var(--faint);font-size:11px;transition:transform .12s;
|
||||
}
|
||||
.chev:hover{background:var(--raise);color:var(--fg)}
|
||||
.chev.open{transform:rotate(90deg)}
|
||||
.childlist{display:grid;gap:4px;margin-top:10px}
|
||||
.childrow{
|
||||
display:flex;gap:10px;align-items:center;padding:7px 9px;border:1px solid var(--line);
|
||||
border-radius:9px;cursor:pointer;background:var(--panel);
|
||||
}
|
||||
.childrow:hover{border-color:var(--accent)}
|
||||
.childrow .art{width:32px;height:32px;font-size:12px}
|
||||
.childrow .txt{flex:1;min-width:0}
|
||||
.childrow .txt b{display:block;font-size:13.5px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
|
||||
.tag{
|
||||
font-size:10px;text-transform:uppercase;letter-spacing:.04em;font-weight:700;
|
||||
padding:1px 5px;border-radius:4px;background:var(--raise);color:var(--warn);flex:none;
|
||||
@@ -402,7 +416,7 @@ const LIMIT = 50;
|
||||
/* ---------------- feeds ---------------- */
|
||||
async function loadFeeds(keepSel){
|
||||
S.feeds = await api('/api/feeds');
|
||||
api('/api/settings').then(g=>{globalEvery=g.every_mins}).catch(()=>{});
|
||||
api('/api/settings').then(g=>{globalEvery=g.every_mins;globalMax=g.max_new_per_check}).catch(()=>{});
|
||||
renderFeeds();
|
||||
if(!keepSel && !S.feed && S.feeds.length) selectFeed(S.feeds[0].id);
|
||||
}
|
||||
@@ -418,19 +432,26 @@ function renderFeeds(){
|
||||
for(const f of shown){
|
||||
if(f.group && byId[f.group]) continue; // drawn under its parent instead
|
||||
order.push([f,0]);
|
||||
for(const c of shown) if(c.group===f.id) order.push([c,1]);
|
||||
// A subscription can hold dozens of feeds, so the folder starts closed.
|
||||
if(!collapsed.has(f.id) || q) for(const c of shown) if(c.group===f.id) order.push([c,1]);
|
||||
}
|
||||
for(const [f,depth] of order){
|
||||
const kids=shown.filter(c=>c.group===f.id).length;
|
||||
const el=document.createElement('div');
|
||||
el.className='feed'+(S.feed===f.id?' sel':'')+(depth?' child':'')+(kids?' group':'');
|
||||
el.innerHTML = artHTML(f.image,f.title||f.id)+
|
||||
const open = kids && (!collapsed.has(f.id) || q);
|
||||
el.innerHTML =
|
||||
(kids?`<span class="chev${open?' open':''}" title="Show or hide the feeds inside">▶</span>`:'')+
|
||||
artHTML(f.image,f.title||f.id)+
|
||||
`<div class="txt"><b>${esc(f.title||f.id)}</b><small>`+
|
||||
(kids?`${kids} feed${kids===1?'':'s'}`:`${f.entries} eps · ${f.downloaded} saved`)+
|
||||
(kids?`${kids} feed${kids===1?'':'s'}${f.unread?` · ${f.unread} unread`:''}`
|
||||
:`${f.entries} eps · ${f.downloaded} saved`)+
|
||||
`</small></div>`+
|
||||
(f.orphaned?'<span class="tag" title="No longer listed in the OPML, kept because it has downloads">gone</span>':'')+
|
||||
`<span class="badge${f.unread?'':' zero'}">${f.unread}</span>`;
|
||||
el.onclick=()=>{ selectFeed(f.id); $('#sidebar').classList.remove('open'); };
|
||||
const chev=$('.chev',el);
|
||||
if(chev) chev.onclick=ev=>{ ev.stopPropagation(); toggleGroup(f.id); };
|
||||
list.appendChild(el);
|
||||
}
|
||||
}
|
||||
@@ -443,6 +464,8 @@ function selectFeed(id){
|
||||
function renderFeed(){
|
||||
const f=S.feeds.find(x=>x.id===S.feed);
|
||||
if(!f){ $('#content').innerHTML='<p class="empty">Add a feed to get started.</p>'; return; }
|
||||
const kids=S.feeds.filter(c=>c.group===f.id);
|
||||
if(kids.length){ renderGroup(f,kids); return; }
|
||||
$('#content').innerHTML = `
|
||||
<div class="fhead">
|
||||
${artHTML(f.image,f.title||f.id)}
|
||||
@@ -478,6 +501,58 @@ function renderFeed(){
|
||||
let t; $('#epSearch').oninput=e=>{clearTimeout(t);t=setTimeout(()=>{S.q=e.target.value;S.offset=0;loadEntries()},250)};
|
||||
}
|
||||
|
||||
/// An OPML subscription's page lists the feeds inside it rather than episodes, but keeps
|
||||
/// every action a normal feed has -- it is still an ordinary feed entry underneath.
|
||||
function renderGroup(f,kids){
|
||||
const unread=kids.reduce((n,c)=>n+c.unread,0);
|
||||
const saved=kids.reduce((n,c)=>n+c.downloaded,0);
|
||||
const gone=kids.filter(c=>c.orphaned).length;
|
||||
$('#content').innerHTML = `
|
||||
<div class="fhead">
|
||||
${artHTML(f.image,f.title||f.id)}
|
||||
<div class="meta">
|
||||
<h2>${esc(f.title||f.id)}</h2>
|
||||
<div class="sub">OPML subscription · ${kids.length} feed${kids.length===1?'':'s'}
|
||||
· ${unread} unread · ${saved} downloaded · checked ${ago(f.last_checked)}
|
||||
· every ${everyText(f.every_mins)}</div>
|
||||
${f.last_error?`<div class="sub" style="color:var(--bad)">${esc(f.last_error)}</div>`:''}
|
||||
${gone?`<div class="sub" style="color:var(--warn)">${gone} feed${gone===1?' is':'s are'} no longer
|
||||
listed in this OPML but kept because ${gone===1?'it has':'they have'} downloads.</div>`:''}
|
||||
<div class="acts">
|
||||
<button class="btn primary" data-a="scan">Re-read OPML</button>
|
||||
<button class="btn" data-a="settings">Settings</button>
|
||||
<button class="btn danger" data-a="rm">Unsubscribe</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="toolbar">
|
||||
<input type="search" class="grow" id="kidSearch" placeholder="Search these feeds…">
|
||||
<span style="color:var(--faint);font-size:12.5px">${esc(f.url)}</span>
|
||||
</div>
|
||||
<div class="childlist" id="kidlist"></div>`;
|
||||
$$('#content .acts .btn').forEach(b=>b.onclick=()=>feedAction(b.dataset.a,f));
|
||||
const draw=()=>{
|
||||
const q=($('#kidSearch').value||'').trim().toLowerCase();
|
||||
const box=$('#kidlist'); box.innerHTML='';
|
||||
const rows=kids.filter(c=>!q||(c.title||c.id).toLowerCase().includes(q));
|
||||
if(!rows.length){ box.innerHTML='<p class="empty">Nothing matches.</p>'; return; }
|
||||
for(const c of rows){
|
||||
const el=document.createElement('div');
|
||||
el.className='childrow';
|
||||
el.innerHTML = artHTML(c.image,c.title||c.id)+
|
||||
`<div class="txt"><b>${esc(c.title||c.id)}</b>`+
|
||||
`<small class="meta">${c.entries} eps · ${c.downloaded} downloaded`+
|
||||
(c.last_error?` · <span style="color:var(--bad)">error</span>`:'')+`</small></div>`+
|
||||
(c.orphaned?'<span class="tag">gone</span>':'')+
|
||||
`<span class="badge${c.unread?'':' zero'}">${c.unread}</span>`;
|
||||
el.onclick=()=>selectFeed(c.id);
|
||||
box.appendChild(el);
|
||||
}
|
||||
};
|
||||
$('#kidSearch').oninput=draw;
|
||||
draw();
|
||||
}
|
||||
|
||||
async function feedAction(a,f){
|
||||
if(a==='scan'){ toast('Scanning '+(f.title||f.id)+'…'); await api('/api/fetch',{method:'POST',body:JSON.stringify({feed:f.id,force:true})}); }
|
||||
if(a==='read'){ const r=await api(`/api/feeds/${encodeURIComponent(f.id)}/read-all`,{method:'POST'}); toast(`Marked ${r.marked} read`); await loadFeeds(true); loadEntries(); }
|
||||
@@ -780,7 +855,13 @@ $('#addFeed').onclick=()=>{
|
||||
};
|
||||
};
|
||||
|
||||
let globalEvery = 60;
|
||||
let collapsed = new Set(JSON.parse(localStorage.getItem('ipx.collapsed')||'[]'));
|
||||
function toggleGroup(id){
|
||||
collapsed.has(id) ? collapsed.delete(id) : collapsed.add(id);
|
||||
try{ localStorage.setItem('ipx.collapsed', JSON.stringify([...collapsed])); }catch{}
|
||||
renderFeeds();
|
||||
}
|
||||
let globalEvery = 60, globalMax = 3;
|
||||
const UNITS = [['m','minutes'],['h','hours'],['d','days'],['w','weeks']];
|
||||
const UNIT_MINS = {m:1, h:60, d:1440, w:10080};
|
||||
|
||||
@@ -822,6 +903,11 @@ async function prefsModal(){
|
||||
</div>
|
||||
<span class="hint">Applies to every feed that does not set its own. A feed's suggested
|
||||
interval (its <b>ttl</b>) is still honoured when it asks to be polled less often.</span></div>
|
||||
<div class="field"><label>Max new downloads per scan, per feed</label>
|
||||
<input type="number" id="gmax" min="0" max="999" value="${g.max_new_per_check}">
|
||||
<span class="hint">Applies to any feed that does not set its own — including every feed
|
||||
inside an OPML subscription. <b>0 means unlimited</b>, which will pull a whole back
|
||||
catalogue the first time a feed is scanned.</span></div>
|
||||
<div class="field"><label>Disk quota (GB, 0 = unlimited)</label>
|
||||
<input type="number" id="gquota" min="0" step="0.5" value="${g.max_total_gb}">
|
||||
<span class="hint">Over this, the oldest played episodes are deleted first. Starred
|
||||
@@ -836,6 +922,7 @@ async function prefsModal(){
|
||||
try{
|
||||
await api('/api/settings',{method:'PATCH',body:JSON.stringify({
|
||||
schedule:`every ${Math.max(1,Number($('#gnum').value)||1)}${$('#gunit').value}`,
|
||||
max_new_per_check:Math.max(0,Number($('#gmax').value)||0),
|
||||
max_total_gb:Number($('#gquota').value)||0,
|
||||
max_age_days:Number($('#gage').value)||0})});
|
||||
closeModal(); toast('Settings saved');
|
||||
@@ -846,7 +933,13 @@ async function prefsModal(){
|
||||
|
||||
function settingsModal(f){
|
||||
const fs = splitEvery(f.schedule_mins || globalEvery);
|
||||
const isGroup = S.feeds.some(c=>c.group===f.id);
|
||||
openModal(`<h3>${esc(f.title||f.id)}</h3>
|
||||
${isGroup?`<p class="hint" style="margin:-6px 0 12px">This is an OPML subscription. These
|
||||
settings apply to it and are inherited by every feed inside it.</p>`:''}
|
||||
${f.managed?`<p class="hint" style="margin:-6px 0 12px">This feed comes from an OPML
|
||||
subscription and follows its settings. Saving anything here gives it its own entry in
|
||||
config.toml, and it stops following the subscription's settings.</p>`:''}
|
||||
<div class="field"><label>Download folder</label>
|
||||
<input type="text" id="sfolder" value="${esc(f.folder||'')}" placeholder="${esc(f.title||f.id)}"></div>
|
||||
<div class="field"><label>Keywords</label>
|
||||
@@ -861,7 +954,8 @@ function settingsModal(f){
|
||||
interval, for this feed only.</span></div>
|
||||
<div class="field"><label>Max new downloads per scan</label>
|
||||
<input type="number" id="smax" min="0" value="${f.max_new_per_check??''}">
|
||||
<span class="hint">Blank means no limit. The rest wait for the next scan.</span></div>
|
||||
<span class="hint">Blank follows the global default (${globalMax}). The rest wait for
|
||||
the next scan.</span></div>
|
||||
<label class="check"><input type="checkbox" id="sauto" ${f.auto_download?'checked':''}> Download new episodes automatically</label>
|
||||
<label class="check"><input type="checkbox" id="sexp" ${f.allow_explicit?'checked':''}> Allow episodes marked explicit</label>
|
||||
<div class="field"><label>Feed URL</label>
|
||||
|
||||
Reference in New Issue
Block a user