epg-grabber 0.29.1 → 0.29.2

package/bin/epg-grabber.js

@@ -9,6 +9,7 @@ const { EPGGrabber, parseChannels, generateXMLTV } = require('../src/index')
 const { create: createLogger } = require('../src/logger')
 const { parseNumber, getUTCDate } = require('../src/utils')
 const { name, version, description } = require('../package.json')
+const _ = require('lodash')
 const dayjs = require('dayjs')
 const utc = require('dayjs/plugin/utc')
 
@@ -99,6 +100,8 @@ async function main() {
     }
   }
 
+  programs = _.uniqBy(programs, p => p.start + p.channel)
+
   const xml = generateXMLTV({ channels, programs })
   let outputPath = options.output || config.output
   if (options.gzip) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epg-grabber",
-  "version": "0.29.1",
+  "version": "0.29.2",
   "description": "Node.js CLI tool for grabbing EPG from different sites",
   "main": "src/index.js",
   "preferGlobal": true,
@@ -35,6 +35,7 @@
     "commander": "^7.1.0",
     "curl-generator": "^0.2.0",
     "dayjs": "^1.10.4",
+    "epg-parser": "^0.1.6",
     "glob": "^7.1.6",
     "lodash": "^4.17.21",
     "node-gzip": "^1.1.2",

package/tests/__data__/expected/duplicates.guide.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?><tv date="20220828">
+<channel id="1TV.com"><display-name>1 TV</display-name><icon src="https://example.com/logos/1TV.png"/><url>https://example.com</url></channel>
+<channel id="2TV.com"><display-name>2 TV</display-name><url>https://example.com</url></channel>
+<programme start="20220101000000 +0000" stop="20220101010000 +0000" channel="1TV.com"><title lang="fr">Program1</title></programme>
+<programme start="20220101000000 +0000" stop="20220101010000 +0000" channel="2TV.com"><title>Program1</title></programme>
+</tv>

package/tests/__data__/input/duplicates.config.js

@@ -0,0 +1,18 @@
+module.exports = {
+  site: 'example.com',
+  url: 'https://google.com',
+  parser() {
+    return [
+      {
+        title: 'Program1',
+        start: 1640995200000,
+        stop: 1640998800000
+      },
+      {
+        title: 'Program1',
+        start: 1640995200000,
+        stop: 1640998900000
+      }
+    ]
+  }
+}

package/tests/__data__/output/duplicates.guide.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?><tv date="20220829">
+<channel id="1TV.com"><display-name>1 TV</display-name><icon src="https://example.com/logos/1TV.png"/><url>https://example.com</url></channel>
+<channel id="2TV.com"><display-name>2 TV</display-name><url>https://example.com</url></channel>
+<programme start="20220101000000 +0000" stop="20220101010000 +0000" channel="1TV.com"><title lang="fr">Program1</title></programme>
+<programme start="20220101000000 +0000" stop="20220101010000 +0000" channel="2TV.com"><title>Program1</title></programme>
+</tv>

package/tests/__data__/output/mini.guide.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?><tv date="20220829">
+<channel id="1TV.com"><display-name>1 TV</display-name><icon src="https://example.com/logos/1TV.png"/><url>https://example.com</url></channel>
+<channel id="2TV.com"><display-name>2 TV</display-name><url>https://example.com</url></channel>
+</tv>

package/tests/bin.test.js

@@ -1,4 +1,7 @@
 const { execSync } = require('child_process')
+const fs = require('fs')
+const path = require('path')
+const epgParser = require('epg-parser')
 
 const pwd = `${__dirname}/..`
 
@@ -10,7 +13,7 @@ function stdoutResultTester(stdout) {
 
 it('can load config', () => {
   const result = execSync(
-    `node ${pwd}/bin/epg-grabber.js --config=tests/input/example.config.js --delay=0`,
+    `node ${pwd}/bin/epg-grabber.js --config=tests/__data__/input/example.config.js --delay=0`,
     {
       encoding: 'utf8'
     }
@@ -22,9 +25,9 @@ it('can load config', () => {
 it('can load mini config', () => {
   const result = execSync(
     `node ${pwd}/bin/epg-grabber.js \
-      --config=tests/input/mini.config.js \
-      --channels=tests/input/example.channels.xml \
-      --output=tests/output/mini.guide.xml \
+      --config=tests/__data__/input/mini.config.js \
+      --channels=tests/__data__/input/example.channels.xml \
+      --output=tests/__data__/output/mini.guide.xml \
       --lang=fr \
       --days=3 \
       --delay=0 \
@@ -36,15 +39,17 @@ it('can load mini config', () => {
   )
 
   expect(stdoutResultTester(result)).toBe(true)
-  expect(result.includes("File 'tests/output/mini.guide.xml' successfully saved")).toBe(true)
+  expect(result.includes("File 'tests/__data__/output/mini.guide.xml' successfully saved")).toBe(
+    true
+  )
 })
 
 it('can generate gzip version', () => {
   const result = execSync(
     `node ${pwd}/bin/epg-grabber.js \
-      --config=tests/input/mini.config.js \
-      --channels=tests/input/example.channels.xml \
-      --output=tests/output/mini.guide.xml.gz \
+      --config=tests/__data__/input/mini.config.js \
+      --channels=tests/__data__/input/example.channels.xml \
+      --output=tests/__data__/output/mini.guide.xml.gz \
       --gzip`,
     {
       encoding: 'utf8'
@@ -52,5 +57,27 @@ it('can generate gzip version', () => {
   )
 
   expect(stdoutResultTester(result)).toBe(true)
-  expect(result.includes("File 'tests/output/mini.guide.xml.gz' successfully saved")).toBe(true)
+  expect(result.includes("File 'tests/__data__/output/mini.guide.xml.gz' successfully saved")).toBe(
+    true
+  )
+})
+
+it('removes duplicates of the program', () => {
+  const result = execSync(
+    `node ${pwd}/bin/epg-grabber.js \
+      --config=tests/__data__/input/duplicates.config.js \
+      --channels=tests/__data__/input/example.channels.xml \
+      --output=tests/__data__/output/duplicates.guide.xml`,
+    {
+      encoding: 'utf8'
+    }
+  )
+
+  let output = fs.readFileSync(path.resolve(__dirname, '__data__/output/duplicates.guide.xml'))
+  let expected = fs.readFileSync(path.resolve(__dirname, '__data__/expected/duplicates.guide.xml'))
+
+  output = epgParser.parse(output)
+  expected = epgParser.parse(expected)
+
+  expect(output.programs).toEqual(expected.programs)
 })

package/tests/config.test.js

@@ -3,7 +3,7 @@ import path from 'path'
 import fs from 'fs'
 
 it('can load config', () => {
-  const config = loadConfig(require(path.resolve('./tests/input/example.config.js')))
+  const config = loadConfig(require(path.resolve('./tests/__data__/input/example.config.js')))
   expect(config).toMatchObject({
     days: 1,
     delay: 3000,

package/tests/parser.test.js

@@ -4,7 +4,7 @@ import Program from '../src/Program'
 import fs from 'fs'
 
 it('can parse valid channels.xml', () => {
-  const file = fs.readFileSync('./tests/input/example.channels.xml', { encoding: 'utf-8' })
+  const file = fs.readFileSync('./tests/__data__/input/example.channels.xml', { encoding: 'utf-8' })
   const { channels, site } = parseChannels(file)
 
   expect(typeof site).toBe('string')
@@ -15,7 +15,7 @@ it('can parse valid channels.xml', () => {
 
 it('can parse programs', done => {
   const channel = new Channel({ xmltv_id: '1tv' })
-  const config = require('./input/example.config.js')
+  const config = require('./__data__/input/example.config.js')
 
   parsePrograms({ channel, config })
     .then(programs => {
@@ -28,7 +28,7 @@ it('can parse programs', done => {
 
 it('can parse programs async', done => {
   const channel = new Channel({ xmltv_id: '1tv' })
-  const config = require('./input/async.config.js')
+  const config = require('./__data__/input/async.config.js')
 
   parsePrograms({ channel, config })
     .then(programs => {