epg-grabber 0.25.0 → 0.25.3

package/package.json

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

package/src/utils.js

@@ -70,9 +70,10 @@ utils.createClient = function (config) {
   client.interceptors.response.use(
     function (response) {
       if (config.debug) {
-        const data = utils.isObject(response.data)
-          ? JSON.stringify(response.data)
-          : response.data.toString()
+        const data =
+          utils.isObject(response.data) || Array.isArray(response.data)
+            ? JSON.stringify(response.data)
+            : response.data.toString()
         console.log(
           'Response:',
           JSON.stringify(
@@ -219,13 +220,15 @@ utils.convertToXMLTV = function ({ channels, programs }) {
   output += '</tv>'
 
   function createXMLTVNS(s, e) {
-    if (!s || !e) return null
+    if (!s && !e) return null
+    s = s || 1
 
     return `${s - 1}.${e - 1}.0/1`
   }
 
   function createOnScreen(s, e) {
-    if (!s || !e) return null
+    if (!s && !e) return null
+    s = s || 1
 
     s = padStart(s, 2, '0')
     e = padStart(e, 2, '0')
@@ -315,10 +318,15 @@ utils.getUTCDate = function (d = null) {
 }
 
 utils.parseResponse = async (item, response, config) => {
-  const content = utils.isObject(response.data)
-    ? JSON.stringify(response.data)
-    : response.data.toString()
-  const buffer = Buffer.from(content, 'utf8')
+  let buffer
+  let content
+  if (utils.isObject(response.data) || Array.isArray(response.data)) {
+    content = JSON.stringify(response.data)
+    buffer = Buffer.from(content, 'utf8')
+  } else {
+    content = response.data.toString()
+    buffer = response.data
+  }
   const data = merge(item, config, {
     content,
     buffer,

package/tests/utils.test.js

@@ -73,6 +73,28 @@ it('can convert object to xmltv string', () => {
   )
 })
 
+it('can convert object to xmltv string without season number', () => {
+  const file = fs.readFileSync('./tests/input/example.com.channels.xml', { encoding: 'utf-8' })
+  const { channels } = utils.parseChannels(file)
+  const programs = [
+    {
+      title: 'Program 1',
+      description: 'Description for Program 1',
+      start: 1616133600,
+      stop: 1616135400,
+      category: 'Test',
+      episode: 239,
+      icon: 'https://example.com/images/Program1.png?x=шеллы&sid=777',
+      channel: '1TV.com',
+      lang: 'it'
+    }
+  ]
+  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><episode-num system="xmltv_ns">0.238.0/1</episode-num><episode-num system="onscreen">S01E239</episode-num><icon src="https://example.com/images/Program1.png?x=шеллы&amp;sid=777"/></programme>\r\n</tv>'
+  )
+})
+
 it('can convert object to xmltv string without categories', () => {
   const channels = [
     {