Merge pull request #2092 from iptv-org/fix-tvgids.nl

Fix tvgids.nl

sites/tvgids.nl/tvgids.nl.config.js

@@ -1,17 +1,15 @@
 const cheerio = require('cheerio')
 const axios = require('axios')
-const dayjs = require('dayjs')
-const utc = require('dayjs/plugin/utc')
-const timezone = require('dayjs/plugin/timezone')
-
-dayjs.extend(utc)
-dayjs.extend(timezone)
+const { DateTime } = require('luxon')
 
 module.exports = {
   site: 'tvgids.nl',
   days: 2,
   url: function ({ date, channel }) {
-    const path = dayjs.utc().isSame(date, 'd') ? '' : `${date.format('DD-MM-YYYY')}/`
+    const path =
+      DateTime.now().day === DateTime.fromMillis(date.valueOf()).day
+        ? ''
+        : `${date.format('DD-MM-YYYY')}/`
 
     return `https://www.tvgids.nl/gids/${path}${channel.site_id}`
   },
@@ -24,13 +22,13 @@ module.exports = {
       const prev = programs[programs.length - 1]
       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(30, 'm')
+      const stop = start.plus({ minutes: 30 })
       programs.push({
         title: parseTitle($item),
         description: parseDescription($item),
@@ -75,9 +73,11 @@ function parseIcon($item) {
 }
 
 function parseStart($item, date) {
-  const time = $item('.program__starttime').text().trim()
+  const time = $item('.program__starttime').clone().children().remove().end().text().trim()
 
-  return dayjs.tz(`${date.format('YYYY-MM-DD')} ${time}`, 'YYYY-MM-DD HH:mm', 'Europe/Amsterdam')
+  return DateTime.fromFormat(`${date.format('YYYY-MM-DD')} ${time}`, 'yyyy-MM-dd HH:mm', {
+    zone: 'Europe/Amsterdam'
+  }).toUTC()
 }
 
 function parseItems(content) {

sites/tvgids.nl/tvgids.nl.test.js

@@ -1,5 +1,5 @@
 // npm run channels:parse -- --config=./sites/tvgids.nl/tvgids.nl.config.js --output=./sites/tvgids.nl/tvgids.nl.channels.xml
-// npx epg-grabber --config=sites/tvgids.nl/tvgids.nl.config.js --channels=sites/tvgids.nl/tvgids.nl.channels.xml --output=guide.xml --days=2
+// npx epg-grabber --config=sites/tvgids.nl/tvgids.nl.config.js --channels=sites/tvgids.nl/tvgids.nl.channels.xml --output=guide.xml
 
 const { parser, url } = require('./tvgids.nl.config.js')
 const fs = require('fs')
@@ -10,20 +10,20 @@ const customParseFormat = require('dayjs/plugin/customParseFormat')
 dayjs.extend(customParseFormat)
 dayjs.extend(utc)
 
-const date = dayjs.utc('2022-11-18', 'YYYY-MM-DD').startOf('d')
+const date = dayjs.utc('2023-06-13', 'YYYY-MM-DD').startOf('d')
 const channel = {
-  site_id: 'eurosport1',
-  xmltv_id: 'Eurosport1Netherlands.nl'
+  site_id: 'npo1',
+  xmltv_id: 'NPO1.nl'
 }
 
 it('can generate valid url', () => {
-  expect(url({ date, channel })).toBe('https://www.tvgids.nl/gids/18-11-2022/eurosport1')
+  expect(url({ date, channel })).toBe('https://www.tvgids.nl/gids/13-06-2023/npo1')
 })
 
 it('can generate valid url for today', () => {
   const today = dayjs.utc().startOf('d')
 
-  expect(url({ date: today, channel })).toBe('https://www.tvgids.nl/gids/eurosport1')
+  expect(url({ date: today, channel })).toBe('https://www.tvgids.nl/gids/npo1')
 })
 
 it('can parse response', () => {
@@ -35,18 +35,20 @@ it('can parse response', () => {
   })
 
   expect(results[0]).toMatchObject({
-    start: '2022-11-17T22:30:00.000Z',
-    stop: '2022-11-17T23:30:00.000Z',
-    title: 'Autosport: 8 uur van Bahrein',
-    description: 'Verslag van de 8 uur van Bahrein, gereden op het Bahrain International Circuit.'
+    start: '2023-06-12T21:57:00.000Z',
+    stop: '2023-06-12T22:58:00.000Z',
+    title: 'Op1',
+    icon: 'https://tvgidsassets.nl/v301/upload/o/carrousel/op1-451542641.jpg',
+    description: "Talkshow met wisselende presentatieduo's, live vanuit Amsterdam."
   })
 
-  expect(results[1]).toMatchObject({
-    start: '2022-11-17T23:30:00.000Z',
-    stop: '2022-11-18T00:30:00.000Z',
-    title: 'Powerlifting: Wereldkampioenschap Viborg',
-    description: 'Verslag van de krachtsport powerlifting.',
-    icon: 'https://tvgidsassets.nl/v270/upload/p/klein/powerlifting-wereldkampioenschap-viborg-418877211.jpg'
+  expect(results[61]).toMatchObject({
+    start: '2023-06-14T00:18:00.000Z',
+    stop: '2023-06-14T00:48:00.000Z',
+    title: 'NOS Journaal',
+    icon: 'https://tvgidsassets.nl/v301/upload/n/carrousel/nos-journaal-452818771.jpg',
+    description:
+      'Met het laatste nieuws, gebeurtenissen van nationaal en internationaal belang en de weersverwachting voor vandaag.'
   })
 })