From 2db1669c1b60aa1eb3b0d91d9db8ef1072b26a7a Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Tue, 15 Mar 2022 21:26:47 +0300 Subject: [PATCH 1/7] Create kplus.vn.test.js --- sites/kplus.vn/kplus.vn.test.js | 66 +++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 sites/kplus.vn/kplus.vn.test.js diff --git a/sites/kplus.vn/kplus.vn.test.js b/sites/kplus.vn/kplus.vn.test.js new file mode 100644 index 00000000..11c4a96a --- /dev/null +++ b/sites/kplus.vn/kplus.vn.test.js @@ -0,0 +1,66 @@ +// npm run channels:parse -- --config=sites/kplus.vn/kplus.vn.config.js --output=sites/kplus.vn/kplus.vn_vn.channels.xml +// npx epg-grabber --config=sites/kplus.vn/kplus.vn.config.js --channels=sites/kplus.vn/kplus.vn_vn.channels.xml --output=guide.xml --days=2 + +const { parser, url, request } = require('./kplus.vn.config.js') +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('2022-03-15', 'YYYY-MM-DD').startOf('d') +const channel = { + site_id: '7019', + xmltv_id: 'KPlus1HD.vn' +} + +it('can generate valid url', () => { + expect(url).toBe('https://www.kplus.vn/Schedule/getSchedule') +}) + +it('can generate valid request headers', () => { + expect(request.headers).toMatchObject({ + 'Content-Type': 'application/x-www-form-urlencoded' + }) +}) + +it('can generate valid request data', () => { + const data = request.data({ date }) + + expect(data.get('date')).toBe('15-3-2022') + expect(data.get('categories')).toBe('') +}) + +it('can parse response', () => { + const content = `{"SchedulesCount":1105,"ChannelsCount":28,"Schedules":[{"Id":12195,"ChannelId":7019,"ProgramId":35111026,"EpgProgramId":"1252496\\r","ShowingTime":"2022-03-15T06:15:00","EpgBroadcastId":"HD_ENT_DOC_LNO_21_2649421_2652183_4383385_OnAir","EpgId":"HD_ENT_DOC_LNO_21_2649421_2652183_4383385_OnAir","IsDeleted":false,"CreatedOn":"2022-03-15T06:22:45","UpdatedOn":"0001-01-01T00:00:00","Channel":{"Id":7019,"Name":"K+1 HD","Image":"https://kplus-website-production-cdn.azureedge.net/content/upload/7/images-mkt/logo-k-1-hd-new.png","LiveUrlSegment":"highlights/broadcast-schedule/K-1-HD","FeatureImage":"https://kplus-website-production-cdn.azureedge.net/content/upload/7/images-mkt/logo-k-1-hd-new.png","EpgId":null,"IsOTTEnabled":false,"StartOver":0,"DisplayOrder":0},"Program":{"Id":35111026,"Name":"WEEKLY FILMS AND STARS, EP740","BodyContent":"","Cast":"","Director":"","Duration":0,"EpgId":"93701","EpgProgramId":null,"Episode":0,"Genres":"Documentary","Images":"https://img.kplus.vn/images?filename=Media/HDVN/2022_02/ENT_DOC_LNO_21_2649421_2652183_2652183.jpg","IsFeatured":false,"IsOTTEnabled":true,"IsRebroadcast":false,"ShortDescription":"","SubTitle":"","Trailers":"","UrlSegment":"highlights/broadcast-schedule/93701/weekly-films-and-stars-ep740","CreatedOn":"2022-03-16T00:15:45","UpdatedOn":"2022-03-16T00:15:45","ParentalRating":null},"RelatedSchedules":null},{"Id":12196,"ChannelId":7019,"ProgramId":35111279,"EpgProgramId":"798685\\r","ShowingTime":"2022-03-15T07:00:00","EpgBroadcastId":"HD_MOV_COM__2632318_4383386_OnAir","EpgId":"HD_MOV_COM__2632318_4383386_OnAir","IsDeleted":false,"CreatedOn":"2022-03-15T07:02:46","UpdatedOn":"0001-01-01T00:00:00","Channel":{"Id":7019,"Name":"K+1 HD","Image":"https://kplus-website-production-cdn.azureedge.net/content/upload/7/images-mkt/logo-k-1-hd-new.png","LiveUrlSegment":"highlights/broadcast-schedule/K-1-HD","FeatureImage":"https://kplus-website-production-cdn.azureedge.net/content/upload/7/images-mkt/logo-k-1-hd-new.png","EpgId":null,"IsOTTEnabled":false,"StartOver":0,"DisplayOrder":0},"Program":{"Id":35111279,"Name":"ST. VINCENT","BodyContent":"","Cast":"Bill Murray, Melissa McCarthy, Naomi Watts","Director":"Theodore Melfi","Duration":0,"EpgId":"93959","EpgProgramId":null,"Episode":0,"Genres":"Comedy","Images":"https://img.kplus.vn/images?filename=Media/HDVN/2020_05/MOV_COM__2632318_2632318.jpg","IsFeatured":false,"IsOTTEnabled":true,"IsRebroadcast":false,"ShortDescription":"","SubTitle":"","Trailers":"","UrlSegment":"highlights/broadcast-schedule/93959/st-vincent","CreatedOn":"2022-03-16T00:15:45","UpdatedOn":"2022-03-16T00:15:45","ParentalRating":null},"RelatedSchedules":null}]}` + const result = parser({ content, channel }).map(p => { + p.start = p.start.toJSON() + p.stop = p.stop.toJSON() + return p + }) + + expect(result).toMatchObject([ + { + start: '2022-03-14T23:15:00.000Z', + stop: '2022-03-15T00:00:00.000Z', + title: 'WEEKLY FILMS AND STARS, EP740', + icon: 'https://img.kplus.vn/images?filename=Media/HDVN/2022_02/ENT_DOC_LNO_21_2649421_2652183_2652183.jpg', + category: 'Documentary' + }, + { + start: '2022-03-15T00:00:00.000Z', + stop: '2022-03-15T01:00:00.000Z', + title: 'ST. VINCENT', + icon: 'https://img.kplus.vn/images?filename=Media/HDVN/2020_05/MOV_COM__2632318_2632318.jpg', + category: 'Comedy' + } + ]) +}) + +it('can handle empty guide', () => { + const result = parser({ + content: `{"SchedulesCount":0,"ChannelsCount":0,"Schedules":[],"Channels":[],"MinDuration":0}`, + channel + }) + expect(result).toMatchObject([]) +}) From e125dc83150f8e6a0cbc1809c223155a61fb7263 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Tue, 15 Mar 2022 21:26:50 +0300 Subject: [PATCH 2/7] Create kplus.vn.config.js --- sites/kplus.vn/kplus.vn.config.js | 78 +++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 sites/kplus.vn/kplus.vn.config.js diff --git a/sites/kplus.vn/kplus.vn.config.js b/sites/kplus.vn/kplus.vn.config.js new file mode 100644 index 00000000..e681a65e --- /dev/null +++ b/sites/kplus.vn/kplus.vn.config.js @@ -0,0 +1,78 @@ +const axios = require('axios') +const dayjs = require('dayjs') +const utc = require('dayjs/plugin/utc') +const timezone = require('dayjs/plugin/timezone') + +dayjs.extend(timezone) +dayjs.extend(utc) + +const API_ENDPOINT = `https://www.kplus.vn/Schedule/getSchedule` + +module.exports = { + site: 'kplus.vn', + url: API_ENDPOINT, + request: { + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' + }, + data({ date }) { + const params = new URLSearchParams() + params.append('date', date.format('D-M-YYYY')) + params.append('categories', '') + + return params + }, + method: 'POST' + }, + parser: function ({ content, channel }) { + let programs = [] + const items = parseItems(content, channel) + items.forEach(item => { + const prev = programs[programs.length - 1] + const start = parseStart(item) + const stop = start.add(1, 'h') + if (prev) prev.stop = start + programs.push({ + title: item.Program.Name, + icon: item.Program.Images, + category: item.Program.Genres, + start, + stop + }) + }) + + return programs + }, + async channels() { + const params = new URLSearchParams() + params.append('date', dayjs().format('D-M-YYYY')) + params.append('categories', '') + const data = await axios + .post(API_ENDPOINT, params, { + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' + } + }) + .then(r => r.data) + .catch(console.log) + + return data.Channels.map(item => { + return { + lang: 'vi', + site_id: item.Id, + name: item.Name + } + }) + } +} + +function parseStart(item) { + return dayjs.tz(item.ShowingTime, 'Asia/Ho_Chi_Minh') +} + +function parseItems(content, channel) { + const data = JSON.parse(content) + if (!data || !Array.isArray(data.Schedules)) return [] + + return data.Schedules.filter(i => i.ChannelId == channel.site_id) +} From 3c854f1cb0056f659337f708b711d53c667a3402 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Tue, 15 Mar 2022 21:26:52 +0300 Subject: [PATCH 3/7] Create kplus.vn_vn.channels.xml --- sites/kplus.vn/kplus.vn_vn.channels.xml | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 sites/kplus.vn/kplus.vn_vn.channels.xml diff --git a/sites/kplus.vn/kplus.vn_vn.channels.xml b/sites/kplus.vn/kplus.vn_vn.channels.xml new file mode 100644 index 00000000..9aaf4189 --- /dev/null +++ b/sites/kplus.vn/kplus.vn_vn.channels.xml @@ -0,0 +1,36 @@ + + + + HITS SD + VTV2 + VTV4 + VTV9 + VTVCab1-GIAITRITV + AFC + HTV7 + HTV9 + K+CINE HD + K+LIFE HD + K+PM HD + K+PC HD + VTV1 HD + VTV3 HD + VTV6 HD + K+1 HD + K+NS HD + VTV7 + VTV8 + SCTV PHIMTONGHOP + HBO HD + AXN HD + VTC7-TODAY TV + KBS WORLD + DISCOVERY CHANNEL + CARTOON NETWORK + TV5 MONDE + VTC1 + NHK WORLD JAPAN + NGC HD + YOU TV + + From 2d72e91465a6cec6f07fb2b117d9b056cb018fb0 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Tue, 15 Mar 2022 21:42:15 +0300 Subject: [PATCH 4/7] Update kplus.vn_vn.channels.xml --- sites/kplus.vn/kplus.vn_vn.channels.xml | 62 ++++++++++++------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/sites/kplus.vn/kplus.vn_vn.channels.xml b/sites/kplus.vn/kplus.vn_vn.channels.xml index 9aaf4189..270dd1a5 100644 --- a/sites/kplus.vn/kplus.vn_vn.channels.xml +++ b/sites/kplus.vn/kplus.vn_vn.channels.xml @@ -1,36 +1,36 @@ - HITS SD - VTV2 - VTV4 - VTV9 - VTVCab1-GIAITRITV - AFC - HTV7 - HTV9 - K+CINE HD - K+LIFE HD - K+PM HD - K+PC HD - VTV1 HD - VTV3 HD - VTV6 HD - K+1 HD - K+NS HD - VTV7 - VTV8 - SCTV PHIMTONGHOP - HBO HD - AXN HD - VTC7-TODAY TV - KBS WORLD - DISCOVERY CHANNEL - CARTOON NETWORK - TV5 MONDE - VTC1 - NHK WORLD JAPAN - NGC HD - YOU TV + AFC + AXN HD + CARTOON NETWORK + DISCOVERY CHANNEL + VTVCab1-GIAITRITV + HBO HD + HITS SD + HTV7 + HTV9 + KBS WORLD + K+1 HD + K+CINE HD + K+LIFE HD + K+NS HD + K+PC HD + K+PM HD + NGC HD + NHK WORLD JAPAN + SCTV PHIMTONGHOP + VTC7-TODAY TV + TV5 MONDE + VTC1 + VTV1 HD + VTV2 + VTV3 HD + VTV4 + VTV6 HD + VTV7 + VTV8 + VTV9 + YOU TV From 0f24cad0342438b5ddb80c9278ee3643f034d4df Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Tue, 15 Mar 2022 22:23:35 +0300 Subject: [PATCH 5/7] Update kplus.vn_vn.channels.xml --- sites/kplus.vn/kplus.vn_vn.channels.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sites/kplus.vn/kplus.vn_vn.channels.xml b/sites/kplus.vn/kplus.vn_vn.channels.xml index 270dd1a5..f3f17b55 100644 --- a/sites/kplus.vn/kplus.vn_vn.channels.xml +++ b/sites/kplus.vn/kplus.vn_vn.channels.xml @@ -11,12 +11,10 @@ HTV7 HTV9 KBS WORLD - K+1 HD K+CINE HD K+LIFE HD - K+NS HD - K+PC HD - K+PM HD + K+PC HD + K+PM HD NGC HD NHK WORLD JAPAN SCTV PHIMTONGHOP From e01d97a58e3c58cc3e9c4e911f97be47fb4d3b93 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Tue, 15 Mar 2022 22:25:16 +0300 Subject: [PATCH 6/7] Create kplus.vn.yml --- .github/workflows/kplus.vn.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/kplus.vn.yml diff --git a/.github/workflows/kplus.vn.yml b/.github/workflows/kplus.vn.yml new file mode 100644 index 00000000..a5c49cff --- /dev/null +++ b/.github/workflows/kplus.vn.yml @@ -0,0 +1,17 @@ +name: kplus.vn +on: + schedule: + - cron: '0 0 * * *' + workflow_dispatch: + workflow_run: + workflows: [_trigger] + types: + - completed +jobs: + load: + uses: ./.github/workflows/_load.yml + with: + site: ${{github.workflow}} + secrets: + APP_ID: ${{ secrets.APP_ID }} + APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }} From 8bfc31b8bf441d1a5a0585fcafb4df9253f1f5f0 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Tue, 15 Mar 2022 22:25:22 +0300 Subject: [PATCH 7/7] Update kplus.vn.config.js --- sites/kplus.vn/kplus.vn.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/kplus.vn/kplus.vn.config.js b/sites/kplus.vn/kplus.vn.config.js index e681a65e..7e82f258 100644 --- a/sites/kplus.vn/kplus.vn.config.js +++ b/sites/kplus.vn/kplus.vn.config.js @@ -10,6 +10,7 @@ const API_ENDPOINT = `https://www.kplus.vn/Schedule/getSchedule` module.exports = { site: 'kplus.vn', + ignore: true, // channel list changes with each request url: API_ENDPOINT, request: { headers: {