diff --git a/sites/tvmusor.hu/__data__/content.json b/sites/tvmusor.hu/__data__/content.json new file mode 100644 index 00000000..6c6dddb2 --- /dev/null +++ b/sites/tvmusor.hu/__data__/content.json @@ -0,0 +1 @@ +{"status":"success","data":{"time":0.00061583518981934,"loadedBlocks":{"290_2022-11-19":[{"a":1109861478,"b":182081154,"c":"Forma-1 magazin. Hírek, információk, érdekességek a Forma-1 világából.","d":85,"e":1668814200000,"f":1668819300000,"g":0,"h":"sportm\u0171sor","i":"0:30","j":"R\u00f6vidp\u00e1ly\u00e1s \u00dasz\u00f3 Orsz\u00e1gos Bajnoks\u00e1g","l":"0","n":"rovidpalyas-uszo-orszagos-bajnoksag","z": "f1e45193930943d9ee29769e0afa902aff0e4a90-better-call-saul.jpg"},{"a":1109694402,"b":182081154,"c":"","d":120,"e":1668814200000,"f":1668821400000,"g":0,"h":"sportm\u0171sor","i":"0:30","j":"R\u00f6vidp\u00e1ly\u00e1s \u00dasz\u00f3 Orsz\u00e1gos Bajnoks\u00e1g","l":"0","n":"rovidpalyas-uszo-orszagos-bajnoksag"},{"a":1109861491,"b":119070278,"c":"","d":15,"e":1668819300000,"f":1668820200000,"g":0,"h":"sportm\u0171sor","i":"1:55","j":"Sportl\u00f6v\u00e9szet","l":"0","n":"sportloveszet"},{"a":1109694395,"b":155272,"c":"Forma-1 magazin. H\u00edrek, inform\u00e1ci\u00f3k, \u00e9rdekess\u00e9gek a Forma-1 vil\u00e1g\u00e1b\u00f3l.","d":25,"e":1668820200000,"f":1668821700000,"g":0,"h":"sportm\u0171sor","i":"2:10","j":"Boxutca","l":"0","n":"boxutca"},{"a":1109694411,"b":129719,"c":"","d":25,"e":1668821700000,"f":1668823200000,"g":0,"h":"sportm\u0171sor","i":"2:35","j":"V\u00edv\u00e1s","l":"0","n":"vivas"},{"a":1109861492,"b":201151,"c":"Horg\u00e1szunk, sz\u00e9p vid\u00e9keket barangolunk be, remek hal\u00e9teleket k\u00e9sz\u00edt\u00fcnk, valamint besz\u00e1molunk a horg\u00e1szvizeket \u00e9s a horg\u00e1szatot \u00e9rint\u0151 aktualit\u00e1sokr\u00f3l.","d":30,"e":1668823200000,"f":1668825000000,"g":0,"h":"sportm\u0171sor","i":"3:00","j":"Pecat\u00fara","l":"0","n":"pecatura"},{"a":1109694412,"b":193538538,"c":"","d":105,"e":1668824400000,"f":1668830700000,"g":0,"h":"sportm\u0171sor","i":"3:20","j":"K&H f\u00e9rfi k\u00e9zilabda Liga","l":"0","n":"k-h-ferfi-kezilabda-liga"},{"a":1109861487,"b":193538538,"c":"","d":95,"e":1668825000000,"f":1668830700000,"g":0,"h":"sportm\u0171sor","i":"3:30","j":"K&H f\u00e9rfi k\u00e9zilabda Liga","l":"0","n":"k-h-ferfi-kezilabda-liga"},{"a":1109694841,"b":103253000,"c":"","d":25,"e":1668830700000,"f":1668832200000,"g":0,"h":"sportm\u0171sor","i":"5:05","j":"Futsal magazin","l":"0","n":"futsal-magazin"},{"a":1109694834,"b":187051552,"c":"","d":35,"e":1668832200000,"f":1668834300000,"g":0,"h":"sportm\u0171sor","i":"5:30","j":"MTK Tv","l":"0","n":"mtk-tv"},{"a":1109694845,"b":182081154,"c":"","d":80,"e":1668834300000,"f":1668839100000,"g":0,"h":"sportm\u0171sor","i":"6:05","j":"R\u00f6vidp\u00e1ly\u00e1s \u00dasz\u00f3 Orsz\u00e1gos Bajnoks\u00e1g","l":"0","n":"rovidpalyas-uszo-orszagos-bajnoksag"},{"a":1109862280,"b":182081154,"c":"","d":80,"e":1668834300000,"f":1668839100000,"g":0,"h":"sportm\u0171sor","i":"6:05","j":"R\u00f6vidp\u00e1ly\u00e1s \u00dasz\u00f3 Orsz\u00e1gos Bajnoks\u00e1g","l":"0","n":"rovidpalyas-uszo-orszagos-bajnoksag"},{"a":1109862283,"b":142979464,"c":"","d":105,"e":1668839100000,"f":1668845400000,"g":0,"h":"sportm\u0171sor","i":"7:25","j":"N\u0151i k\u00e9zilabda Eur\u00f3pa-bajnoks\u00e1g","l":"0","n":"noi-kezilabda-europa-bajnoksag"},{"a":1109694838,"b":142979464,"c":"","d":105,"e":1668839100000,"f":1668845400000,"g":0,"h":"sportm\u0171sor","i":"7:25","j":"N\u0151i k\u00e9zilabda Eur\u00f3pa-bajnoks\u00e1g","l":"0","n":"noi-kezilabda-europa-bajnoksag"},{"a":1122074022,"b":142979464,"c":"","d":105,"e":1668839100000,"f":1668845400000,"g":0,"h":"sportm\u0171sor","i":"7:25","j":"N\u0151i k\u00e9zilabda Eur\u00f3pa-bajnoks\u00e1g","l":"0","n":"noi-kezilabda-europa-bajnoksag"},{"a":1109862282,"b":142979464,"c":"","d":105,"e":1668845400000,"f":1668851700000,"g":0,"h":"sportm\u0171sor","i":"9:10","j":"N\u0151i k\u00e9zilabda Eur\u00f3pa-bajnoks\u00e1g","l":"0","n":"noi-kezilabda-europa-bajnoksag"},{"a":1122074023,"b":142979464,"c":"","d":100,"e":1668845400000,"f":1668851400000,"g":0,"h":"sportm\u0171sor","i":"9:10","j":"N\u0151i k\u00e9zilabda Eur\u00f3pa-bajnoks\u00e1g","l":"0","n":"noi-kezilabda-europa-bajnoksag"},{"a":1109694835,"b":142979464,"c":"","d":105,"e":1668845400000,"f":1668851700000,"g":0,"h":"sportm\u0171sor","i":"9:10","j":"N\u0151i k\u00e9zilabda Eur\u00f3pa-bajnoks\u00e1g","l":"0","n":"noi-kezilabda-europa-bajnoksag"},{"a":1109694848,"b":155272,"c":"Forma-1 magazin. H\u00edrek, inform\u00e1ci\u00f3k, \u00e9rdekess\u00e9gek a Forma-1 vil\u00e1g\u00e1b\u00f3l.","d":35,"e":1668851400000,"f":1668853500000,"g":0,"h":"sportm\u0171sor","i":"10:50","j":"Boxutca","l":"0","n":"boxutca"},{"a":1109694844,"b":75702,"c":"Forma-1-es vil\u00e1gbajnoks\u00e1g futamainak k\u00f6zvet\u00edt\u00e9se.","d":70,"e":1668853500000,"f":1668857700000,"g":0,"h":"sportm\u0171sor","i":"11:25","j":"Forma-1","l":"0","n":"forma-1"},{"a":1109862284,"b":49850339,"c":"","d":70,"e":1668853500000,"f":1668857700000,"g":0,"h":"sportm\u0171sor","i":"11:25","j":"Forma-1 Abu Dhabi Nagyd\u00edj","l":"0","n":"forma-1-abu-dhabi-nagydij"},{"a":1109694831,"b":162158,"c":"","d":40,"e":1668857700000,"f":1668860100000,"g":0,"h":"sportm\u0171sor","i":"12:35","j":"Forma 2","l":"0","n":"forma-2"},{"a":1109862285,"b":180980910,"c":"","d":40,"e":1668857700000,"f":1668860100000,"g":0,"h":"sportm\u0171sor","i":"12:35","j":"Forma-2 Abu Dhabi Nagyd\u00edj","l":"0","n":"forma-2-abu-dhabi-nagydij"},{"a":1109694833,"b":162158,"c":"","d":65,"e":1668860100000,"f":1668864000000,"g":0,"h":"sportm\u0171sor","i":"13:15","j":"Forma 2","l":"0","n":"forma-2"},{"a":1109862286,"b":180980910,"c":"","d":65,"e":1668860100000,"f":1668864000000,"g":0,"h":"sportm\u0171sor","i":"13:15","j":"Forma-2 Abu Dhabi Nagyd\u00edj","l":"0","n":"forma-2-abu-dhabi-nagydij"},{"a":1109694832,"b":102900348,"c":"Szombatonk\u00e9nt, heti 15 perc bringa az M4 Sport m\u0171sor\u00e1n.","d":25,"e":1668864000000,"f":1668865500000,"g":0,"h":"sportm\u0171sor","i":"14:20","j":"Bringasport","l":"0","n":"bringasport"},{"a":1109694842,"b":201140,"c":"Sportesem\u00e9nyek \u00f6sszefoglal\u00f3 magazinm\u0171sora.","d":15,"e":1668865500000,"f":1668866400000,"g":0,"h":"sportm\u0171sor","i":"14:45","j":"M4 Sport st\u00fadi\u00f3","l":"0","n":"m4-sport-studio"},{"a":1109862287,"b":201140,"c":"Sportesem\u00e9nyek \u00f6sszefoglal\u00f3 magazinm\u0171sora.","d":15,"e":1668865500000,"f":1668866400000,"g":0,"h":"sportm\u0171sor","i":"14:45","j":"M4 Sport st\u00fadi\u00f3","l":"0","n":"m4-sport-studio"},{"a":1109694846,"b":49850339,"c":"","d":75,"e":1668866400000,"f":1668870900000,"g":0,"h":"sportm\u0171sor","i":"15:00","j":"Forma-1 Abu Dhabi Nagyd\u00edj","l":"0","n":"forma-1-abu-dhabi-nagydij"},{"a":1109694849,"b":201140,"c":"Sportesem\u00e9nyek \u00f6sszefoglal\u00f3 magazinm\u0171sora.","d":10,"e":1668870900000,"f":1668871500000,"g":0,"h":"sportm\u0171sor","i":"16:15","j":"M4 Sport st\u00fadi\u00f3","l":"0","n":"m4-sport-studio"},{"a":1109862288,"b":201140,"c":"Sportesem\u00e9nyek \u00f6sszefoglal\u00f3 magazinm\u0171sora.","d":10,"e":1668870900000,"f":1668871500000,"g":0,"h":"sportm\u0171sor","i":"16:15","j":"M4 Sport st\u00fadi\u00f3","l":"0","n":"m4-sport-studio"},{"a":1109694839,"b":102653596,"c":"","d":35,"e":1668871500000,"f":1668873600000,"g":0,"h":"sportm\u0171sor","i":"16:25","j":"K\u00e9kek","l":"0","n":"kekek"},{"a":1109694847,"b":182081154,"c":"","d":125,"e":1668873600000,"f":1668881100000,"g":0,"h":"sportm\u0171sor","i":"17:00","j":"R\u00f6vidp\u00e1ly\u00e1s \u00dasz\u00f3 Orsz\u00e1gos Bajnoks\u00e1g","l":"0","n":"rovidpalyas-uszo-orszagos-bajnoksag"},{"a":1109862281,"b":182081154,"c":"","d":125,"e":1668873600000,"f":1668881100000,"g":0,"h":"sportm\u0171sor","i":"17:00","j":"R\u00f6vidp\u00e1ly\u00e1s \u00dasz\u00f3 Orsz\u00e1gos Bajnoks\u00e1g","l":"0","n":"rovidpalyas-uszo-orszagos-bajnoksag"},{"a":1109694837,"b":227848270,"c":"","d":85,"e":1668881100000,"f":1668886200000,"g":0,"h":"sportm\u0171sor","i":"19:05","j":"V\u00edzilabda EON F\u00e9rfi OBI","l":"0","n":"vizilabda-eon-ferfi-obi"},{"a":1109862289,"b":331991798,"c":"","d":60,"e":1668886200000,"f":1668889800000,"g":0,"h":"sportm\u0171sor","i":"20:30","j":"Labdar\u00fag\u00f3 VB 2022 el\u0151tt","l":"0","n":"labdarugo-vb-2022-elott"},{"a":1109694836,"b":201140,"c":"Sportesem\u00e9nyek \u00f6sszefoglal\u00f3 magazinm\u0171sora.","d":60,"e":1668886200000,"f":1668889800000,"g":0,"h":"sportm\u0171sor","i":"20:30","j":"M4 Sport st\u00fadi\u00f3","l":"0","n":"m4-sport-studio"},{"a":1109694850,"b":49850339,"c":"","d":80,"e":1668889800000,"f":1668894600000,"g":0,"h":"sportm\u0171sor","i":"21:30","j":"Forma-1 Abu Dhabi Nagyd\u00edj","l":"0","n":"forma-1-abu-dhabi-nagydij"},{"a":1109862290,"b":202944546,"c":"","d":120,"e":1668894600000,"f":1668901800000,"g":0,"h":"sportm\u0171sor","i":"22:50","j":"Labdar\u00fag\u00f3 felk\u00e9sz\u00fcl\u00e9si m\u00e9rk\u0151z\u00e9s","l":"0","n":"labdarugo-felkeszulesi-merkozes"},{"a":1109694840,"b":202944546,"c":"","d":345,"e":1668894600000,"f":1668915300000,"g":0,"h":"sportm\u0171sor","i":"22:50","j":"Labdar\u00fag\u00f3 felk\u00e9sz\u00fcl\u00e9si m\u00e9rk\u0151z\u00e9s","l":"0","n":"labdarugo-felkeszulesi-merkozes"}]}}} \ No newline at end of file diff --git a/sites/tvmusor.hu/tvmusor.hu.config.js b/sites/tvmusor.hu/tvmusor.hu.config.js index 737098e3..a489dbdc 100644 --- a/sites/tvmusor.hu/tvmusor.hu.config.js +++ b/sites/tvmusor.hu/tvmusor.hu.config.js @@ -1,6 +1,6 @@ -const FormData = require('form-data') const axios = require('axios') const dayjs = require('dayjs') +const _ = require('lodash') module.exports = { site: 'tvmusor.hu', @@ -26,13 +26,20 @@ module.exports = { let programs = [] const items = parseItems(content, channel, date) items.forEach(item => { + const prev = programs[programs.length - 1] + let start = dayjs(item.e) + let stop = dayjs(item.f) + if (prev) { + start = prev.stop + } + programs.push({ title: item.j, category: item.h, description: item.c, icon: parseIcon(item), - start: dayjs(item.e), - stop: dayjs(item.f) + start, + stop }) }) @@ -67,6 +74,7 @@ function parseItems(content, channel, date) { if (!data || !data.data || !data.data.loadedBlocks) return [] const blocks = data.data.loadedBlocks const blockId = `${channel.site_id}_${date.format('YYYY-MM-DD')}` + if (!Array.isArray(blocks[blockId])) return [] - return Array.isArray(blocks[blockId]) ? blocks[blockId] : [] + return _.uniqBy(_.uniqBy(blocks[blockId], 'e'), 'b') } diff --git a/sites/tvmusor.hu/tvmusor.hu.test.js b/sites/tvmusor.hu/tvmusor.hu.test.js index 08fc6a3c..903536b0 100644 --- a/sites/tvmusor.hu/tvmusor.hu.test.js +++ b/sites/tvmusor.hu/tvmusor.hu.test.js @@ -1,17 +1,19 @@ -// node ./scripts/channels.js --config=./sites/tvmusor.hu/tvmusor.hu.config.js --output=./sites/tvmusor.hu/tvmusor.hu_hu.channels.xml +// npm run channels:parse -- --config=./sites/tvmusor.hu/tvmusor.hu.config.js --output=./sites/tvmusor.hu/tvmusor.hu_hu.channels.xml // npx epg-grabber --config=sites/tvmusor.hu/tvmusor.hu.config.js --channels=sites/tvmusor.hu/tvmusor.hu_hu.channels.xml --output=guide.xml --days=2 const { parser, url, request } = require('./tvmusor.hu.config.js') +const fs = require('fs') +const path = require('path') const dayjs = require('dayjs') const utc = require('dayjs/plugin/utc') const customParseFormat = require('dayjs/plugin/customParseFormat') dayjs.extend(customParseFormat) dayjs.extend(utc) -const date = dayjs.utc('2021-11-24', 'YYYY-MM-DD').startOf('d') +const date = dayjs.utc('2022-11-19', 'YYYY-MM-DD').startOf('d') const channel = { - site_id: '139', - xmltv_id: 'AMCHungary.hu' + site_id: '290', + xmltv_id: 'M4Sport.hu' } it('can generate valid url', () => { @@ -30,27 +32,33 @@ it('can generate valid request headers', () => { it('can generate valid request data', () => { const result = request.data({ channel, date }) - expect(result.get('data')).toBe('{"blocks":["139|2021-11-24"]}') + expect(result.get('data')).toBe('{"blocks":["290|2022-11-19"]}') }) it('can parse response', () => { - const content = `{"status":"success","data":{"time":0.00033187866210938,"loadedBlocks":{"139_2021-11-24":[{"a":903037163,"b":167085,"c":"Milyen volt a vil\\u00e1g, amikor elkezdett \\u00e1talakulni azz\\u00e1 a horrorisztikus apokalipsziss\\u00e9, amelyet a The Walking Dead festett le? A Los Angeles-ben j\\u00e1tsz\\u00f3d\\u00f3 t\\u00e1rs-sorozat pontosan erre a k\\u00e9rd\\u00e9sre v\\u00e1laszol.","d":65,"e":1637712900000,"f":1637716800000,"g":2021,"h":"filmsorozat","i":"1:15","j":"Fear the Walking Dead","l":"18","n":"fear-the-walking-dead","z":"d6310651d2be559cc4e49498a21edd7477c19244_6345563D34F3542B1649E80.jpg"}]}}}` - const result = parser({ content, channel, date }).map(p => { + const content = fs.readFileSync(path.resolve(__dirname, '__data__/content.json')) + let results = parser({ content, channel, date }) + results = results.map(p => { p.start = p.start.toJSON() p.stop = p.stop.toJSON() return p }) - expect(result).toMatchObject([ - { - start: '2021-11-24T00:15:00.000Z', - stop: '2021-11-24T01:20:00.000Z', - title: `Fear the Walking Dead`, - category: 'filmsorozat', - description: `Milyen volt a világ, amikor elkezdett átalakulni azzá a horrorisztikus apokalipszissé, amelyet a The Walking Dead festett le? A Los Angeles-ben játszódó társ-sorozat pontosan erre a kérdésre válaszol.`, - icon: 'http://www.tvmusor.hu/images/events/408/d6310651d2be559cc4e49498a21edd7477c19244_6345563D34F3542B1649E80.jpg' - } - ]) + expect(results[0]).toMatchObject({ + start: '2022-11-18T23:30:00.000Z', + stop: '2022-11-19T00:55:00.000Z', + title: `Rövidpályás Úszó Országos Bajnokság`, + category: 'sportműsor', + description: 'Forma-1 magazin. Hírek, információk, érdekességek a Forma-1 világából.', + icon: 'http://www.tvmusor.hu/images/events/408/f1e45193930943d9ee29769e0afa902aff0e4a90-better-call-saul.jpg' + }) + + expect(results[1]).toMatchObject({ + start: '2022-11-19T00:55:00.000Z', + stop: '2022-11-19T01:10:00.000Z', + title: `Sportlövészet`, + category: 'sportműsor' + }) }) it('can handle empty guide', () => { diff --git a/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml b/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml index 4d8ef129..c80c1bb8 100644 --- a/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml +++ b/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml @@ -30,7 +30,6 @@ Eurosport 1 Eurosport 2 Fem 3 - Film Café Film Mánia Film Now @@ -91,5 +90,6 @@ Viasat Explore Viasat History Viasat Nature + \ No newline at end of file