Merge pull request #2668 from iptv-org/update-tvtv.us-2

Update tvtv.us

sites/tvtv.us/__data__/program_1.json

@@ -0,0 +1 @@
+{"type":"E","title":"The Big Bang Theory","image":"/gn/pi/assets/p185554_b_v11_az.jpg?w=240&h=360","description":"When Amy's parents and Sheldon's family arrive, everybody is focused on making sure the wedding arrangements go according to plan -- everyone except the bride and groom.","releaseYear":2018,"mainCast":["Johnny Galecki (Leonard Hofstadter)","Jim Parsons (Sheldon Cooper)","Kaley Cuoco (Penny)"],"directors":["Mark Cendrowski"],"genres":["Sitcom"],"ratings":[{"code":"TVPG","body":"USA Parental Rating"}],"seriesEpisode":{"seriesId":"185554","episodeTitle":"The Bow Tie Asymmetry","image":"/gn/pi/assets/p15015849_e_v8_aa.jpg?w=240&h=360","seasonEpisode":"Season 11; Episode 24"},"cast":[{"personId":"33631","name":"Johnny Galecki","role":"Leonard Hofstadter"},{"personId":"314170","name":"Jim Parsons","role":"Sheldon Cooper"},{"personId":"169721","name":"Kaley Cuoco","role":"Penny"},{"personId":"220961","name":"Simon Helberg","role":"Howard Wolowitz"},{"personId":"508075","name":"Kunal Nayyar","role":"Raj Koothrappali"},{"personId":"155","name":"Mayim Bialik","role":"Amy Farrah Fowler"},{"personId":"530748","name":"Melissa Rauch","role":"Bernadette Rostenkowski"},{"personId":"308458","name":"Kevin Sussman","role":"Stuart - Guest Star"},{"personId":"38285","name":"Laurie Metcalf","role":"Mary - Guest Star"},{"personId":"260209","name":"John Ross Bowie","role":"Kripke - Guest Star"},{"personId":"65798","name":"Wil Wheaton","role":"Himself - Guest Star"},{"personId":"181887","name":"Brian Posehn","role":"Bert - Guest Star"},{"personId":"31226","name":"Jerry O'Connell","role":"George - Guest Star"},{"personId":"271536","name":"Courtney Henggeler","role":"Missy - Guest Star"},{"personId":"620417","name":"Lauren Lapkus","role":"Denise - Guest Star"},{"personId":"232486","name":"Teller","role":"Mr. Fowler - Guest Star"},{"personId":"106","name":"Kathy Bates","role":"Mrs. Fowler - Guest Star"},{"personId":"73414","name":"Mark Hamill","role":"Himself - Guest Star"}],"crew":[{"personId":"75481","name":"Chuck Lorre","role":"Executive Producer"},{"personId":"232097","name":"Bill Prady","role":"Executive Producer"},{"personId":"262338","name":"Steven Molaro","role":"Executive Producer"},{"personId":"75481","name":"Chuck Lorre","role":"Writer"},{"personId":"262338","name":"Steven Molaro","role":"Writer"},{"personId":"490163","name":"Maria Ferrari","role":"Writer"},{"personId":"278500","name":"Steve Holland","role":"Writer"},{"personId":"383184","name":"Eric Kaplan","role":"Writer"},{"personId":"643632","name":"Tara Hernandez","role":"Writer"},{"personId":"188536","name":"Mark Cendrowski","role":"Director"}]}

sites/tvtv.us/tvtv.us.config.js

@@ -1,22 +1,16 @@
 const dayjs = require('dayjs')
-const utc = require('dayjs/plugin/utc')
 
-dayjs.extend(utc)
+let cachedPrograms = {}
 
 module.exports = {
   site: 'tvtv.us',
   days: 2,
-  url: function ({ date, channel }) {
+  url({ date, channel }) {
-    if (!dayjs.isDayjs(date)) {
-      throw new Error('Invalid date object passed to url function')
-    }
-
     return `https://www.tvtv.us/api/v1/lineup/USA-NY71652-X/grid/${date.toJSON()}/${date
       .add(1, 'day')
       .toJSON()}/${channel.site_id}`
   },
   request: {
-    method: 'GET',
     headers: {
       Accept: '*/*',
       Connection: 'keep-alive',
@@ -27,27 +21,131 @@ module.exports = {
       'sec-ch-ua-platform': '"Windows"'
     }
   },
-  parser: function ({ content }) {
+  async parser(ctx) {
     let programs = []
+    let queue = []
+
+    const items = parseItems(ctx.content)
+    for (const item of items) {
+      const start = dayjs(item.startTime)
+      const stop = start.add(item.duration, 'minute')
 
-    const items = parseItems(content)
-    items.forEach(item => {
-      const start = dayjs.utc(item.startTime)
-      const stop = start.add(item.runTime, 'minute')
       programs.push({
+        id: item.programId,
         title: item.title,
-        description: item.subtitle,
+        subtitle: item.subtitle || null,
         start,
         stop
       })
+
+      // NOTE: This part of the code is commented out because loading additional data leads either to error 429 Too Many Requests or to even greater delays between requests.
+      // if (item.programId && !cachedPrograms[item.programId]) {
+      //   queue.push({
+      //     programId: item.programId,
+      //     url: `https://tvtv.us/api/v1/programs/${item.programId}`,
+      //     httpAgent: ctx.request.agent,
+      //     httpsAgent: ctx.request.agent,
+      //     headers: module.exports.request.headers
+      //   })
+      // }
+    }
+
+    const axios = require('axios')
+    for (const req of queue) {
+      await wait(5000)
+
+      const data = await axios(req)
+        .then(r => r.data)
+        .catch(console.error)
+
+      if (!data || !data.title) continue
+
+      cachedPrograms[req.programId] = data
+    }
+
+    programs.forEach(program => {
+      const data = cachedPrograms[program.id]
+
+      if (!data) return
+
+      program.description = data.description || null
+      program.image = data.image ? `https://tvtv.us${data.image}` : null
+      program.date = data.releaseYear ? data.releaseYear.toString() : null
+      program.directors = data.directors
+      program.categories = data.genres
+      program.actors = parseActors(data)
+      program.writers = parseWriters(data)
+      program.producers = parseProducers(data)
+      program.ratings = parseRatings(data)
+      program.season = parseSeason(data)
+      program.episode = parseEpisode(data)
     })
 
     return programs
   }
 }
 
-function parseItems(content) {
+function parseEpisode(data) {
-  const json = JSON.parse(content)
+  if (!data?.seriesEpisode?.seasonEpisode) return null
-  if (!json.length) return []
+
-  return json[0]
+  const [, episode] = data.seriesEpisode.seasonEpisode.match(/Episode (\d+)/) || [null, null]
+
+  return episode ? parseInt(episode) : null
+}
+
+function parseSeason(data) {
+  if (!data?.seriesEpisode?.seasonEpisode) return null
+
+  const [, season] = data.seriesEpisode.seasonEpisode.match(/Season (\d+);/) || [null, null]
+
+  return season ? parseInt(season) : null
+}
+
+function parseRatings(data) {
+  return Array.isArray(data.ratings)
+    ? data.ratings.map(rating => ({
+        value: rating.code,
+        system: rating.body
+      }))
+    : []
+}
+
+function parseWriters(data) {
+  return data.crew.filter(member => member.role.includes('Writer')).map(member => member.name)
+}
+
+function parseProducers(data) {
+  return data.crew.filter(member => member.role.includes('Producer')).map(member => member.name)
+}
+
+function parseActors(data) {
+  return data.cast.map(actor => {
+    const guest = actor.role.includes('Guest Star') ? 'yes' : undefined
+    const role = actor.role.replace(' - Guest Star', '')
+
+    return {
+      value: actor.name,
+      role,
+      guest
+    }
+  })
+}
+
+function parseItems(content) {
+  try {
+    const json = JSON.parse(content)
+    if (!json.length) return []
+
+    return json[0]
+  } catch {
+    return []
+  }
+}
+
+function wait(ms) {
+  if (process.env.NODE_ENV === 'test') return
+
+  return new Promise(resolve => {
+    setTimeout(resolve, ms)
+  })
 }

sites/tvtv.us/tvtv.us.test.js

@@ -1,52 +1,172 @@
 const { parser, url } = require('./tvtv.us.config.js')
+const fs = require('fs')
+const path = require('path')
+const axios = require('axios')
 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('2022-09-20', 'YYYY-MM-DD').startOf('d')
+jest.mock('axios')
-const channel = {
+
-  site_id: '62670',
+axios.mockImplementation(req => {
-  xmltv_id: 'AMITV.ca',
+  if (req.url === 'https://tvtv.us/api/v1/programs/EP009311820269') {
-  logo: 'https://tvtv.us/gn/i/assets/s62670_ll_h15_ab.png?w=360&h=270'
+    return Promise.resolve({
-}
+      data: JSON.parse(fs.readFileSync(path.resolve(__dirname, '__data__/program_1.json')))
+    })
+  } else {
+    return Promise.resolve({ data: '' })
+  }
+})
+
+const date = dayjs.utc('2025-01-30', 'YYYY-MM-DD').startOf('d')
+const channel = { site_id: '20373' }
 
 it('can generate valid url', () => {
   expect(url({ channel, date })).toBe(
-    'https://www.tvtv.us/api/v1/lineup/USA-NY71652-X/grid/2022-09-20T00:00:00.000Z/2022-09-21T00:00:00.000Z/62670'
+    'https://www.tvtv.us/api/v1/lineup/USA-NY71652-X/grid/2025-01-30T00:00:00.000Z/2025-01-31T00:00:00.000Z/20373'
   )
 })
 
-it('can parse response', () => {
+it('can parse response', async () => {
-  const content =
+  const content = fs.readFileSync(path.resolve(__dirname, '__data__/content.json'))
-    '[[{"programId":"EP039131940001","title":"Beyond the Field","subtitle":"Diversity in Sport","flags":["CC","DVS"],"type":"O","startTime":"2022-09-20T00:00Z","start":0,"duration":30,"runTime":30},{"programId":"EP032368970002","title":"IGotThis","subtitle":"Listen to Dis","flags":["CC","DVS"],"type":"O","startTime":"2022-09-20T00:30Z","start":120,"duration":30,"runTime":30}]]'
 
-  const result = parser({ content }).map(p => {
+  let results = await parser({ content, request: { agent: null } })
+  results = results.map(p => {
     p.start = p.start.toJSON()
     p.stop = p.stop.toJSON()
     return p
   })
 
-  expect(result).toMatchObject([
+  expect(results.length).toBe(33)
-    {
+  expect(results[0]).toMatchObject({
-      start: '2022-09-20T00:00:00.000Z',
+    start: '2025-01-30T00:00:00.000Z',
-      stop: '2022-09-20T00:30:00.000Z',
+    stop: '2025-01-30T00:30:00.000Z',
-      title: 'Beyond the Field',
+    title: 'NY Sports Nation Nightly',
-      description: 'Diversity in Sport'
+    subtitle: null
-    },
+  })
-    {
+  expect(results[1]).toMatchObject({
-      start: '2022-09-20T00:30:00.000Z',
+    start: '2025-01-30T00:30:00.000Z',
-      stop: '2022-09-20T01:00:00.000Z',
+    stop: '2025-01-30T01:00:00.000Z',
-      title: 'IGotThis',
+    title: 'The Big Bang Theory',
-      description: 'Listen to Dis'
+    subtitle: 'The Bow Tie Asymmetry'
-    }
+    // description:
-  ])
+    //   "When Amy's parents and Sheldon's family arrive, everybody is focused on making sure the wedding arrangements go according to plan -- everyone except the bride and groom.",
+    // image: 'https://tvtv.us/gn/pi/assets/p185554_b_v11_az.jpg?w=240&h=360',
+    // date: '2018',
+    // season: 11,
+    // episode: 24,
+    // actors: [
+    //   {
+    //     value: 'Johnny Galecki',
+    //     role: 'Leonard Hofstadter'
+    //   },
+    //   {
+    //     value: 'Jim Parsons',
+    //     role: 'Sheldon Cooper'
+    //   },
+    //   {
+    //     value: 'Kaley Cuoco',
+    //     role: 'Penny'
+    //   },
+    //   {
+    //     value: 'Simon Helberg',
+    //     role: 'Howard Wolowitz'
+    //   },
+    //   {
+    //     value: 'Kunal Nayyar',
+    //     role: 'Raj Koothrappali'
+    //   },
+    //   {
+    //     value: 'Mayim Bialik',
+    //     role: 'Amy Farrah Fowler'
+    //   },
+    //   {
+    //     value: 'Melissa Rauch',
+    //     role: 'Bernadette Rostenkowski'
+    //   },
+    //   {
+    //     value: 'Kevin Sussman',
+    //     role: 'Stuart',
+    //     guest: 'yes'
+    //   },
+    //   {
+    //     value: 'Laurie Metcalf',
+    //     role: 'Mary',
+    //     guest: 'yes'
+    //   },
+    //   {
+    //     value: 'John Ross Bowie',
+    //     role: 'Kripke',
+    //     guest: 'yes'
+    //   },
+    //   {
+    //     value: 'Wil Wheaton',
+    //     role: 'Himself',
+    //     guest: 'yes'
+    //   },
+    //   {
+    //     value: 'Brian Posehn',
+    //     role: 'Bert',
+    //     guest: 'yes'
+    //   },
+    //   {
+    //     value: "Jerry O'Connell",
+    //     role: 'George',
+    //     guest: 'yes'
+    //   },
+    //   {
+    //     value: 'Courtney Henggeler',
+    //     role: 'Missy',
+    //     guest: 'yes'
+    //   },
+    //   {
+    //     value: 'Lauren Lapkus',
+    //     role: 'Denise',
+    //     guest: 'yes'
+    //   },
+    //   {
+    //     value: 'Teller',
+    //     role: 'Mr. Fowler',
+    //     guest: 'yes'
+    //   },
+    //   {
+    //     value: 'Kathy Bates',
+    //     role: 'Mrs. Fowler',
+    //     guest: 'yes'
+    //   },
+    //   {
+    //     value: 'Mark Hamill',
+    //     role: 'Himself',
+    //     guest: 'yes'
+    //   }
+    // ],
+    // directors: ['Mark Cendrowski'],
+    // producers: ['Chuck Lorre', 'Bill Prady', 'Steven Molaro'],
+    // writers: [
+    //   'Chuck Lorre',
+    //   'Steven Molaro',
+    //   'Maria Ferrari',
+    //   'Steve Holland',
+    //   'Eric Kaplan',
+    //   'Tara Hernandez'
+    // ],
+    // categories: ['Sitcom'],
+    // ratings: [
+    //   {
+    //     value: 'TVPG',
+    //     system: 'USA Parental Rating'
+    //   }
+    // ]
+  })
 })
 
-it('can handle empty guide', () => {
+it('can handle empty guide', async () => {
-  const result = parser({
+  const results = await parser({
-    content: '[]'
+    content: '[]',
+    request: { agent: null }
   })
-  expect(result).toMatchObject([])
+
+  expect(results).toMatchObject([])
 })