From f3df393df6c17ddb24a9e62b23b1bc8fb2c6376a Mon Sep 17 00:00:00 2001 From: Aandree5 Date: Tue, 4 Mar 2025 17:21:45 +0000 Subject: [PATCH 1/3] Added image to sky.com --- sites/sky.com/sky.com.config.js | 7 ++++++- sites/sky.com/sky.com.test.js | 12 ++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/sites/sky.com/sky.com.config.js b/sites/sky.com/sky.com.config.js index 3be68669..b7ba6e98 100644 --- a/sites/sky.com/sky.com.config.js +++ b/sites/sky.com/sky.com.config.js @@ -28,13 +28,18 @@ module.exports = { schedule.events.forEach(event => { const start = dayjs.utc(event.st * 1000) if (start.isSame(date, 'd')) { + const image = `https://images.metadata.sky.com/pd-image/${event.programmeuuid}/16-9/640` programs.push({ title: event.t, description: event.sy, season: event.seasonnumber, episode: event.episodenumber, start, - stop: start.add(event.d, 's') + stop: start.add(event.d, 's'), + icon: { + src: image + }, + image, }) } }) diff --git a/sites/sky.com/sky.com.test.js b/sites/sky.com/sky.com.test.js index 4f349ea9..a829ccc2 100644 --- a/sites/sky.com/sky.com.test.js +++ b/sites/sky.com/sky.com.test.js @@ -34,7 +34,11 @@ it('can parse response', () => { description: 'A Sale Of Two Cities: Emily brings her mother along with her to Walnut, and Darrell wastes no time finding an advantage. Ivy and Ivy jr clean up with their locker. (S12, ep 4)', season: 12, - episode: 4 + episode: 4, + icon: { + src: 'https://images.metadata.sky.com/pd-image/42dd62d5-7d64-38b7-aafc-1c624c005f16/16-9/640' + }, + image: 'https://images.metadata.sky.com/pd-image/42dd62d5-7d64-38b7-aafc-1c624c005f16/16-9/640' }) expect(result[2]).toMatchObject({ start: '2024-12-14T01:00:00.000Z', @@ -43,7 +47,11 @@ it('can parse response', () => { description: 'Not All That Glitters Is Gourd: Back in the city of Orange, the Vegas Ladies arrive in vintage style - though not everyone agrees. (S12, ep 6)', season: 12, - episode: 6 + episode: 6, + icon: { + src: 'https://images.metadata.sky.com/pd-image/b9572a38-8db7-471e-a2d7-462e1dd26af2/16-9/640' + }, + image: 'https://images.metadata.sky.com/pd-image/b9572a38-8db7-471e-a2d7-462e1dd26af2/16-9/640' }) }) From 145ed8c831dfa98e622d038a9e6df84c79e812f1 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 5 Mar 2025 02:17:22 +0300 Subject: [PATCH 2/3] Update sky.com.test.js --- sites/sky.com/sky.com.test.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sites/sky.com/sky.com.test.js b/sites/sky.com/sky.com.test.js index a829ccc2..e58a818d 100644 --- a/sites/sky.com/sky.com.test.js +++ b/sites/sky.com/sky.com.test.js @@ -35,10 +35,8 @@ it('can parse response', () => { 'A Sale Of Two Cities: Emily brings her mother along with her to Walnut, and Darrell wastes no time finding an advantage. Ivy and Ivy jr clean up with their locker. (S12, ep 4)', season: 12, episode: 4, - icon: { - src: 'https://images.metadata.sky.com/pd-image/42dd62d5-7d64-38b7-aafc-1c624c005f16/16-9/640' - }, - image: 'https://images.metadata.sky.com/pd-image/42dd62d5-7d64-38b7-aafc-1c624c005f16/16-9/640' + icon: 'https://images.metadata.sky.com/pd-image/b9572a38-8db7-471e-a2d7-462e1dd26af2/16-9/640', + image: 'https://images.metadata.sky.com/pd-image/b9572a38-8db7-471e-a2d7-462e1dd26af2/16-9/640' }) expect(result[2]).toMatchObject({ start: '2024-12-14T01:00:00.000Z', @@ -48,10 +46,8 @@ it('can parse response', () => { 'Not All That Glitters Is Gourd: Back in the city of Orange, the Vegas Ladies arrive in vintage style - though not everyone agrees. (S12, ep 6)', season: 12, episode: 6, - icon: { - src: 'https://images.metadata.sky.com/pd-image/b9572a38-8db7-471e-a2d7-462e1dd26af2/16-9/640' - }, - image: 'https://images.metadata.sky.com/pd-image/b9572a38-8db7-471e-a2d7-462e1dd26af2/16-9/640' + icon: 'https://images.metadata.sky.com/pd-image/e9521ccc-bdcc-4075-9c2e-bc835247148b/16-9/640', + image: 'https://images.metadata.sky.com/pd-image/e9521ccc-bdcc-4075-9c2e-bc835247148b/16-9/640' }) }) From 15c51c1d7d48864ee22436e849fe1011a21ac766 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 5 Mar 2025 02:17:49 +0300 Subject: [PATCH 3/3] Update sky.com.config.js --- sites/sky.com/sky.com.config.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sites/sky.com/sky.com.config.js b/sites/sky.com/sky.com.config.js index b7ba6e98..bed9a107 100644 --- a/sites/sky.com/sky.com.config.js +++ b/sites/sky.com/sky.com.config.js @@ -3,6 +3,7 @@ const dayjs = require('dayjs') const utc = require('dayjs/plugin/utc') const doFetch = require('@ntlab/sfetch') const debug = require('debug')('site:sky.com') +const _ = require('lodash') dayjs.extend(utc) @@ -25,7 +26,7 @@ module.exports = { .filter(schedule => schedule.sid === channel.site_id) .forEach(schedule => { if (Array.isArray(schedule.events)) { - schedule.events.forEach(event => { + _.sortBy(schedule.events, 'st').forEach(event => { const start = dayjs.utc(event.st * 1000) if (start.isSame(date, 'd')) { const image = `https://images.metadata.sky.com/pd-image/${event.programmeuuid}/16-9/640` @@ -36,10 +37,8 @@ module.exports = { episode: event.episodenumber, start, stop: start.add(event.d, 's'), - icon: { - src: image - }, - image, + icon: image, + image }) } })