From 7f35496c7d52b26ebb6273a30ea2e1dbabff92cf Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Sat, 3 Jun 2023 21:37:50 +0300 Subject: [PATCH 1/3] Update turksatkablo.com.tr.test.js --- sites/turksatkablo.com.tr/turksatkablo.com.tr.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/turksatkablo.com.tr/turksatkablo.com.tr.test.js b/sites/turksatkablo.com.tr/turksatkablo.com.tr.test.js index 545c0081..6be05fb0 100644 --- a/sites/turksatkablo.com.tr/turksatkablo.com.tr.test.js +++ b/sites/turksatkablo.com.tr/turksatkablo.com.tr.test.js @@ -1,4 +1,4 @@ -// npx epg-grabber --config=sites/turksatkablo.com.tr/turksatkablo.com.tr.config.js --channels=sites/turksatkablo.com.tr/turksatkablo.com.tr.channels.xml --output=guide.xml --days=2 +// npx epg-grabber --config=sites/turksatkablo.com.tr/turksatkablo.com.tr.config.js --channels=sites/turksatkablo.com.tr/turksatkablo.com.tr.channels.xml --output=guide.xml const { parser, url } = require('./turksatkablo.com.tr.config.js') const dayjs = require('dayjs') From de75e854be4f574b652fd4366189e001ba82b2f8 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Sat, 3 Jun 2023 21:37:56 +0300 Subject: [PATCH 2/3] Update turksatkablo.com.tr.config.js --- .../turksatkablo.com.tr.config.js | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/sites/turksatkablo.com.tr/turksatkablo.com.tr.config.js b/sites/turksatkablo.com.tr/turksatkablo.com.tr.config.js index 025d4f06..581575d7 100644 --- a/sites/turksatkablo.com.tr/turksatkablo.com.tr.config.js +++ b/sites/turksatkablo.com.tr/turksatkablo.com.tr.config.js @@ -1,14 +1,6 @@ -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 = { - skip: true, // Error: Connection timeout site: 'turksatkablo.com.tr', days: 2, url: function ({ date }) { @@ -23,13 +15,13 @@ module.exports = { items.forEach(item => { const prev = programs[programs.length - 1] let start = parseStart(item, date) - if (prev && start.isBefore(prev.start)) { - start = start.add(1, 'd') + if (prev && start < prev.start) { + start = start.plus({ days: 1 }) date = date.add(1, 'd') } let stop = parseStop(item, date) - if (prev && stop.isBefore(start)) { - stop = stop.add(1, 'd') + if (prev && stop < start) { + stop = stop.plus({ days: 1 }) date = date.add(1, 'd') } programs.push({ @@ -46,13 +38,13 @@ module.exports = { function parseStart(item, date) { const time = `${date.format('YYYY-MM-DD')} ${item.c}` - return dayjs.tz(time, 'YYYY-MM-DD HH:mm', 'Europe/Istanbul') + return DateTime.fromFormat(time, 'yyyy-MM-dd HH:mm', { zone: 'Europe/Istanbul' }).toUTC() } function parseStop(item, date) { const time = `${date.format('YYYY-MM-DD')} ${item.d}` - return dayjs.tz(time, 'YYYY-MM-DD HH:mm', 'Europe/Istanbul') + return DateTime.fromFormat(time, 'yyyy-MM-dd HH:mm', { zone: 'Europe/Istanbul' }).toUTC() } function parseItems(content, channel) { From ef5e64e76a592cbed593d332ff53ccbdd061b38b Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Sat, 3 Jun 2023 21:38:00 +0300 Subject: [PATCH 3/3] Update turksatkablo.com.tr.channels.xml --- sites/turksatkablo.com.tr/turksatkablo.com.tr.channels.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/sites/turksatkablo.com.tr/turksatkablo.com.tr.channels.xml b/sites/turksatkablo.com.tr/turksatkablo.com.tr.channels.xml index 83604085..e7a3746a 100644 --- a/sites/turksatkablo.com.tr/turksatkablo.com.tr.channels.xml +++ b/sites/turksatkablo.com.tr/turksatkablo.com.tr.channels.xml @@ -63,7 +63,6 @@ Fast & FunBox HD FB TV FightBox HD - FilmBox Türkiye Flash TV Fox Crime Türkiye