From 3cce5060a9ebfdc9d6b77df4fe86be7f11c051de Mon Sep 17 00:00:00 2001 From: freearhey Date: Mon, 12 Jun 2023 00:42:27 +0300 Subject: [PATCH 1/2] Update telecablesat.fr.test.js --- sites/telecablesat.fr/telecablesat.fr.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/telecablesat.fr/telecablesat.fr.test.js b/sites/telecablesat.fr/telecablesat.fr.test.js index 33ea1035..f3840954 100644 --- a/sites/telecablesat.fr/telecablesat.fr.test.js +++ b/sites/telecablesat.fr/telecablesat.fr.test.js @@ -1,5 +1,5 @@ // npm run channels:parse -- --config=./sites/telecablesat.fr/telecablesat.fr.config.js --output=./sites/telecablesat.fr/telecablesat.fr.channels.xml -// npx epg-grabber --config=sites/telecablesat.fr/telecablesat.fr.config.js --channels=sites/telecablesat.fr/telecablesat.fr.channels.xml --output=guide.xml --days=2 +// npx epg-grabber --config=sites/telecablesat.fr/telecablesat.fr.config.js --channels=sites/telecablesat.fr/telecablesat.fr.channels.xml --output=guide.xml const { parser, url } = require('./telecablesat.fr.config.js') const axios = require('axios') From 699df24d745f27ab3ae06315b2c6c4fb920165ce Mon Sep 17 00:00:00 2001 From: freearhey Date: Mon, 12 Jun 2023 00:42:33 +0300 Subject: [PATCH 2/2] Update telecablesat.fr.config.js --- .../telecablesat.fr/telecablesat.fr.config.js | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/sites/telecablesat.fr/telecablesat.fr.config.js b/sites/telecablesat.fr/telecablesat.fr.config.js index abfa3dd0..e45fa4ac 100644 --- a/sites/telecablesat.fr/telecablesat.fr.config.js +++ b/sites/telecablesat.fr/telecablesat.fr.config.js @@ -1,14 +1,6 @@ const cheerio = require('cheerio') const axios = require('axios') -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') const API_ENDPOINT = 'https://tv-programme.telecablesat.fr/chaine' @@ -39,13 +31,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), @@ -86,7 +78,9 @@ function parseStart($item, date) { const timeString = $item('.schedule-hour').text() if (!timeString) return null - return dayjs.tz(`${date.format('YYYY-MM-DD')} ${timeString}`, 'YYYY-MM-DD HH:mm', 'Europe/Paris') + return DateTime.fromFormat(`${date.format('YYYY-MM-DD')} ${timeString}`, 'yyyy-MM-dd HH:mm', { + zone: 'Europe/Paris' + }).toUTC() } function parseIcon($item) {