Merge pull request #2189 from Sicilykill/issue_2160

Issue 2160
2025-05-10 00:50:09 -04:00 · 2023-10-23 01:46:40 +03:00 · 2023-10-23 01:46:40 +03:00 · c6ee1346e7
commit c6ee1346e7
parent b1bcc08591 0aef34c884
13 changed files with 80 additions and 269 deletions
--- a/sites/beinsports.com/beinsports.com.config.js
+++ b/sites/beinsports.com/beinsports.com.config.js
@ -13,118 +13,39 @@ module.exports = {
  site: 'beinsports.com',
  days: 2,
  request: {
-    cache: {
-      ttl: 60 * 60 * 1000, // 1h
-      interpretHeader: false
+    headers: {
+      'User-Agent':
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36'
    }
  },
  url: function ({ date, channel }) {
-    let [region] = channel.site_id.split('#')
-    region = region ? `_${region}` : ''
-
-    return `https://epg.beinsports.com/utctime${region}.php?mins=00&serviceidentity=beinsports.com&cdate=${date.format(
-      'YYYY-MM-DD'
-    )}`
+    return `https://www.beinsports.com/api/opta/tv-event?&startBefore=${date.add(1, 'd').format(
+    "YYYY-MM-DDTHH:mm:ss.SSS")}Z&endAfter=${date.format(
+    "YYYY-MM-DDTHH:mm:ss.SSS")}Z&channelIds=${channel.site_id}`
  },
-  parser: function ({ content, channel, date }) {
+  parser: function ({ content }) {
    let programs = []
-    const items = parseItems(content, channel)
-    let i = 0
-    items.forEach(item => {
-      const $item = cheerio.load(item)
-      const title = parseTitle($item)
-      if (!title) return
-      const category = parseCategory($item)
-      const prev = programs[programs.length - 1]
-      let start = parseStart($item, date)
-      if (i === 0 && start.hour() > 18) {
-        date = date.subtract(1, 'd')
-        start = start.subtract(1, 'd')
-      }
-      if (prev) {
-        if (start.isBefore(prev.start)) {
-          start = start.add(1, 'd')
-          date = date.add(1, 'd')
-        }
-        prev.stop = start
-      }
-      let stop = parseStop($item, start)
-      if (stop.isBefore(start)) {
-        stop = stop.add(1, 'd')
-      }
-
-      programs.push({ title, category, start, stop })
-      i++
-    })
-
-    return programs
-  },
-  async channels({ region, lang }) {
-    const suffix = region ? `_${region}` : ''
-    const content = await axios
-      .get(
-        `https://epg.beinsports.com/utctime${suffix}.php?mins=00&serviceidentity=beinsports.com&cdate=2022-05-08`
-      )
-      .then(r => r.data)
-      .catch(console.log)
-    const $ = cheerio.load(content)
-    const items = $('.container > div, #epg_div > div').toArray()
-    return items
-      .map(item => {
-        const $item = cheerio.load(item)
-        const id = $item('*').attr('id')
-        if (!/^channels_[0-9]+$/.test(id)) return null
-        const channelId = id.replace('channels_', '')
-        const imgSrc = $item('img').attr('src')
-        const [, , name] = imgSrc.match(/(\/|)([a-z0-9-_.]+)(.png|.svg)$/i) || [null, null, '']
-
-        return {
-          lang,
-          site_id: `${region}#${channelId}`,
-          name
-        }
+    const items = parseItems(content)
+    if (!items.length == 0) {
+      items.forEach(item => {
+        const start = dayjs.utc(item.startDate)
+        const stop = dayjs.utc(item.endDate)
+        programs.push({
+          title: item.title,
+          description: item.description,
+          start,
+          stop
+        })
      })
-      .filter(i => i)
+    }
+    return programs
  }
 }

-function parseTitle($item) {
-  return $item('.title').text()
-}
-
-function parseCategory($item) {
-  return $item('.format')
-    .map(function () {
-      return $item(this).text()
-    })
-    .get()
-}
-
-function parseStart($item, date) {
-  let time = $item('.time').text()
-  if (!time) return null
-  let [, start, period] = time.match(/^(\d{2}:\d{2})( AM| PM|)/) || [null, null, null]
-  if (!start) return null
-  start = `${date.format('YYYY-MM-DD')} ${start}${period}`
-  const format = period ? 'YYYY-MM-DD hh:mm A' : 'YYYY-MM-DD HH:mm'
-
-  return dayjs.tz(start, format, 'Asia/Qatar')
-}
-
-function parseStop($item, date) {
-  let time = $item('.time').text()
-  if (!time) return null
-  let [, stop, period] = time.match(/(\d{2}:\d{2})( AM| PM|)$/) || [null, null, null]
-  if (!stop) return null
-  stop = `${date.format('YYYY-MM-DD')} ${stop}${period}`
-  const format = period ? 'YYYY-MM-DD hh:mm A' : 'YYYY-MM-DD HH:mm'
-
-  return dayjs.tz(stop, format, 'Asia/Qatar')
-}
-
-function parseItems(content, channel) {
-  const [, channelId] = channel.site_id.split('#')
-  const $ = cheerio.load(content)
-
-  return $(`#channels_${channelId} .slider > ul:first-child > li`).toArray()
+function parseItems(content) {
+  const data = JSON.parse(content)
+  if (data.length === 0) {
+    return []
+  }
+  return data['rows']
 }
--- a/sites/beinsports.com/beinsports.com.test.js
+++ b/sites/beinsports.com/beinsports.com.test.js
@ -11,81 +11,39 @@ const customParseFormat = require('dayjs/plugin/customParseFormat')
 dayjs.extend(customParseFormat)
 dayjs.extend(utc)

-const date = dayjs.utc('2022-05-08', 'YYYY-MM-DD').startOf('d')
-const channel = { site_id: '#2', xmltv_id: 'BeINSports.qa' }
+const date = dayjs.utc('2023-10-22T00:00:00.000', '"YYYY-MM-DDTHH:mm:ss.SSS').startOf('d')
+const channel = { site_id: 'C244C48D-3B54-406A-94C9-D63B16318267', xmltv_id: 'beINSportsUSA.us' }

 it('can generate valid url', () => {
  const result = url({ date, channel })
  expect(result).toBe(
-    'https://epg.beinsports.com/utctime.php?mins=00&serviceidentity=beinsports.com&cdate=2022-05-08'
+    'https://www.beinsports.com/api/opta/tv-event?&startBefore=2023-10-23T00:00:00.000Z&endAfter=2023-10-22T00:00:00.000Z&channelIds=C244C48D-3B54-406A-94C9-D63B16318267'
  )
 })

-it('can generate valid url for arabic guide', () => {
-  const channel = { site_id: 'ar#1', xmltv_id: 'BeINSports.qa' }
-  const result = url({ date, channel })
-  expect(result).toBe(
-    'https://epg.beinsports.com/utctime_ar.php?mins=00&serviceidentity=beinsports.com&cdate=2022-05-08'
-  )
-})
+const content ='{"count":1,"rows":[{"data":{"eventId":"2028126","eventDate":"2023-10-21T10:30:00","utcEventDate":"2023-10-20T23:30:00","duration":"90","programId":"106230","programTypeId":"5","title":"ATP 500"},"duration":5400000,"title":"Tokyo Day 5 QF 2","startDate":"2023-10-20T23:30:00.000Z","endDate":"2023-10-21T01:00:00.000Z","description":"Exclusive coverage of the 2023 ATP Tour on beIN SPORTS","channelId":"164C0EDA-EBCE-4AA6-9DDA-D603E0948B9F"}]}'
+

 it('can parse response', () => {
-  const content = fs.readFileSync(path.resolve('sites/beinsports.com/__data__/content.html'))
-  const results = parser({ date, channel, content }).map(p => {
+  const result = parser({ content, channel, date }).map(p => {
    p.start = p.start.toJSON()
    p.stop = p.stop.toJSON()
    return p
  })

-  expect(results[0]).toMatchObject({
-    start: '2022-05-07T19:30:00.000Z',
-    stop: '2022-05-07T21:20:00.000Z',
-    title: 'Lorient vs Marseille',
-    category: ['Ligue 1 2021/22']
-  })
-})
-
-it('can parse response for tomorrow', () => {
-  const date = dayjs.utc('2022-05-09', 'YYYY-MM-DD').startOf('d')
-  const content = fs.readFileSync(
-    path.resolve('sites/beinsports.com/__data__/content_tomorrow.html')
-  )
-  const results = parser({ date, channel, content }).map(p => {
-    p.start = p.start.toJSON()
-    p.stop = p.stop.toJSON()
-    return p
-  })
-
-  expect(results[0]).toMatchObject({
-    start: '2022-05-08T21:20:00.000Z',
-    stop: '2022-05-08T23:10:00.000Z',
-    title: 'Celtic vs Hearts',
-    category: ['SPFL Premiership 2021/22']
-  })
-})
-
-it('can parse US response', () => {
-  const content = fs.readFileSync(path.resolve('sites/beinsports.com/__data__/content_us.html'))
-  const results = parser({ date, channel, content }).map(p => {
-    p.start = p.start.toJSON()
-    p.stop = p.stop.toJSON()
-    return p
-  })
-
-  expect(results[0]).toMatchObject({
-    start: '2022-05-07T20:00:00.000Z',
-    stop: '2022-05-07T22:00:00.000Z',
-    title: 'Basaksehir vs. Galatasaray',
-    category: ['Fútbol Turco Superliga', 'Soccer']
-  })
+  expect(result).toMatchObject([
+    {
+      start: '2023-10-20T23:30:00.000Z',
+      stop: '2023-10-21T01:00:00.000Z',
+      title: 'Tokyo Day 5 QF 2',
+      description: 'Exclusive coverage of the 2023 ATP Tour on beIN SPORTS'
+    }
+  ])
 })   
  
 it('can handle empty guide', () => {
-  const noContent = fs.readFileSync(path.resolve('sites/beinsports.com/__data__/no-content.html'))
  const result = parser({
-    date,
-    channel,
-    content: noContent
+    content: '[]'
  })
  expect(result).toMatchObject([])
 })
--- a/sites/beinsports.com/beinsports.com_au.channels.xml
+++ b/sites/beinsports.com/beinsports.com_au.channels.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports1Australia.au" site_id="au#1">BeIn Sports 1 Australia</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports2Australia.au" site_id="au#2">BeIn Sports 2 Australia</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports3Australia.au" site_id="au#3">BeIn Sports 3 Australia</channel>
+  <channel site="beinsports.com" lang="en" xmltv_id="beINSports1Australia.au" site_id="164C0EDA-EBCE-4AA6-9DDA-D603E0948B9F">BeIn Sports 1 Australia</channel>
+  <channel site="beinsports.com" lang="en" xmltv_id="beINSports2Australia.au" site_id="63A30D9C-609D-4A30-8730-2CA391DF287A">BeIn Sports 2 Australia</channel>
+  <channel site="beinsports.com" lang="en" xmltv_id="beINSports3Australia.au" site_id="2E8A6222-8D90-4291-81E3-AF2F72557746">BeIn Sports 3 Australia</channel>
 </channels>
--- a/sites/beinsports.com/beinsports.com_fr.channels.xml
+++ b/sites/beinsports.com/beinsports.com_fr.channels.xml
@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
-  <channel site="beinsports.com" lang="fr" xmltv_id="beINSports1France.fr" site_id="france#1">BeIN Sports 1 HD France</channel>
-  <channel site="beinsports.com" lang="fr" xmltv_id="beINSports2France.fr" site_id="france#2">BeIN Sports 2 HD France</channel>
-  <channel site="beinsports.com" lang="fr" xmltv_id="beINSports3France.fr" site_id="france#3">BeIN Sports 3 France</channel>
-  <channel site="beinsports.com" lang="fr" xmltv_id="beINSportsMax4France.fr" site_id="france#4">BeIN Sports Max 4 France</channel>
-  <channel site="beinsports.com" lang="fr" xmltv_id="beINSportsMax5France.fr" site_id="france#5">BeIN Sports Max 5 France</channel>
-  <channel site="beinsports.com" lang="fr" xmltv_id="beINSportsMax6France.fr" site_id="france#6">BeIN Sports Max 6 France</channel>
-  <channel site="beinsports.com" lang="fr" xmltv_id="beINSportsMax7France.fr" site_id="france#7">BeIN Sports Max 7 France</channel>
-  <channel site="beinsports.com" lang="fr" xmltv_id="beINSportsMax8France.fr" site_id="france#8">BeIN Sports Max 8 France</channel>
-  <channel site="beinsports.com" lang="fr" xmltv_id="beINSportsMax9France.fr" site_id="france#9">BeIN Sports Max 9 France</channel>
-  <channel site="beinsports.com" lang="fr" xmltv_id="beINSportsMax10France.fr" site_id="france#10">BeIN Sports Max 10 France</channel>
+  <channel site="beinsports.com" lang="fr" xmltv_id="beINSports1France.fr" site_id="66265DD1-D2AA-4A89-9412-2455186E90ED">BeIN Sports 1 HD France</channel>
+  <channel site="beinsports.com" lang="fr" xmltv_id="beINSports2France.fr" site_id="1E886E98-3104-4D8E-A97F-734B23108E8A">BeIN Sports 2 HD France</channel>
+  <channel site="beinsports.com" lang="fr" xmltv_id="beINSports3France.fr" site_id="6DB008B8-66DA-423E-805D-616211D4B174">BeIN Sports 3 France</channel>
+  <channel site="beinsports.com" lang="fr" xmltv_id="beINSportsMax4France.fr" site_id="EF7E0369-CFD9-4607-9238-EC483E6D58A3">BeIN Sports Max 4 France</channel>
+  <channel site="beinsports.com" lang="fr" xmltv_id="beINSportsMax5France.fr" site_id="A4425E44-B004-4137-ACB4-458BA4D710F8">BeIN Sports Max 5 France</channel>
+  <channel site="beinsports.com" lang="fr" xmltv_id="beINSportsMax6France.fr" site_id="BBD26D71-897D-4799-87A1-A87120130D48">BeIN Sports Max 6 France</channel>
+  <channel site="beinsports.com" lang="fr" xmltv_id="beINSportsMax7France.fr" site_id="9B4708C5-F5F0-452A-8157-4661C30FAE6A">BeIN Sports Max 7 France</channel>
+  <channel site="beinsports.com" lang="fr" xmltv_id="beINSportsMax8France.fr" site_id="76D2430C-8BCB-41BD-A1DE-FBA0D58C5E8A">BeIN Sports Max 8 France</channel>
+  <channel site="beinsports.com" lang="fr" xmltv_id="beINSportsMax9France.fr" site_id="FB208953-1C70-4D1E-B918-103AB02AB181">BeIN Sports Max 9 France</channel>
+  <channel site="beinsports.com" lang="fr" xmltv_id="beINSportsMax10France.fr" site_id="6F425028-14F0-4E38-B776-71A9DB3F3493">BeIN Sports Max 10 France</channel>
 </channels>
--- a/sites/beinsports.com/beinsports.com_hk.channels.xml
+++ b/sites/beinsports.com/beinsports.com_hk.channels.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<channels>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports1HongKong.hk" site_id="hk#1">BeIN Sports 1 Hong Kong</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports2HongKong.hk" site_id="hk#2">BeIN Sports 2 Hong Kong</channel>
-</channels>
--- a/sites/beinsports.com/beinsports.com_id.channels.xml
+++ b/sites/beinsports.com/beinsports.com_id.channels.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<channels>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports1Indonesia.id" site_id="id#1">BeIN Sports 1 Indonesia</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports3Indonesia.id" site_id="id#2">BeIN Sports 3 Indonesia</channel>
-</channels>
--- a/sites/beinsports.com/beinsports.com_my.channels.xml
+++ b/sites/beinsports.com/beinsports.com_my.channels.xml
@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports1MalaysiaSingapore.my" site_id="my#1">BeIN Sports 1 Malaysia &amp; Singapore</channel>
+  <channel site="beinsports.com" lang="en" xmltv_id="beINSports1MalaysiaSingapore.my" site_id="0FA3DEF0-234B-4E25-934F-392DF2C3162C">BeIN Sports 1 Malaysia &amp; Singapore</channel>
+  <channel site="beinsports.com" lang="en" xmltv_id="beINSports2MalaysiaSingapore.my" site_id="DDFC8C16-6363-4A2C-AE66-2CE357DBC28E">BeIN Sports 2 Malaysia &amp; Singapore</channel>
+  <channel site="beinsports.com" lang="en" xmltv_id="beINSports3MalaysiaSingapore.my" site_id="7C714598-E7ED-4B0F-8BD1-E8E80D473922">BeIN Sports 3 Malaysia &amp; Singapore</channel>
 </channels>
--- a/sites/beinsports.com/beinsports.com_ph.channels.xml
+++ b/sites/beinsports.com/beinsports.com_ph.channels.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<channels>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports1Philippines.ph" site_id="id#1">BeIN Sports 1 Philippines</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports3Philippines.ph" site_id="id#2">BeIN Sports 3 Philippines</channel>
-</channels>
--- a/sites/beinsports.com/beinsports.com_qa-ar.channels.xml
+++ b/sites/beinsports.com/beinsports.com_qa-ar.channels.xml
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<channels>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSports.qa" site_id="ar#1">beIN SPORTS FTA</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSportsNews.qa" site_id="ar#2">beIN SPORTS News</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSports2.qa" site_id="ar#3">beIN SPORTS2</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSports3.qa" site_id="ar#4">beIN SPORTS3</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSports4.qa" site_id="ar#5">beIN SPORTS4</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSports5.qa" site_id="ar#6">beIN SPORTS5</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSports6.qa" site_id="ar#7">beIN SPORTS6</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSports7.qa" site_id="ar#8">beIN SPORTS7</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSportsPremium3.qa" site_id="ar#9">beIN SPORTS3 PREMIUM</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSportsXtra1.qa" site_id="ar#10">beIN SPORTS XTRA1</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSportsXtra2.qa" site_id="ar#11">beIN SPORTS XTRA2</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beIN4K.qa" site_id="ar#12">beIN 4k</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSportsAFC.qa" site_id="ar#13">beIN SPORTS AFC</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSportsAFC1.qa" site_id="ar#14">beIN SPORTS AFC1</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSportsAFC2.qa" site_id="ar#15">beIN SPORTS AFC2</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSportsAFC3.qa" site_id="ar#16">beIN SPORTS AFC3</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSportsNBA.qa" site_id="ar#17">beIN SPORTS NBA</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSportsEnglish1.qa" site_id="ar#18">beIN SPORTS1 ENGLISH</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSportsEnglish2.qa" site_id="ar#19">beIN SPORTS2 ENGLISH</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSportsEnglish3.qa" site_id="ar#20">beIN SPORTS3 ENGLISH</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSportsFrench1.qa" site_id="ar#21">beIN SPORTS1 FRENCH</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSportsFrench2.qa" site_id="ar#22">beIN SPORTS2 FRENCH</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSportsFrench3.qa" site_id="ar#23">beIN SPORTS3 FRENCH</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSportsMax1.qa" site_id="ar#24">beIN SPORTS MAX 1</channel>
-  <channel site="beinsports.com" lang="ar" xmltv_id="beINSportsMax2.qa" site_id="ar#25">beIN SPORTS MAX 2</channel>
-</channels>
--- a/sites/beinsports.com/beinsports.com_qa-en.channels.xml
+++ b/sites/beinsports.com/beinsports.com_qa-en.channels.xml
@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<channels>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports.qa" site_id="#1">BeIn Sports</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSportsNews.qa" site_id="#2">BeIn Sports News</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports2.qa" site_id="#3">BeIn Sports 2</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports3.qa" site_id="#4">BeIn Sports 3</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports4.qa" site_id="#5">BeIn Sports 4</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports5.qa" site_id="#6">BeIn Sports 5</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports6.qa" site_id="#7">BeIn Sports 6</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports7.qa" site_id="#8">BeIn Sports 7</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSportsPremium3.qa" site_id="#9">BeIn Sports Premium 3</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSportsXtra1.qa" site_id="#10">BeIn Sports Xtra 1</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSportsXtra2.qa" site_id="#11">BeIn Sports Xtra 2</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beIN4K.qa" site_id="#12">BeIn 4K</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSportsNBA.qa" site_id="#13">BeIn NBA</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSportsEnglish1.qa" site_id="#14">BeIn Sports English 1</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSportsEnglish2.qa" site_id="#15">BeIn Sports English 2</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSportsEnglish3.qa" site_id="#16">BeIn Sports English 3</channel>
-  <channel site="beinsports.com" lang="fr" xmltv_id="beINSportsFrench1.qa" site_id="#17">BeIn Sports French 1</channel>
-  <channel site="beinsports.com" lang="fr" xmltv_id="beINSportsFrench2.qa" site_id="#18">BeIn Sports French 2</channel>
-  <channel site="beinsports.com" lang="fr" xmltv_id="beINSportsFrench3.qa" site_id="#19">BeIn Sports French 3</channel>
-</channels>
--- a/sites/beinsports.com/beinsports.com_th.channels.xml
+++ b/sites/beinsports.com/beinsports.com_th.channels.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<channels>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports1Thailand.th" site_id="th#1">BeIN Sports 1 Thailand</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports3Thailand.th" site_id="th#2">BeIN Sports 3 Thailand</channel>
-</channels>
--- a/sites/beinsports.com/beinsports.com_us-en.channels.xml
+++ b/sites/beinsports.com/beinsports.com_us-en.channels.xml
@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSportsUSA.us" site_id="us#1">BeIN Sports USA</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSportsenEspanol.us" site_id="us#2">BeIN Sports en Español</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSPORTSXTRA.us" site_id="us#3">BeIN Sports Xtra USA</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSPORTSXTRAenEspanol.us" site_id="us#4">BeIN Sports Xtra en Español</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports3USA.us" site_id="us#5">BeIN Sports 3 USA</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports4USA.us" site_id="us#6">BeIN Sports 4 USA</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports5USA.us" site_id="us#7">BeIN Sports 5 USA</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports6USA.us" site_id="us#8">BeIN Sports 6 USA</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports7USA.us" site_id="us#9">BeIN Sports 7 USA</channel>
-  <channel site="beinsports.com" lang="en" xmltv_id="beINSports8USA.us" site_id="us#10">BeIN Sports 8 USA</channel>
+  <channel site="beinsports.com" lang="en" xmltv_id="beINSportsUSA.us" site_id="C244C48D-3B54-406A-94C9-D63B16318267">BeIN Sports USA</channel>
+  <channel site="beinsports.com" lang="en" xmltv_id="beINSportsenEspanol.us" site_id="4083661E-F588-4700-943C-8FDF65F1B5EB">BeIN Sports Español</channel>
+  <channel site="beinsports.com" lang="en" xmltv_id="beINSPORTSXTRA.us" site_id="1ACADCF1-DFAC-480B-872C-53D51FE1B45D">BeIN Sports Xtra USA</channel>
+  <channel site="beinsports.com" lang="en" xmltv_id="beINSPORTSXTRAenEspanol.us" site_id="5223E3D7-FB4E-4155-885A-9165996B22FA">BeIN SPORTS XTRA ñ</channel>
+  <channel site="beinsports.com" lang="en" xmltv_id="beINSports3USA.us" site_id="90E69FC7-AA8C-40F2-B35F-EBD174495F76">BeIN Sports 3 USA</channel>
+  <channel site="beinsports.com" lang="en" xmltv_id="beINSports4USA.us" site_id="D0546ED7-9DB2-4924-9E32-C4F077E7BFC7">BeIN Sports 4 USA</channel>
+  <channel site="beinsports.com" lang="en" xmltv_id="beINSports5USA.us" site_id="A5A48DB1-C00B-4DB9-9FC6-5E5F25C18830">BeIN Sports 5 USA</channel>
+  <channel site="beinsports.com" lang="en" xmltv_id="beINSports6USA.us" site_id="E56B0905-F99F-4DB1-931E-E6002B530867">BeIN Sports 6 USA</channel>
+  <channel site="beinsports.com" lang="en" xmltv_id="beINSports7USA.us" site_id="831591C8-DA65-4528-B837-0E5A147887FB">BeIN Sports 7 USA</channel>
+  <channel site="beinsports.com" lang="en" xmltv_id="beINSports8USA.us" site_id="9A424246-EC89-43C3-9239-AA3A40540F94">BeIN Sports 8 USA</channel>
 </channels>
--- a/sites/beinsports.com/beinsports.com_us-es.channels.xml
+++ b/sites/beinsports.com/beinsports.com_us-es.channels.xml
@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
-  <channel site="beinsports.com" lang="es" xmltv_id="beINSportsUSA.us" site_id="us_es#1">BeIN Sports USA</channel>
-  <channel site="beinsports.com" lang="es" xmltv_id="beINSportsenEspanol.us" site_id="us_es#2">BeIN Sports en Español</channel>
-  <channel site="beinsports.com" lang="es" xmltv_id="beINSPORTSXTRA.us" site_id="us_es#3">BeIN Sports Xtra USA</channel>
-  <channel site="beinsports.com" lang="es" xmltv_id="beINSPORTSXTRAenEspanol.us" site_id="us_es#4">BeIN Sports Xtra en Español</channel>
-  <channel site="beinsports.com" lang="es" xmltv_id="beINSports3USA.us" site_id="us_es#5">BeIN Sports 3 USA</channel>
-  <channel site="beinsports.com" lang="es" xmltv_id="beINSports4USA.us" site_id="us_es#6">BeIN Sports 4 USA</channel>
-  <channel site="beinsports.com" lang="es" xmltv_id="beINSports5USA.us" site_id="us_es#7">BeIN Sports 5 USA</channel>
-  <channel site="beinsports.com" lang="es" xmltv_id="beINSports6USA.us" site_id="us_es#8">BeIN Sports 6 USA</channel>
-  <channel site="beinsports.com" lang="es" xmltv_id="beINSports7USA.us" site_id="us_es#9">BeIN Sports 7 USA</channel>
-  <channel site="beinsports.com" lang="es" xmltv_id="beINSports8USA.us" site_id="us_es#10">BeIN Sports 8 USA</channel>
+  <channel site="beinsports.com" lang="es" xmltv_id="beINSportsUSA.us" site_id="C244C48D-3B54-406A-94C9-D63B16318267">BeIN Sports USA</channel>
+  <channel site="beinsports.com" lang="es" xmltv_id="beINSportsenEspanol.us" site_id="4083661E-F588-4700-943C-8FDF65F1B5EB">BeIN Sports Español</channel>
+  <channel site="beinsports.com" lang="es" xmltv_id="beINSPORTSXTRA.us" site_id="1ACADCF1-DFAC-480B-872C-53D51FE1B45D">BeIN Sports Xtra USA</channel>
+  <channel site="beinsports.com" lang="es" xmltv_id="beINSPORTSXTRAenEspanol.us" site_id="5223E3D7-FB4E-4155-885A-9165996B22FA">BeIN SPORTS XTRA ñ</channel>
+  <channel site="beinsports.com" lang="es" xmltv_id="beINSports3USA.us" site_id="90E69FC7-AA8C-40F2-B35F-EBD174495F76">BeIN Sports 3 USA</channel>
+  <channel site="beinsports.com" lang="es" xmltv_id="beINSports4USA.us" site_id="D0546ED7-9DB2-4924-9E32-C4F077E7BFC7">BeIN Sports 4 USA</channel>
+  <channel site="beinsports.com" lang="es" xmltv_id="beINSports5USA.us" site_id="A5A48DB1-C00B-4DB9-9FC6-5E5F25C18830">BeIN Sports 5 USA</channel>
+  <channel site="beinsports.com" lang="es" xmltv_id="beINSports6USA.us" site_id="E56B0905-F99F-4DB1-931E-E6002B530867">BeIN Sports 6 USA</channel>
+  <channel site="beinsports.com" lang="es" xmltv_id="beINSports7USA.us" site_id="831591C8-DA65-4528-B837-0E5A147887FB">BeIN Sports 7 USA</channel>
+  <channel site="beinsports.com" lang="es" xmltv_id="beINSports8USA.us" site_id="9A424246-EC89-43C3-9239-AA3A40540F94">BeIN Sports 8 USA</channel>
 </channels>