epg-grabber 0.36.0 → 0.37.0

package/README.md

@@ -172,27 +172,9 @@ module.exports = {
 
     return [
       {
-        title, // program title (required)
-        start, // start time of the program (required)
-        stop, // end time of the program (required)
-        sub_title, // program sub-title (optional)
-        description, // description of the program (optional)
-        category, // type of program (optional)
-        season, // season number (optional)
-        episode, // episode number (optional)
-        date, // the date the programme or film was finished (optional)
-        icon, // image associated with the program (optional)
-        rating, // program rating (optional)
-        director, // the name of director (optional)
-        actor, // the name of actor (optional)
-        writer, // the name of writer (optional)
-        adapter, // the name of adapter (optional)
-        producer, // the name of producer (optional)
-        composer, // the name of composer (optional)
-        editor, // the name of editor (optional)
-        presenter, // the name of presenter (optional)
-        commentator, // the name of commentator (optional)
-        guest // the name of guest (optional)
+        title,
+        start,
+        stop
       },
       ...
     ]
@@ -212,6 +194,176 @@ From each function in `config.js` you can access a `context` object containing t
 - `request`: The request config
 - `cached`: A boolean to check whether this request was cached or not
 
+## Program Object
+
+| Name            | Aliases                          | Type                                             | Required |
+| --------------- | -------------------------------- | ------------------------------------------------ | -------- |
+| start           |                                  | `String` or `Number` or `Date()`                 | true     |
+| stop            |                                  | `String` or `Number` or `Date()`                 | true     |
+| title           | titles                           | `String` or `Object` or `String[]` or `Object[]` | true     |
+| subTitle        | subTitles, sub_title, sub_titles | `String` or `Object` or `String[]` or `Object[]` | false    |
+| description     | desc, descriptions               | `String` or `Object` or `String[]` or `Object[]` | false    |
+| date            |                                  | `String` or `Number` or `Date()`                 | false    |
+| category        | categories                       | `String` or `Object` or `String[]` or `Object[]` | false    |
+| keyword         | keywords                         | `String` or `Object` or `String[]` or `Object[]` | false    |
+| language        | languages                        | `String` or `Object` or `String[]` or `Object[]` | false    |
+| origLanguage    | origLanguages                    | `String` or `Object` or `String[]` or `Object[]` | false    |
+| length          |                                  | `String` or `Object` or `String[]` or `Object[]` | false    |
+| url             | urls                             | `String` or `Object` or `String[]` or `Object[]` | false    |
+| country         | countries                        | `String` or `Object` or `String[]` or `Object[]` | false    |
+| video           |                                  | `Object`                                         | false    |
+| audio           |                                  | `Object`                                         | false    |
+| season          |                                  | `String` or `Number`                             | false    |
+| episode         |                                  | `String` or `Number`                             | false    |
+| episodeNumber   | episodeNum, episodeNumbers       | `Object`                                         | false    |
+| previouslyShown |                                  | `String` or `Object` or `String[]` or `Object[]` | false    |
+| premiere        |                                  | `String` or `Object` or `String[]` or `Object[]` | false    |
+| lastChance      |                                  | `String` or `Object` or `String[]` or `Object[]` | false    |
+| new             |                                  | `Boolean`                                        | false    |
+| subtitles       |                                  | `Object` or `Object[]`                           | false    |
+| rating          | ratings                          | `String` or `Object` or `String[]` or `Object[]` | false    |
+| starRating      | starRatings                      | `String` or `Object` or `String[]` or `Object[]` | false    |
+| review          | reviews                          | `String` or `Object` or `String[]` or `Object[]` | false    |
+| director        | directors                        | `String` or `Object` or `String[]` or `Object[]` | false    |
+| actor           | actors                           | `String` or `Object` or `String[]` or `Object[]` | false    |
+| writer          | writers                          | `String` or `Object` or `String[]` or `Object[]` | false    |
+| adapter         | adapters                         | `String` or `Object` or `String[]` or `Object[]` | false    |
+| producer        | producers                        | `String` or `Object` or `String[]` or `Object[]` | false    |
+| presenter       | presenters                       | `String` or `Object` or `String[]` or `Object[]` | false    |
+| composer        | composers                        | `String` or `Object` or `String[]` or `Object[]` | false    |
+| editor          | editors                          | `String` or `Object` or `String[]` or `Object[]` | false    |
+| commentator     | commentators                     | `String` or `Object` or `String[]` or `Object[]` | false    |
+| guest           | guests                           | `String` or `Object` or `String[]` or `Object[]` | false    |
+| image           | images                           | `String` or `Object` or `String[]` or `Object[]` | false    |
+| icon            | icons                            | `String` or `Object` or `String[]` or `Object[]` | false    |
+
+Example:
+
+```js
+{
+  start: '2021-03-19T06:00:00.000Z',
+  stop: '2021-03-19T06:30:00.000Z',
+  title: 'Program 1',
+  subTitle: 'Sub-title & 1',
+  description: 'Description for Program 1',
+  date: '2022-05-06',
+  categories: ['Comedy', 'Drama'],
+  keyword: [
+    { lang: 'en', value: 'physical-comedy' },
+    { lang: 'en', value: 'romantic' }
+  ],
+  language: 'English',
+  origLanguage: { lang: 'en', value: 'French' },
+  length: { units: 'minutes', value: '60' },
+  url: 'http://example.com/title.html',
+  country: 'US',
+  video: {
+    present: 'yes',
+    colour: 'no',
+    aspect: '16:9',
+    quality: 'HDTV'
+  },
+  audio: {
+    present: 'yes',
+    stereo: 'Dolby Digital'
+  },
+  season: 9,
+  episode: 239,
+  previouslyShown: [{ start: '20080711000000', channel: 'channel-two.tv' }],
+  premiere: 'First time on British TV',
+  lastChance: [{ lang: 'en', value: 'Last time on this channel' }],
+  new: true,
+  subtitles: [
+    { type: 'teletext', language: 'English' },
+    { type: 'onscreen', language: [{ lang: 'en', value: 'Spanish' }] }
+  ],
+  rating: {
+    system: 'MPAA',
+    value: 'P&G',
+    icon: 'http://example.com/pg_symbol.png'
+  },
+  starRatings: [
+    {
+      system: 'TV Guide',
+      value: '4/5',
+      icon: [{ src: 'stars.png', width: 100, height: 100 }]
+    },
+    {
+      system: 'IMDB',
+      value: '8/10'
+    }
+  ],
+  reviews: [
+    {
+      type: 'text',
+      source: 'Rotten Tomatoes',
+      reviewer: 'Joe Bloggs',
+      lang: 'en',
+      value: 'This is a fantastic show!'
+    },
+    {
+      type: 'text',
+      source: 'IDMB',
+      reviewer: 'Jane Doe',
+      lang: 'en',
+      value: 'I love this show!'
+    },
+    {
+      type: 'url',
+      source: 'Rotten Tomatoes',
+      reviewer: 'Joe Bloggs',
+      lang: 'en',
+      value: 'https://example.com/programme_one_review'
+    }
+  ],
+  directors: [
+    {
+      value: 'Director 1',
+      url: { value: 'http://example.com/director1.html', system: 'TestSystem' },
+      image: [
+        'https://example.com/image1.jpg',
+        {
+          value: 'https://example.com/image2.jpg',
+          type: 'person',
+          size: '2',
+          system: 'TestSystem',
+          orient: 'P'
+        }
+      ]
+    },
+    'Director 2'
+  ],
+  actors: ['Actor 1', 'Actor 2'],
+  writer: 'Writer 1',
+  producers: 'Roger Dobkowitz',
+  presenters: 'Drew Carey',
+  images: [
+    {
+      type: 'poster',
+      size: '1',
+      orient: 'P',
+      system: 'tvdb',
+      value: 'https://tvdb.com/programme_one_poster_1.jpg'
+    },
+    {
+      type: 'poster',
+      size: '2',
+      orient: 'P',
+      system: 'tmdb',
+      value: 'https://tmdb.com/programme_one_poster_2.jpg'
+    },
+    {
+      type: 'backdrop',
+      size: '3',
+      orient: 'L',
+      system: 'tvdb',
+      value: 'https://tvdb.com/programme_one_backdrop_3.jpg'
+    }
+  ],
+  icon: 'https://example.com/images/Program1.png?x=шеллы&sid=777'
+}
+```
+
 ## Channels List
 
 ```xml
@@ -222,7 +374,7 @@ From each function in `config.js` you can access a `context` object containing t
 </channels>
 ```
 
-You can also specify the language, site and logo for each channel individually, like so:
+You can also specify the language, site, url, logo and LCN (Logical Channel Number) for each channel individually, like so:
 
 ```xml
 <channel
@@ -231,6 +383,8 @@ You can also specify the language, site and logo for each channel individually,
   xmltv_id="France24.fr"
   lang="fr"
   logo="https://example.com/france24.png"
+  url="https://example.com/"
+  lcn="36"
 >France 24</channel>
 ```
 

package/package.json

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

package/src/Channel.js

@@ -1,13 +1,18 @@
+const { toArray } = require('./utils')
+
 class Channel {
   constructor(c) {
     const data = {
       xmltv_id: c.xmltv_id,
-      name: c.name,
+      displayNames: toArray(c.displayNames || c.displayName || c.names || c.name).map(text =>
+        toTextObject(text, c.lang)
+      ),
       site: c.site || '',
       site_id: c.site_id,
       lang: c.lang || '',
-      logo: c.logo || '',
-      url: c.url || toURL(c.site)
+      icons: toArray(c.icons || c.icon || c.logo).map(toIconObject),
+      urls: toArray(c.urls || c.url || toURL(c.site)).map(toUrlObject),
+      lcn: toArray(c.lcn).map(toTextObject)
     }
 
     for (let key in data) {
@@ -21,3 +26,34 @@ module.exports = Channel
 function toURL(site) {
   return site ? `https://${site}` : ''
 }
+
+function toTextObject(text, lang) {
+  if (typeof text === 'string') {
+    return { value: text, lang }
+  }
+
+  return {
+    value: text.value,
+    lang: text.lang
+  }
+}
+
+function toIconObject(icon) {
+  if (!icon) return { src: '' }
+  if (typeof icon === 'string') return { src: icon }
+
+  return {
+    src: icon.src,
+    width: icon.width,
+    height: icon.height
+  }
+}
+
+function toUrlObject(url) {
+  if (typeof url === 'string') return { system: '', value: url }
+
+  return {
+    system: url.system || '',
+    value: url.value || ''
+  }
+}

package/src/Program.js

@@ -9,21 +9,43 @@ class Program {
     }
 
     const data = {
-      site: c.site || '',
+      start: p.start ? toUnix(p.start) : null,
+      stop: p.stop ? toUnix(p.stop) : null,
       channel: c.xmltv_id || '',
       titles: toArray(p.titles || p.title).map(text => toTextObject(text, c.lang)),
-      sub_titles: toArray(p.sub_titles || p.sub_title).map(text => toTextObject(text, c.lang)),
+      subTitles: toArray(p.subTitles || p.subTitle || p.sub_titles || p.sub_title).map(text =>
+        toTextObject(text, c.lang)
+      ),
       descriptions: toArray(p.descriptions || p.description || p.desc).map(text =>
         toTextObject(text, c.lang)
       ),
-      icon: toIconObject(p.icon),
-      episodeNumbers: p.episodeNum || p.episodeNumbers || getEpisodeNumbers(p.season, p.episode),
       date: p.date ? toUnix(p.date) : null,
-      start: p.start ? toUnix(p.start) : null,
-      stop: p.stop ? toUnix(p.stop) : null,
+      categories: toArray(p.categories || p.category).map(text => toTextObject(text, c.lang)),
+      keywords: toArray(p.keywords || p.keyword).map(text => toTextObject(text, c.lang)),
+      languages: toArray(p.languages || p.language).map(text => toTextObject(text, c.lang)),
+      origLanguages: toArray(p.origLanguages || p.origLanguage).map(text =>
+        toTextObject(text, c.lang)
+      ),
+      length: toArray(p.length).map(toLengthObject),
       urls: toArray(p.urls || p.url).map(toUrlObject),
+      countries: toArray(p.countries || p.country).map(text => toTextObject(text, c.lang)),
+      site: c.site || '',
+      episodeNumbers: toArray(
+        p.episodeNum ||
+          p.episodeNumber ||
+          p.episodeNumbers ||
+          makeEpisodeNumberObjects(p.season, p.episode)
+      ).map(toEpisodeNumberObject),
+      video: toVideoObject(p.video),
+      audio: toAudioObject(p.audio),
+      previouslyShown: toArray(p.previouslyShown).map(toPreviouslyShownObject),
+      premiere: toArray(p.premiere).map(toTextObject),
+      lastChance: toArray(p.lastChance).map(toTextObject),
+      new: p.new,
+      subtitles: toArray(p.subtitles).map(toSubtitlesObject),
       ratings: toArray(p.ratings || p.rating).map(toRatingObject),
-      categories: toArray(p.categories || p.category).map(text => toTextObject(text, c.lang)),
+      starRatings: toArray(p.starRatings || p.starRating).map(toRatingObject),
+      reviews: toArray(p.reviews || p.review).map(toReviewObject),
       directors: toArray(p.directors || p.director).map(toPersonObject),
       actors: toArray(p.actors || p.actor).map(toPersonObject),
       writers: toArray(p.writers || p.writer).map(toPersonObject),
@@ -33,7 +55,9 @@ class Program {
       editors: toArray(p.editors || p.editor).map(toPersonObject),
       presenters: toArray(p.presenters || p.presenter).map(toPersonObject),
       commentators: toArray(p.commentators || p.commentator).map(toPersonObject),
-      guests: toArray(p.guests || p.guest).map(toPersonObject)
+      guests: toArray(p.guests || p.guest).map(toPersonObject),
+      images: toArray(p.images || p.image).map(toImageObject),
+      icons: toArray(p.icons || p.icon).map(toIconObject)
     }
 
     for (let key in data) {
@@ -71,6 +95,10 @@ function toPersonObject(person) {
   }
 }
 
+function toSubtitlesObject(subtitles) {
+  return { type: subtitles.type || '', language: toArray(subtitles.language).map(toTextObject) }
+}
+
 function toImageObject(image) {
   if (typeof image === 'string') return { type: '', size: '', orient: '', system: '', value: image }
 
@@ -84,15 +112,24 @@ function toImageObject(image) {
 }
 
 function toRatingObject(rating) {
-  if (typeof rating === 'string') return { system: '', icon: '', value: rating }
+  if (typeof rating === 'string') return { system: '', icon: [], value: rating }
 
   return {
     system: rating.system || '',
-    icon: rating.icon || '',
+    icon: toArray(rating.icon).map(toIconObject),
     value: rating.value || ''
   }
 }
 
+function toLengthObject(length) {
+  if (typeof length === 'string') return { units: '', value: length }
+
+  return {
+    units: length.units || '',
+    value: length.value || ''
+  }
+}
+
 function toUrlObject(url) {
   if (typeof url === 'string') return { system: '', value: url }
 
@@ -102,22 +139,74 @@ function toUrlObject(url) {
   }
 }
 
+function toVideoObject(video) {
+  if (!video) return {}
+
+  return {
+    present: video.present || '',
+    colour: video.colour || '',
+    aspect: video.aspect || '',
+    quality: video.quality || ''
+  }
+}
+
+function toAudioObject(audio) {
+  if (!audio) return {}
+
+  return {
+    present: audio.present || '',
+    stereo: audio.stereo || ''
+  }
+}
+
+function toReviewObject(review) {
+  if (!review) return {}
+
+  return {
+    type: review.type || '',
+    source: review.source || '',
+    reviewer: review.reviewer || '',
+    lang: review.lang || '',
+    value: review.value || ''
+  }
+}
+
+function toPreviouslyShownObject(previouslyShown) {
+  if (!previouslyShown) return {}
+
+  return {
+    start: previouslyShown.start || '',
+    channel: previouslyShown.channel || ''
+  }
+}
+
 function toIconObject(icon) {
   if (!icon) return { src: '' }
   if (typeof icon === 'string') return { src: icon }
 
   return {
-    src: icon.src || ''
+    src: icon.src,
+    width: icon.width,
+    height: icon.height
   }
 }
 
-function getEpisodeNumbers(s, e) {
+function makeEpisodeNumberObjects(s, e) {
   s = parseNumber(s)
   e = parseNumber(e)
 
   return [createXMLTVNS(s, e), createOnScreen(s, e)].filter(Boolean)
 }
 
+function toEpisodeNumberObject(episode) {
+  if (!episode) return {}
+
+  return {
+    system: episode.system || '',
+    value: episode.value || ''
+  }
+}
+
 function createXMLTVNS(s, e) {
   if (!e) return null
   s = s || 1

package/src/index.js

@@ -64,12 +64,18 @@ class EPGGrabberMock {
     this.config = config
   }
 
-  async grab(channel, date, cb) {
+  async grab(channel, date, config = {}, cb = () => {}) {
     let _date = getUTCDate(date)
-    let _programs = await this.config.parser({ channel, date: _date })
+    if (typeof config == 'function') {
+      cb = config
+      config = {}
+    }
+    config = merge(this.config, config)
+    config = parseConfig(config)
+    let _programs = await config.parser({ channel, date: _date })
     let programs = _programs.map(data => new Program(data, channel))
 
-    if (this.config.request?.timeout !== undefined && this.config.request.timeout < 1) {
+    if (config.request?.timeout !== undefined && config.request.timeout < 1) {
       cb({ programs: [], date: _date, channel }, new Error('Connection timeout'))
       return []
     }

package/src/xmltv.js

@@ -30,9 +30,12 @@ function createElements(channels, programs, date) {
       return (
         '\r\n' +
         el('channel', { id: channel.xmltv_id }, [
-          el('display-name', {}, [escapeString(channel.name)]),
-          el('icon', { src: channel.logo }),
-          el('url', {}, [channel.url])
+          ...channel.displayNames.map(name =>
+            el('display-name', { lang: name.lang }, [escapeString(name.value)])
+          ),
+          ...channel.icons.map(icon => el('icon', icon)),
+          ...channel.urls.map(createURLElement),
+          ...channel.lcn.map(lcn => el('lcn', {}, [escapeString(lcn.value)]))
         ])
       )
     }),
@@ -50,8 +53,8 @@ function createElements(channels, programs, date) {
             ...program.titles.map(title =>
               el('title', { lang: title.lang }, [escapeString(title.value)])
             ),
-            ...program.sub_titles.map(sub_title =>
-              el('sub-title', { lang: sub_title.lang }, [escapeString(sub_title.value)])
+            ...program.subTitles.map(subTitle =>
+              el('sub-title', { lang: subTitle.lang }, [escapeString(subTitle.value)])
             ),
             ...program.descriptions.map(desc =>
               el('desc', { lang: desc.lang }, [escapeString(desc.value)])
@@ -72,17 +75,83 @@ function createElements(channels, programs, date) {
             ...program.categories.map(category =>
               el('category', { lang: category.lang }, [escapeString(category.value)])
             ),
-            el('icon', { src: program.icon.src }),
-            ...program.urls.map(createURL),
+            ...program.keywords.map(keyword =>
+              el('keyword', { lang: keyword.lang }, [escapeString(keyword.value)])
+            ),
+            ...program.languages.map(language =>
+              el('language', { lang: language.lang }, [escapeString(language.value)])
+            ),
+            ...program.origLanguages.map(origLanguage =>
+              el('orig-language', { lang: origLanguage.lang }, [escapeString(origLanguage.value)])
+            ),
+            ...program.length.map(length =>
+              el('length', { units: length.units }, [escapeString(length.value)])
+            ),
+            ...program.countries.map(country =>
+              el('country', { lang: country.lang }, [escapeString(country.value)])
+            ),
+            ...program.urls.map(createURLElement),
             ...program.episodeNumbers.map(episode =>
               el('episode-num', { system: episode.system }, [episode.value])
             ),
+            el('video', {}, [
+              el('present', {}, [program.video.present]),
+              el('colour', {}, [program.video.colour]),
+              el('aspect', {}, [program.video.aspect]),
+              el('quality', {}, [program.video.quality])
+            ]),
+            el('audio', {}, [
+              el('present', {}, [program.audio.present]),
+              el('stereo', {}, [program.audio.stereo])
+            ]),
+            ...program.previouslyShown.map(previouslyShown =>
+              el('previously-shown', {
+                start: previouslyShown.start,
+                channel: previouslyShown.channel
+              })
+            ),
+            ...program.premiere.map(premiere =>
+              el('premiere', { lang: premiere.lang }, [escapeString(premiere.value)])
+            ),
+            ...program.lastChance.map(lastChance =>
+              el('last-chance', { lang: lastChance.lang }, [escapeString(lastChance.value)])
+            ),
+            program.new ? el('new') : '',
+            ...program.subtitles.map(subtitles =>
+              el(
+                'subtitles',
+                { type: subtitles.type },
+                subtitles.language.map(language =>
+                  el('language', { lang: language.lang }, [escapeString(language.value)])
+                )
+              )
+            ),
             ...program.ratings.map(rating =>
               el('rating', { system: rating.system }, [
                 el('value', {}, [escapeString(rating.value)]),
-                el('icon', { src: rating.icon })
+                ...rating.icon.map(icon => el('icon', icon))
+              ])
+            ),
+            ...program.starRatings.map(rating =>
+              el('star-rating', { system: rating.system }, [
+                el('value', {}, [escapeString(rating.value)]),
+                ...rating.icon.map(icon => el('icon', icon))
               ])
-            )
+            ),
+            ...program.reviews.map(review =>
+              el(
+                'review',
+                {
+                  type: review.type,
+                  source: review.source,
+                  reviewer: review.reviewer,
+                  lang: review.lang
+                },
+                [escapeString(review.value)]
+              )
+            ),
+            ...program.images.map(createImageElement),
+            ...program.icons.map(icon => el('icon', icon))
           ]
         )
       )
@@ -94,12 +163,12 @@ function createElements(channels, programs, date) {
 function createCastMember(position, data) {
   return el(position, {}, [
     escapeString(data.value),
-    ...data.url.map(createURL),
-    ...data.image.map(createImage)
+    ...data.url.map(createURLElement),
+    ...data.image.map(createImageElement)
   ])
 }
 
-function createImage(image) {
+function createImageElement(image) {
   return el(
     'image',
     {
@@ -112,16 +181,17 @@ function createImage(image) {
   )
 }
 
-function createURL(url) {
+function createURLElement(url) {
   return el('url', { system: url.system }, [url.value])
 }
 
-function createElement(name, attrs = {}, children = []) {
+function createElement(name, attrs, children) {
   return toString({ name, attrs, children })
 }
 
 function toString(elem) {
   if (typeof elem === 'string' || typeof elem === 'number') return elem
+  if (!elem.attrs && !elem.children) return `<${elem.name}/>`
 
   let attrs = ''
   for (let key in elem.attrs) {
@@ -131,17 +201,18 @@ function toString(elem) {
     }
   }
 
-  if (elem.children.filter(Boolean).length) {
-    let children = ''
+  let children = elem.children || []
+  if (children.filter(Boolean).length) {
+    let _children = ''
     elem.children.forEach(childElem => {
-      children += toString(childElem)
+      _children += toString(childElem)
     })
 
-    return `<${elem.name}${attrs}>${children}</${elem.name}>`
+    return `<${elem.name}${attrs}>${_children}</${elem.name}>`
   }
 
   if (!attrs) return ''
-  if (!['icon'].includes(elem.name)) return ''
+  if (!['icon', 'previously-shown'].includes(elem.name)) return ''
 
   return `<${elem.name}${attrs}/>`
 }

package/tests/Channel.test.js

@@ -11,12 +11,12 @@ it('can create new Channel', () => {
   })
 
   expect(channel).toMatchObject({
-    name: '1 TV',
+    displayNames: [{ lang: 'fr', value: '1 TV' }],
     xmltv_id: '1TV.com',
     site_id: '1',
     site: 'example.com',
-    url: 'https://example.com',
+    urls: [{ system: '', value: 'https://example.com' }],
     lang: 'fr',
-    logo: 'https://example.com/logos/1TV.png'
+    icons: [{ src: 'https://example.com/logos/1TV.png' }]
   })
 })

package/tests/Program.test.js

@@ -53,14 +53,14 @@ it('can create new Program', () => {
     site: 'example.com',
     channel: '1tv',
     titles: [{ value: 'Title', lang: 'fr' }],
-    sub_titles: [{ value: 'Subtitle', lang: 'fr' }],
+    subTitles: [{ value: 'Subtitle', lang: 'fr' }],
     descriptions: [{ value: 'Description', lang: 'fr' }],
     urls: [{ system: '', value: 'http://example.com/title.html' }],
     categories: [
       { value: 'Category1', lang: 'fr' },
       { value: 'Category2', lang: 'fr' }
     ],
-    icon: { src: 'https://example.com/image.jpg' },
+    icons: [{ src: 'https://example.com/image.jpg' }],
     episodeNumbers: [
       { system: 'xmltv_ns', value: '8.237.0/1' },
       { system: 'onscreen', value: 'S09E238' }
@@ -72,7 +72,7 @@ it('can create new Program', () => {
       {
         system: 'MPAA',
         value: 'PG',
-        icon: 'http://example.com/pg_symbol.png'
+        icon: [{ src: 'http://example.com/pg_symbol.png' }]
       }
     ],
     directors: [{ value: 'Director1', url: [], image: [] }],
@@ -154,11 +154,11 @@ it('can create program from exist object', () => {
   expect(program).toMatchObject({
     channel: '1tv',
     titles: [{ value: 'Program 1', lang: 'de' }],
-    sub_titles: [],
+    subTitles: [],
     descriptions: [],
     urls: [],
     categories: [],
-    icon: {},
+    icons: [],
     episodeNumbers: [],
     date: null,
     start: 1616133600000,
@@ -167,7 +167,7 @@ it('can create program from exist object', () => {
       {
         system: 'MPAA',
         value: 'PG',
-        icon: 'http://example.com/pg_symbol.png'
+        icon: [{ src: 'http://example.com/pg_symbol.png' }]
       }
     ],
     directors: [],

package/tests/index.test.js

@@ -114,7 +114,7 @@ it('can mock epg grabber', done => {
     site: 'example.com',
     url: 'http://example.com/20210319/1tv.json',
     parser: ({ channel, date }) => [
-      { title: `Test (${channel.name})`, start: '2021-03-19T04:30:00.000Z' }
+      { title: `Test (${channel.displayNames[0].value})`, start: '2021-03-19T04:30:00.000Z' }
     ]
   }
   const channel = new Channel({
@@ -138,9 +138,9 @@ it('can mock epg grabber', done => {
           site: 'example.com',
           channel: '1TV.fr',
           titles: [{ value: 'Test (1TV)', lang: 'fr' }],
-          sub_titles: [],
+          subTitles: [],
           descriptions: [],
-          icon: { src: '' },
+          icons: [],
           episodeNumbers: [],
           date: null,
           start: 1616128200000,
@@ -152,6 +152,21 @@ it('can mock epg grabber', done => {
           actors: [],
           writers: [],
           adapters: [],
+          audio: {},
+          video: {},
+          images: [],
+          keywords: [],
+          languages: [],
+          lastChance: [],
+          length: [],
+          new: undefined,
+          origLanguages: [],
+          premiere: [],
+          previouslyShown: [],
+          reviews: [],
+          starRatings: [],
+          subtitles: [],
+          countries: [],
           producers: [],
           composers: [],
           editors: [],

package/tests/parser.test.js

@@ -17,16 +17,16 @@ it('can parse channels.xml', () => {
     site_id: '1',
     xmltv_id: '1TV.com',
     lang: 'fr',
-    logo: 'https://example.com/logos/1TV.png',
-    name: '1 TV'
+    icons: [{ src: 'https://example.com/logos/1TV.png' }],
+    displayNames: [{ value: '1 TV', lang: 'fr' }]
   })
   expect(channels[1]).toMatchObject({
     site: 'example.com',
     site_id: '2',
     lang: '',
-    logo: '',
+    icons: [],
     xmltv_id: '2TV.com',
-    name: '2 TV'
+    displayNames: [{ value: '2 TV' }]
   })
 })
 
@@ -44,16 +44,16 @@ it('can parse channels.xml with inline site attribute', () => {
     site_id: '1',
     xmltv_id: '1TV.com',
     lang: 'fr',
-    logo: 'https://example.com/logos/1TV.png',
-    name: '1 TV'
+    icons: [{ src: 'https://example.com/logos/1TV.png' }],
+    displayNames: [{ value: '1 TV', lang: 'fr' }]
   })
   expect(channels[1]).toMatchObject({
     site: 'example.com',
     site_id: '2',
     lang: '',
-    logo: '',
+    icons: [],
     xmltv_id: '2TV.com',
-    name: '2 TV'
+    displayNames: [{ value: '2 TV' }]
   })
 })
 
@@ -69,16 +69,16 @@ it('can parse legacy channels.xml', () => {
     site_id: '1',
     xmltv_id: '1TV.com',
     lang: 'fr',
-    logo: 'https://example.com/logos/1TV.png',
-    name: '1 TV'
+    icons: [{ src: 'https://example.com/logos/1TV.png' }],
+    displayNames: [{ value: '1 TV', lang: 'fr' }]
   })
   expect(channels[1]).toMatchObject({
     site: 'example.com',
     site_id: '2',
     lang: '',
-    logo: '',
+    icons: [],
     xmltv_id: '2TV.com',
-    name: '2 TV'
+    displayNames: [{ value: '2 TV' }]
   })
 })
 

package/tests/xmltv.test.js

@@ -8,14 +8,20 @@ const channels = [
   new Channel({
     xmltv_id: '1TV.co',
     name: '1 TV',
-    logo: 'https://example.com/logos/1TV.png',
-    site: 'example.com'
+    site: 'example.com',
+    icon: [{ src: 'https://example.com/channel_one_icon.jpg', width: '100', height: '100' }],
+    url: [
+      { system: 'example', value: 'https://example.com/channel_one' },
+      { system: 'other_system', value: 'https://example.com/channel_one_alternate' }
+    ],
+    lcn: [{ value: '36' }]
   }),
   new Channel({
     xmltv_id: '2TV.co',
     name: '2 TV',
     site: 'example.com',
-    lang: 'es'
+    lang: 'es',
+    logo: 'https://example.com/logos/2TV.png'
   })
 ]
 
@@ -23,22 +29,81 @@ it('can generate xmltv', () => {
   const programs = [
     new Program(
       {
-        title: 'Program 1',
-        sub_title: 'Sub-title & 1',
-        description: 'Description for Program 1',
-        url: 'http://example.com/title.html',
         start: '2021-03-19T06:00:00.000Z',
         stop: '2021-03-19T06:30:00.000Z',
-        category: 'Test',
+        title: 'Program 1',
+        subTitle: 'Sub-title & 1',
+        description: 'Description for Program 1',
         date: '2022-05-06',
+        category: 'Test',
+        keyword: [
+          { lang: 'en', value: 'physical-comedy' },
+          { lang: 'en', value: 'romantic' }
+        ],
+        language: [{ value: 'English' }],
+        origLanguage: [{ lang: 'en', value: 'French' }],
+        length: [{ units: 'minutes', value: '60' }],
+        url: 'http://example.com/title.html',
+        country: [{ value: 'US' }],
+        video: {
+          present: 'yes',
+          colour: 'no',
+          aspect: '16:9',
+          quality: 'HDTV'
+        },
+        audio: {
+          present: 'yes',
+          stereo: 'Dolby Digital'
+        },
         season: 9,
         episode: 239,
-        icon: 'https://example.com/images/Program1.png?x=шеллы&sid=777',
+        previouslyShown: [{ start: '20080711000000', channel: 'channel-two.tv' }],
+        premiere: [{ value: 'First time on British TV' }],
+        lastChance: [{ lang: 'en', value: 'Last time on this channel' }],
+        new: true,
+        subtitles: [
+          { type: 'teletext', language: [{ value: 'English' }] },
+          { type: 'onscreen', language: [{ lang: 'en', value: 'Spanish' }] }
+        ],
         rating: {
           system: 'MPAA',
           value: 'P&G',
           icon: 'http://example.com/pg_symbol.png'
         },
+        starRating: [
+          {
+            system: 'TV Guide',
+            value: '4/5',
+            icon: [{ src: 'stars.png' }]
+          },
+          {
+            system: 'IMDB',
+            value: '8/10'
+          }
+        ],
+        review: [
+          {
+            type: 'text',
+            source: 'Rotten Tomatoes',
+            reviewer: 'Joe Bloggs',
+            lang: 'en',
+            value: 'This is a fantastic show!'
+          },
+          {
+            type: 'text',
+            source: 'IDMB',
+            reviewer: 'Jane Doe',
+            lang: 'en',
+            value: 'I love this show!'
+          },
+          {
+            type: 'url',
+            source: 'Rotten Tomatoes',
+            reviewer: 'Joe Bloggs',
+            lang: 'en',
+            value: 'https://example.com/programme_one_review'
+          }
+        ],
         director: [
           {
             value: 'Director 1',
@@ -57,7 +122,38 @@ it('can generate xmltv', () => {
           'Director 2'
         ],
         actor: ['Actor 1', 'Actor 2'],
-        writer: 'Writer 1'
+        writer: 'Writer 1',
+        image: [
+          {
+            type: 'poster',
+            size: '1',
+            orient: 'P',
+            system: 'tvdb',
+            value: 'https://tvdb.com/programme_one_poster_1.jpg'
+          },
+          {
+            type: 'poster',
+            size: '2',
+            orient: 'P',
+            system: 'tmdb',
+            value: 'https://tmdb.com/programme_one_poster_2.jpg'
+          },
+          {
+            type: 'backdrop',
+            size: '3',
+            orient: 'L',
+            system: 'tvdb',
+            value: 'https://tvdb.com/programme_one_backdrop_3.jpg'
+          },
+          {
+            type: 'backdrop',
+            size: '3',
+            orient: 'L',
+            system: 'tmdb',
+            value: 'https://tmdb.com/programme_one_backdrop_3.jpg'
+          }
+        ],
+        icon: 'https://example.com/images/Program1.png?x=шеллы&sid=777'
       },
       channels[0]
     ),
@@ -74,6 +170,6 @@ it('can generate xmltv', () => {
   const output = xmltv.generate({ channels, programs })
 
   expect(output).toBe(
-    '<?xml version="1.0" encoding="UTF-8" ?><tv date="20220505">\r\n<channel id="1TV.co"><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.co"><display-name>2 TV</display-name><url>https://example.com</url></channel>\r\n<programme start="20210319060000 +0000" stop="20210319063000 +0000" channel="1TV.co"><title>Program 1</title><sub-title>Sub-title &amp; 1</sub-title><desc>Description for Program 1</desc><credits><director>Director 1<url system="TestSystem">http://example.com/director1.html</url><image>https://example.com/image1.jpg</image><image type="person" size="2" orient="P" system="TestSystem">https://example.com/image2.jpg</image></director><director>Director 2</director><actor>Actor 1</actor><actor>Actor 2</actor><writer>Writer 1</writer></credits><date>20220506</date><category>Test</category><icon src="https://example.com/images/Program1.png?x=шеллы&amp;sid=777"/><url>http://example.com/title.html</url><episode-num system="xmltv_ns">8.238.0/1</episode-num><episode-num system="onscreen">S09E239</episode-num><rating system="MPAA"><value>P&amp;G</value><icon src="http://example.com/pg_symbol.png"/></rating></programme>\r\n<programme start="20210319060000 +0000" stop="20210319063000 +0000" channel="2TV.co"><title lang="es">Program 2</title></programme>\r\n</tv>'
+    '<?xml version="1.0" encoding="UTF-8" ?><tv date="20220505">\r\n<channel id="1TV.co"><display-name>1 TV</display-name><icon src="https://example.com/channel_one_icon.jpg" width="100" height="100"/><url system="example">https://example.com/channel_one</url><url system="other_system">https://example.com/channel_one_alternate</url><lcn>36</lcn></channel>\r\n<channel id="2TV.co"><display-name lang="es">2 TV</display-name><icon src="https://example.com/logos/2TV.png"/><url>https://example.com</url></channel>\r\n<programme start="20210319060000 +0000" stop="20210319063000 +0000" channel="1TV.co"><title>Program 1</title><sub-title>Sub-title &amp; 1</sub-title><desc>Description for Program 1</desc><credits><director>Director 1<url system="TestSystem">http://example.com/director1.html</url><image>https://example.com/image1.jpg</image><image type="person" size="2" orient="P" system="TestSystem">https://example.com/image2.jpg</image></director><director>Director 2</director><actor>Actor 1</actor><actor>Actor 2</actor><writer>Writer 1</writer></credits><date>20220506</date><category>Test</category><keyword lang="en">physical-comedy</keyword><keyword lang="en">romantic</keyword><language>English</language><orig-language lang="en">French</orig-language><length units="minutes">60</length><country>US</country><url>http://example.com/title.html</url><episode-num system="xmltv_ns">8.238.0/1</episode-num><episode-num system="onscreen">S09E239</episode-num><video><present>yes</present><colour>no</colour><aspect>16:9</aspect><quality>HDTV</quality></video><audio><present>yes</present><stereo>Dolby Digital</stereo></audio><previously-shown start="20080711000000" channel="channel-two.tv"/><premiere>First time on British TV</premiere><last-chance lang="en">Last time on this channel</last-chance><new/><subtitles type="teletext"><language>English</language></subtitles><subtitles type="onscreen"><language lang="en">Spanish</language></subtitles><rating system="MPAA"><value>P&amp;G</value><icon src="http://example.com/pg_symbol.png"/></rating><star-rating system="TV Guide"><value>4/5</value><icon src="stars.png"/></star-rating><star-rating system="IMDB"><value>8/10</value></star-rating><review type="text" source="Rotten Tomatoes" reviewer="Joe Bloggs" lang="en">This is a fantastic show!</review><review type="text" source="IDMB" reviewer="Jane Doe" lang="en">I love this show!</review><review type="url" source="Rotten Tomatoes" reviewer="Joe Bloggs" lang="en">https://example.com/programme_one_review</review><image type="poster" size="1" orient="P" system="tvdb">https://tvdb.com/programme_one_poster_1.jpg</image><image type="poster" size="2" orient="P" system="tmdb">https://tmdb.com/programme_one_poster_2.jpg</image><image type="backdrop" size="3" orient="L" system="tvdb">https://tvdb.com/programme_one_backdrop_3.jpg</image><image type="backdrop" size="3" orient="L" system="tmdb">https://tmdb.com/programme_one_backdrop_3.jpg</image><icon src="https://example.com/images/Program1.png?x=шеллы&amp;sid=777"/></programme>\r\n<programme start="20210319060000 +0000" stop="20210319063000 +0000" channel="2TV.co"><title lang="es">Program 2</title></programme>\r\n</tv>'
   )
 })

package/tests/__data__/output/guide.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?><tv date="20231125">
-<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><icon src="http://example.com/logos/1TV.png?x=шеллы&amp;sid=777"/><url>https://example.com</url></channel>
-<channel id="3TV.com"><display-name>3 TV</display-name><icon src="http://example.com/logos/1TV.png?x=шеллы&amp;sid=777"/><url>https://example2.com</url></channel>
-<channel id="4TV.com"><display-name>4 TV</display-name><icon src="http://example.com/logos/1TV.png?x=шеллы&amp;sid=777"/><url>https://example2.com</url></channel>
-</tv>