From fa77ccfdf138e7d6cdbcdf097d5b4550e2352a85 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Tue, 1 Feb 2022 05:29:13 +0300 Subject: [PATCH] Update programme-tv.vini.pf --- .../programme-tv.vini.pf.config.js | 14 ++++---------- .../programme-tv.vini.pf.test.js | 11 ++--------- .../programme-tv.vini.pf_pf.channels.xml | 4 ++-- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/sites/programme-tv.vini.pf/programme-tv.vini.pf.config.js b/sites/programme-tv.vini.pf/programme-tv.vini.pf.config.js index 267d7bc4..12eb7bf0 100644 --- a/sites/programme-tv.vini.pf/programme-tv.vini.pf.config.js +++ b/sites/programme-tv.vini.pf/programme-tv.vini.pf.config.js @@ -1,13 +1,11 @@ const dayjs = require('dayjs') const axios = require('axios') -const API = { - url: `https://programme-tv.vini.pf/programmesJSON` -} +const apiUrl = `https://programme-tv.vini.pf/programmesJSON` module.exports = { site: 'programme-tv.vini.pf', - url: API.url, + url: apiUrl, request: { method: 'POST', timeout: 30000, @@ -17,9 +15,6 @@ module.exports = { } } }, - logo({ channel }) { - return channel.logo - }, parser: async function ({ content, channel, date }) { const programs = [] const items = parseItems(content, channel) @@ -59,8 +54,7 @@ module.exports = { return { lang: 'fr', site_id: channelId, - name: channelId, - logo: item.src + name: channelId } }) } @@ -71,7 +65,7 @@ async function loadNextItems(date, hours) { return axios .post( - API.url, + apiUrl, { dateDebut: `${date.subtract(10, 'h').format('YYYY-MM-DDTHH:mm:ss')}-10:00` }, diff --git a/sites/programme-tv.vini.pf/programme-tv.vini.pf.test.js b/sites/programme-tv.vini.pf/programme-tv.vini.pf.test.js index 8d8d44df..8ba6637b 100644 --- a/sites/programme-tv.vini.pf/programme-tv.vini.pf.test.js +++ b/sites/programme-tv.vini.pf/programme-tv.vini.pf.test.js @@ -1,7 +1,7 @@ // node ./scripts/channels.js --config=./sites/programme-tv.vini.pf/programme-tv.vini.pf.config.js --output=./sites/programme-tv.vini.pf/programme-tv.vini.pf_pf.channels.xml // npx epg-grabber --config=sites/programme-tv.vini.pf/programme-tv.vini.pf.config.js --channels=sites/programme-tv.vini.pf/programme-tv.vini.pf_pf.channels.xml --output=.gh-pages/guides/pf/programme-tv.vini.pf.epg.xml --days=2 -const { parser, url, request, logo } = require('./programme-tv.vini.pf.config.js') +const { parser, url, request } = require('./programme-tv.vini.pf.config.js') const axios = require('axios') const dayjs = require('dayjs') const utc = require('dayjs/plugin/utc') @@ -15,8 +15,7 @@ jest.mock('axios') const date = dayjs.utc('2021-11-21', 'YYYY-MM-DD').startOf('d') const channel = { site_id: 'tf1', - xmltv_id: 'TF1.fr', - logo: 'https://programme-tv.vini.pf/sites/default/files/img-icones/192.png' + xmltv_id: 'TF1.fr' } it('can generate valid url', () => { @@ -31,12 +30,6 @@ it('can generate valid request data', () => { expect(request.data({ date })).toMatchObject({ dateDebut: '2021-11-20T14:00:00-10:00' }) }) -it('can generate valid logo url', () => { - expect(logo({ channel })).toBe( - 'https://programme-tv.vini.pf/sites/default/files/img-icones/192.png' - ) -}) - it('can parse response', done => { axios.post.mockImplementation((url, data) => { if (data.dateDebut === '2021-11-20T16:00:00-10:00') { diff --git a/sites/programme-tv.vini.pf/programme-tv.vini.pf_pf.channels.xml b/sites/programme-tv.vini.pf/programme-tv.vini.pf_pf.channels.xml index 7468644a..515e54c2 100644 --- a/sites/programme-tv.vini.pf/programme-tv.vini.pf_pf.channels.xml +++ b/sites/programme-tv.vini.pf/programme-tv.vini.pf_pf.channels.xml @@ -1,7 +1,7 @@ - Polynésie 1ère - Tahiti Nui TV + Polynésie 1ère + Tahiti Nui TV