diff --git a/sites/programtv.onet.pl/programtv.onet.pl.channels.xml b/sites/programtv.onet.pl/programtv.onet.pl.channels.xml index 14d01630..d70f3723 100644 --- a/sites/programtv.onet.pl/programtv.onet.pl.channels.xml +++ b/sites/programtv.onet.pl/programtv.onet.pl.channels.xml @@ -1,7 +1,6 @@ - 13th Street Deutschland 13 Ulica 360 Tune Box diff --git a/sites/programtv.onet.pl/programtv.onet.pl.config.js b/sites/programtv.onet.pl/programtv.onet.pl.config.js index 02757357..9028de3c 100644 --- a/sites/programtv.onet.pl/programtv.onet.pl.config.js +++ b/sites/programtv.onet.pl/programtv.onet.pl.config.js @@ -1,19 +1,12 @@ const cheerio = require('cheerio') -const dayjs = require('dayjs') -const utc = require('dayjs/plugin/utc') -const timezone = require('dayjs/plugin/timezone') -const customParseFormat = require('dayjs/plugin/customParseFormat') - -dayjs.extend(utc) -dayjs.extend(timezone) -dayjs.extend(customParseFormat) +const { DateTime } = require('luxon') module.exports = { delay: 5000, site: 'programtv.onet.pl', days: 2, url: function ({ date, channel }) { - const currDate = dayjs.utc().startOf('d') + const currDate = DateTime.now().toUTC().startOf('day') const day = date.diff(currDate, 'd') return `https://programtv.onet.pl/program-tv/${channel.site_id}?dzien=${day}` @@ -26,13 +19,13 @@ module.exports = { const $item = cheerio.load(item) let start = parseStart($item, date) if (prev) { - if (start.isBefore(prev.start)) { - start = start.add(1, 'd') + if (start < prev.start) { + start = start.plus({ days: 1 }) date = date.add(1, 'd') } prev.stop = start } - const stop = start.add(1, 'h') + const stop = start.plus({ hours: 1 }) programs.push({ title: parseTitle($item), description: parseDescription($item), @@ -50,7 +43,7 @@ function parseStart($item, date) { const timeString = $item('.hours > .hour').text() const dateString = `${date.format('MM/DD/YYYY')} ${timeString}` - return dayjs.tz(dateString, 'MM/DD/YYYY HH:mm', 'Europe/Warsaw') + return DateTime.fromFormat(dateString, 'MM/dd/yyyy HH:mm', { zone: 'Europe/Warsaw' }).toUTC() } function parseCategory($item) { diff --git a/sites/programtv.onet.pl/programtv.onet.pl.test.js b/sites/programtv.onet.pl/programtv.onet.pl.test.js index a43b9952..037cfd7a 100644 --- a/sites/programtv.onet.pl/programtv.onet.pl.test.js +++ b/sites/programtv.onet.pl/programtv.onet.pl.test.js @@ -1,4 +1,4 @@ -// npx epg-grabber --config=sites/programtv.onet.pl/programtv.onet.pl.config.js --channels=sites/programtv.onet.pl/programtv.onet.pl.channels.xml --output=guide.xml --days=2 +// npx epg-grabber --config=sites/programtv.onet.pl/programtv.onet.pl.config.js --channels=sites/programtv.onet.pl/programtv.onet.pl.channels.xml --output=guide.xml const MockDate = require('mockdate') const { parser, url } = require('./programtv.onet.pl.config.js')