diff --git a/sites/andorradifusio.ad/andorradifusio.ad.config.js b/sites/andorradifusio.ad/andorradifusio.ad.config.js index 87e57fbe..c0963966 100644 --- a/sites/andorradifusio.ad/andorradifusio.ad.config.js +++ b/sites/andorradifusio.ad/andorradifusio.ad.config.js @@ -15,21 +15,21 @@ module.exports = { return `https://www.andorradifusio.ad/programacio/${channel.site_id}` }, parser({ content, date }) { - let PM = false const programs = [] const items = parseItems(content, date) items.forEach(item => { - const title = item.title + const prev = programs[programs.length - 1] let start = parseStart(item, date) - if (start.hour() > 11) PM = true - if (start.hour() < 12 && PM) start = start.add(1, 'd') - const stop = start.add(1, 'h') - if (programs.length) { - programs[programs.length - 1].stop = start + if (prev) { + if (start.isBefore(prev.start)) { + start = start.add(1, 'd') + date = date.add(1, 'd') + } + prev.stop = start } - + const stop = start.add(1, 'h') programs.push({ - title, + title: item.title, start, stop }) @@ -40,9 +40,9 @@ module.exports = { } function parseStart(item, date) { - time = `${date.format('MM/DD/YYYY')} ${item.time}` + const dateString = `${date.format('MM/DD/YYYY')} ${item.time}` - return dayjs.tz(time, 'MM/DD/YYYY HH:mm', 'Europe/Madrid') + return dayjs.tz(dateString, 'MM/DD/YYYY HH:mm', 'Europe/Madrid') } function parseItems(content, date) { diff --git a/sites/andorradifusio.ad/andorradifusio.ad.test.js b/sites/andorradifusio.ad/andorradifusio.ad.test.js new file mode 100644 index 00000000..9ac8ac6d --- /dev/null +++ b/sites/andorradifusio.ad/andorradifusio.ad.test.js @@ -0,0 +1,54 @@ +// npx epg-grabber --config=sites/andorradifusio.ad/andorradifusio.ad.config.js --channels=sites/andorradifusio.ad/andorradifusio.ad_ad.channels.xml --output=.gh-pages/guides/ad/andorradifusio.ad.epg.xml --days=2 + +const { parser, url } = require('./andorradifusio.ad.config.js') +const dayjs = require('dayjs') +const utc = require('dayjs/plugin/utc') +const customParseFormat = require('dayjs/plugin/customParseFormat') +dayjs.extend(customParseFormat) +dayjs.extend(utc) + +const date = dayjs.utc('2021-11-24', 'YYYY-MM-DD').startOf('d') +const channel = { + site_id: 'atv', + xmltv_id: 'AndorraTV.ad' +} + +it('can generate valid url', () => { + expect(url({ channel })).toBe('https://www.andorradifusio.ad/programacio/atv') +}) + +it('can parse response', () => { + const content = `

dimecres 24 nov.

07:00

Club Piolet

23:30

Informatiu vespre

01:00

Àrea Andorra Difusió

dijous 25 nov.

07:00

Club Piolet

` + const result = parser({ content, date }).map(p => { + p.start = p.start.toJSON() + p.stop = p.stop.toJSON() + return p + }) + + expect(result).toMatchObject([ + { + start: '2021-11-24T06:00:00.000Z', + stop: '2021-11-24T22:30:00.000Z', + title: `Club Piolet` + }, + { + start: '2021-11-24T22:30:00.000Z', + stop: '2021-11-25T00:00:00.000Z', + title: `Informatiu vespre` + }, + { + start: '2021-11-25T00:00:00.000Z', + stop: '2021-11-25T01:00:00.000Z', + title: `Àrea Andorra Difusió` + } + ]) +}) + +it('can handle empty guide', () => { + const result = parser({ + date, + channel, + content: `` + }) + expect(result).toMatchObject([]) +})