From 7a5a1505f3a56462d86cff74aad7a75e66102cd3 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Tue, 1 Feb 2022 05:45:00 +0300 Subject: [PATCH] Update tva.tv --- sites/tva.tv/tva.tv.config.js | 12 +----- sites/tva.tv/tva.tv.test.js | 11 +----- sites/tva.tv/tva.tv_ir.channels.xml | 58 ++++++++++++++--------------- 3 files changed, 32 insertions(+), 49 deletions(-) diff --git a/sites/tva.tv/tva.tv.config.js b/sites/tva.tv/tva.tv.config.js index c86292a4..ef341919 100644 --- a/sites/tva.tv/tva.tv.config.js +++ b/sites/tva.tv/tva.tv.config.js @@ -8,9 +8,6 @@ module.exports = { channel.site_id }&pivot_date=${date.format('YYYY-MM-DD')}` }, - logo: function ({ channel }) { - return channel.logo - }, parser: function ({ content, date, channel }) { const programs = [] const items = parseItems(content) @@ -40,18 +37,11 @@ module.exports = { const channels = [] for (let item of data.data) { - const logo = item.images - ? item.images[0].url_template - .replace('{width}', '512') - .replace('{height}', '512') - .replace('{crop}', 'c') - : null channels.push({ lang: 'fa', site_id: item.id, name: item.name, - xmltv_id: item.slug, - logo + xmltv_id: item.slug }) } diff --git a/sites/tva.tv/tva.tv.test.js b/sites/tva.tv/tva.tv.test.js index afb648cd..55c3ce0a 100644 --- a/sites/tva.tv/tva.tv.test.js +++ b/sites/tva.tv/tva.tv.test.js @@ -1,7 +1,7 @@ // node ./scripts/channels.js --config=./sites/tva.tv/tva.tv.config.js --output=./sites/tva.tv/tva.tv_ir.channels.xml // npx epg-grabber --config=sites/tva.tv/tva.tv.config.js --channels=sites/tva.tv/tva.tv_ir.channels.xml --output=.gh-pages/guides/ir/tva.tv.epg.xml --timeout=30000 --days=2 -const { parser, url, logo } = require('./tva.tv.config.js') +const { parser, url } = require('./tva.tv.config.js') const dayjs = require('dayjs') const utc = require('dayjs/plugin/utc') const customParseFormat = require('dayjs/plugin/customParseFormat') @@ -11,8 +11,7 @@ dayjs.extend(utc) const date = dayjs.utc('2021-11-25', 'YYYY-MM-DD').startOf('d') const channel = { site_id: '6fcc0a2e-1135-482c-b054-08a96e68b758', - xmltv_id: 'IRIB2.ir', - logo: 'https://s3.ott.tva.tv/rosing-tva-production/bec73f72f63958fc6998_512x512c.png' + xmltv_id: 'IRIB2.ir' } const content = `{"data":[{"id":"c0667229-eaf8-472f-8ba7-ad4417348baf","start_at":"2021-11-24T00:20:39.000Z","end_at":"2021-11-24T00:32:11.000Z","description":"تلفن های شبکه 5 سیما: تلفن: 23511000 -تلفن گویا:2786500 نمابر:23511289","name":"میان برنامه","subtitle":"","season_number":null,"episode_number":null,"channel_id":"6fcc0a2e-1135-482c-b054-08a96e68b758","program_id":"e495c06e-80de-46ee-9120-619631f554d9","competition_id":null,"object":"program_event","cast_members":[],"genres":[],"images":[],"program_type":null,"certification_ratings":[]}]}` @@ -22,12 +21,6 @@ it('can generate valid url', () => { ) }) -it('can generate valid logo url', () => { - expect(logo({ channel })).toBe( - 'https://s3.ott.tva.tv/rosing-tva-production/bec73f72f63958fc6998_512x512c.png' - ) -}) - it('can parse response', () => { const result = parser({ content, channel, date }).map(p => { p.start = p.start.toJSON() diff --git a/sites/tva.tv/tva.tv_ir.channels.xml b/sites/tva.tv/tva.tv_ir.channels.xml index 62c5108d..be7f7b2b 100644 --- a/sites/tva.tv/tva.tv_ir.channels.xml +++ b/sites/tva.tv/tva.tv_ir.channels.xml @@ -1,34 +1,34 @@ - Azarbayjan-e Gharbi TV - Doc TV - Hamedan TV - IRIB 1 - IRIB 2 - IRIB 3 - IRIB 4 - IRIB 5 - IRINN - Irkala TV - Jame-Jam TV Network 1 - Khorasan Razavi TV - Namayesh TV - Nasim - Omid TV - Salaam TV - Sepehr - Taban TV - TVA 1 - TVA 2 - TVA Avand - TVA Bourse - TVA Film - TVA Kids - TVA Mahfel - TVA Nava - TVA Sport - TVA Sport 2 - Velayat TV Network + Azarbayjan-e Gharbi TV + Doc TV + Hamedan TV + IRIB 1 + IRIB 2 + IRIB 3 + IRIB 4 + IRIB 5 + IRINN + Irkala TV + Jame-Jam TV Network 1 + Khorasan Razavi TV + Namayesh TV + Nasim + Omid TV + Salaam TV + Sepehr + Taban TV + TVA 1 + TVA 2 + TVA Avand + TVA Bourse + TVA Film + TVA Kids + TVA Mahfel + TVA Nava + TVA Sport + TVA Sport 2 + Velayat TV Network \ No newline at end of file