Merge branch 'iptv-org:master' into nickleby-patch-1

2026-03-22 11:50:59 -04:00 · 2025-05-30 13:39:33 -04:00
parent 3caa2cc03d c8c32cb024
commit 89007255f2
13 changed files with 291 additions and 73 deletions
--- a/SITES.md
+++ b/SITES.md
@@ -35,6 +35,7 @@
    <tr><td><a href="sites/cubmu.com">cubmu.com</a></td><td align="right">174</td><td align="right">122</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/cyta.com.cy">cyta.com.cy</a></td><td align="right">116</td><td align="right">0</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/dens.tv">dens.tv</a></td><td align="right">67</td><td align="right">64</td><td align="center">🟢</td><td></td></tr>
+    <tr><td><a href="sites/derana.lk">derana.lk</a></td><td align="right">1</td><td align="right">1</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/digea.gr">digea.gr</a></td><td align="right">92</td><td align="right">0</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/digiturk.com.tr">digiturk.com.tr</a></td><td align="right">108</td><td align="right">107</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/directv.com">directv.com</a></td><td align="right">1043</td><td align="right">696</td><td align="center">🔴</td><td>https://github.com/iptv-org/epg/issues/2284</td></tr>
@@ -53,7 +54,8 @@
    <tr><td><a href="sites/epg.iptvx.one">epg.iptvx.one</a></td><td align="right">2862</td><td align="right">747</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/epg.telemach.ba">epg.telemach.ba</a></td><td align="right">259</td><td align="right">0</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/epg.telemach.me">epg.telemach.me</a></td><td align="right">216</td><td align="right">0</td><td align="center">🟢</td><td></td></tr>
-    <tr><td><a href="sites/epgshare01.online">epgshare01.online</a></td><td align="right">20970</td><td align="right">17</td><td align="center">🟢</td><td></td></tr>
+    <tr><td><a href="sites/epgmaster.com">epgmaster.com</a></td><td align="right">1</td><td align="right">1</td><td align="center">🟢</td><td></td></tr>
+    <tr><td><a href="sites/epgshare01.online">epgshare01.online</a></td><td align="right">20971</td><td align="right">17</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/firstmedia.com">firstmedia.com</a></td><td align="right">116</td><td align="right">101</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/foxsports.com.au">foxsports.com.au</a></td><td align="right">7</td><td align="right">7</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/foxtel.com.au">foxtel.com.au</a></td><td align="right">155</td><td align="right">87</td><td align="center">🟢</td><td></td></tr>
@@ -147,7 +149,7 @@
    <tr><td><a href="sites/singtel.com">singtel.com</a></td><td align="right">155</td><td align="right">113</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/sjonvarp.is">sjonvarp.is</a></td><td align="right">13</td><td align="right">13</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/sky.co.nz">sky.co.nz</a></td><td align="right">111</td><td align="right">93</td><td align="center">🟢</td><td></td></tr>
-    <tr><td><a href="sites/sky.com">sky.com</a></td><td align="right">532</td><td align="right">433</td><td align="center">🟢</td><td>https://github.com/iptv-org/epg/issues/2763</td></tr>
+    <tr><td><a href="sites/sky.com">sky.com</a></td><td align="right">559</td><td align="right">458</td><td align="center">🟢</td><td>https://github.com/iptv-org/epg/issues/2763</td></tr>
    <tr><td><a href="sites/sky.de">sky.de</a></td><td align="right">75</td><td align="right">75</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/skylife.co.kr">skylife.co.kr</a></td><td align="right">251</td><td align="right">0</td><td align="center">🟢</td><td></td></tr>
    <tr><td><a href="sites/skyperfectv.co.jp">skyperfectv.co.jp</a></td><td align="right">137</td><td align="right">130</td><td align="center">🟢</td><td></td></tr>
--- a/sites/derana.lk/data/content.json
+++ b/sites/derana.lk/data/content.json
--- a/sites/derana.lk/derana.lk.channels.xml
+++ b/sites/derana.lk/derana.lk.channels.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<channels>
+  <channel site="derana.lk" lang="sn" xmltv_id="TVDerana.lk" site_id="#">TV Derana</channel>
+</channels>
--- a/sites/derana.lk/derana.lk.config.js
+++ b/sites/derana.lk/derana.lk.config.js
@@ -0,0 +1,48 @@
+const dayjs = require('dayjs')
+const utc = require('dayjs/plugin/utc')
+const customParseFormat = require('dayjs/plugin/customParseFormat')
+const parseDuration = require('parse-duration').default
+const timezone = require('dayjs/plugin/timezone')
+const _ = require('lodash')
+
+dayjs.extend(customParseFormat)
+dayjs.extend(utc)
+dayjs.extend(timezone)
+
+module.exports = {
+  site: 'derana.lk',
+  url({ date }) {
+    return `https://derana.lk/api/schedules/${date.format('DD-MM-YYYY')}`
+  },
+  parser({ content }) {
+    const programs = parseItems(content).map(item => {
+      const start = parseStart(item)
+      const duration = parseDuration(item.duration)
+      const stop = start.add(duration, 'ms')
+
+      return {
+        title: item.dramaName,
+        image: item.imageUrl,
+        start,
+        stop
+      }
+    })
+
+    return _.sortBy(programs, p => p.start)
+  }
+}
+
+function parseStart(item) {
+  return dayjs.tz(`${item.date} ${item.time}`, 'DD-MM-YYYY H:mm A', 'Asia/Colombo')
+}
+
+function parseItems(content) {
+  try {
+    const data = JSON.parse(content)
+    if (!data || !Array.isArray(data.all_schedules)) return []
+
+    return data.all_schedules
+  } catch {
+    return []
+  }
+}
--- a/sites/derana.lk/derana.lk.test.js
+++ b/sites/derana.lk/derana.lk.test.js
@@ -0,0 +1,50 @@
+const { parser, url } = require('./derana.lk.config.js')
+const fs = require('fs')
+const path = require('path')
+const dayjs = require('dayjs')
+const utc = require('dayjs/plugin/utc')
+const customParseFormat = require('dayjs/plugin/customParseFormat')
+dayjs.extend(customParseFormat)
+dayjs.extend(utc)
+
+const date = dayjs.utc('2025-05-18', 'YYYY-MM-DD').startOf('d')
+
+it('can generate valid url', () => {
+  expect(url({ date })).toBe('https://derana.lk/api/schedules/18-05-2025')
+})
+
+it('can parse response', () => {
+  const content = fs.readFileSync(path.resolve(__dirname, '__data__/content.json'))
+
+  let results = parser({ content })
+  results = results.map(p => {
+    p.start = p.start.toJSON()
+    p.stop = p.stop.toJSON()
+
+    return p
+  })
+
+  expect(results.length).toBe(20)
+  expect(results[0]).toMatchObject({
+    title: 'Dahami Derana',
+    image: 'https://derana.lk/storage/uploads/imgs/program/51/20240717062206.jpg',
+    start: '2025-05-17T23:05:00.000Z',
+    stop: '2025-05-18T00:55:00.000Z'
+  })
+  expect(results[1]).toMatchObject({
+    title: 'Derana Aruna',
+    image: 'https://derana.lk/storage/uploads/imgs/program/15/20240613075807.jpg',
+    start: '2025-05-18T00:55:00.000Z',
+    stop: '2025-05-18T02:00:00.000Z'
+  })
+})
+
+it('can handle empty guide', () => {
+  const results = parser({
+    content: {
+      error: 'An error occurred'
+    }
+  })
+
+  expect(results).toMatchObject([])
+})
--- a/sites/derana.lk/readme.md
+++ b/sites/derana.lk/readme.md
@@ -0,0 +1,15 @@
+# derana.lk
+
+https://www.derana.lk/schedule
+
+### Download the guide
+
+```sh
+npm run grab --- --site=derana.lk
+```
+
+### Test
+
+```sh
+npm test --- derana.lk
+```
--- a/sites/epgmaster.com/data/content.json
+++ b/sites/epgmaster.com/data/content.json
--- a/sites/epgmaster.com/epgmaster.com.channels.xml
+++ b/sites/epgmaster.com/epgmaster.com.channels.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<channels>
+  <channel site="epgmaster.com" lang="ne" xmltv_id="NepalTelevision.np" site_id="ntv">NTV</channel>
+</channels>
--- a/sites/epgmaster.com/epgmaster.com.config.js
+++ b/sites/epgmaster.com/epgmaster.com.config.js
@@ -0,0 +1,45 @@
+const dayjs = require('dayjs')
+const utc = require('dayjs/plugin/utc')
+const customParseFormat = require('dayjs/plugin/customParseFormat')
+
+dayjs.extend(customParseFormat)
+dayjs.extend(utc)
+
+const TOKEN = '1610283054'
+
+module.exports = {
+  site: 'epgmaster.com',
+  url({ channel }) {
+    return `https://epgmaster.com/api/channels/${channel.site_id}/epgs?token=${TOKEN}`
+  },
+  parser({ content, date }) {
+    return parseItems(content, date).map(item => {
+      return {
+        title: item.programName,
+        start: parseStart(item),
+        stop: parseStop(item)
+      }
+    })
+  }
+}
+
+function parseStart(item) {
+  return dayjs.utc(`${item.startDate} ${item.startTime}`, 'YYYY-MM-DD HH:mm:ss')
+}
+
+function parseStop(item) {
+  return dayjs.utc(`${item.startDate} ${item.endTime}`, 'YYYY-MM-DD HH:mm:ss')
+}
+
+function parseItems(content, date) {
+  try {
+    const data = JSON.parse(content)
+    if (!data || !Array.isArray(data)) return []
+    const filtered = data.find(group => date.format('YYYY-MM-DD') === group.date)
+    if (!filtered || !Array.isArray(filtered.epgTokenList)) return []
+
+    return filtered.epgTokenList
+  } catch {
+    return []
+  }
+}
--- a/sites/epgmaster.com/epgmaster.com.test.js
+++ b/sites/epgmaster.com/epgmaster.com.test.js
@@ -0,0 +1,45 @@
+const { parser, url } = require('./epgmaster.com.config.js')
+const fs = require('fs')
+const path = require('path')
+const dayjs = require('dayjs')
+const utc = require('dayjs/plugin/utc')
+const customParseFormat = require('dayjs/plugin/customParseFormat')
+dayjs.extend(customParseFormat)
+dayjs.extend(utc)
+
+const date = dayjs.utc('2025-05-18', 'YYYY-MM-DD').startOf('d')
+const channel = { site_id: 'ntv' }
+
+it('can generate valid url', () => {
+  expect(url({ channel })).toBe('https://epgmaster.com/api/channels/ntv/epgs?token=1610283054')
+})
+
+it('can parse response', () => {
+  const content = fs.readFileSync(path.resolve(__dirname, '__data__/content.json'))
+
+  let results = parser({ content, date })
+  results = results.map(p => {
+    p.start = p.start.toJSON()
+    p.stop = p.stop.toJSON()
+
+    return p
+  })
+
+  expect(results.length).toBe(46)
+  expect(results[0]).toMatchObject({
+    title: 'Krishi Teleflim-Bharosa Yuwama',
+    start: '2025-05-18T00:00:00.000Z',
+    stop: '2025-05-18T00:15:00.000Z'
+  })
+  expect(results[1]).toMatchObject({
+    title: 'News in Nepali [Rec.]',
+    start: '2025-05-18T00:15:00.000Z',
+    stop: '2025-05-18T00:45:00.000Z'
+  })
+})
+
+it('can handle empty guide', () => {
+  const results = parser({ content: '', date })
+
+  expect(results).toMatchObject([])
+})
--- a/sites/epgmaster.com/readme.md
+++ b/sites/epgmaster.com/readme.md
@@ -0,0 +1,15 @@
+# epgmaster.com
+
+https://epgmaster.com
+
+### Download the guide
+
+```sh
+npm run grab --- --site=epgmaster.com
+```
+
+### Test
+
+```sh
+npm test --- epgmaster.com
+```
--- a/sites/epgshare01.online/epgshare01.online_RAKUTEN_PL1.channels.xml
+++ b/sites/epgshare01.online/epgshare01.online_RAKUTEN_PL1.channels.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
-  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Africanews.English.pl">PL: Africanews English</channel>
+  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Africanews.pl">PL: Africanews</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.AFV.Family.pl">PL: AFV Family</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.American.Crime.Channel.pl">PL: American Crime Channel</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Baby.Shark.TV.pl">PL: Baby Shark TV</channel>
@@ -9,6 +9,7 @@
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Bloomberg.Television.pl">PL: Bloomberg Television</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Buzzfeed.Unsolved.pl">PL: Buzzfeed Unsolved</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Car.City.Adventures.pl">PL: Car City Adventures</channel>
+  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Cartoon.Classics.pl">PL: Cartoon Classics</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.CGTN.Documentary.pl">PL: CGTN Documentary</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.CGTN.pl">PL: CGTN</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.CLUBBING.TV.pl">PL: CLUBBING TV</channel>
@@ -28,7 +29,6 @@
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Hard.Knocks.Fighting.Championship.pl">PL: Hard Knocks Fighting Championship</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Jail.pl">PL: Jail</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Lone.Star.pl">PL: Lone Star</channel>
-  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.MAVTV.International.pl">PL: MAVTV International</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Moconomy.-.Gospodarka.i.Finanse.pl">PL: Moconomy - Gospodarka i Finanse</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Monster.Jam.pl">PL: Monster Jam</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Motorsport.tv.pl">PL: Motorsport.tv</channel>
@@ -41,10 +41,10 @@
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.PFL.MMA.pl">PL: PFL MMA</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Qello.Concerts.by.Stingray.pl">PL: Qello Concerts by Stingray</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Qwest.TV.pl">PL: Qwest TV</channel>
+  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.RACER.International.pl">PL: RACER International</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Rakuten.VIKI.pl">PL: Rakuten VIKI</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Red.Bull.TV.pl">PL: Red Bull TV</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Red.Carpet.TV.International.pl">PL: Red Carpet TV International</channel>
-  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Reuters.pl">PL: Reuters</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Revry.News.pl">PL: Revry News</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Revry.pl">PL: Revry</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Royalworld.-.Arystokracja.&amp;.Dynastie.pl">PL: Royalworld - Arystokracja &amp;amp; Dynastie</channel>
@@ -58,6 +58,7 @@
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.The.Design.Network.pl">PL: The Design Network</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.The.Guardian.pl">PL: The Guardian</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.The.Pet.Collective.pl">PL: The Pet Collective</channel>
+  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.The.Reuters.60.pl">PL: The Reuters 60</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.TNA.Wrestling.Channel.pl">PL: TNA Wrestling Channel</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.TOP.Barça.pl">PL: TOP Barça</channel>
  <channel site="epgshare01.online" lang="en" xmltv_id="" site_id="RAKUTEN_PL1#PL:.Top.Million.Dollar.Agent.pl">PL: Top Million Dollar Agent</channel>
--- a/sites/sky.com/sky.com.channels.xml
+++ b/sites/sky.com/sky.com.channels.xml
@@ -7,25 +7,31 @@
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1029">XXX Girl Girl</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1030">Rewind TV</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1031">TVX 40+</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="1081">U&amp;Drama+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1083">Heart 90s</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1101">Ideal World HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1102">Sky Intro</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1103">NOW XMAS</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1114">Sky Intro</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="1139">U&amp;Yesterday HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1142">TRUE CRIME</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1148">Virgin Radio</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1205">LBC News</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1224">That&apos;s Dance</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="1228">LoveWorld HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1232">TRUE CRIME X</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1261">RTÉ Radio 1</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1262">RTÉ 2FM</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1263">RTÉ R na G</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1264">RTÉ Lyric fm</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="1289">Premier 1 HD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="1290">Premier 2 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1305">That&apos;s Melody</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="1850">Chl Line-up</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="2021">BBC R Cymru 2</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="2026">BBC R5L</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="2034">BBC R5SX</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="2084">BBC Three HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="2111">BBC R1</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="2112">BBC R2</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="2113">BBC R3</channel>
@@ -42,7 +48,20 @@
  <channel site="sky.com" lang="en" xmltv_id="" site_id="2128">BBC R4 Extra</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="2129">BBC RnGàid</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="2130">BBC R London</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="2302">U&amp;Eden</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="2303">U&amp;Alibi</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="2304">U&amp;Gold</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="2305">U&amp;Yesterday</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="2306">U&amp;Dave</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="2307">U&amp;Eden+1</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="2320">U&amp;DaveJaVu</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="2418">ID</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="2612">U&amp;Drama</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="2615">U&amp;Yesterday+1</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="2616">U&amp;W+1</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="2617">U&amp;W</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="2630">U&amp;Alibi+1</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="2703">U&amp;Gold+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="2902">talkSPORT</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="2903">Gold Radio</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="2904">Radio X</channel>
@@ -53,6 +72,7 @@
  <channel site="sky.com" lang="en" xmltv_id="" site_id="2926">LBC</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="2928">Heart 80s</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="2971">Capital XTRA</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="3021">BBC ALBA HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="3117">EWTN Catholic</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="3202">MTA1 World HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="3352">TRUE CRIME</channel>
@@ -62,7 +82,11 @@
  <channel site="sky.com" lang="en" xmltv_id="" site_id="3400">Babenation</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="3470">Classic FM</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="3731">NTD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="3809">U&amp;Dave HD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="3810">U&amp;W HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="3815">CHSTV</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="3825">U&amp;Alibi HD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="" site_id="4110">GEO TV</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="4155">TWR</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="4158">WRN Europe</channel>
  <channel site="sky.com" lang="en" xmltv_id="" site_id="4163">EWTN Catholic</channel>
@@ -90,10 +114,7 @@
  <channel site="sky.com" lang="en" xmltv_id="AhlebaitTV.uk" site_id="6765">Ahlebait TV</channel>
  <channel site="sky.com" lang="en" xmltv_id="AkaalChannel.uk" site_id="5087">Akaal Channel</channel>
  <channel site="sky.com" lang="en" xmltv_id="alibi.ie" site_id="2330">U&amp;Alibi</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="2303">U&amp;Alibi</channel>
  <channel site="sky.com" lang="en" xmltv_id="alibi.ie@HD" site_id="3077">U&amp;Alibi HD</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="3825">U&amp;Alibi HD</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="2630">U&amp;Alibi+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="AlJazeera.qa@English" site_id="1023">Al Jazeera HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="AnimalPlanet.uk" site_id="2402">Animal Planet</channel>
  <channel site="sky.com" lang="en" xmltv_id="AnimalPlanet.uk@Plus1" site_id="1352">Animal Plnt+1</channel>
@@ -104,9 +125,8 @@
  <channel site="sky.com" lang="en" xmltv_id="B4UMovies.in@UK" site_id="5703">B4U Movies</channel>
  <channel site="sky.com" lang="en" xmltv_id="B4UMusic.in@UK" site_id="5708">B4U Music</channel>
  <channel site="sky.com" lang="en" xmltv_id="BabyTV.uk" site_id="3645">BabyTV</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="3021">BBC ALBA HD</channel>
-  <channel site="sky.com" lang="en" xmltv_id="BBCFour.uk@IrelandHD" site_id="2091">BBC Four HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="BBCFour.uk@HD" site_id="2086">BBC Four HD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="BBCFour.uk@IrelandHD" site_id="2091">BBC Four HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="BBCNews.uk@HD" site_id="2085">BBC NEWS HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="BBCOne.uk@ChannelIslandsHD" site_id="3018">BBC One CI HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="BBCOne.uk@EastHD" site_id="3006">BBC One EastHD</channel>
@@ -128,7 +148,6 @@
  <channel site="sky.com" lang="en" xmltv_id="BBCParliament.uk@HD" site_id="3020">BBC Parl HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="BBCRedButton1.uk@HD" site_id="2053">BBC RB 1 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="BBCScotland.uk@HD" site_id="1138">BBCScotlandHD</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="2084">BBC Three HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="BBCThree.uk@HD" site_id="2080">BBC Three HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="BBCTwo.uk@HD" site_id="2075">BBC Two HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="BBCTwo.uk@NorthernIrelandHD" site_id="1135">BBC Two NI HD</channel>
@@ -153,24 +172,18 @@
  <channel site="sky.com" lang="en" xmltv_id="CBSReality.uk@Plus1" site_id="3602">TRUE CRIME+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="Challenge.ie" site_id="2203">Challenge</channel>
  <channel site="sky.com" lang="en" xmltv_id="Challenge.uk" site_id="2202">Challenge</channel>
-  <channel site="sky.com" lang="en" xmltv_id="Channel4.uk@IrelandHD" site_id="1246">Channel 4 HD</channel>
-  <!--
-  <channel site="sky.com" lang="en" xmltv_id="Channel4.uk@IrelandHD" site_id="1250">Channel 4 HD</channel>
-  -->
  <channel site="sky.com" lang="en" xmltv_id="Channel4.uk@HD" site_id="1202">Channel 4 HD</channel>
-  <!--
  <channel site="sky.com" lang="en" xmltv_id="Channel4.uk@HD" site_id="1213">Channel 4 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="Channel4.uk@HD" site_id="1248">Channel 4 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="Channel4.uk@HD" site_id="1249">Channel 4 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="Channel4.uk@HD" site_id="4075">Channel 4 HD</channel>
-  -->
+  <channel site="sky.com" lang="en" xmltv_id="Channel4.uk@IrelandHD" site_id="1246">Channel 4 HD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="Channel4.uk@IrelandHD" site_id="1250">Channel 4 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="Channel4.uk@IrelandPlus1" site_id="1667">Channel 4+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="Channel4.uk@Plus1" site_id="1670">Channel 4+1</channel>
-  <!--
  <channel site="sky.com" lang="en" xmltv_id="Channel4.uk@Plus1" site_id="1671">Channel 4+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="Channel4.uk@Plus1" site_id="1673">Channel 4+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="Channel4.uk@Plus1" site_id="1675">Channel 4+1</channel>
-  -->
  <channel site="sky.com" lang="en" xmltv_id="Channel5.uk" site_id="1800">Channel 5</channel>
  <channel site="sky.com" lang="en" xmltv_id="Channel5.uk@HD" site_id="4058">Channel 5 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="Channel5.uk@Plus1" site_id="1839">Channel 5+1</channel>
@@ -185,10 +198,10 @@
  <channel site="sky.com" lang="en" xmltv_id="ColorsRishteyEurope.in" site_id="3916">ColorsRishtey</channel>
  <channel site="sky.com" lang="en" xmltv_id="ComedyCentral.ie" site_id="3705">ComedyCentral</channel>
  <channel site="sky.com" lang="en" xmltv_id="ComedyCentral.uk" site_id="2510">ComedyCentral</channel>
-  <channel site="sky.com" lang="en" xmltv_id="ComedyCentralExtra.ie" site_id="2709">ComedyXtra</channel>
-  <channel site="sky.com" lang="en" xmltv_id="ComedyCentralExtra.uk" site_id="1813">ComedyXtra</channel>
  <channel site="sky.com" lang="en" xmltv_id="ComedyCentral.uk@HD" site_id="4056">ComedyCentHD</channel>
  <channel site="sky.com" lang="en" xmltv_id="ComedyCentral.uk@Plus1" site_id="3802">ComedyCent+1</channel>
+  <channel site="sky.com" lang="en" xmltv_id="ComedyCentralExtra.ie" site_id="2709">ComedyXtra</channel>
+  <channel site="sky.com" lang="en" xmltv_id="ComedyCentralExtra.uk" site_id="1813">ComedyXtra</channel>
  <channel site="sky.com" lang="en" xmltv_id="CourtTV.uk" site_id="1207">Court TV</channel>
  <channel site="sky.com" lang="en" xmltv_id="CrimePlusInvestigation.ie" site_id="1072">Crime+Inv</channel>
  <channel site="sky.com" lang="en" xmltv_id="CrimePlusInvestigation.uk" site_id="1448">Crime+Inv</channel>
@@ -197,15 +210,12 @@
  <channel site="sky.com" lang="en" xmltv_id="Cruise1stTV.uk" site_id="1018">Cruise1st.tv</channel>
  <channel site="sky.com" lang="en" xmltv_id="Cula4.ie@HD" site_id="1861">Cúla4 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="Dave.ie" site_id="2376">U&amp;Dave</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="2306">U&amp;Dave</channel>
  <channel site="sky.com" lang="en" xmltv_id="Dave.ie@HD" site_id="3078">U&amp;Dave HD</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="3809">U&amp;Dave HD</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="2320">U&amp;DaveJaVu</channel>
  <channel site="sky.com" lang="en" xmltv_id="DaystarTV.us" site_id="5541">DAYSTAR HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="DeenTV.uk" site_id="1235">Deen TV</channel>
-  <channel site="sky.com" lang="en" xmltv_id="DiscoveryChannel.uk@Ireland" site_id="1370">Discovery</channel>
  <channel site="sky.com" lang="en" xmltv_id="DiscoveryChannel.uk" site_id="2401">Discovery</channel>
  <channel site="sky.com" lang="en" xmltv_id="DiscoveryChannel.uk@HD" site_id="4003">Discovery HD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="DiscoveryChannel.uk@Ireland" site_id="1370">Discovery</channel>
  <channel site="sky.com" lang="en" xmltv_id="DiscoveryChannel.uk@Plus1" site_id="2404">Discovery+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="DiscoveryHistory.uk" site_id="2407">Disc.History</channel>
  <channel site="sky.com" lang="en" xmltv_id="DiscoveryHistory.uk@Plus1" site_id="3760">Disc.History+1</channel>
@@ -213,21 +223,17 @@
  <channel site="sky.com" lang="en" xmltv_id="DiscoveryScienceEurope.uk@UKHD@Plus1" site_id="1351">Disc.Sci+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="DiscoveryTurbo.uk" site_id="2409">Disc.Turbo</channel>
  <channel site="sky.com" lang="en" xmltv_id="DiscoveryTurbo.uk@Plus1" site_id="5245">Disc.Turbo+1</channel>
-  <channel site="sky.com" lang="en" xmltv_id="DMAX.uk@Ireland" site_id="4548">DMAX</channel>
  <channel site="sky.com" lang="en" xmltv_id="DMAX.uk" site_id="3618">DMAX</channel>
+  <channel site="sky.com" lang="en" xmltv_id="DMAX.uk@Ireland" site_id="4548">DMAX</channel>
  <channel site="sky.com" lang="en" xmltv_id="DMAX.uk@Plus1" site_id="1865">DMAX+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="Drama.ie" site_id="2613">U&amp;Drama</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="2612">U&amp;Drama</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="1081">U&amp;Drama+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="DunamisTV.ng" site_id="1191">Dunamis TV</channel>
  <channel site="sky.com" lang="en" xmltv_id="E4.ie" site_id="1637">E4</channel>
-  <channel site="sky.com" lang="en" xmltv_id="E4.uk" site_id="1628">E4</channel>
-  <channel site="sky.com" lang="en" xmltv_id="E4Extra.uk" site_id="1758">E4 Extra</channel>
-  <channel site="sky.com" lang="en" xmltv_id="E4.uk@HD" site_id="4076">E4 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="E4.ie@Plus1" site_id="1668">E4+1</channel>
+  <channel site="sky.com" lang="en" xmltv_id="E4.uk" site_id="1628">E4</channel>
+  <channel site="sky.com" lang="en" xmltv_id="E4.uk@HD" site_id="4076">E4 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="E4.uk@Plus1" site_id="3300">E4+1</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="2302">U&amp;Eden</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="2307">U&amp;Eden+1</channel>
+  <channel site="sky.com" lang="en" xmltv_id="E4Extra.uk" site_id="1758">E4 Extra</channel>
  <channel site="sky.com" lang="en" xmltv_id="EmanChannel.uk" site_id="3111">Eman Channel</channel>
  <channel site="sky.com" lang="en" xmltv_id="EuronewsEnglish.fr" site_id="4604">Euronews</channel>
  <channel site="sky.com" lang="en" xmltv_id="Eurosport1.fr@UK" site_id="1726">Eurosport 1</channel>
@@ -248,19 +254,16 @@
  <channel site="sky.com" lang="en" xmltv_id="GBNews.uk" site_id="1196">GB News HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="GemsTV.uk" site_id="3010">Gems TV</channel>
  <channel site="sky.com" lang="en" xmltv_id="GeoNewsInternational.pk" site_id="4407">GEO News</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="4110">GEO TV</channel>
  <channel site="sky.com" lang="en" xmltv_id="GODTV.uk" site_id="3105">GOD Channel</channel>
-  <channel site="sky.com" lang="en" xmltv_id="GOLD.ie" site_id="2365">U&amp;Gold</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="2304">U&amp;Gold</channel>
-  <channel site="sky.com" lang="en" xmltv_id="GOLDHD.uk" site_id="6513">U&amp;Gold HD</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="2703">U&amp;Gold+1</channel>
+  <channel site="sky.com" lang="en" xmltv_id="UGold.uk@SD" site_id="2365">U&amp;Gold</channel>
+  <channel site="sky.com" lang="en" xmltv_id="UGold.uk@HD" site_id="6513">U&amp;Gold HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="GREATaction.uk" site_id="3708">GREAT! action</channel>
  <channel site="sky.com" lang="en" xmltv_id="GREATaction.uk@Plus1" site_id="3721">GREAT!action+1</channel>
-  <channel site="sky.com" lang="en" xmltv_id="GREATmovies.uk@Ireland" site_id="1318">GREAT! movies</channel>
  <channel site="sky.com" lang="en" xmltv_id="GREATmovies.uk" site_id="3709">GREAT! movies</channel>
+  <channel site="sky.com" lang="en" xmltv_id="GREATmovies.uk@Ireland" site_id="1318">GREAT! movies</channel>
  <channel site="sky.com" lang="en" xmltv_id="GREATmovies.uk@Plus1" site_id="3771">GREAT! movies+1</channel>
-  <channel site="sky.com" lang="en" xmltv_id="GREATromance.uk@Ireland" site_id="1133">GREAT! xmas</channel>
  <channel site="sky.com" lang="en" xmltv_id="GREATromance.uk" site_id="3643">GREAT! xmas</channel>
+  <channel site="sky.com" lang="en" xmltv_id="GREATromance.uk@Ireland" site_id="1133">GREAT! xmas</channel>
  <channel site="sky.com" lang="en" xmltv_id="GREATromance.uk@Plus1" site_id="3751">GREAT! xmas+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="GREATtv.ie" site_id="1320">GREAT! tv</channel>
  <channel site="sky.com" lang="en" xmltv_id="GREATtv.uk" site_id="4266">GREAT! tv</channel>
@@ -288,7 +291,6 @@
  <channel site="sky.com" lang="en" xmltv_id="ITV1.uk@BorderScotlandHD" site_id="3063">ITV1 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="ITV1.uk@GranadaHD" site_id="6505">ITV1 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="ITV1.uk@HD" site_id="1043">ITV1 HD</channel>
-  <!--
  <channel site="sky.com" lang="en" xmltv_id="ITV1.uk@HD" site_id="1044">ITV1 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="ITV1.uk@HD" site_id="1045">ITV1 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="ITV1.uk@HD" site_id="1061">ITV1 HD</channel>
@@ -300,15 +302,12 @@
  <channel site="sky.com" lang="en" xmltv_id="ITV1.uk@HD" site_id="1219">ITV1 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="ITV1.uk@HD" site_id="3062">ITV1 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="ITV1.uk@HD" site_id="6503">ITV1 HD</channel>
-  -->
  <channel site="sky.com" lang="en" xmltv_id="ITV1.uk@LondonHD" site_id="6504">ITV1 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="ITV1.uk@MeridianHD" site_id="6502">ITV1 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="ITV1.uk@Plus1" site_id="6145">ITV1+1</channel>
-  <!--
  <channel site="sky.com" lang="en" xmltv_id="ITV1.uk@Plus1" site_id="6155">ITV1+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="ITV1.uk@Plus1" site_id="6355">ITV1+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="ITV1.uk@Plus1" site_id="6365">ITV1+1</channel>
-  -->
  <channel site="sky.com" lang="en" xmltv_id="ITV1.uk@WalesHD" site_id="6501">ITV1 Wales HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="ITV2.uk@HD" site_id="6532">ITV2 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="ITV2.uk@Plus1" site_id="6241">ITV2+1</channel>
@@ -322,7 +321,6 @@
  <channel site="sky.com" lang="en" xmltv_id="Legend.uk" site_id="4610">LEGEND</channel>
  <channel site="sky.com" lang="en" xmltv_id="LFCTV.uk" site_id="3845">LFCTV HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="LondonLive.uk" site_id="5090">London Live</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="1228">LoveWorld HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="MadaniChannelEnglish.pk" site_id="4460">Madani Chnl</channel>
  <channel site="sky.com" lang="en" xmltv_id="MasalaTV.pk" site_id="1069">HUM Masala</channel>
  <channel site="sky.com" lang="en" xmltv_id="MATVChannel.uk" site_id="3401">MATV National</channel>
@@ -334,9 +332,9 @@
  <channel site="sky.com" lang="en" xmltv_id="Movies24Plus.uk" site_id="4421">Christmas24+</channel>
  <channel site="sky.com" lang="en" xmltv_id="MTV.ie" site_id="2516">MTV</channel>
  <channel site="sky.com" lang="en" xmltv_id="MTV.uk" site_id="2501">MTV</channel>
+  <channel site="sky.com" lang="en" xmltv_id="MTV.uk@HD" site_id="3831">MTV HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="MTVBase.uk" site_id="2508">MTV XMAS</channel>
  <channel site="sky.com" lang="en" xmltv_id="MTVClassic.uk" site_id="2509">MTV 80s</channel>
-  <channel site="sky.com" lang="en" xmltv_id="MTV.uk@HD" site_id="3831">MTV HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="MTVHits.uk" site_id="2506">MTV HITS</channel>
  <channel site="sky.com" lang="en" xmltv_id="MTVMusic.uk" site_id="2512">MTV MUSIC</channel>
  <channel site="sky.com" lang="en" xmltv_id="MustHaveIdeas.uk@HD" site_id="1089">MstHveIdeasHD</channel>
@@ -371,13 +369,11 @@
  <channel site="sky.com" lang="en" xmltv_id="Pitaara.in" site_id="1260">Pitaara</channel>
  <channel site="sky.com" lang="en" xmltv_id="PoliticsPunjab.uk" site_id="3421">PoliticsPunjab</channel>
  <channel site="sky.com" lang="en" xmltv_id="Pop.uk" site_id="3750">POP</channel>
+  <channel site="sky.com" lang="en" xmltv_id="Pop.uk@Plus1" site_id="4216">POP+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="PopMax.uk" site_id="4262">POP Max</channel>
  <channel site="sky.com" lang="en" xmltv_id="PopMax.uk@Plus1" site_id="4263">POP Max+1</channel>
-  <channel site="sky.com" lang="en" xmltv_id="Pop.uk@Plus1" site_id="4216">POP+1</channel>
-  <channel site="sky.com" lang="en" xmltv_id="PremierSports1.ie" site_id="1633">Premier 1 HD</channel>
-  <channel site="sky.com" lang="en" xmltv_id="PremierSports1.uk" site_id="1289">Premier 1 HD</channel>
-  <channel site="sky.com" lang="en" xmltv_id="PremierSports2.ie" site_id="1635">Premier 2 HD</channel>
-  <channel site="sky.com" lang="en" xmltv_id="PremierSports2.uk" site_id="1290">Premier 2 HD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="PremierSports1.ie@HD" site_id="1633">Premier 1 HD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="PremierSports2.ie@HD" site_id="1635">Premier 2 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="PTCPunjabi.in" site_id="5715">PTC PUNJABI</channel>
  <channel site="sky.com" lang="en" xmltv_id="Quest.uk" site_id="6761">QUEST</channel>
  <channel site="sky.com" lang="en" xmltv_id="Quest.uk@HD" site_id="1128">QUEST HD</channel>
@@ -385,9 +381,9 @@
  <channel site="sky.com" lang="en" xmltv_id="QuestRed.ie" site_id="2410">Quest Red</channel>
  <channel site="sky.com" lang="en" xmltv_id="QuestRed.uk" site_id="2411">Quest Red</channel>
  <channel site="sky.com" lang="en" xmltv_id="QuestRed.uk@Plus1" site_id="4547">Quest Red+1</channel>
+  <channel site="sky.com" lang="en" xmltv_id="QVC.uk@HD" site_id="1076">QVC HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="QVCBeauty.uk" site_id="4105">QVC Beauty</channel>
  <channel site="sky.com" lang="en" xmltv_id="QVCExtra.uk" site_id="3359">QVC Extra</channel>
-  <channel site="sky.com" lang="en" xmltv_id="QVC.uk@HD" site_id="1076">QVC HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="QVCStyle.uk@HD" site_id="1118">QVC Style HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="RacingTV.uk" site_id="3636">Racing TV</channel>
  <channel site="sky.com" lang="en" xmltv_id="RacingTV.uk@HD" site_id="5272">Racing TV HD</channel>
@@ -428,19 +424,19 @@
  <channel site="sky.com" lang="en" xmltv_id="SkyComedy.uk" site_id="1177">Sky Comedy</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyComedy.uk@HD" site_id="1143">Sky Comedy HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyCrime.ie" site_id="1056">Sky Crime</channel>
-  <channel site="sky.com" lang="en" xmltv_id="SkyCrime.uk" site_id="2207">Sky Crime</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyCrime.ie@HD" site_id="3012">Sky Crime HD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="SkyCrime.uk" site_id="2207">Sky Crime</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyCrime.uk@HD" site_id="1212">Sky Crime HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyCrime.uk@Plus1" site_id="4330">Sky Crime+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyDocumentaries.ie" site_id="1230">SkyDocumntrs</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyDocumentaries.uk" site_id="1127">SkyDocumntrs</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyDocumentaries.uk@HD" site_id="1136">SkyDocmntrsHD</channel>
-  <channel site="sky.com" lang="en" xmltv_id="SkyHistory2.uk" site_id="1879">Sky History2</channel>
-  <channel site="sky.com" lang="en" xmltv_id="SkyHistory2.uk@HD" site_id="1195">SkyHistory2HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyHistory.ie" site_id="1070">Sky History</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyHistory.uk" site_id="1875">Sky History</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyHistory.uk@HD" site_id="4086">Sky HistoryHD</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyHistory.uk@Plus1" site_id="1891">Sky History+1</channel>
+  <channel site="sky.com" lang="en" xmltv_id="SkyHistory2.uk" site_id="1879">Sky History2</channel>
+  <channel site="sky.com" lang="en" xmltv_id="SkyHistory2.uk@HD" site_id="1195">SkyHistory2HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyKids.uk@HD" site_id="1147">Sky Kids HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyMax.ie" site_id="1401">Sky Max</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyMax.uk" site_id="1402">Sky Max</channel>
@@ -451,17 +447,17 @@
  <channel site="sky.com" lang="en" xmltv_id="SkyNature.uk" site_id="1194">Sky Nature</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyNature.uk@HD" site_id="1165">Sky Nature HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyNews.ie" site_id="1406">Sky News</channel>
-  <channel site="sky.com" lang="en" xmltv_id="SkyNews.uk" site_id="1404">Sky News</channel>
-  <channel site="sky.com" lang="en" xmltv_id="SkyNewsArabia.ae" site_id="4645">SkyNewsArabia</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyNews.ie@HD" site_id="4054">Sky News HD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="SkyNews.uk" site_id="1404">Sky News</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyNews.uk@HD" site_id="4050">Sky News HD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="SkyNewsArabia.ae" site_id="4645">SkyNewsArabia</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyReplay.ie" site_id="1835">Sky Replay</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyReplay.uk" site_id="1833">Sky Replay</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkySciFi.uk" site_id="2505">Sky Sci-Fi</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkySciFi.uk@HD" site_id="4074">Sky Sci-Fi HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyShowcase.ie" site_id="1279">Sky Showcase</channel>
-  <channel site="sky.com" lang="en" xmltv_id="SkyShowcase.uk" site_id="1276">Sky Showcase</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyShowcase.ie@HD" site_id="1278">SkyShowcaseHD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="SkyShowcase.uk" site_id="1276">Sky Showcase</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyShowcase.uk@HD" site_id="1275">SkyShowcaseHD</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyShowcase.uk@Plus1" site_id="1277">SkyShowcase+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkySportsArena.ie" site_id="3839">SkySp+</channel>
@@ -482,8 +478,8 @@
  <channel site="sky.com" lang="en" xmltv_id="SkySportsMix.uk" site_id="4091">SkySp Mix</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkySportsMix.uk@HD" site_id="4090">SkySp Mix HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkySportsNews.ie" site_id="1319">SkySp News</channel>
-  <channel site="sky.com" lang="en" xmltv_id="SkySportsNews.uk" site_id="1314">SkySp News</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkySportsNews.ie@HD" site_id="4035">SkySp News HD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="SkySportsNews.uk" site_id="1314">SkySp News</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkySportsNews.uk@HD" site_id="4049">SkySp News HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkySportsNFL.ie" site_id="1333">SkySp NFL</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkySportsNFL.uk@HD" site_id="4022">SkySp NFL HD</channel>
@@ -491,31 +487,27 @@
  <channel site="sky.com" lang="en" xmltv_id="SkySportsPremierLeague.ie@HD" site_id="1010">SkySp PL HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkySportsPremierLeague.uk@HD" site_id="4010">SkySp PL HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkySportsRacing.uk" site_id="1354">SkySp Racing</channel>
-  <channel site="sky.com" lang="en" xmltv_id="SkySportsRacing.uk@IrelandHD" site_id="4037">SkySp Racing HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkySportsRacing.uk@HD" site_id="4032">SkySp Racing HD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="SkySportsRacing.uk@IrelandHD" site_id="4037">SkySp Racing HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkySportsTennis.ie" site_id="1285">SkySp Tennis</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkySportsTennis.uk" site_id="1284">SkySp Tennis HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyWitness.ie" site_id="4334">Sky Witness</channel>
-  <channel site="sky.com" lang="en" xmltv_id="SkyWitness.uk" site_id="2201">Sky Witness</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyWitness.ie@HD" site_id="3051">Sky Witness HD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="SkyWitness.uk" site_id="2201">Sky Witness</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyWitness.uk@HD" site_id="4066">Sky Witness HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="SkyWitness.uk@Plus1" site_id="2205">Sky Witness+1</channel>
  <channel site="sky.com" lang="en" xmltv_id="SonyEntertainmentTelevisionAsia.in" site_id="2601">SONY TV</channel>
  <channel site="sky.com" lang="en" xmltv_id="SonyEntertainmentTelevisionAsia.in@HD" site_id="4045">SONY TV HD</channel>
-  <channel site="sky.com" lang="en" xmltv_id="SonyMax2.in" site_id="5431">SONY MAX 2</channel>
  <channel site="sky.com" lang="en" xmltv_id="SonyMax.uk" site_id="2603">SONY MAX</channel>
  <channel site="sky.com" lang="en" xmltv_id="SonyMax.uk@HD" site_id="4046">SONY MAX HD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="SonyMax2.in" site_id="5431">SONY MAX 2</channel>
  <channel site="sky.com" lang="en" xmltv_id="SonySABAsia.in" site_id="3631">SONY SAB</channel>
  <channel site="sky.com" lang="en" xmltv_id="STV.uk" site_id="6210">STV</channel>
-  <!--
  <channel site="sky.com" lang="en" xmltv_id="STV.uk" site_id="6371">STV</channel>
-  -->
  <channel site="sky.com" lang="en" xmltv_id="STV.uk@HD" site_id="1167">STV HD</channel>
-  <!--
  <channel site="sky.com" lang="en" xmltv_id="STV.uk@HD" site_id="1168">STV HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="STV.uk@HD" site_id="1170">STV HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="STV.uk@HD" site_id="4055">STV HD</channel>
-  -->
  <channel site="sky.com" lang="en" xmltv_id="TakbeerTV.uk" site_id="4408">Takbeer TV</channel>
  <channel site="sky.com" lang="en" xmltv_id="TalkingPicturesTV.uk" site_id="5252">TalkingPictures</channel>
  <channel site="sky.com" lang="en" xmltv_id="TBNUK.uk" site_id="3109">TBN UK</channel>
@@ -540,6 +532,7 @@
  <channel site="sky.com" lang="en" xmltv_id="TNTSports3.uk@HD" site_id="3629">TNTSports3 HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="TNTSports4.uk" site_id="3141">TNT Sports 4</channel>
  <channel site="sky.com" lang="en" xmltv_id="TNTSports4.uk@HD" site_id="4040">TNTSports4 HD</channel>
+  <channel site="sky.com" lang="en" xmltv_id="TNTSportsBoxOffice.uk@HD" site_id="1210">TNT Sports Box Office HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="TNTSportsBoxOffice2.uk@HD" site_id="1099">TNTSBoxOff2HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="TogetherTV.uk" site_id="1872">Together</channel>
  <channel site="sky.com" lang="en" xmltv_id="Travelxp.in" site_id="1226">Travelxp</channel>
@@ -560,15 +553,9 @@
  <channel site="sky.com" lang="en" xmltv_id="VirginMediaThree.ie" site_id="2817">Virgin Three</channel>
  <channel site="sky.com" lang="en" xmltv_id="VirginMediaTwo.ie@HD" site_id="1046">Virgin Two HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="W.ie" site_id="5880">U&amp;W</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="2617">U&amp;W</channel>
  <channel site="sky.com" lang="en" xmltv_id="W.ie@HD" site_id="3080">U&amp;W HD</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="3810">U&amp;W HD</channel>
  <channel site="sky.com" lang="en" xmltv_id="WION.in" site_id="1084">WION HD</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="2616">U&amp;W+1</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="2305">U&amp;Yesterday</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="1139">U&amp;Yesterday HD</channel>
-  <channel site="sky.com" lang="en" xmltv_id="" site_id="2615">U&amp;Yesterday+1</channel>
-  <channel site="sky.com" lang="en" xmltv_id="ZeeCinemaUK.uk" site_id="2608">Zee Cinema</channel>
+  <channel site="sky.com" lang="en" xmltv_id="ZeeCinema.in" site_id="2608">Zee Cinema</channel>
  <channel site="sky.com" lang="en" xmltv_id="ZeePunjabi.in" site_id="1188">Zee Punjabi</channel>
  <channel site="sky.com" lang="en" xmltv_id="ZeeTVUK.uk" site_id="2607">Zee TV</channel>
  <channel site="sky.com" lang="en" xmltv_id="ZeeTVUK.uk@HD" site_id="1016">Zee TV HD</channel>