Update knr.gl

sites/knr.gl/__data__/content.json

@@ -0,0 +1 @@
+[{"command":"insert","method":null,"selector":null,"data":"\u003Cdiv id=\u0022knr-api-program-overview\u0022\u003E\n\u003Cdiv class=\u0022overview-program__output program-overview\u0022\u003E\n      \u003Cul class=\u0022overview-program__list\u0022\u003E\n              \u003Cli class=\u0022overview-program__list__item\u0022\u003E\n          \u003Cspan class=\u0022overview-program__time\u0022\u003E\n            08:00\n          \u003C\/span\u003E\n          \u003Cspan class=\u0022overview-program__text \u0022\u003E\n            Issittormiuaqqat\n          \u003C\/span\u003E\n\n                  \u003C\/li\u003E\n              \u003Cli class=\u0022overview-program__list__item\u0022\u003E\n          \u003Cspan class=\u0022overview-program__time\u0022\u003E\n            08:30\n          \u003C\/span\u003E\n          \u003Cspan class=\u0022overview-program__text \u0022\u003E\n            Meeqqanut\n          \u003C\/span\u003E\n\n                  \u003C\/li\u003E\n              \u003Cli class=\u0022overview-program__list__item\u0022\u003E\n          \u003Cspan class=\u0022overview-program__time\u0022\u003E\n            09:00\n          \u003C\/span\u003E\n          \u003Cspan class=\u0022overview-program__text has-sublist\u0022\u003E\n            Inuusuttunut (A)\n          \u003C\/span\u003E\n\n                      \u003Cul class=\u0022overview-program__sublist\u0022\u003E\n              \u003Cli class=\u0022overview-program__sublist__item\u0022\u003E\n                Inuusuttunut \r\nAaqqissuisoq: Tungutaq Larsen\r\nKNR 26.02.1995\n              \u003C\/li\u003E\n            \u003C\/ul\u003E\n                  \u003C\/li\u003E\n              \u003Cli class=\u0022overview-program__list__item\u0022\u003E\n          \u003Cspan class=\u0022overview-program__time\u0022\u003E\n            10:00\n          \u003C\/span\u003E\n          \u003Cspan class=\u0022overview-program__text \u0022\u003E\n            Qanorooq\n          \u003C\/span\u003E\n\n                  \u003C\/li\u003E\n              \u003Cli class=\u0022overview-program__list__item\u0022\u003E\n          \u003Cspan class=\u0022overview-program__time\u0022\u003E\n            10:00\n          \u003C\/span\u003E\n          \u003Cspan class=\u0022overview-program__text has-sublist\u0022\u003E\n            KNR2: Tusagassiortunik katersortitsineq - Erik Jensen\n          \u003C\/span\u003E\n\n                      \u003Cul class=\u0022overview-program__sublist\u0022\u003E\n              \u003Cli class=\u0022overview-program__sublist__item\u0022\u003E\n                Naalakkersuisoq Erik Jensen tusagassiortunut 21.november nal. 10.00-11.00 katersortitsissaaq attassisinnaanermut siuariartornermullu pilersaarut pillugu (holdbarheds- og v\u00e6kstplan).\n              \u003C\/li\u003E\n            \u003C\/ul\u003E\n                  \u003C\/li\u003E\n              \u003Cli class=\u0022overview-program__list__item\u0022\u003E\n          \u003Cspan class=\u0022overview-program__time\u0022\u003E\n            10:30\n          \u003C\/span\u003E\n          \u003Cspan class=\u0022overview-program__text \u0022\u003E\n            Tema:\n          \u003C\/span\u003E\n\n                  \u003C\/li\u003E\n              \u003Cli class=\u0022overview-program__list__item\u0022\u003E\n          \u003Cspan class=\u0022overview-program__time\u0022\u003E\n            11:00\n          \u003C\/span\u003E\n          \u003Cspan class=\u0022overview-program__text has-sublist\u0022\u003E\n            MOOQQU (2:2)\n          \u003C\/span\u003E\n\n                      \u003Cul class=\u0022overview-program__sublist\u0022\u003E\n              \u003Cli class=\u0022overview-program__sublist__item\u0022\u003E\n                Piorsarsimassuseq - \r\nUani aallakaatitani marluusuni Simon \u0026#039;Mooqu\u0026#039; L\u00f8vstr\u00f8m ilisaritipparput. \r\nAallakaatitassiortoq: Ane-Marie Petersen.\r\nKNR 02.10.2022\n              \u003C\/li\u003E\n            \u003C\/ul\u003E\n                  \u003C\/li\u003E\n              \u003Cli class=\u0022overview-program__list__item\u0022\u003E\n          \u003Cspan class=\u0022overview-program__time\u0022\u003E\n            11:30\n          \u003C\/span\u003E\n          \u003Cspan class=\u0022overview-program__text has-sublist\u0022\u003E\n            Saqqami nalliuttorsiorneq\n          \u003C\/span\u003E\n\n                      \u003Cul class=\u0022overview-program__sublist\u0022\u003E\n              \u003Cli class=\u0022overview-program__sublist__item\u0022\u003E\n                Saqqami nalliuttorsiorneq KNR 2005\r\n2005-mi Saqqap 250-nngortorsiorluni nalliuttorsiornerani KNR-TV najuussimavoq, ullormilu tassani pisimasut takusassiarineqarsimallutik.\r\nPeqataapput: Jonas Jensen, Mikkel jensen (Uno), Hans Enoksen, Arnaq Eriksen, Ulf Fleischer, Maariu Olsen, Kunuk Platou, Simon L\u00f8vstr\u00f8m nipilersortut, Meeqqat aliikkusersuisut, erinarsoqatigiit erinarsortut, Pele Jensen, aliikkusersuisut assigiingitsut.\r\nAaqqiss.:\tTungutaq Larsen\r\Line truncated

sites/knr.gl/__data__/no_content.json

@@ -0,0 +1,16 @@
+[
+	{
+		"command": "insert",
+		"method": null,
+		"selector": null,
+		"data": "<div id=\"knr-api-program-overview\">\n<div class=\"overview-program__output program-overview\">\n      <ul class=\"overview-program__list\">\n              <li class=\"overview-program__list__item\">\n          <span class=\"overview-program__time\">\n            08:00\n          <\/span>\n          <span class=\"overview-program__text \">\n            Meeqqanut\n          <\/span>\n\n                  <\/li>\n              <li class=\"overview-program__list__item\">\n          <span class=\"overview-program__time\">\n            09:00\n          <\/span>\n          <span class=\"overview-program__text has-sublist\">\n            Taamani: Oqallinneq: Akileraartarneq pillugu (A)\n          <\/span>\n\n                      <ul class=\"overview-program__sublist\">\n              <li class=\"overview-program__sublist__item\">\n                Oqallinneq: Akileraartarneq pillugu \r\nAaqqissuisoq: Else Løvstrøm\r\nKNR 15.04.1991\n              <\/li>\n            <\/ul>\n                  <\/li>\n              <li class=\"overview-program__list__item\">\n          <span class=\"overview-program__time\">\n            10:00\n          <\/span>\n          <span class=\"overview-program__text \">\n            Piorsarsimassuseq: \n          <\/span>\n\n                  <\/li>\n              <li class=\"overview-program__list__item\">\n          <span class=\"overview-program__time\">\n            10:30\n          <\/span>\n          <span class=\"overview-program__text has-sublist\">\n            Kangerlussuarmi borgerråd (A)\n          <\/span>\n\n                      <ul class=\"overview-program__sublist\">\n              <li class=\"overview-program__sublist__item\">\n                Kangerlussuarmi borgerråd \r\nAaqqissuisoq: Iisaaq Olsen\r\nKNR 14.01.1998\n              <\/li>\n            <\/ul>\n                  <\/li>\n              <li class=\"overview-program__list__item\">\n          <span class=\"overview-program__time\">\n            11:00\n          <\/span>\n          <span class=\"overview-program__text has-sublist\">\n            Kalaaliwood\n          <\/span>\n\n                      <ul class=\"overview-program__sublist\">\n              <li class=\"overview-program__sublist__item\">\n                Aallakaatitassiaq toqqaannartoq Kalaaliwood nammineq videolianik sms 1717 atorlugu unammisitsinermik illarnarsinnaasunillu imalik.\r\nKalaaliwod-imi ilisarititsisorissavarput Marie Mathiassen.\r\nKNR 10.03.2017\n              <\/li>\n            <\/ul>\n                  <\/li>\n          <\/ul>\n      <ul class=\"overview-program__list\">\n              <li class=\"overview-program__list__item\">\n          <span class=\"overview-program__time\">\n            12:00\n          <\/span>\n          <span class=\"overview-program__text \">\n            Unilaarfik\n          <\/span>\n\n                  <\/li>\n              <li class=\"overview-program__list__item\">\n          <span class=\"overview-program__time\">\n            17:00\n          <\/span>\n          <span class=\"overview-program__text \">\n            Issittormiuaqqat\n          <\/span>\n\n                  <\/li>\n              <li class=\"overview-program__list__item\">\n          <span class=\"overview-program__time\">\n            17:00\n          <\/span>\n          <span class=\"overview-program__text has-sublist\">\n            KNR2: EM24 Isikkamik arsaalluni anngunniunneq Nordirland-Danmark\n          <\/span>\n\n                      <ul class=\"overview-program__sublist\">\n              <li class=\"overview-program__sublist__item\">\n                Sidste og afgørende kamp om kvalifikationen til EM i Tyskland 2024. Danmark vandt 1-0 i første opgør mellem de to nationer i EM-kvalifikationen. Får Kasper Hjulmands tropper en sejr på en svær udebane i Belfast? Og hvilken plads ender Danmark på i kvalifikationen?\r\n\r\n\n              <\/li>\n            <\/ul>\n                  <\/li>\n              <li class=\"overview-program__list__item\">\n          <span class=\"overview-program__time\">\n            17:30\n          <\/span>\n          <span class=\"overview-program__text \">\n            Meeqqanut\n          <\/span>\n\n                  <\/li>\n          <\/ul>\n      <ul class=\"overview-program__list\">\n              <li class=\"overview-program__list__item\">\n          <span class=\"overview-program__time\">\n            18:00\n          <\/span>\n          <span class=\"overview-program__text has-sublist\">\n            Inuusuttunut (A)\n          <\/span>\n\n                      <ul class=\"overview-program__sublist\">\n              <li class=\"overview-program__sublist__item\">\n                Inuusuttunut \r\nAaqqissuisoq: Tungutaq Larsen\r\nKNR 26.02.1995\n              <\/li>\n            <\/ul>\n                  <\/li>\n              <li class=\"overview-program__list__item\">\n          <span class=\"overview-program__time\">\n            19:00\n          <\/span>\n        Line truncated
+		"settings": null
+	},
+	{
+		"command": "insert",
+		"method": "prepend",
+		"selector": null,
+		"data": "<div data-drupal-messages>\n    <div role=\"contentinfo\" aria-label=\"Error message\" class=\"alert alert--error\">\n          <div role=\"alert\">\n                  <h2 class=\"visually-hidden\">Error message<\/h2>\n                    An illegal choice has been detected. Please contact the site administrator.\n                <\/div>\n      <\/div>\n<\/div>\n",
+		"settings": null
+	}
+]

sites/knr.gl/knr.gl.channels.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
-  <channel site="knr.gl" lang="kl" xmltv_id="KNR1.gl" site_id="#">KNR TV</channel>
+  <channel site="knr.gl" lang="kl" xmltv_id="KNR1.gl" site_id="#">KNR</channel>
 </channels>

sites/knr.gl/knr.gl.config.js

@@ -11,8 +11,20 @@ dayjs.extend(customParseFormat)
 module.exports = {
   site: 'knr.gl',
   days: 2,
-  url({ date }) {
-    return `https://knr.gl/admin/knr/TV/program/${date.format('YYYY-MM-DD')}/gl`
+  url: 'https://knr.gl/kl/tv/aallakaatitassat?ajax_form=1',
+  request: {
+    method: 'POST',
+    headers: {
+      'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'
+    },
+    data({ date }) {
+      const params = new URLSearchParams()
+      params.append('list_date', date.format('YYYY-MM-DD'))
+      params.append('form_id', 'knr_radio_tv_program_overview_form')
+      params.append('_triggering_element_name', 'list_date')
+
+      return params
+    }
   },
   parser({ content, date }) {
     let programs = []
@@ -37,27 +49,29 @@ module.exports = {
 function parseStart(item, date) {
   const time = `${date.format('YYYY-MM-DD')} ${item.time}`
 
-  return dayjs.tz(time, 'YYYY-MM-DD HH:mm', 'America/Godthab')
+  return dayjs.tz(time, 'YYYY-MM-DD HH:mm', 'America/Nuuk')
 }
 
 function parseItems(content) {
   const data = JSON.parse(content)
-  if (!data.program_list) return []
-  const $ = cheerio.load(data.program_list)
+  if (data.length !== 1 || !data[0].data) return []
+  const $ = cheerio.load(data[0].data)
+
   const items = []
-  $('dt').each(function () {
-    const titleElem = $(this)
-      .contents()
-      .filter(function () {
-        return this.nodeType === 3
-      })[0]
+  $('.overview-program__list__item').each((i, el) => {
+    const title = $(el).find('.overview-program__text').text().trim()
+    const description = $(el)
+      .find('.overview-program__sublist__item')
+      .first()
+      .text()
+      .trim()
+      .replace(/(\r\n|\n|\r)/gm, ' ')
+    const time = $(el).find('.overview-program__time').text().trim()
+
     items.push({
-      title: titleElem.nodeValue.trim(),
-      description: $(this)
-        .next('dd')
-        .text()
-        .replace(/(\r\n|\n|\r)/gm, ' '),
-      time: $(this, 'strong').text().trim()
+      title,
+      description,
+      time
     })
   })
 

sites/knr.gl/knr.gl.test.js

@@ -1,6 +1,8 @@
 // npm run grab -- --site=knr.gl
 
-const { parser, url } = require('./knr.gl.config.js')
+const { parser, url, request } = require('./knr.gl.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')
@@ -10,43 +12,58 @@ dayjs.extend(utc)
 const date = dayjs.utc('2021-11-22', 'YYYY-MM-DD').startOf('d')
 const channel = {
   site_id: '#',
-  xmltv_id: 'KNRTV.gl'
+  xmltv_id: 'KNR.gl'
 }
 
 it('can generate valid url', () => {
-  expect(url({ date })).toBe('https://knr.gl/admin/knr/TV/program/2021-11-22/gl')
+  expect(url).toBe('https://knr.gl/kl/tv/aallakaatitassat?ajax_form=1')
+})
+
+it('can generate valid request method', () => {
+  expect(request.method).toBe('POST')
+})
+
+it('can generate valid request headers', () => {
+  expect(request.headers).toMatchObject({})
+})
+
+it('can generate valid request data', () => {
+  const params = request.data({ date })
+
+  expect(params.get('list_date')).toBe('2021-11-22')
+  expect(params.get('form_id')).toBe('knr_radio_tv_program_overview_form')
+  expect(params.get('_triggering_element_name')).toBe('list_date')
 })
 
 it('can parse response', () => {
-  const content =
-    '{"program_list":"\\u003Cdt class=\\u0022program\\u0022\\u003E\\u003Cstrong\\u003E08:00\\u003C\\/strong\\u003E Meeqqanut - Toqqorsivimmiit\\u003C\\/dt\\u003E\\u003Cdt class=\\u0022knr-program-pointer knr-program-togle-program\\u0022 data-program-id=\\u0022588574\\u0022 data-module-path=\\u0022sites\\/knr\\/modules\\/custom\\/knr_site\\u0022\\u003E\\u003Cimg height=\\u00229\\u0022 width=\\u00229\\u0022 id=\\u0022icon_588574\\u0022 alt=\\u0022View description\\u0022 src=\\u0022\\/sites\\/knr\\/modules\\/custom\\/knr_site\\/assets\\/img\\/plus.gif\\u0022\\u003E\\u003Cstrong\\u003E08:30\\u003C\\/strong\\u003E ICC 2018 Piorsarsimassutikkut pisut (1:3)\\u003C\\/dt\\u003E\\u003Cdd id=\\u0022program_588574\\u0022 style=\\u0022display: none;\\u0022\\u003E\\u003Cdiv class=\\u0022box\\u0022\\u003E2018 ICC ataatsimersuareernerata kingorna unnukkut piorsarsimassutsikkut pisut takutinneqarput. Aammalu illoqarfik Utqiagvik ilisaritinneqarluni. Ove Heilmann, Aannguaq Nielsen, Aannguaq Reimer-Johansen\\r\\nKNR 09.12.2018\\u003C\\/div\\u003E\\u003C\\/dd\\u003E"}'
-  const result = parser({ content, date }).map(p => {
+  const content = fs.readFileSync(path.resolve(__dirname, '__data__/content.json'))
+  const results = parser({ content, date }).map(p => {
     p.start = p.start.toJSON()
     p.stop = p.stop.toJSON()
     return p
   })
 
-  expect(result).toMatchObject([
-    {
-      start: '2021-11-22T11:00:00.000Z',
-      stop: '2021-11-22T11:30:00.000Z',
-      title: 'Meeqqanut - Toqqorsivimmiit'
-    },
-    {
-      start: '2021-11-22T11:30:00.000Z',
-      stop: '2021-11-22T12:30:00.000Z',
-      title: 'ICC 2018 Piorsarsimassutikkut pisut (1:3)',
-      description:
-        '2018 ICC ataatsimersuareernerata kingorna unnukkut piorsarsimassutsikkut pisut takutinneqarput. Aammalu illoqarfik Utqiagvik ilisaritinneqarluni. Ove Heilmann, Aannguaq Nielsen, Aannguaq Reimer-Johansen KNR 09.12.2018'
-    }
-  ])
+  expect(results[0]).toMatchObject({
+    start: '2021-11-22T11:00:00.000Z',
+    stop: '2021-11-22T11:30:00.000Z',
+    title: 'Issittormiuaqqat'
+  })
+
+  expect(results[4]).toMatchObject({
+    start: '2021-11-22T13:00:00.000Z',
+    stop: '2021-11-22T13:30:00.000Z',
+    title: 'KNR2: Tusagassiortunik katersortitsineq - Erik Jensen',
+    description:
+      'Naalakkersuisoq Erik Jensen tusagassiortunut 21.november nal. 10.00-11.00 katersortitsissaaq attassisinnaanermut siuariartornermullu pilersaarut pillugu (holdbarheds- og vækstplan).'
+  })
 })
 
 it('can handle empty guide', () => {
+  const content = fs.readFileSync(path.resolve(__dirname, '__data__/no_content.json'))
   const result = parser({
     date,
     channel,
-    content: '{"program_list":""}'
+    content
   })
   expect(result).toMatchObject([])
 })