Merge pull request #302 from iptv-org/update-comteco-com-bo

Update comteco.com.bo

sites/comteco.com.bo/comteco.com.bo.config.js

@@ -1,5 +1,4 @@
-const jsdom = require('jsdom')
+const cheerio = require('cheerio')
-const { JSDOM } = jsdom
 const dayjs = require('dayjs')
 const utc = require('dayjs/plugin/utc')
 const timezone = require('dayjs/plugin/timezone')
@@ -11,8 +10,14 @@ dayjs.extend(customParseFormat)
 
 module.exports = {
   site: 'comteco.com.bo',
+  url: function ({ channel }) {
+    return `https://comteco.com.bo/pages/canales-y-programacion-tv/paquete-oro/${channel.site_id}`
+  },
   request: {
     method: 'POST',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    },
     data: function ({ date }) {
       const params = new URLSearchParams()
       params.append('_method', 'POST')
@@ -20,57 +25,51 @@ module.exports = {
       params.append('fechafin', date.format('D/M/YYYY'))
 
       return params
-    },
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
     }
   },
-  url: function ({ channel }) {
-    return `https://comteco.com.bo/pages/canales-y-programacion-tv/paquete-oro/${channel.site_id}`
-  },
   logo: function ({ content }) {
-    const dom = new JSDOM(content)
+    const $ = cheerio.load(content)
-    const img = dom.window.document.querySelector(
+    const imgSrc = $('#myform > div.row > div:nth-child(1) > div.col-xs-5.col-sm-7 > img').attr(
-      '#myform > div.row > div:nth-child(1) > div.col-xs-5.col-sm-7 > img'
+      'src'
     )
 
-    return img ? `https://comteco.com.bo${img.src}` : null
+    return imgSrc ? `https://comteco.com.bo${imgSrc}` : null
   },
   parser: function ({ content, date }) {
     const programs = []
     const items = parseItems(content)
     items.forEach(item => {
-      const title = parseTitle(item)
+      const prev = programs[programs.length - 1]
-      let start = parseStart(item, date)
+      const $item = cheerio.load(item)
-      const stop = start.add(30, 'm')
+      let start = parseStart($item, date)
-      if (programs.length) {
+      if (prev) {
-        programs[programs.length - 1].stop = start
+        if (start.isBefore(prev.start)) {
+          start = start.add(1, 'd')
+          date = date.add(1, 'd')
+        }
+        prev.stop = start
       }
-
+      const stop = start.add(30, 'm')
-      programs.push({ title, start, stop })
+      programs.push({ title: parseTitle($item), start, stop })
     })
 
     return programs
   }
 }
 
-function parseStart(item, date) {
+function parseStart($item, date) {
-  let time = (
+  const timeString = $item('div > div.col-xs-11 > p > span').text().trim()
-    item.querySelector('div > div.col-xs-11 > p > span') || { textContent: '' }
+  const dateString = `${date.format('YYYY-MM-DD')} ${timeString}`
-  ).textContent.trim()
-  time = `${date.format('MM/DD/YYYY')} ${time}`
 
-  return dayjs.tz(time, 'MM/DD/YYYY HH:mm:ss', 'America/La_Paz')
+  return dayjs.tz(dateString, 'YYYY-MM-DD HH:mm:ss', 'America/La_Paz')
 }
 
-function parseTitle(item) {
+function parseTitle($item) {
-  return (
+  return $item('div > div.col-xs-11 > p > strong').text().trim()
-    item.querySelector('div > div.col-xs-11 > p > strong') || { textContent: '' }
-  ).textContent.trim()
 }
 
 function parseItems(content) {
-  const dom = new JSDOM(content)
+  const $ = cheerio.load(content)
 
-  return dom.window.document.querySelectorAll('#datosasociados > div > .list-group-item')
+  return $('#datosasociados > div > .list-group-item').toArray()
 }

sites/comteco.com.bo/comteco.com.bo.test.js

@@ -0,0 +1,77 @@
+// npx epg-grabber --config=sites/comteco.com.bo/comteco.com.bo.config.js --channels=sites/comteco.com.bo/comteco.com.bo_bo.channels.xml --output=.gh-pages/guides/bo/comteco.com.bo.epg.xml --days=2
+
+const { parser, url, request, logo } = require('./comteco.com.bo.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('2021-11-25', 'YYYY-MM-DD').startOf('d')
+const channel = {
+  site_id: 'ABYA YALA',
+  xmltv_id: 'AbyaYalaTV.bo'
+}
+const content = `<!DOCTYPE html><html dir="ltr" lang="es"> <head></head> <body class=""> <div id="wrapper" class="clearfix"> <div class="main-content"> <section class="rubroguias"> <div class="container pt-70 pb-40"> <div class="section-content"> <form method="post" accept-charset="utf-8" class="reservation-form mb-0" role="form" id="myform" action="/pages/canales-y-programacion-tv/paquete-oro/ABYA%20YALA" > <div style="display: none"><input type="hidden" name="_method" value="POST"/></div><div class="row"> <div class="col-sm-5"> <div class="col-xs-5 col-sm-7"> <img src="/img/upload/canales/abya-yala.png" alt="" class="img-responsive"/> </div><div class="col-xs-7 col-sm-5 mt-sm-50 mt-lg-50 mt-md-50 mt-xs-20"> <p><strong>Canal Analógico:</strong> 48</p></div></div></div></form> <div class="row"> <div class="col-sm-12"> <div class="row mt-0"> <div class="single-service"> <h3 class=" text-theme-colored line-bottom text-theme-colored mt-0 text-uppercase " > ABYA YALA </h3> <div id="datosasociados"> <div class="list-group"> <div href="#" class="list-group-item bg-white-f1"> <div class="row"> <div class="col-xs-11"> <p class="mb-0"> <span class="text-red mr-15">00:00:00</span> <strong>Abya Yala noticias - 3ra edición</strong> </p></div></div></div><div href="#" class="list-group-item bg-white-f1"> <div class="row"> <div class="col-xs-11"> <p class="mb-0"> <span class="text-red mr-15">01:00:00</span> <strong>Cierre de emisión</strong> </p></div></div></div><div href="#" class="list-group-item bg-white-f1"> <div class="row"> <div class="col-xs-11"> <p class="mb-0"> <span class="text-red mr-15">23:00:00</span> <strong>Referentes</strong> </p></div></div></div><p class="mt-20"> <a href="/pages/canales-y-programacion-tv" class="btn btn-border btn-gray btn-transparent btn-circled" >Regresar a canales</a > </p></div></div></div></div></div></div></div></div></section> </div></div></body></html>`
+
+it('can generate valid url', () => {
+  expect(url({ channel })).toBe(
+    'https://comteco.com.bo/pages/canales-y-programacion-tv/paquete-oro/ABYA YALA'
+  )
+})
+
+it('can generate valid request method', () => {
+  expect(request.method).toBe('POST')
+})
+
+it('can generate valid request headers', () => {
+  expect(request.headers).toMatchObject({
+    'Content-Type': 'application/x-www-form-urlencoded'
+  })
+})
+
+it('can generate valid request data', () => {
+  const result = request.data({ date })
+  expect(result.get('_method')).toBe('POST')
+  expect(result.get('fechaini')).toBe('25/11/2021')
+  expect(result.get('fechafin')).toBe('25/11/2021')
+})
+
+it('can generate valid logo url', () => {
+  expect(logo({ content })).toBe('https://comteco.com.bo/img/upload/canales/abya-yala.png')
+})
+
+it('can parse response', () => {
+  const result = parser({ content, channel, date }).map(p => {
+    p.start = p.start.toJSON()
+    p.stop = p.stop.toJSON()
+    return p
+  })
+
+  expect(result).toMatchObject([
+    {
+      start: '2021-11-25T04:00:00.000Z',
+      stop: '2021-11-25T05:00:00.000Z',
+      title: `Abya Yala noticias - 3ra edición`
+    },
+    {
+      start: '2021-11-25T05:00:00.000Z',
+      stop: '2021-11-26T03:00:00.000Z',
+      title: `Cierre de emisión`
+    },
+    {
+      start: '2021-11-26T03:00:00.000Z',
+      stop: '2021-11-26T03:30:00.000Z',
+      title: `Referentes`
+    }
+  ])
+})
+
+it('can handle empty guide', () => {
+  const result = parser({
+    date,
+    channel,
+    content: `<!DOCTYPE html><html><head></head><body></body></html>`
+  })
+  expect(result).toMatchObject([])
+})