Merge branch 'master' of https://github.com/iptv-org/epg into Update-xmltv_id-for-Indian-channels.xml

2026-04-16 07:39:24 -04:00 · 2026-02-14 14:56:27 +05:30
parent 04986a3450 de08d7df85
commit fae4d9dfd7
7 changed files with 1260 additions and 54 deletions
--- a/SITES.md
+++ b/SITES.md
@@ -22,11 +22,11 @@
    <tr><td><a href="sites/beinsports.com">beinsports.com</a></td><td align="right">130</td><td align="right">81</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/berrymedia.co.kr">berrymedia.co.kr</a></td><td align="right">5</td><td align="right">5</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/cableplus.com.uy">cableplus.com.uy</a></td><td align="right">171</td><td align="right">44</td><td align="center">🟢</td><td></td></tr>
-    <tr><td><a href="sites/canalplus.com">canalplus.com</a></td><td align="right">13118</td><td align="right">179</td><td align="center">🟢</td><td></td></tr>
+    <tr><td><a href="sites/canalplus.com">canalplus.com</a></td><td align="right">13118</td><td align="right">179</td><td align="center">🟢</td><td>https://github.com/iptv-org/epg/issues/3002</td></tr>
    <tr><td><a href="sites/cgates.lt">cgates.lt</a></td><td align="right">47</td><td align="right">29</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/chada.ma">chada.ma</a></td><td align="right">1</td><td align="right">1</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/chaines-tv.orange.fr">chaines-tv.orange.fr</a></td><td align="right">373</td><td align="right">328</td><td align="center">🟢</td><td></td></tr>
-    <tr><td><a href="sites/claro.com.br">claro.com.br</a></td><td align="right">273</td><td align="right">0</td><td align="center">🟢</td><td></td></tr>
+    <tr><td><a href="sites/claro.com.br">claro.com.br</a></td><td align="right">273</td><td align="right">0</td><td align="center">🟢</td><td>https://github.com/iptv-org/epg/issues/2988</td></tr>
    <tr><td><a href="sites/clarotvmais.com.br">clarotvmais.com.br</a></td><td align="right">158</td><td align="right">0</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/clickthecity.com">clickthecity.com</a></td><td align="right">32</td><td align="right">30</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/content.astro.com.my">content.astro.com.my</a></td><td align="right">149</td><td align="right">93</td><td align="center">🟢</td><td></td></tr>
@@ -38,7 +38,7 @@
    <tr><td><a href="sites/derana.lk">derana.lk</a></td><td align="right">1</td><td align="right">1</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/digea.gr">digea.gr</a></td><td align="right">88</td><td align="right">0</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/digiturk.com.tr">digiturk.com.tr</a></td><td align="right">112</td><td align="right">91</td><td align="center">🟢</td><td></td></tr>
-    <tr><td><a href="sites/directv.com">directv.com</a></td><td align="right">1043</td><td align="right">640</td><td align="center">🔴</td><td>https://github.com/iptv-org/epg/issues/2284</td></tr>
+    <tr><td><a href="sites/directv.com">directv.com</a></td><td align="right">1043</td><td align="right">640</td><td align="center">🔴</td><td>https://github.com/iptv-org/epg/issues/3001, https://github.com/iptv-org/epg/issues/2284</td></tr>
    <tr><td><a href="sites/directv.com.ar">directv.com.ar</a></td><td align="right">371</td><td align="right">0</td><td align="center">🔴</td><td>https://github.com/iptv-org/epg/issues/2339</td></tr>
    <tr><td><a href="sites/directv.com.uy">directv.com.uy</a></td><td align="right">374</td><td align="right">59</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/dishtv.in">dishtv.in</a></td><td align="right">434</td><td align="right">326</td><td align="center">🟢</td><td></td></tr>
@@ -146,7 +146,7 @@
    <tr><td><a href="sites/ruv.is">ruv.is</a></td><td align="right">2</td><td align="right">2</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/s.mxtv.jp">s.mxtv.jp</a></td><td align="right">2</td><td align="right">2</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/sat.tv">sat.tv</a></td><td align="right">30308</td><td align="right">249</td><td align="center">🟢</td><td></td></tr>
-    <tr><td><a href="sites/shahid.mbc.net">shahid.mbc.net</a></td><td align="right">206</td><td align="right">167</td><td align="center">🟢</td><td></td></tr>
+    <tr><td><a href="sites/shahid.mbc.net">shahid.mbc.net</a></td><td align="right">207</td><td align="right">168</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/siba.com.co">siba.com.co</a></td><td align="right">98</td><td align="right">95</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/singtel.com">singtel.com</a></td><td align="right">155</td><td align="right">113</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/sjonvarp.is">sjonvarp.is</a></td><td align="right">13</td><td align="right">13</td><td align="center">🟢</td><td></td></tr>
@@ -212,10 +212,11 @@
    <tr><td><a href="sites/tvmusor.hu">tvmusor.hu</a></td><td align="right">99</td><td align="right">66</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/tvmustra.hu">tvmustra.hu</a></td><td align="right">189</td><td align="right">0</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/tvpassport.com">tvpassport.com</a></td><td align="right">19287</td><td align="right">2496</td><td align="center">🟢</td><td></td></tr>
-    <tr><td><a href="sites/tvplus.com.tr">tvplus.com.tr</a></td><td align="right">150</td><td align="right">144</td><td align="center">🟢</td><td></td></tr>
+    <tr><td><a href="sites/tvplus.com.tr">tvplus.com.tr</a></td><td align="right">150</td><td align="right">144</td><td align="center">🟢</td><td>https://github.com/iptv-org/epg/issues/2983</td></tr>
    <tr><td><a href="sites/tvprofil.com">tvprofil.com</a></td><td align="right">9091</td><td align="right">408</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/tvtv.us">tvtv.us</a></td><td align="right">2299</td><td align="right">2230</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/v3.myafn.dodmedia.osd.mil">v3.myafn.dodmedia.osd.mil</a></td><td align="right">8</td><td align="right">8</td><td align="center">🟢</td><td></td></tr>
+    <tr><td><a href="sites/vantagetv.ee">vantagetv.ee</a></td><td align="right">3</td><td align="right">1</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/vidio.com">vidio.com</a></td><td align="right">57</td><td align="right">52</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/virginmediatelevision.ie">virginmediatelevision.ie</a></td><td align="right">5</td><td align="right">5</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/virgintvgo.virginmedia.com">virgintvgo.virginmedia.com</a></td><td align="right">238</td><td align="right">181</td><td align="center">🟢</td><td></td></tr>
@@ -229,7 +230,7 @@
    <tr><td><a href="sites/wavve.com">wavve.com</a></td><td align="right">77</td><td align="right">76</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/web.magentatv.de">web.magentatv.de</a></td><td align="right">348</td><td align="right">226</td><td align="center">🟢</td><td>https://github.com/iptv-org/epg/issues/2966</td></tr>
    <tr><td><a href="sites/webtv.delta.nl">webtv.delta.nl</a></td><td align="right">247</td><td align="right">204</td><td align="center">🟢</td><td></td></tr>
-    <tr><td><a href="sites/winplay.co">winplay.co</a></td><td align="right">2</td><td align="right">2</td><td align="center">🟢</td><td></td></tr>
+    <tr><td><a href="sites/winplay.co">winplay.co</a></td><td align="right">2</td><td align="right">2</td><td align="center">🟢</td><td>https://github.com/iptv-org/epg/issues/3003</td></tr>
    <tr><td><a href="sites/worldfishingnetwork.com">worldfishingnetwork.com</a></td><td align="right">1</td><td align="right">1</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/www3.nhk.or.jp">www3.nhk.or.jp</a></td><td align="right">1</td><td align="right">1</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/xem.kplus.vn">xem.kplus.vn</a></td><td align="right">77</td><td align="right">0</td><td align="center">🟢</td><td></td></tr>
@@ -237,7 +238,7 @@
    <tr><td><a href="sites/yes.co.il">yes.co.il</a></td><td align="right">174</td><td align="right">0</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/zap.co.ao">zap.co.ao</a></td><td align="right">114</td><td align="right">63</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/zap2it.com">zap2it.com</a></td><td align="right">595</td><td align="right">0</td><td align="center">🟢</td><td></td></tr>
-    <tr><td><a href="sites/ziggogo.tv">ziggogo.tv</a></td><td align="right">156</td><td align="right">150</td><td align="center">🟢</td><td></td></tr>
+    <tr><td><a href="sites/ziggogo.tv">ziggogo.tv</a></td><td align="right">156</td><td align="right">150</td><td align="center">🟢</td><td>https://github.com/iptv-org/epg/issues/2977, https://github.com/iptv-org/epg/issues/2976</td></tr>
    <tr><td><a href="sites/znbc.co.zm">znbc.co.zm</a></td><td align="right">4</td><td align="right">4</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/zuragt.mn">zuragt.mn</a></td><td align="right">34</td><td align="right">27</td><td align="center">🟢</td><td></td></tr>
  </tbody>
--- a/sites/movistarplus.es/movistarplus.es.config.js
+++ b/sites/movistarplus.es/movistarplus.es.config.js
@@ -1,6 +1,11 @@
 const axios = require('axios')
 const cheerio = require('cheerio')
 const dayjs = require('dayjs')
+const utc = require('dayjs/plugin/utc')
+const timezone = require('dayjs/plugin/timezone')
+
+dayjs.extend(utc)
+dayjs.extend(timezone)

 module.exports = {
  site: 'movistarplus.es',
@@ -8,35 +13,87 @@ module.exports = {
  url({ channel, date }) {
    return `https://www.movistarplus.es/programacion-tv/${channel.site_id}/${date.format('YYYY-MM-DD')}`
  },
-  async parser({ content }) {
+  request: {
+    headers: {
+      'User-Agent':
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
+      Accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
+      'Accept-Language': 'es-ES,es;q=0.9,en;q=0.8',
+      Referer: 'https://www.movistarplus.es/programacion-tv'
+    },
+    maxRedirects: 5
+  },
+  async parser({ content, date }) {
    let programs = []
-    let items = parseItems(content)
-    if (!items.length) return programs
-
    const $ = cheerio.load(content)
-    const programElements = $('div[id^="ele-"]').get()

-    for (let i = 0; i < items.length; i++) {
-      const el = items[i]
-      let description = null
+    const programDivs = $('div[id^="ele-"]').toArray()

-      if (programElements[i]) {
-        const programDiv = $(programElements[i])
-        const programLink = programDiv.find('a').attr('href')
-        
-        if (programLink) {
-          const idMatch = programLink.match(/id=(\d+)/)
-          if (idMatch && idMatch[1]) {
-            description = await getProgramDescription(programLink).catch(() => null)
+    for (let i = 0; i < programDivs.length; i++) {
+      const el = $(programDivs[i])
+
+      const title = el.find('li.title').text().trim()
+      if (!title) continue
+
+      const timeText = el.find('li.time').text().trim()
+      if (!timeText) continue
+
+      const [hours, minutes] = timeText.split(':').map(h => parseInt(h, 10))
+
+      // Parse time in Spain timezone (Europe/Madrid)
+      let startDate = dayjs.tz(
+        `${date.format('YYYY-MM-DD')} ${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}`,
+        'YYYY-MM-DD HH:mm',
+        'Europe/Madrid'
+      )
+
+      // If the time is in early morning (before 5 AM), it's the next day
+      if (hours < 5) {
+        startDate = startDate.add(1, 'day')
+      }
+
+      // Calculate end time from next program's start time
+      let endDate
+      if (i < programDivs.length - 1) {
+        const nextEl = $(programDivs[i + 1])
+        const nextTimeText = nextEl.find('li.time').text().trim()
+        if (nextTimeText) {
+          const [nextHours, nextMinutes] = nextTimeText.split(':').map(h => parseInt(h, 10))
+          endDate = dayjs.tz(
+            `${date.format('YYYY-MM-DD')} ${nextHours.toString().padStart(2, '0')}:${nextMinutes.toString().padStart(2, '0')}`,
+            'YYYY-MM-DD HH:mm',
+            'Europe/Madrid'
+          )
+
+          // If the next time is in early morning (before 5 AM), it's the next day
+          if (nextHours < 5) {
+            endDate = endDate.add(1, 'day')
+          }
+
+          // If end time is still before or same as start time, add another day
+          if (endDate.isBefore(startDate) || endDate.isSame(startDate)) {
+            endDate = endDate.add(1, 'day')
          }
        }
      }

+      // If no end time, use start of next day
+      if (!endDate) {
+        endDate = startDate.add(1, 'day').startOf('day')
+      }
+
+      const programLink = el.find('a').attr('href')
+      let description = null
+
+      if (programLink) {
+        description = await getProgramDescription(programLink).catch(() => null)
+      }
+
      programs.push({
-        title: el.item.name,
-        description: description,
-        start: dayjs(el.item.startDate),
-        stop: dayjs(el.item.endDate)
+        title,
+        description,
+        start: startDate,
+        stop: endDate
      })
    }

@@ -44,7 +101,13 @@ module.exports = {
  },
  async channels() {
    const html = await axios
-      .get('https://www.movistarplus.es/programacion-tv')
+      .get('https://www.movistarplus.es/programacion-tv', {
+        headers: {
+          'User-Agent':
+            'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
+          Accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8'
+        }
+      })
      .then(r => r.data)
      .catch(console.log)

@@ -65,33 +128,17 @@ module.exports = {
  }
 }

-function parseItems(content) {
-  try {
-    const $ = cheerio.load(content)
-    let scheme = $('script:contains("@type": "ItemList")').html()
-    scheme = JSON.parse(scheme)
-    if (!scheme || !Array.isArray(scheme.itemListElement)) return []
-
-    return scheme.itemListElement
-  } catch {
-    return []
-  }
-}
-
 async function getProgramDescription(programUrl) {
-  try {
-    const response = await axios.get(programUrl, {
-      headers: {
-        'Referer': 'https://www.movistarplus.es/programacion-tv/'
-      }
-    })
+  const response = await axios.get(programUrl, {
+    headers: {
+      'User-Agent':
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
+      Referer: 'https://www.movistarplus.es/programacion-tv/'
+    }
+  })

-    const $ = cheerio.load(response.data)
-    const description = $('.show-content .text p').first().text().trim() || null
+  const $ = cheerio.load(response.data)
+  const description = $('.show-content .text p').first().text().trim() || null

-    return description
-  } catch (error) {
-    console.error(`Error fetching description from ${programUrl}:`, error.message)
-    return null
-  }
+  return description
 }
--- a/sites/vantagetv.ee/data/content.xml
+++ b/sites/vantagetv.ee/data/content.xml
--- a/sites/vantagetv.ee/readme.md
+++ b/sites/vantagetv.ee/readme.md
@@ -0,0 +1,15 @@
+# vantagetv.ee
+
+https://vantagetv.ee/epg.xml
+
+### Download the guide
+
+```sh
+npm run grab --- --site=vantagetv.ee
+```
+
+### Test
+
+```sh
+npm test --- vantagetv.ee
+```
--- a/sites/vantagetv.ee/vantagetv.ee.channels.xml
+++ b/sites/vantagetv.ee/vantagetv.ee.channels.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<channels>
+  <channel site="vantagetv.ee" site_id="vmusic" lang="en" xmltv_id="VantageMusic.ee@SD">Vantage Music</channel>
+  <channel site="vantagetv.ee" site_id="vdance" lang="en" xmltv_id="">Vantage Dance</channel>
+  <channel site="vantagetv.ee" site_id="vrock" lang="en" xmltv_id="">Vantage Rock</channel>
+</channels>
--- a/sites/vantagetv.ee/vantagetv.ee.config.js
+++ b/sites/vantagetv.ee/vantagetv.ee.config.js
@@ -0,0 +1,27 @@
+const parser = require('epg-parser')
+
+module.exports = {
+  site: 'vantagetv.ee',
+  days: 2,
+  url: 'http://vantagetv.ee/epg.xml',
+  parser: function ({ content, channel, date }) {
+    let programs = []
+    const items = parseItems(content, channel, date)
+    items.forEach(item => {
+      programs.push({
+        title: item.title?.[0]?.value,
+        description: item.desc?.[0]?.value,
+        start: item.start,
+        stop: item.stop
+      })
+    })
+
+    return programs
+  }
+}
+
+function parseItems(content, channel, date) {
+  const { programs } = parser.parse(content)
+
+  return programs.filter(p => p.channel === channel.site_id && date.isSame(p.start, 'day'))
+}
--- a/sites/vantagetv.ee/vantagetv.ee.test.js
+++ b/sites/vantagetv.ee/vantagetv.ee.test.js
@@ -0,0 +1,41 @@
+const { parser, url } = require('./vantagetv.ee.config.js')
+const fs = require('fs')
+const path = require('path')
+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('2026-02-05', 'YYYY-MM-DD').startOf('d')
+const channel = { site_id: 'vrock' }
+
+it('can generate valid url', () => {
+  expect(url).toBe('http://vantagetv.ee/epg.xml')
+})
+
+it('can parse response', () => {
+  const content = fs.readFileSync(path.resolve(__dirname, '__data__/content.xml'))
+
+  const results = parser({ content, channel, date })
+
+  expect(results.length).toBe(3)
+  expect(results[0]).toMatchObject({
+    title: 'Breakfast with Vantage Rock',
+    description: 'Get ready for your day with Vantage Rock',
+    start: '2026-02-05T04:00:00.000Z',
+    stop: '2026-02-05T08:00:00.000Z'
+  })
+  expect(results[2]).toMatchObject({
+    title: 'Rock All Night',
+    description: 'It might be late, but that&apos;s no reason to stop!',
+    start: '2026-02-05T22:00:00.000Z',
+    stop: '2026-02-06T04:00:00.000Z'
+  })
+})
+
+it('can handle empty guide', () => {
+  const results = parser({ content: '' })
+
+  expect(results).toMatchObject([])
+})