epg-grabber 0.14.0 → 0.16.0

package/README.md

@@ -56,6 +56,7 @@ module.exports = {
 <tv>
   <channel id="CNN.us">
     <display-name>CNN</display-name>
+    <url>https://example.com</url>
   </channel>
   <programme start="20211116040000 +0000" stop="20211116050000 +0000" channel="CNN.us">
     <title lang="en">News at 10PM</title>
@@ -93,6 +94,7 @@ module.exports = {
   lang: 'fr', // default language for all programs (default: 'en')
   days: 3, // number of days for which to grab the program (default: 1)
   delay: 5000, // delay between requests (default: 3000)
+  ignore: true, // skip all channels during request (default: false)
 
   request: { // request options (details: https://github.com/axios/axios#request-config)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epg-grabber",
-  "version": "0.14.0",
+  "version": "0.16.0",
   "description": "Node.js CLI tool for grabbing EPG from different sites",
   "main": "src/index.js",
   "preferGlobal": true,

package/src/index.js

@@ -14,6 +14,12 @@ module.exports = {
 
     let programs = []
     for (let item of queue) {
+      if (config.ignore) {
+        item.programs = []
+        cb(item, new Error('Skipped'))
+        continue
+      }
+
       await utils
         .buildRequest(item, config)
         .then(request => utils.fetchData(request))

package/src/utils.js

@@ -123,8 +123,8 @@ utils.convertToXMLTV = function ({ channels, programs }) {
     const title = utils.escapeString(program.title)
     const description = utils.escapeString(program.description)
     const categories = Array.isArray(program.category) ? program.category : [program.category]
-    const start = program.start ? dayjs.utc(program.start).format('YYYYMMDDHHmmss ZZ') : ''
-    const stop = program.stop ? dayjs.utc(program.stop).format('YYYYMMDDHHmmss ZZ') : ''
+    const start = program.start ? dayjs.unix(program.start).utc().format('YYYYMMDDHHmmss ZZ') : ''
+    const stop = program.stop ? dayjs.unix(program.stop).utc().format('YYYYMMDDHHmmss ZZ') : ''
     const lang = program.lang || 'en'
     const icon = utils.escapeString(program.icon)
 
@@ -244,7 +244,7 @@ utils.parseResponse = async (item, response, config) => {
   })
 
   if (!item.channel.logo && config.logo) {
-    item.channel.logo = await utils.loadLogo(data, config)
+    data.channel.logo = await utils.loadLogo(data, config)
   }
 
   return await utils.parsePrograms(data, config)
@@ -265,9 +265,16 @@ utils.parsePrograms = async function (data, config) {
   return programs
     .filter(i => i)
     .map(program => {
-      program.channel = channel.xmltv_id
-      program.lang = program.lang || channel.lang || config.lang || 'en'
-      return program
+      return {
+        title: program.title,
+        description: program.description || null,
+        category: program.category || null,
+        icon: program.icon || null,
+        channel: channel.xmltv_id,
+        lang: program.lang || channel.lang || config.lang || 'en',
+        start: program.start ? dayjs(program.start).unix() : null,
+        stop: program.stop ? dayjs(program.stop).unix() : null
+      }
     })
 }
 

package/tests/bin.test.js

@@ -1,8 +1,6 @@
 const { execSync } = require('child_process')
-const pwd = `${__dirname}/..`
-import axios from 'axios'
 
-jest.mock('axios')
+const pwd = `${__dirname}/..`
 
 function stdoutResultTester(stdout) {
   return [`Finish`].every(val => {
@@ -22,8 +20,6 @@ it('can load config', () => {
 })
 
 it('can load mini config', () => {
-  axios.mockImplementation(() => Promise.resolve({ data: '' }))
-
   const result = execSync(
     `node ${pwd}/bin/epg-grabber.js \
       --config=tests/input/mini.config.js \
@@ -32,7 +28,8 @@ it('can load mini config', () => {
       --lang=fr \
       --days=3 \
       --delay=0 \
-      --timeout=10000`,
+      --debug \
+      --timeout=1`,
     {
       encoding: 'utf8'
     }

package/tests/index.test.js

@@ -71,3 +71,23 @@ it('can grab single channel programs', done => {
       done()
     })
 })
+
+it('return "Skipped" error if ignore option in config is true', done => {
+  const config = {
+    site: 'example.com',
+    ignore: true,
+    url: `http://example.com/20210319/1tv.json`,
+    parser: () => []
+  }
+  const channel = {
+    site: 'example.com',
+    site_id: 'cnn',
+    xmltv_id: 'CNN.us',
+    lang: 'en',
+    name: 'CNN'
+  }
+  grabber.grab(channel, config, (data, err) => {
+    expect(err.message).toBe('Skipped')
+    done()
+  })
+})

package/tests/input/example.com.config.js

@@ -1,5 +1,6 @@
 module.exports = {
   site: 'example.com',
+  ignore: true,
   channels: 'example.com.channels.xml',
   output: 'tests/output/guide.xml',
   url: () => 'http://example.com/20210319/1tv.json',

package/tests/input/mini.config.js

@@ -1,5 +1,6 @@
 module.exports = {
   site: 'example.com',
+  ignore: true,
   url: 'http://example.com/20210319/1tv.json',
   parser: () => []
 }

package/tests/utils.test.js

@@ -7,6 +7,7 @@ it('can load valid config.js', () => {
   const config = utils.loadConfig(require(path.resolve('./tests/input/example.com.config.js')))
   expect(config).toMatchObject({
     days: 1,
+    ignore: true,
     delay: 3000,
     lang: 'en',
     site: 'example.com'
@@ -56,8 +57,8 @@ it('can convert object to xmltv string', () => {
     {
       title: 'Program 1',
       description: 'Description for Program 1',
-      start: '2021-03-19 06:00:00 +0000',
-      stop: '2021-03-19 06:30:00 +0000',
+      start: 1616133600,
+      stop: 1616135400,
       category: 'Test',
       icon: 'https://example.com/images/Program1.png?x=шеллы&sid=777',
       channel: '1TV.com',
@@ -84,8 +85,8 @@ it('can convert object to xmltv string without categories', () => {
   const programs = [
     {
       title: 'Program 1',
-      start: '2021-03-19 06:00:00 +0000',
-      stop: '2021-03-19 06:30:00 +0000',
+      start: 1616133600,
+      stop: 1616135400,
       channel: '1TV.com',
       lang: 'it'
     }
@@ -104,8 +105,8 @@ it('can convert object to xmltv string with multiple categories', () => {
     {
       title: 'Program 1',
       description: 'Description for Program 1',
-      start: '2021-03-19 06:00:00 +0000',
-      stop: '2021-03-19 06:30:00 +0000',
+      start: 1616133600,
+      stop: 1616135400,
       category: ['Test1', 'Test2'],
       icon: 'https://example.com/images/Program1.png?x=шеллы&sid=777',
       channel: '1TV.com',