})
@@ -72,7 +92,12 @@ async function pdShow(id) {
${items.length ? `` : ''}
Episodes
${items.map(ep).join('') || '
No episodes yet. Podgrab may still be fetching the feed.
'}
`;
const byId = new Map(items.map(e => [String(pdId(e)), e]));
- const playFrom = e => { const i = items.indexOf(e); playQueue(items.slice(0, i + 1).reverse().map(x => pdTrack(x, show)), 0); }; // this one, then the newer ones after it
+ const playFrom = e => { // this one (from where you left off), then the newer ones after it
+ const i = items.indexOf(e), id = String(pdId(e)), p = pdLeft(e);
+ if (pdPlaying() === id) { if (pl.a.paused) pl.a.play().catch(() => {}); return; }
+ playQueue(items.slice(0, i + 1).reverse().map(x => pdTrack(x, show)), 0);
+ if (p) pl.a.addEventListener('loadedmetadata', () => { if (pdPlaying() === id) pl.a.currentTime = p.pos; }, { once: true });
+ };
document.querySelectorAll('.pdep').forEach(r => {
const e = byId.get(r.dataset.id);
r.querySelector('[data-play]').onclick = () => playFrom(e);
diff --git a/tools/podcast-test.js b/tools/podcast-test.js
index ca7f28f..b5db2c6 100644
--- a/tools/podcast-test.js
+++ b/tools/podcast-test.js
@@ -1,5 +1,6 @@
// Podcast proxy: only the allowed Podgrab calls get through, the Podgrab password is added server-side, audio ranges and redirects work.
-const http = require('http'), assert = require('assert');
+const http = require('http'), assert = require('assert'), fs = require('fs'), os = require('os'), path = require('path');
+process.env.DATA_DIR = fs.mkdtempSync(path.join(os.tmpdir(), 'nehub-pod-'));
const seen = [];
const fake = http.createServer((req, res) => {
let b = ''; req.on('data', c => b += c); req.on('end', () => {
@@ -11,8 +12,8 @@ const fake = http.createServer((req, res) => {
});
}).listen(0, async () => {
process.env.PODCAST_URL = 'http://127.0.0.1:' + fake.address().port + '/'; process.env.PODGRAB_PASSWORD = 'secret';
- const podcast = require('../podcast');
- const hub = http.createServer((req, res) => podcast.handle(req, res)).listen(0, async () => {
+ const podcast = require('../podcast'), users = require('../users');
+ const hub = http.createServer((req, res) => users.runAs({ id: 'pod-user', name: 'P' }, () => podcast.handle(req, res))).listen(0, async () => {
const base = 'http://127.0.0.1:' + hub.address().port, get = (p, o = {}) => fetch(base + '/api/podcast' + p, { redirect: 'manual', ...o });
try {
let r = await get('/podcasts'); assert.equal(r.status, 200); assert.equal((await r.json())[0].Title, 'Show');
@@ -20,6 +21,9 @@ const fake = http.createServer((req, res) => {
r = await get('/podcastitems/e1/file', { headers: { range: 'bytes=0-3' } }); assert.equal(r.status, 206); assert.equal(await r.text(), 'abcd'); assert.equal(seen.at(-1).range, 'bytes=0-3');
r = await get('/podcastitems/e2/file'); assert.equal(r.status, 302); assert.equal(r.headers.get('location'), 'https://cdn.example.com/a.mp3');
r = await get('/podcasts', { method: 'POST', body: '{"url":"https://x.test/feed"}' }); assert.equal(r.status, 200); assert.equal(seen.at(-1).b, '{"url":"https://x.test/feed"}');
+ const post = b => get('/progress', { method: 'POST', body: JSON.stringify(b) }).then(x => x.json());
+ await post({ e1: { pos: 90, dur: 600, t: 10 } }); const pr = await post({ e1: { pos: 5, dur: 600, t: 3 }, e2: { pos: 7, dur: 300, t: 4 } });
+ assert.equal(pr.e1.pos, 90, 'the newest position wins'); assert.equal((await (await get('/progress')).json()).e2.pos, 7);
const n = seen.length;
for (const [m, p] of [['GET', '/settings'], ['POST', '/settings'], ['GET', '/opml'], ['DELETE', '/tags/1'], ['GET', '/backups'], ['GET', '/podcasts/../settings'], ['DELETE', '/podcastitems/e1']]) {
r = await get(p, { method: m }); assert.equal(r.status, 404, m + ' ' + p);