epg-grabber 0.13.0 → 0.15.2

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>
@@ -78,6 +79,7 @@ Arguments:
 - `--lang`: set default language for all programs (default: 'en')
 - `--days`: number of days for which to grab the program (default: 1)
 - `--delay`: delay between requests (default: 3000)
+- `--timeout`: set a timeout for each request (default: 5000)
 - `--debug`: enable debug mode (default: false)
 - `--log`: path to log file (optional)
 - `--log-level`: set the log level (default: 'info')

package/bin/epg-grabber.js

@@ -21,6 +21,7 @@ program
   .option('--lang <lang>', 'Set default language for all programs')
   .option('--days <days>', 'Number of days for which to grab the program', parseInteger, 1)
   .option('--delay <delay>', 'Delay between requests (in mileseconds)', parseInteger)
+  .option('--timeout <timeout>', 'Set a timeout for each request (in mileseconds)', parseInteger)
   .option('--debug', 'Enable debug mode', false)
   .option('--log <log>', 'Path to log file')
   .option('--log-level <level>', 'Set log level', 'info')
@@ -60,7 +61,15 @@ async function main() {
 
   logger.info(`Loading '${options.config}'...`)
   let config = require(path.resolve(options.config))
-  config = merge(config, options)
+  config = merge(config, {
+    days: options.days,
+    debug: options.debug,
+    lang: options.lang,
+    delay: options.delay,
+    request: {
+      timeout: options.timeout
+    }
+  })
 
   if (options.channels) config.channels = options.channels
   else if (config.channels)
@@ -70,8 +79,7 @@ async function main() {
   if (!config.channels) return logger.error('Path to [site].channels.xml is missing')
   logger.info(`Loading '${config.channels}'...`)
   const channelsXML = fs.readFileSync(path.resolve(config.channels), { encoding: 'utf-8' })
-  const parsed = utils.parseChannels(channelsXML)
-  const channels = parsed.channels || []
+  const channels = utils.parseChannels(channelsXML)
 
   let programs = []
   let i = 1
@@ -96,7 +104,7 @@ async function main() {
   }
 
   const xml = utils.convertToXMLTV({ config, channels, programs })
-  const outputPath = config.output || 'guide.xml'
+  const outputPath = options.output || config.output || 'guide.xml'
   utils.writeToFile(outputPath, xml)
 
   logger.info(`File '${outputPath}' successfully saved`)

package/package.json

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

package/src/utils.js

@@ -59,11 +59,12 @@ utils.parseChannels = function (xml) {
       const channel = el.attributes
       if (!el.elements) throw new Error(`Channel '${channel.xmltv_id}' has no valid name`)
       channel.name = el.elements.find(el => el.type === 'text').text
+      channel.site = channel.site || site
 
       return channel
     })
 
-  return { site, channels }
+  return channels
 }
 
 utils.sleep = function (ms) {
@@ -122,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)
 
@@ -243,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)
@@ -264,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,5 +1,8 @@
 const { execSync } = require('child_process')
 const pwd = `${__dirname}/..`
+import axios from 'axios'
+
+jest.mock('axios')
 
 function stdoutResultTester(stdout) {
   return [`Finish`].every(val => {
@@ -19,6 +22,8 @@ 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 \
@@ -26,7 +31,8 @@ it('can load mini config', () => {
       --output=tests/output/mini.guide.xml \
       --lang=fr \
       --days=3 \
-      --delay=0`,
+      --delay=0 \
+      --timeout=10000`,
     {
       encoding: 'utf8'
     }

package/tests/input/example.com.channels.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="example.com">
   <channels>
-    <channel xmltv_id="1TV.com" site="example.com" site_id="1" lang="fr" logo="https://example.com/logos/1TV.png">1 TV</channel>
+    <channel xmltv_id="1TV.com" site_id="1" lang="fr" logo="https://example.com/logos/1TV.png">1 TV</channel>
     <channel xmltv_id="2TV.com" site="example.com" site_id="2">2 TV</channel>
   </channels>
 </site>

package/tests/utils.test.js

@@ -28,9 +28,8 @@ it('can load valid config.js', () => {
 
 it('can parse valid channels.xml', () => {
   const file = fs.readFileSync('./tests/input/example.com.channels.xml', { encoding: 'utf-8' })
-  const parsed = utils.parseChannels(file)
-  expect(parsed.site).toBe('example.com')
-  expect(parsed.channels).toEqual([
+  const channels = utils.parseChannels(file)
+  expect(channels).toEqual([
     {
       name: '1 TV',
       xmltv_id: '1TV.com',
@@ -52,22 +51,20 @@ it('can parse valid channels.xml', () => {
 
 it('can convert object to xmltv string', () => {
   const file = fs.readFileSync('./tests/input/example.com.channels.xml', { encoding: 'utf-8' })
-  const parsed = utils.parseChannels(file)
-  const channels = parsed.channels
+  const channels = utils.parseChannels(file)
   const programs = [
     {
       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',
       lang: 'it'
     }
   ]
-  const config = { site: 'example.com' }
-  const output = utils.convertToXMLTV({ config, channels, programs })
+  const output = utils.convertToXMLTV({ channels, programs })
   expect(output).toBe(
     '<?xml version="1.0" encoding="UTF-8" ?><tv>\r\n<channel id="1TV.com"><display-name>1 TV</display-name><icon src="https://example.com/logos/1TV.png"/><url>https://example.com</url></channel>\r\n<channel id="2TV.com"><display-name>2 TV</display-name><url>https://example.com</url></channel>\r\n<programme start="20210319060000 +0000" stop="20210319063000 +0000" channel="1TV.com"><title lang="it">Program 1</title><desc lang="it">Description for Program 1</desc><category lang="it">Test</category><icon src="https://example.com/images/Program1.png?x=шеллы&amp;sid=777"/></programme>\r\n</tv>'
   )
@@ -87,8 +84,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'
     }
@@ -102,22 +99,20 @@ it('can convert object to xmltv string without categories', () => {
 
 it('can convert object to xmltv string with multiple categories', () => {
   const file = fs.readFileSync('./tests/input/example.com.channels.xml', { encoding: 'utf-8' })
-  const parsed = utils.parseChannels(file)
-  const channels = parsed.channels
+  const channels = utils.parseChannels(file)
   const programs = [
     {
       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',
       lang: 'it'
     }
   ]
-  const config = { site: 'example.com' }
-  const output = utils.convertToXMLTV({ config, channels, programs })
+  const output = utils.convertToXMLTV({ channels, programs })
   expect(output).toBe(
     '<?xml version="1.0" encoding="UTF-8" ?><tv>\r\n<channel id="1TV.com"><display-name>1 TV</display-name><icon src="https://example.com/logos/1TV.png"/><url>https://example.com</url></channel>\r\n<channel id="2TV.com"><display-name>2 TV</display-name><url>https://example.com</url></channel>\r\n<programme start="20210319060000 +0000" stop="20210319063000 +0000" channel="1TV.com"><title lang="it">Program 1</title><desc lang="it">Description for Program 1</desc><category lang="it">Test1</category><category lang="it">Test2</category><icon src="https://example.com/images/Program1.png?x=шеллы&amp;sid=777"/></programme>\r\n</tv>'
   )