Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4199210593 | |||
| 3c9432d1f3 | |||
| fa76db456f | |||
| b434ce505b | |||
| 2d3ffcbd42 | |||
| c4c0bf5270 | |||
| 8736114213 | |||
| 075ac41e2a | |||
| c7dc12f4bb | |||
| 3a7f23577a | |||
| 02725264fd |
@ -23,7 +23,8 @@ RUN apk update \
|
||||
&& mkdir $(echo "${BIN_FOLDER}/${EPG_FOLDER}") -p \
|
||||
&& git -C $(echo "${BIN_FOLDER}") clone --depth 1 -b $(echo "${GIT_BRANCH} ${GIT_REPO}") \
|
||||
&& cd $WORKDIR && npm install && npm update \
|
||||
&& rm .eslintrc.json \
|
||||
&& rm -rf .sites \
|
||||
&& rm -rf .husky \
|
||||
&& rm -rf .github \
|
||||
&& rm -rf .git \
|
||||
&& rm .gitignore \
|
||||
@ -41,7 +42,12 @@ RUN apk update \
|
||||
&& rm -rf node_modules/**/.github \
|
||||
&& rm -rf node_modules/**/docs \
|
||||
&& rm -rf node_modules/**/LICENSE \
|
||||
&& rm -rf node_modules/**/license \
|
||||
&& rm -rf node_modules/**/**.md \
|
||||
&& rm -rf node_modules/**/**/LICENSE \
|
||||
&& rm -rf node_modules/**/**/license \
|
||||
&& rm -rf node_modules/**/**/.github \
|
||||
&& rm -rf node_modules/**/**/**.md \
|
||||
&& ln -s /config/channels.xml $(echo "${WORKDIR}/channels.xml") \
|
||||
&& mkdir /public
|
||||
COPY start.sh $WORKDIR
|
||||
|
||||
16
README.md
16
README.md
@ -41,7 +41,7 @@ This the list of the provided custom fixes :
|
||||
| Provider | Author(s) | Status |
|
||||
|--------------------|------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||
| movistarplus.es | [davidclaeysquinones](https://github.com/davidclaeysquinones) | [PR](https://github.com/iptv-org/epg/pull/2440) pending approval |
|
||||
| orangetv.orange.es | [fraudiay79](https://github.com/fraudiay79) and [davidclaeysquinones](https://github.com/davidclaeysquinones) | [PR](https://github.com/iptv-org/epg/pull/2485) merged since commit [fd91a9c](https://github.com/iptv-org/epg/commit/8a8262eacb46b2d35df7eb11f46de22263eab053) |
|
||||
| orangetv.orange.es | [fraudiay79](https://github.com/fraudiay79) and [davidclaeysquinones](https://github.com/davidclaeysquinones) | [PR](https://github.com/iptv-org/epg/pull/2485) merged since commit [8a8262e](https://github.com/iptv-org/epg/commit/8a8262eacb46b2d35df7eb11f46de22263eab053) |
|
||||
| pickx.be | [davidclaeysquinones](https://github.com/davidclaeysquinones) and [BellezaEmporium](https://github.com/BellezaEmporium) | [PR](https://github.com/iptv-org/epg/pull/2525) merged since commit [fd91a9c](https://github.com/iptv-org/epg/commit/fd91a9c532b476f6e192a564371d30e766b762ab) |
|
||||
| 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) merged since commit [61afe09](https://github.com/iptv-org/epg/commit/61afe090b6e7892cc5426457d960e9452222f885) |
|
||||
@ -164,3 +164,17 @@ Sometimes a new version of this image will be bound to the same source commit. T
|
||||
[12-31-2024 06:25](https://github.com/iptv-org/epg/commit/7e7efaa48717d6b96f6d05aa9cf73271750d788b)
|
||||
- 1.0.36
|
||||
[12-31-2024 17:32](https://github.com/iptv-org/epg/commit/5ffe285c1e5882e905c5aaee672849f6f89e5cf3)
|
||||
- 1.0.37
|
||||
[09-01-2025](https://github.com/iptv-org/epg/commit/8e39af2a4d7c15f442a3e686144278e97151d46e)
|
||||
- 1.0.38
|
||||
[13-01-2025](https://github.com/iptv-org/epg/commit/9a565f16f4016e49d17b762477e0f6d29bb0f970)
|
||||
- 1.0.39
|
||||
[14-01-2025](https://github.com/iptv-org/epg/commit/76df1541d8b0b90533ea74dcbb7815c27425b608)
|
||||
- 1.0.40
|
||||
[14-01-2025](https://github.com/iptv-org/epg/commit/76df1541d8b0b90533ea74dcbb7815c27425b608)<br> Fixes issue with api url
|
||||
- 1.0.41
|
||||
[15-01-2025](https://github.com/iptv-org/epg/commit/65331dff1c6728c3012e314e51d40da85d2d7f3c)
|
||||
- 1.0.42
|
||||
[15-01-2025](https://github.com/iptv-org/epg/commit/5958c77c65a652285da64ad8a77d137306ca46d7)
|
||||
- 1.0.43
|
||||
[20-01-2025](https://github.com/iptv-org/epg/commit/7b2cfba7f5d4df8c01ff74a7c26d7695cb750244)
|
||||
@ -1,11 +1,15 @@
|
||||
const dayjs = require('dayjs')
|
||||
const utc = require('dayjs/plugin/utc')
|
||||
const axios = require('axios')
|
||||
const doFetch = require('@ntlab/sfetch')
|
||||
const debug = require('debug')('site:orangetv.orange.es')
|
||||
|
||||
dayjs.extend(utc)
|
||||
|
||||
doFetch.setDebugger(debug)
|
||||
|
||||
const API_PROGRAM_ENDPOINT = 'https://epg.orangetv.orange.es/epg/Smartphone_Android/1_PRO'
|
||||
const API_CHANNEL_ENDPOINT = 'https://pc.orangetv.orange.es/pc/api/rtv/v1/GetChannelList?bouquet_id=1&model_external_id=PC&filter_unsupported_channels=false&client=json'
|
||||
const API_CHANNEL_ENDPOINT =
|
||||
'https://pc.orangetv.orange.es/pc/api/rtv/v1/GetChannelList?bouquet_id=1&model_external_id=PC&filter_unsupported_channels=false&client=json'
|
||||
const API_IMAGE_ENDPOINT = 'https://pc.orangetv.orange.es/pc/api/rtv/v1/images'
|
||||
|
||||
module.exports = {
|
||||
@ -13,53 +17,39 @@ module.exports = {
|
||||
days: 2,
|
||||
request: {
|
||||
cache: {
|
||||
ttl: 60 * 60 * 1000 // 1 hour
|
||||
ttl: 24 * 60 * 60 * 1000 // 1 day
|
||||
}
|
||||
},
|
||||
url({ date }) {
|
||||
return `${API_PROGRAM_ENDPOINT}/${date.format('YYYYMMDD')}_8h_1.json`
|
||||
url({ date, segment = 1 }) {
|
||||
return `${API_PROGRAM_ENDPOINT}/${date.format('YYYYMMDD')}_8h_${segment}.json`
|
||||
},
|
||||
async parser({ content, channel, date }) {
|
||||
let programs = []
|
||||
let items = parseItems(content, channel)
|
||||
if (!items.length) return programs
|
||||
|
||||
const promises = [
|
||||
axios.get(
|
||||
`${API_PROGRAM_ENDPOINT}/${date.format('YYYYMMDD')}_8h_1.json`,
|
||||
),
|
||||
axios.get(
|
||||
`${API_PROGRAM_ENDPOINT}/${date.format('YYYYMMDD')}_8h_2.json`,
|
||||
),
|
||||
axios.get(
|
||||
`${API_PROGRAM_ENDPOINT}/${date.format('YYYYMMDD')}_8h_3.json`,
|
||||
),
|
||||
const programs = []
|
||||
const items = parseItems(content, channel)
|
||||
if (items.length) {
|
||||
const queues = [
|
||||
module.exports.url({ date, segment: 2 }),
|
||||
module.exports.url({ date, segment: 3 })
|
||||
]
|
||||
|
||||
await Promise.allSettled(promises)
|
||||
.then(results => {
|
||||
results.forEach(r => {
|
||||
if (r.status === 'fulfilled') {
|
||||
const parsed = parseItems(r.value.data, channel)
|
||||
|
||||
items = items.filter((item, index) => items.findIndex(oi => oi.id === item.id) === index).concat(parsed)
|
||||
}
|
||||
await doFetch(queues, (url, res) => {
|
||||
items.push(...parseItems(res, channel))
|
||||
})
|
||||
})
|
||||
.catch(console.error)
|
||||
|
||||
items.forEach(item => {
|
||||
programs.push({
|
||||
programs.push(
|
||||
...items.map(item => {
|
||||
return {
|
||||
title: item.name,
|
||||
sub_title: item.seriesName,
|
||||
description: item.description,
|
||||
category: parseGenres(item),
|
||||
season: item.seriesSeason || null,
|
||||
episode: item.episodeId || null,
|
||||
season: item.seriesSeason ? parseInt(item.seriesSeason) : null,
|
||||
episode: item.episodeId ? parseInt(item.episodeId) : null,
|
||||
icon: parseIcon(item),
|
||||
start: dayjs.utc(item.startDate) || null,
|
||||
stop: dayjs.utc(item.endDate) || null,
|
||||
})
|
||||
start: dayjs.utc(item.startDate),
|
||||
stop: dayjs.utc(item.endDate)
|
||||
}
|
||||
})
|
||||
)
|
||||
}
|
||||
|
||||
return programs
|
||||
},
|
||||
@ -68,7 +58,8 @@ module.exports = {
|
||||
const data = await axios
|
||||
.get(API_CHANNEL_ENDPOINT)
|
||||
.then(r => r.data)
|
||||
.catch(console.log)
|
||||
.catch(console.error)
|
||||
|
||||
return data.response.map(item => {
|
||||
return {
|
||||
lang: 'es',
|
||||
@ -79,35 +70,30 @@ module.exports = {
|
||||
}
|
||||
}
|
||||
|
||||
function parseIcon(item){
|
||||
|
||||
if(item.attachments.length > 0){
|
||||
const cover = item.attachments.find(i => i.name === "COVER" || i.name === "cover")
|
||||
|
||||
if(cover)
|
||||
{
|
||||
return `${API_IMAGE_ENDPOINT}${cover.value}`;
|
||||
function parseIcon(item) {
|
||||
if (item.attachments.length) {
|
||||
const cover = item.attachments.find(i => i.name.match(/cover/i))
|
||||
if (cover) {
|
||||
return `${API_IMAGE_ENDPOINT}${cover.value}`
|
||||
}
|
||||
}
|
||||
|
||||
return ''
|
||||
}
|
||||
|
||||
function parseGenres(item){
|
||||
return item.genres.map(i => i.name);
|
||||
function parseGenres(item) {
|
||||
return item.genres.map(i => i.name)
|
||||
}
|
||||
|
||||
function parseItems(content, channel) {
|
||||
const json = typeof content === 'string' ? JSON.parse(content) : Array.isArray(content) ? content : []
|
||||
|
||||
if (!Array.isArray(json)) {
|
||||
return [];
|
||||
const result = []
|
||||
const json =
|
||||
typeof content === 'string' ? JSON.parse(content) : Array.isArray(content) ? content : []
|
||||
if (Array.isArray(json)) {
|
||||
json
|
||||
.filter(i => i.channelExternalId === channel.site_id)
|
||||
.forEach(i => {
|
||||
result.push(...i.programs)
|
||||
})
|
||||
}
|
||||
|
||||
const channelData = json.find(i => i.channelExternalId == channel.site_id);
|
||||
|
||||
if(!channelData)
|
||||
return [];
|
||||
|
||||
return channelData.programs;
|
||||
return result
|
||||
}
|
||||
2
start.sh
2
start.sh
@ -24,7 +24,7 @@ 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
|
||||
sed -i -E "s/(https:\x2f\x2fiptv-org.github.io\x2fapi$\123filename\125)/$api_url$\123filename\125/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
|
||||
|
||||
Reference in New Issue
Block a user