diff --git a/sites/novacyprus.com/novacyprus.com.config.js b/sites/novacyprus.com/novacyprus.com.config.js index aee60a43..cee97aaa 100644 --- a/sites/novacyprus.com/novacyprus.com.config.js +++ b/sites/novacyprus.com/novacyprus.com.config.js @@ -15,9 +15,6 @@ module.exports = { .add(1, 'd') .format('YYYYMMDD')}` }, - logo({ channel }) { - return channel.logo - }, parser({ content, channel }) { let programs = [] const items = parseItems(content, channel) @@ -42,15 +39,10 @@ module.exports = { .catch(console.log) return channels.map(item => { - const logo = item.Logo.replace(/\\/g, '').startsWith('/sites/default/files') - ? `https://www.novacyprus.com${item.Logo}` - : item.Logo - return { lang: 'el', site_id: item.ChannelId, - name: item.nameEl, - logo + name: item.nameEl } }) } diff --git a/sites/novacyprus.com/novacyprus.com.test.js b/sites/novacyprus.com/novacyprus.com.test.js index 4ded900c..4ff0c1e0 100644 --- a/sites/novacyprus.com/novacyprus.com.test.js +++ b/sites/novacyprus.com/novacyprus.com.test.js @@ -1,7 +1,7 @@ // node ./scripts/channels.js --config=./sites/novacyprus.com/novacyprus.com.config.js --output=./sites/novacyprus.com/novacyprus.com_cy.channels.xml // npx epg-grabber --config=sites/novacyprus.com/novacyprus.com.config.js --channels=sites/novacyprus.com/novacyprus.com_cy.channels.xml --output=.gh-pages/guides/cy/novacyprus.com.epg.xml --days=2 -const { parser, url, logo } = require('./novacyprus.com.config.js') +const { parser, url } = require('./novacyprus.com.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-17', 'YYYY-MM-DD').startOf('d') const channel = { site_id: '614', - xmltv_id: 'NovaCinema1.gr', - logo: 'https://www.novacyprus.com/sites/default/files/2020-04/VOULI-85x80.png' + xmltv_id: 'NovaCinema1.gr' } it('can generate valid url', () => { @@ -21,12 +20,6 @@ it('can generate valid url', () => { ) }) -it('can generate valid logo url', () => { - expect(logo({ channel })).toBe( - 'https://www.novacyprus.com/sites/default/files/2020-04/VOULI-85x80.png' - ) -}) - it('can parse response', () => { const content = `{"nodes":[{"datetime":"2021-11-17 06:20:00","day":"Wednesday","numDay":17,"numMonth":11,"month":"November","channelName":"Cyprus Novacinema1HD","channelLog":"https:\/\/ssl2.novago.gr\/EPG\/jsp\/images\/universal\/film\/logo\/20200210\/000100\/XTV100000762\/d6a2f5e0-dbc0-49c7-9843-e3161ca5ae5d.png","cid":"42","ChannelId":"614","startingTime":"06:20","endTime":"08:10","title":"Δεσμοί Αίματος","description":"Θρίλερ Μυστηρίου","duration":"109","slotDuration":"110","bref":"COMMOBLOOX","mediaItems":[{"MediaListTypeId":"6","CdnUrl":"http:\/\/cache-forthnet.secure.footprint.net\/linear\/3\/0\/305608_COMMOBLOOX_GUIDE_STILL.jpg"},{"MediaListTypeId":"7","CdnUrl":"http:\/\/cache-forthnet.secure.footprint.net\/linear\/3\/0\/305608_COMMOBLOOX_POSTER_CROSS.jpg"},{"MediaListTypeId":"8","CdnUrl":"http:\/\/cache-forthnet.secure.footprint.net\/linear\/3\/0\/305608_COMMOBLOOX_ICON_CYP.jpg"},{"MediaListTypeId":"9","CdnUrl":"http:\/\/cache-forthnet.secure.footprint.net\/linear\/3\/0\/305608_COMMOBLOOX_POSTER_CYP.jpg"},{"MediaListTypeId":"10","CdnUrl":"http:\/\/cache-forthnet.secure.footprint.net\/linear\/3\/0\/305608_COMMOBLOOX_BACKGROUND_CYP.jpg"}]},{"datetime":"2021-11-17 06:00:00","day":"Wednesday","numDay":17,"numMonth":11,"month":"November","channelName":"Cyprus Novacinema2HD","channelLog":"https:\/\/ssl2.novago.gr\/EPG\/jsp\/images\/universal\/film\/logo\/20200210\/000100\/XTV100000763\/24e05354-d6ad-4949-bcb3-a81d1c1d2cba.png","cid":"62","ChannelId":"653","startingTime":"06:00","endTime":"07:40","title":"Ανυπόφοροι Γείτονες","description":"Κωμωδία","duration":"93","slotDuration":"100","bref":"NEIGHBORSX","mediaItems":[{"MediaListTypeId":"7","CdnUrl":"http:\/\/cache-forthnet.secure.footprint.net\/linear\/3\/1\/312582_NEIGHBORSX_POSTER_CROSS.jpg"},{"MediaListTypeId":"8","CdnUrl":"http:\/\/cache-forthnet.secure.footprint.net\/linear\/3\/1\/312582_NEIGHBORSX_ICON_CYP.jpg"},{"MediaListTypeId":"9","CdnUrl":"http:\/\/cache-forthnet.secure.footprint.net\/linear\/3\/1\/312582_NEIGHBORSX_POSTER_CYP.jpg"},{"MediaListTypeId":"10","CdnUrl":"http:\/\/cache-forthnet.secure.footprint.net\/linear\/3\/1\/312582_NEIGHBORSX_BACKGROUND_CYP.jpg"}]}]}` const result = parser({ content, channel }).map(p => { diff --git a/sites/novacyprus.com/novacyprus.com_cy.channels.xml b/sites/novacyprus.com/novacyprus.com_cy.channels.xml index 62c74d2c..8f2d59c3 100644 --- a/sites/novacyprus.com/novacyprus.com_cy.channels.xml +++ b/sites/novacyprus.com/novacyprus.com_cy.channels.xml @@ -1,35 +1,35 @@ - Animal Planet Africa - Boomerang Central & Eastern Europe - Discovery Channel Europe - Disney Channel Middle East - EuroNews Ellinika - Eurosport 1 - Eurosport 2 - Fox Greece - Fox Life Greece - Insight HD - Mad Greekz - Mad TV - MTV Live - MyZen TV - National Geographic Ellada - Nickelodeon Greece - Nova Cinema 1 - Nova Cinema 2 - Nova Cinema 3 - Nova Cinema 4 - Nova Life - Nova Sports 2 - Nova Sports 3 - Nova Sports 4 - Nova Sports 5 - Number 1 TV - One Channel - Smile TV - Viasat History HD - Vouli TV + Animal Planet Africa + Boomerang Central & Eastern Europe + Discovery Channel Europe + Disney Channel Middle East + EuroNews Ellinika + Eurosport 1 + Eurosport 2 + Fox Greece + Fox Life Greece + Insight HD + Mad Greekz + Mad TV + MTV Live + MyZen TV + National Geographic Ellada + Nickelodeon Greece + Nova Cinema 1 + Nova Cinema 2 + Nova Cinema 3 + Nova Cinema 4 + Nova Life + Nova Sports 2 + Nova Sports 3 + Nova Sports 4 + Nova Sports 5 + Number 1 TV + One Channel + Smile TV + Viasat History HD + Vouli TV \ No newline at end of file