update custom fix

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: davidclaeysquinones

Dockerfile

@@ -2,6 +2,7 @@ FROM node:21-alpine
 ARG GIT_REPO=https://github.com/iptv-org/epg.git
 ARG GIT_BRANCH=master
 ENV CRON_SCHEDULE="0 0,12 * * *"
+ENV API_URL="https://iptv-org.github.io/api"
 ENV DAYS=14
 ENV MAX_CONNECTIONS=10
 ENV ENABLE_FIXES=false
@@ -49,5 +50,5 @@ RUN chmod +x "$START_SCRIPT" \
   && apk del git curl \
   && rm -rf /var/cache/apk/*
 SHELL ["/bin/bash", "-c"]
-ENTRYPOINT bash $START_SCRIPT chron-schedule="$CRON_SCHEDULE" work-dir="$WORKDIR" days="$DAYS" max_connections="$MAX_CONNECTIONS" enable_fixes="$ENABLE_FIXES"
+ENTRYPOINT bash $START_SCRIPT chron-schedule="$CRON_SCHEDULE" work-dir="$WORKDIR" days="$DAYS" max_connections="$MAX_CONNECTIONS" enable_fixes="$ENABLE_FIXES" api_url="$API_URL"
 EXPOSE 3000

README.md

@@ -32,19 +32,32 @@ You can do this by creating a mapping in the `/config` folder.
 #### Custom fixes
 
 Through the `ENABLE_FIXES` variable custom provider fixes can be applied to the container.
-By default some fixes are available. If you have suggestions or a problem with them please submit an issue.
+By default some fixes are available. These fixes have been validated before being added to this repo.
+However this option is disabled by default since you might only want to run the unmodified source.
+If you have suggestions or a problem with them please submit an issue.
+
+This the list of the provided custom fixes :
+
+| Provider         | Author                                                        | Status                                                                                                                                                         |
+|------------------|---------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| movistarplus.es  | [davidclaeysquinones](https://github.com/davidclaeysquinones) | [PR](https://github.com/iptv-org/epg/pull/2440) pending approval                                                                                               |
+| pickx.be         | [davidclaeysquinones](https://github.com/davidclaeysquinones) | [PR](https://github.com/iptv-org/epg/pull/2430) merged since commit [d159110](https://github.com/iptv-org/epg/commit/d15911006e163262c0c7f267deae28160c0d7a8f) |
+| telenet.tv       | [davidclaeysquinones](https://github.com/davidclaeysquinones) | [PR](https://github.com/iptv-org/epg/pull/2429) merged since commit [fd382db](https://github.com/iptv-org/epg/commit/fd382db08da7a96150928b8dcfef115e29e661d3) |
+| web.magentatv.de | [klausellus-wallace](https://github.com/klausellus-wallace)   | [PR](https://github.com/iptv-org/epg/pull/2458) pending approval                                                                                               |
+
 If for some reason you want to include your own provider fixes this is possible by creation a mapping in the `/fixes` folder.<br>
 The expected structure is */fixes/`provider_name`/`provider_name`.config.js*.<br>
 It is recommended that you take existing provider code as a base for your customisations.
 
 ### Environment Variables
 
-| Variable                      | Description                                                                | Default          |
+| Variable                      | Description                                                                | Default                          |
-|-------------------------------|----------------------------------------------------------------------------|------------------|
+|-------------------------------|----------------------------------------------------------------------------|----------------------------------|
-| CRON_SCHEDULE                 | CRON expression describing the recurrence for epg retrieval.               | `0 0,12 * * *`   |            
+| CRON_SCHEDULE                 | CRON expression describing the recurrence for epg retrieval.               | `0 0,12 * * *`                   |            
-| DAYS                          | Describes the desired amount of days in the future for for epg retrieval.  | 14               |
+| DAYS                          | Describes the desired amount of days in the future for for epg retrieval.  | 14                               |
-| MAX_CONNECTIONS               | The maximum amount of parallel connections that can be established         | 10               |
+| MAX_CONNECTIONS               | The maximum amount of parallel connections that can be established         | 10                               |
 | ENABLE_FIXES                  | Some fixes to providers take a long time to be merged into the main branch.<br>When this option is enabled some of these fixes will also be included.<br>The source code for these fixes can be seen under the `fixes` folder.<br> Recreate the container when changing this variable in order for it to take effect  | false            |
+| API_URL                       | The endpoint where channel information will be grabbed                     | `https://iptv-org.github.io/api` |
 
 ### Compose file
 
@@ -101,4 +114,12 @@ Sometimes a new version of this image will be bound to the same source commit. T
 - 1.0.11 
   [10-14-2024 17:34](https://github.com/iptv-org/epg/commit/7610f7b9f5cc1ccab8d17f3408a95d31b36ace7c)
 - 1.0.12
-  [10-14-2024 17:34](https://github.com/iptv-org/epg/commit/7610f7b9f5cc1ccab8d17f3408a95d31b36ace7c)<br>Fix Pickx.be url
+  [10-14-2024](https://github.com/iptv-org/epg/commit/7610f7b9f5cc1ccab8d17f3408a95d31b36ace7c)<br>Fix Pickx.be url
+- 1.0.13
+  [10-14-2024](https://github.com/iptv-org/epg/commit/7610f7b9f5cc1ccab8d17f3408a95d31b36ace7c)<br>Add custom fix for web.magentatv.de
+- 1.0.14
+  [10-14-2024](https://github.com/iptv-org/epg/commit/7610f7b9f5cc1ccab8d17f3408a95d31b36ace7c)<br>Change fix for movistarplus.es in order to work with new API
+- 1.0.15
+  [11-26-2024](https://github.com/iptv-org/epg/commit/d15911006e163262c0c7f267deae28160c0d7a8f)<br>Add option to customize channel endpoint
+- 1.0.16
+  [11-26-2024](https://github.com/iptv-org/epg/commit/d15911006e163262c0c7f267deae28160c0d7a8f)<br>Fix icons for movistarplus.es

fixes/movistarplus.es/movistarplus.es.config.js

@@ -1,74 +1,78 @@
 const { DateTime } = require('luxon')
 
-const API_PROD_ENDPOINT = 'https://www.movistarplus.es/programacion-tv'
+const API_PROGRAM_ENDPOINT = 'https://comunicacion.movistarplus.es'
-const API_IMAGE_ENDPOINT = 'https://www.movistarplus.es/recorte/n/caratulaH/';
+const API_IMAGE_ENDPOINT = 'https://www.movistarplus.es/recorte/n/externov';
 
 module.exports = {
   site: 'movistarplus.es',
   days: 2,
-  url: function ({ date }) {
+  url: function ({ channel, date }) {
-    return `${API_PROD_ENDPOINT}/${date.format('YYYY-MM-DD')}?v=json`
+    return `${API_PROGRAM_ENDPOINT}/wp-admin/admin-ajax.php`
+  },
+  request: {
+    method: 'POST',
+    headers: {
+      Origin: API_PROGRAM_ENDPOINT,
+      Referer: `${API_PROGRAM_ENDPOINT}/programacion/`,
+      "Content-Type" : 'application/x-www-form-urlencoded; charset=UTF-8',
+    },
+    data: function ({ channel, date }) {
+      return {
+        action: 'getProgramation',
+        day: date.format('YYYY-MM-DD'),
+        "channels[]": channel.site_id,
+      };
+    },
   },
   parser({ content, channel, date }) {
     let programs = []
-    let items = parseItems(content, channel)
+    let items = parseItems(content, channel);
-    if (!items.length) return programs
+    if (!items.length) return programs;
-    let guideDate = date
 
     items.forEach(item => {
       let startTime = DateTime.fromFormat(
-        `${guideDate.format('YYYY-MM-DD')} ${item.HORA_INICIO}`,
+        `${item.f_evento_rejilla}`,
-        'yyyy-MM-dd HH:mm',
+        'yyyy-MM-dd HH:mm:ss',
-        {
+        { zone: 'Europe/Madrid' }
-          zone: 'Europe/Madrid'
+      ).toUTC();
-        }
+
-      ).toUTC()
       let stopTime = DateTime.fromFormat(
-        `${guideDate.format('YYYY-MM-DD')} ${item.HORA_FIN}`,
+        `${item.f_fin_evento_rejilla}`,
-        'yyyy-MM-dd HH:mm',
+        'yyyy-MM-dd HH:mm:ss',
-        {
+        { zone: 'Europe/Madrid' }
-          zone: 'Europe/Madrid'
-        }
       ).toUTC()
+
+      // Adjust stop time if it's on the next day
       if (stopTime < startTime) {
-        guideDate = guideDate.add(1, 'd')
+        stopTime = stopTime.plus({ days: 1 });
-        stopTime = stopTime.plus({ days: 1 })
       }
+
       programs.push({
-        title: item.TITULO,
+        title: item.des_evento_rejilla,
         icon: parseIcon(item, channel),
-        category: item.GENERO,
+        category: item.des_genero,
         start: startTime,
-        stop: stopTime
+        stop: stopTime,
       })
     })
+
     return programs
   },
-  async channels() {
-    const axios = require('axios')
-    const dayjs = require('dayjs')
-    const data = await axios
-      .get(`${API_PROD_ENDPOINT}/${dayjs().format('YYYY-MM-DD')}?v=json`)
-      .then(r => r.data)
-      .catch(console.log)
-
-    return Object.values(data.data).map(item => {
-      return {
-        lang: 'es',
-        site_id: item.DATOS_CADENA.CODIGO,
-        name: item.DATOS_CADENA.NOMBRE
-      }
-    })
-  }
 }
 
 function parseIcon(item, channel) {
-  return `${API_IMAGE_ENDPOINT}/M${channel.site_id}P${item.ELEMENTO}`;
+  if(item.cod_elemento_emision)
+  {
+    	return `${API_IMAGE_ENDPOINT}/M${channel.site_id}P${item.cod_elemento_emision}`
+  }
+  
+  return ''
 }
 
 function parseItems(content, channel) {
-  const json = typeof content === 'string' ? JSON.parse(content) : content
+  const json = typeof content === 'string' ? JSON.parse(content) : content;
-  if (!(`${channel.site_id}-CODE` in json.data)) return []
+  const data = json.channelsProgram;
-  const data = json.data[`${channel.site_id}-CODE`]
+
-  return data ? data.PROGRAMAS : []
+  if (data.length !== 1) return [];
+  return data[0];
 }

fixes/pickx.be/pickx.be.config.js

@@ -1,3 +1,5 @@
+// credit for this fix goes to davidclaeysquinones for his PR on https://github.com/iptv-org/epg/pull/2430
+
 const axios = require('axios')
 const dayjs = require('dayjs')
 const utc = require('dayjs/plugin/utc')

fixes/telenet.tv/telenet.tv.config.js

@@ -1,3 +1,5 @@
+// credit for this fix goes to davidclaeysquinones for his PR on https://github.com/iptv-org/epg/pull/2429
+
 const axios = require('axios')
 const dayjs = require('dayjs')
 

fixes/web.magentatv.de/web.magentatv.de.config.js

@@ -0,0 +1,232 @@
+// credit for this fix goes to klausellus-wallace for his PR on https://github.com/iptv-org/epg/pull/2458
+
+const axios = require('axios')
+const dayjs = require('dayjs')
+const utc = require('dayjs/plugin/utc')
+const customParseFormat = require('dayjs/plugin/customParseFormat')
+const fetch = require('node-fetch')
+const { upperCase } = require('lodash')
+
+let X_CSRFTOKEN
+let COOKIE
+const cookiesToExtract = ['JSESSIONID', 'CSESSIONID', 'CSRFSESSION']
+const extractedCookies = {}
+
+dayjs.extend(utc)
+dayjs.extend(customParseFormat)
+
+module.exports = {
+  site: 'web.magentatv.de',
+  days: 2,
+  url: 'https://api.prod.sngtv.magentatv.de/EPG/JSON/PlayBillList',
+  request: {
+    method: 'POST',
+    headers: function () {
+      return setHeaders()
+    },
+
+    data({ channel, date }) {
+      return {
+        count: -1,
+        isFillProgram: 1,
+        offset: 0,
+        properties: [
+          {
+            include: 'endtime,genres,id,name,starttime,channelid,pictures,introduce,subName,seasonNum,subNum,cast,country,producedate,externalIds',
+            name: 'playbill'
+          }
+        ],
+        type: 2,
+        begintime: date.format('YYYYMMDD000000'),
+        channelid: channel.site_id,
+        endtime: date.add(1, 'd').format('YYYYMMDD000000')
+      }
+    }
+  },
+  parser: function ({ content }) {
+    let programs = []
+    const items = parseItems(content)
+    items.forEach(item => {
+      programs.push({
+        title: item.name,
+        description: item.introduce,
+        image: parseImage(item),
+        category: parseCategory(item),
+        start: parseStart(item),
+        stop: parseStop(item),
+        sub_title: item.subName,
+        season: item.seasonNum,
+        episode: item.subNum,
+        directors: parseDirectors(item),
+        producers: parseProducers(item),
+        adapters: parseAdapters(item),
+        country: upperCase(item.country),
+        date: item.producedate,
+        urls: parseUrls(item)
+      })
+    })
+    return programs
+  },
+  async channels() {
+    const url = 'https://api.prod.sngtv.magentatv.de/EPG/JSON/AllChannel'
+    const body = {
+      channelNamespace: 2,
+      filterlist: [
+        {
+          key: 'IsHide',
+          value: '-1'
+        }
+      ],
+      metaDataVer: 'Channel/1.1',
+      properties: [
+        {
+          include: '/channellist/logicalChannel/contentId,/channellist/logicalChannel/name',
+          name: 'logicalChannel'
+        }
+      ],
+      returnSatChannel: 0
+    }
+    const params = {
+      headers: await setHeaders()
+    }
+
+    const data = await axios
+      .post(url, body, params)
+      .then(r => r.data)
+      .catch(console.log)
+
+    return data.channellist.map(item => {
+      return {
+        lang: 'de',
+        site_id: item.contentId,
+        name: item.name
+      }
+    })
+  }
+}
+
+function parseCategory(item) {
+  return item.genres
+    ? item.genres
+        .replace('und', ',')
+        .split(',')
+        .map(i => i.trim())
+    : []
+}
+
+function parseDirectors(item) {
+  if (!item.cast || !item.cast.director) return [];
+  return item.cast.director
+    .replace('und', ',')
+    .split(',')
+    .map(i => i.trim());
+}
+
+function parseProducers(item) {
+  if (!item.cast || !item.cast.producer) return [];
+  return item.cast.producer
+    .replace('und', ',')
+    .split(',')
+    .map(i => i.trim())
+}
+
+function parseAdapters(item) {
+  if (!item.cast || !item.cast.adaptor) return [];
+  return item.cast.adaptor
+    .replace('und', ',')
+    .split(',')
+    .map(i => i.trim())
+}
+
+function parseUrls(item) {
+  // currently only a imdb id is returned by the api, thus we can construct the url here
+  if (!item.externalIds) return [];
+  return JSON.parse(item.externalIds)
+    .filter(externalId => externalId.type === 'imdb' && externalId.id)
+    .map(externalId => ({ system: 'imdb', value: `https://www.imdb.com/title/${externalId.id}` }))
+}
+
+function parseImage(item) {
+  if (!Array.isArray(item.pictures) || !item.pictures.length) return null
+
+  return item.pictures[0].href
+}
+
+function parseStart(item) {
+  return dayjs.utc(item.starttime, 'YYYY-MM-DD HH:mm:ss')
+}
+
+function parseStop(item) {
+  return dayjs.utc(item.endtime, 'YYYY-MM-DD HH:mm:ss')
+}
+
+function parseItems(content) {
+  const data = JSON.parse(content)
+  if (!data || !Array.isArray(data.playbilllist)) return []
+
+  return data.playbilllist
+}
+
+// Function to try to fetch COOKIE and X_CSRFTOKEN
+function fetchCookieAndToken() {
+  return fetch(
+    'https://api.prod.sngtv.magentatv.de/EPG/JSON/Authenticate?SID=firstup&T=Windows_chrome_118',
+    {
+      headers: {
+        accept: 'application/json, text/javascript, */*; q=0.01',
+        'content-type': 'application/x-www-form-urlencoded; charset=UTF-8',
+        'sec-fetch-dest': 'empty',
+        'sec-fetch-mode': 'cors',
+        'sec-fetch-site': 'same-origin',
+        'x-requested-with': 'XMLHttpRequest',
+        Referer: 'https://web.magentatv.de/',
+        'Referrer-Policy': 'strict-origin-when-cross-origin'
+      },
+      body: '{"terminalid":"00:00:00:00:00:00","mac":"00:00:00:00:00:00","terminaltype":"WEBTV","utcEnable":1,"timezone":"Etc/GMT0","userType":3,"terminalvendor":"Unknown"}',
+      method: 'POST'
+    }
+  )
+    .then(response => {
+      // Check if the response status is OK (2xx)
+      if (!response.ok) {
+        throw new Error('HTTP request failed')
+      }
+
+      // Extract the set-cookie header
+      const setCookieHeader = response.headers.raw()['set-cookie']
+
+      // Extract the cookies specified in cookiesToExtract
+      cookiesToExtract.forEach(cookieName => {
+        const regex = new RegExp(`${cookieName}=(.+?)(;|$)`)
+        const match = setCookieHeader.find(header => regex.test(header))
+
+        if (match) {
+          const cookieValue = regex.exec(match)[1]
+          extractedCookies[cookieName] = cookieValue
+        }
+      })
+
+      return response.json()
+    })
+    .then(data => {
+      if (data.csrfToken) {
+        X_CSRFTOKEN = data.csrfToken
+        COOKIE = `JSESSIONID=${extractedCookies.JSESSIONID}; CSESSIONID=${extractedCookies.CSESSIONID}; CSRFSESSION=${extractedCookies.CSRFSESSION}; JSESSIONID=${extractedCookies.JSESSIONID};`
+      } else {
+        console.log('csrfToken not found in the response.')
+      }
+    })
+    .catch(error => {
+      console.error(error)
+    })
+}
+
+function setHeaders() {
+  return fetchCookieAndToken().then(() => {
+    return {
+      X_CSRFTOKEN: X_CSRFTOKEN,
+      'Content-Type': 'application/json',
+      Cookie: COOKIE
+    }
+  })
+}

start.sh

@@ -8,6 +8,7 @@ for arg in "$@"; do
       days=*) days="${arg#*=}" ;;
       max_connections=*) max_connections="${arg#*=}" ;;
       enable_fixes=*) enable_fixes="${arg#*=}" ;;
+	  api_url=*) api_url="${arg#*=}" ;;
    esac
 done
 
@@ -17,11 +18,14 @@ echo "working dir : " $(pwd)
 echo "days : ${days}"
 echo "max_connections : ${max_connections}"
 echo "enable_fixes : ${enable_fixes}"
+echo "api url : ${api_url}"
 
 if [ "$enable_fixes" = true ] ; then
  cp -R /fixes/* /bin/epg/sites/
 fi
 
+sed -i -E "s/(https:\x2f\x2fiptv-org.github.io\x2fapi)/$api_url/g" $work_dir/scripts/core/apiClient.ts
+
 pm2 --name epg start npm -- run serve
 npm run grab -- --channels=channels.xml --maxConnections=$max_connections --days=$days --gzip
 ln -s $work_dir/guide.xml /public/guide.xml