Skip to content

Commit

Permalink
Merge pull request #2402 from iptv-org/patch-2024.06.1
Browse files Browse the repository at this point in the history
Patch 2024.06.1
  • Loading branch information
PopeyeTheSai10r authored Jun 30, 2024
2 parents cd084ed + 1a703ce commit 85939cd
Show file tree
Hide file tree
Showing 173 changed files with 480 additions and 403 deletions.
66 changes: 33 additions & 33 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"csv-parser": "^3.0.0",
"cwait": "^1.1.2",
"dayjs": "^1.11.10",
"epg-grabber": "^0.36.1",
"epg-grabber": "^0.37.1",
"epg-parser": "^0.2.0",
"eslint": "^8.17.0",
"eslint-config-prettier": "^9.0.0",
Expand Down
4 changes: 2 additions & 2 deletions sites/9tv.co.il/9tv.co.il.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports = {
const stop = start.add(1, 'h')
programs.push({
title: parseTitle($item),
icon: parseIcon($item),
image: parseImage($item),
description: parseDescription($item),
start,
stop
Expand All @@ -44,7 +44,7 @@ function parseStart($item, date) {
return dayjs.tz(`${date.format('YYYY-MM-DD')} ${time}`, 'YYYY-MM-DD HH:mm', 'Asia/Jerusalem')
}

function parseIcon($item) {
function parseImage($item) {
const backgroundImage = $item('a > div.guide_info_group > div.guide_info_pict').css(
'background-image'
)
Expand Down
4 changes: 2 additions & 2 deletions sites/9tv.co.il/9tv.co.il.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ it('can parse response', () => {
start: '2022-03-06T04:30:00.000Z',
stop: '2022-03-06T07:10:00.000Z',
title: 'Слепая',
icon: 'https://www.9tv.co.il/download/pictures/img_id=8484.jpg',
image: 'https://www.9tv.co.il/download/pictures/img_id=8484.jpg',
description:
'Она не очень любит говорить о себе или о том, кто и зачем к ней обращается. Живет уединенно, в глуши. Но тех, кто приходит -принимает. Она видит судьбы.'
},
{
start: '2022-03-06T07:10:00.000Z',
stop: '2022-03-06T08:10:00.000Z',
icon: 'https://www.9tv.co.il/download/pictures/img_id=23694.jpg',
image: 'https://www.9tv.co.il/download/pictures/img_id=23694.jpg',
title: 'Орел и решка. Морской сезон',
description: 'Орел и решка. Морской сезон. Ведущие -Алина Астровская и Коля Серга.'
}
Expand Down
4 changes: 2 additions & 2 deletions sites/abc.net.au/abc.net.au.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module.exports = {
season: parseSeason(item),
episode: parseEpisode(item),
rating: parseRating(item),
icon: parseIcon(item),
image: parseImage(item),
start: parseTime(item.start_time),
stop: parseTime(item.end_time)
})
Expand Down Expand Up @@ -106,7 +106,7 @@ function parseEpisode(item) {
function parseTime(time) {
return dayjs.tz(time, 'YYYY-MM-DD HH:mm', 'Australia/Sydney')
}
function parseIcon(item) {
function parseImage(item) {
return item.image_file
? `https://www.abc.net.au/tv/common/images/publicity/${item.image_file}`
: null
Expand Down
2 changes: 1 addition & 1 deletion sites/abc.net.au/abc.net.au.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ it('can parse response', () => {
},
season: 22,
episode: 4,
icon: 'https://www.abc.net.au/tv/common/images/publicity/ZW2178A004S00_460.jpg',
image: 'https://www.abc.net.au/tv/common/images/publicity/ZW2178A004S00_460.jpg',
start: '2022-12-21T13:46:00.000Z',
stop: '2022-12-21T14:44:00.000Z'
}
Expand Down
2 changes: 1 addition & 1 deletion sites/allente.dk/allente.dk.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = {
title: item.title,
category: item.details.categories,
description: item.details.description,
icon: item.details.image,
image: item.details.image,
season: parseSeason(item),
episode: parseEpisode(item),
start,
Expand Down
3 changes: 2 additions & 1 deletion sites/allente.dk/allente.dk.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ it('can parse response', () => {
category: ['other'],
description:
'Svenskt träningsprogram från 2021. Styrka. Sofia Åhman leder SVT:s hemmagympapass. Denna gång fokuserar vi på styrka.',
icon: 'https://viasatps.api.comspace.se/PS/channeldate/image/viasat.ps/21/2022-08-22/se.cs.svt1.event.A_41214031600.jpg?size=2560x1440',
image:
'https://viasatps.api.comspace.se/PS/channeldate/image/viasat.ps/21/2022-08-22/se.cs.svt1.event.A_41214031600.jpg?size=2560x1440',
season: 4,
episode: 1
}
Expand Down
2 changes: 1 addition & 1 deletion sites/allente.fi/allente.fi.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = {
title: item.title,
category: item.details.categories,
description: item.details.description,
icon: item.details.image,
image: item.details.image,
season: parseSeason(item),
episode: parseEpisode(item),
start,
Expand Down
3 changes: 2 additions & 1 deletion sites/allente.fi/allente.fi.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ it('can parse response', () => {
category: ['other'],
description:
'Svenskt träningsprogram från 2021. Styrka. Sofia Åhman leder SVT:s hemmagympapass. Denna gång fokuserar vi på styrka.',
icon: 'https://viasatps.api.comspace.se/PS/channeldate/image/viasat.ps/21/2022-08-22/se.cs.svt1.event.A_41214031600.jpg?size=2560x1440',
image:
'https://viasatps.api.comspace.se/PS/channeldate/image/viasat.ps/21/2022-08-22/se.cs.svt1.event.A_41214031600.jpg?size=2560x1440',
season: 4,
episode: 1
}
Expand Down
2 changes: 1 addition & 1 deletion sites/allente.no/allente.no.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = {
title: item.title,
category: item.details.categories,
description: item.details.description,
icon: item.details.image,
image: item.details.image,
season: parseSeason(item),
episode: parseEpisode(item),
start,
Expand Down
3 changes: 2 additions & 1 deletion sites/allente.no/allente.no.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ it('can parse response', () => {
category: ['other'],
description:
'Svenskt träningsprogram från 2021. Styrka. Sofia Åhman leder SVT:s hemmagympapass. Denna gång fokuserar vi på styrka.',
icon: 'https://viasatps.api.comspace.se/PS/channeldate/image/viasat.ps/21/2022-08-22/se.cs.svt1.event.A_41214031600.jpg?size=2560x1440',
image:
'https://viasatps.api.comspace.se/PS/channeldate/image/viasat.ps/21/2022-08-22/se.cs.svt1.event.A_41214031600.jpg?size=2560x1440',
season: 4,
episode: 1
}
Expand Down
2 changes: 1 addition & 1 deletion sites/allente.se/allente.se.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = {
title: item.title,
category: item.details.categories,
description: item.details.description,
icon: item.details.image,
image: item.details.image,
season: parseSeason(item),
episode: parseEpisode(item),
start,
Expand Down
3 changes: 2 additions & 1 deletion sites/allente.se/allente.se.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ it('can parse response', () => {
category: ['other'],
description:
'Svenskt träningsprogram från 2021. Styrka. Sofia Åhman leder SVT:s hemmagympapass. Denna gång fokuserar vi på styrka.',
icon: 'https://viasatps.api.comspace.se/PS/channeldate/image/viasat.ps/21/2022-08-22/se.cs.svt1.event.A_41214031600.jpg?size=2560x1440',
image:
'https://viasatps.api.comspace.se/PS/channeldate/image/viasat.ps/21/2022-08-22/se.cs.svt1.event.A_41214031600.jpg?size=2560x1440',
season: 4,
episode: 1
}
Expand Down
4 changes: 2 additions & 2 deletions sites/arirang.com/arirang.com.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module.exports = {
title: item.displayNm,
start: parseStart(item),
stop: parseStop(item),
icon: parseIcon(programDetail),
image: parseImage(programDetail),
category: parseCategory(programDetail),
description: parseDescription(programDetail)
})
Expand Down Expand Up @@ -121,7 +121,7 @@ async function parseProgramDetail(item) {
})
}

function parseIcon(programDetail) {
function parseImage(programDetail) {
if (programDetail && programDetail.image && programDetail.image[0].url) {
return programDetail.image[0].url
} else {
Expand Down
3 changes: 2 additions & 1 deletion sites/arirang.com/arirang.com.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ it('can parse response', async () => {
title: 'WITHIN THE FRAME [R]',
start: dayjs.tz(date, 'Asia/Seoul'),
stop: dayjs.tz(date, 'Asia/Seoul').add(30, 'minute'),
icon: 'https://img.arirang.com/v1/AUTH_d52449c16d3b4bbca17d4fffd9fc44af/public/images/202308/2080840096998752900.png',
image:
'https://img.arirang.com/v1/AUTH_d52449c16d3b4bbca17d4fffd9fc44af/public/images/202308/2080840096998752900.png',
description: 'NEWS',
category: 'Current Affairs'
})
Expand Down
6 changes: 3 additions & 3 deletions sites/artonline.tv/artonline.tv.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ module.exports = {
if (!content) return programs
const items = JSON.parse(content)
items.forEach(item => {
const icon = parseIcon(item)
const image = parseImage(item)
const start = parseStart(item)
const duration = parseDuration(item)
const stop = start.add(duration, 's')
programs.push({
title: item.title,
description: item.description,
icon,
image,
start,
stop
})
Expand All @@ -63,6 +63,6 @@ function parseDuration(item) {
return parseInt(HH) * 3600 + parseInt(mm) * 60 + parseInt(ss)
}

function parseIcon(item) {
function parseImage(item) {
return item.thumbnail ? `https://www.artonline.tv${item.thumbnail}` : null
}
2 changes: 1 addition & 1 deletion sites/artonline.tv/artonline.tv.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ it('can parse response', () => {
title: 'الراقصه و السياسي',
description:
'تقرر الراقصه سونيا انشاء دار حضانه للأطفال اليتامى و عندما تتقدم بمشورعها للمسئول يرفض فتتحداه ، تلجأ للوزير عبد الحميد رأفت تربطه بها علاقة قديمة ، يخشى على مركزه و يرفض مساعدتها فتقرر كتابة مذكراتها بمساعدة أحد الصحفيين ، يتخوف عبد الحميد و المسئولين ثم يفاجأ عبد الحميد بحصول سونيا على الموافقه للمشورع و البدء في تنفيذه و ذلك لعلاقتها بأحد كبار المسئولين .',
icon: 'https://www.artonline.tv/UploadImages/Channel/ARTAFLAM1/03/AlRaqesaWaAlSeyasi.jpg'
image: 'https://www.artonline.tv/UploadImages/Channel/ARTAFLAM1/03/AlRaqesaWaAlSeyasi.jpg'
}
])
})
Expand Down
4 changes: 2 additions & 2 deletions sites/cableplus.com.uy/cableplus.com.uy.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ module.exports = {
programs.push({
title: parseTitle($item),
categories: parseCategories($item),
icon: parseIcon($item),
image: parseImage($item),
start,
stop
})
Expand Down Expand Up @@ -84,7 +84,7 @@ function parseTitle($item) {
.trim()
}

function parseIcon($item) {
function parseImage($item) {
return $item('img').data('src') || $item('img').attr('src') || null
}

Expand Down
4 changes: 2 additions & 2 deletions sites/cableplus.com.uy/cableplus.com.uy.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ it('can parse response', () => {
start: '2023-02-12T09:30:00.000Z',
stop: '2023-02-12T10:30:00.000Z',
title: 'Revista agropecuaria',
icon: 'https://www.reportv.com.ar/buscador/img/Programas/2797844.jpg',
image: 'https://www.reportv.com.ar/buscador/img/Programas/2797844.jpg',
categories: []
})

expect(results[4]).toMatchObject({
start: '2023-02-12T12:30:00.000Z',
stop: '2023-02-12T13:30:00.000Z',
title: 'De pago en pago',
icon: 'https://www.reportv.com.ar/buscador/img/Programas/3772835.jpg',
image: 'https://www.reportv.com.ar/buscador/img/Programas/3772835.jpg',
categories: ['Cultural']
})
})
Expand Down
Loading

0 comments on commit 85939cd

Please sign in to comment.