Merge pull request #3077 from iptv-org/update-foxtel.com.au

Update foxtel.com.au

sites/foxtel.com.au/__data__/content.html

@@ -3229,7 +3229,7 @@
         
 
     <!--version num:1952294-->
-    <a href="The-Equalizer/137367334" tabindex="4" data-scheduled-date="1667824800000" class="row epg-channel-event-row
+    <a href="The-Equalizer/174868153" tabindex="4" data-scheduled-date="1667824800000" class="row epg-channel-event-row
         
         
         ">

sites/foxtel.com.au/__data__/program_1.json

@@ -0,0 +1 @@
+{"event":{"eventId":174868153,"programTitle":"Hawaii Five-0","channelId":548,"scheduledDate":1776488400000,"duration":60,"episodeTitle":"Hana Komo Pae","audio":"DIGITAL","parentalRating":"M","seriesLink":"27163","widescreenInd":false,"closedCaptionInd":true,"subtitledInd":false,"premiereInd":false,"hdInd":true,"actors":["Alex O'Loughlin","Scott Caan","Grace Park","Masi Oka","Chi McBride"],"mergedSynopsis":"(v)  S7, Ep8. Hana Komo Pae: While Danny chaperones Grace's winter formal, terrorists seize the venue and hold everyone hostage in order to kidnap a diplomat's son.","seriesNumber":"7","episodeNumber":"8","genreCode":"02","subGenreCode":"5","webLinks":[{"title":"IMDB","url":"http://www.imdb.com/title/tt1600194/"}],"yearOfProduction":"2016","consumerAdvice":"v","countryOfOrigin":"United States","language":"English","displaySepNum":true,"versionNum":2588617,"shortSynopsis":"While Danny chaperones Grace's winter formal, terrorists seize the venue and hold everyone hostage in order to kidnap a diplomat's son.","imageUrl":"https://images1.resources.foxtel.com.au/store2/mount1/16/3/61x61.jpg?maxheight=213&limit=536db4ca3ea686d56daed0b545cc1b4faaeec82f","genre":"Entertainment","subGenre":"Drama","placeholder":false,"isMovie":false,"adultsOnly":false},"alternateEpisodes":[{"eventId":174868152,"programTitle":"Hawaii Five-0","channelId":548,"scheduledDate":1776484800000,"duration":60,"episodeTitle":"Ka Makuahine A Me Ke Keikikane","audio":"DIGITAL","parentalRating":"M","seriesLink":"27163","widescreenInd":false,"closedCaptionInd":true,"subtitledInd":false,"premiereInd":false,"hdInd":true,"actors":["Alex O'Loughlin","Scott Caan","Grace Park","Masi Oka","Chi McBride"],"mergedSynopsis":"(v)  S7, Ep7. Ka Makuahine A Me Ke Keikikane: McGarrett's long-lost love, Catherine, returns to Hawaii unexpectedly to tell Steve that Doris is in trouble and needs his help to be rescued.","seriesNumber":"7","episodeNumber":"7","genreCode":"02","subGenreCode":"5","webLinks":[{"title":"IMDB","url":"http://www.imdb.com/title/tt1600194/"}],"yearOfProduction":"2016","consumerAdvice":"v","countryOfOrigin":"United States","language":"English","displaySepNum":true,"versionNum":2588617,"shortSynopsis":"McGarrett's long-lost love, Catherine, returns to Hawaii unexpectedly to tell Steve that Doris is in trouble and needs his help to be rescued.","imageUrl":"https://images1.resources.foxtel.com.au/store2/mount1/16/3/8w048.jpg?maxheight=213&limit=b456324f41f17d5a7726f94ef2b1ae1e8102a7dd","genre":"Entertainment","subGenre":"Drama","placeholder":false,"isMovie":false,"adultsOnly":false},{"eventId":174869805,"programTitle":"Hawaii Five-0","channelId":714,"scheduledDate":1776492000000,"duration":60,"episodeTitle":"Ka Makuahine A Me Ke Keikikane","audio":"DIGITAL","parentalRating":"M","seriesLink":"26816","widescreenInd":true,"closedCaptionInd":true,"subtitledInd":false,"premiereInd":false,"hdInd":false,"actors":["Alex O'Loughlin","Scott Caan","Grace Park","Masi Oka","Chi McBride"],"mergedSynopsis":"(v)  S7, Ep7. Ka Makuahine A Me Ke Keikikane: McGarrett's long-lost love, Catherine, returns to Hawaii unexpectedly to tell Steve that Doris is in trouble and needs his help to be rescued.","seriesNumber":"7","episodeNumber":"7","genreCode":"02","subGenreCode":"5","webLinks":[{"title":"IMDB","url":"http://www.imdb.com/title/tt1600194/"}],"yearOfProduction":"2016","consumerAdvice":"v","countryOfOrigin":"United States","language":"English","displaySepNum":true,"versionNum":2588617,"shortSynopsis":"McGarrett's long-lost love, Catherine, returns to Hawaii unexpectedly to tell Steve that Doris is in trouble and needs his help to be rescued.","imageUrl":"https://images1.resources.foxtel.com.au/store2/mount1/16/3/8w048.jpg?maxheight=213&limit=b456324f41f17d5a7726f94ef2b1ae1e8102a7dd","genre":"Entertainment","subGenre":"Drama","placeholder":false,"isMovie":false,"adultsOnly":false},{"eventId":174868167,"programTitle":"Hawaii Five-0","channelId":548,"scheduledDate":1776542700000,"duration":55,"episodeTitle":"Elua La MA Nowemapa","audio":"DIGITAL","parentalRating":"MA","seriesLink":"61248","widescreenInd":false,"closedCaptionInd":true,"subtitledInd":false,"premiereInd":false,"hdInd":true,"actors":["Alex O'Loughlin","Scott Caan","Grace Park","Masi Oka","Chi McBride"],"mergedSynopsis":"(v)  S7, Ep9. Elua La MA Nowemapa: A conspiracy theorist with compelling information that JFK's own cabinet planned his assassination is murdered. Jerry tells the story of the Honolulu Conference on November 20, 1963.","seriesNumber":"7","episodeNumber":"9","genreCode":"02","subGenreCode":"5","webLinks":[{"title":"IMDB","url":"http://www.imdb.com/title/tt1600194/"}],"yearOfProduction":"2016","consumerAdvice":"v","countryOfOrigin":"United States","language":"English","displaySepNum":true,"versionNum":2588617,"shortSynopsis":"A conspiracy theorist with compelling information that JFK's own cabinet planned his assassination is murdered. Jerry tells the story of the Honolulu Conference on Line truncated

sites/foxtel.com.au/foxtel.com.au.config.js

@@ -14,10 +14,11 @@ module.exports = {
     headers: {
       'Accept-Language': 'en-US,en;',
       Cookie: 'AAMC_foxtel_0=REGION|7',
-      'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36'
+      'User-Agent':
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36'
     }
   },
-  parser: function ({ content, date }) {
+  async parser({ content, date }) {
     let programs = []
     const items = parseItems(content)
     for (let item of items) {
@@ -32,9 +33,18 @@ module.exports = {
         prev.stop = start
       }
       const stop = start.add(30, 'm')
+
+      const programId = parseProgramId($item)
+      const details = await loadProgramDetails(programId)
+      let description
+      if (details) {
+        description = parseDescription(details)
+      }
+
       programs.push({
         title: parseTitle($item),
         sub_title: parseSubTitle($item),
+        description,
         image: parseImage($item),
         rating: parseRating($item),
         season: parseSeason($item),
@@ -72,6 +82,34 @@ module.exports = {
   }
 }
 
+function parseProgramId($item) {
+  const href = $item('*').attr('href')
+
+  return href.split('/')[1]
+}
+
+async function loadProgramDetails(programId) {
+  if (!programId) return {}
+
+  return await axios
+    .get(
+      `https://www.foxtel.com.au/webepg/ws/foxtel/event/${programId}?movieHeight=213&tvShowHeight=213&regionId=8336`,
+      {
+        headers: {
+          'sec-fetch-dest': 'empty',
+          'sec-fetch-site': 'same-origin',
+          'User-Agent': 'insomnia/2022.7.5'
+        }
+      }
+    )
+    .then(r => r.data)
+    .catch(console.log)
+}
+
+function parseDescription(details) {
+  return details?.event?.shortSynopsis
+}
+
 function parseSeason($item) {
   let seasonString = $item('.epg-event-description > div > abbr:nth-child(1)').attr('title')
   if (!seasonString) return null
@@ -118,9 +156,9 @@ function parseRating($item) {
 
   return rating
     ? {
-      system: 'ACB',
-      value: rating
-    }
+        system: 'ACB',
+        value: rating
+      }
     : null
 }
 

sites/foxtel.com.au/foxtel.com.au.test.js

@@ -1,3 +1,4 @@
+const axios = require('axios')
 const { parser, url, request } = require('./foxtel.com.au.config.js')
 const fs = require('fs')
 const path = require('path')
@@ -7,6 +8,23 @@ const customParseFormat = require('dayjs/plugin/customParseFormat')
 dayjs.extend(customParseFormat)
 dayjs.extend(utc)
 
+jest.mock('axios')
+
+axios.get.mockImplementation(url => {
+  if (
+    url ===
+    'https://www.foxtel.com.au/webepg/ws/foxtel/event/174868153?movieHeight=213&tvShowHeight=213&regionId=8336'
+  ) {
+    return Promise.resolve({
+      data: JSON.parse(fs.readFileSync(path.resolve(__dirname, '__data__/program_1.json')))
+    })
+  } else {
+    return Promise.resolve({
+      data: '{}'
+    })
+  }
+})
+
 const date = dayjs.utc('2022-11-08', 'YYYY-MM-DD').startOf('d')
 const channel = {
   site_id: 'Channel-9-Sydney/NIN',
@@ -26,10 +44,10 @@ it('can generate valid request headers', () => {
   })
 })
 
-it('can parse response', () => {
+it('can parse response', async () => {
   const content = fs.readFileSync(path.resolve(__dirname, '__data__/content.html'))
 
-  let results = parser({ content })
+  let results = await parser({ content })
   results = results.map(p => {
     p.start = p.start.toJSON()
     p.stop = p.stop.toJSON()
@@ -41,6 +59,8 @@ it('can parse response', () => {
     stop: '2022-11-07T13:30:00.000Z',
     title: 'The Equalizer',
     sub_title: 'Glory',
+    description:
+      "While Danny chaperones Grace's winter formal, terrorists seize the venue and hold everyone hostage in order to kidnap a diplomat's son.",
     image:
       'https://images1.resources.foxtel.com.au/store2/mount1/16/3/69e0v.jpg?maxheight=90&limit=91aa1c7a2c485aeeba0706941f79f111adb35830',
     rating: {
@@ -52,8 +72,8 @@ it('can parse response', () => {
   })
 })
 
-it('can handle empty guide', () => {
-  const result = parser({
+it('can handle empty guide', async () => {
+  const result = await parser({
     content: fs.readFileSync(path.resolve(__dirname, '__data__/no-content.html'))
   })
   expect(result).toMatchObject([])