Update update-guides.js

scripts/commands/update-guides.js

@@ -1,4 +1,4 @@
-const { db, logger, file } = require('../core')
+const { db, logger, file, api } = require('../core')
 const grabber = require('epg-grabber')
 const _ = require('lodash')
 
@@ -17,14 +17,23 @@ main()
 async function generateGuides() {
   logger.info(`Generating guides/...`)
 
-  const grouped = groupByGroup(await loadChannels())
+  const grouped = groupByGroup(await loadQueue())
 
   logger.info('Loading "database/programs.db"...')
   await db.programs.load()
 
   for (const key in grouped) {
     const filepath = `${PUBLIC_DIR}/guides/${key}.epg.xml`
-    const channels = grouped[key]
+    const items = grouped[key]
+    const channels = items
+      .map(i => {
+        const channel = api.channels.get(i.xmltv_id)
+        i.name = channel.name
+        i.logo = channel.logo
+        return i
+      })
+      .filter(i => i)
+
     const programs = await loadProgramsForChannels(channels)
     const output = grabber.convertToXMLTV({ channels, programs })
 
@@ -56,12 +65,12 @@ function groupByGroup(channels = []) {
   return groups
 }
 
-async function loadChannels() {
+async function loadQueue() {
-  logger.info('Loading channels...')
+  logger.info('Loading queue...')
 
-  await db.channels.load()
+  await db.queue.load()
 
-  return await db.channels.find({ programCount: { $gt: 0 } }).sort({ xmltv_id: 1 })
+  return await db.queue.find({ programCount: { $gt: 0 } }).sort({ xmltv_id: 1 })
 }
 
 async function loadProgramsForChannels(channels = []) {

scripts/core/api.js

@@ -0,0 +1,15 @@
+class API {
+  constructor(filepath) {
+    this.collection = require(filepath)
+  }
+
+  get(id) {
+    return this.collection.find(c => c.id === id)
+  }
+}
+
+const api = {}
+
+api.channels = new API('../data/channels.json')
+
+module.exports = api

scripts/core/index.js

@@ -4,3 +4,4 @@ exports.file = require('./file')
 exports.parser = require('./parser')
 exports.timer = require('./timer')
 exports.markdown = require('./markdown')
+exports.api = require('./api')

tests/__data__/expected/guides/bh/chaines-tv.orange.fr.epg.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?><tv>
-<channel id="CNNInternationalEurope.us"><display-name>CNN International Europe</display-name><url>https://chaines-tv.orange.fr</url></channel>
+<channel id="CNNInternationalEurope.us"><display-name>CNN International Europe</display-name><icon src="https://i.imgur.com/2BXCg0x.jpg"/><url>https://chaines-tv.orange.fr</url></channel>
 <programme start="20220110000000 +0000" stop="20220110010000 +0000" channel="CNNInternationalEurope.us"><title lang="ru">CNN Newsroom Sunday</title><desc lang="ru">Свежая мировая информационная сводка от CNN. О политике, экономике, общественной жизни, культуре, спорте.</desc><category lang="ru">Category1</category><category lang="ru">Category2</category></programme>
 <programme start="20220110010000 +0000" stop="20220110020000 +0000" channel="CNNInternationalEurope.us"><title lang="ru">Fareed Zakaria GPS</title><desc lang="ru">Интервью с главными игроками мировой политики.</desc><category lang="ru">Category1</category></programme>
 <programme start="20220110020000 +0000" stop="20220110023000 +0000" channel="CNNInternationalEurope.us"><title lang="ru">African Voices Changemakers. 114-я серия</title><desc lang="ru">114-я серия. Африка сегодня - люди, новости, события.</desc></programme>

tests/__data__/expected/guides/fr/chaines-tv.orange.fr.epg.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?><tv>
-<channel id="CNNInternationalEurope.us"><display-name>CNN International Europe</display-name><url>https://chaines-tv.orange.fr</url></channel>
+<channel id="CNNInternationalEurope.us"><display-name>CNN International Europe</display-name><icon src="https://i.imgur.com/2BXCg0x.jpg"/><url>https://chaines-tv.orange.fr</url></channel>
 <programme start="20220110000000 +0000" stop="20220110010000 +0000" channel="CNNInternationalEurope.us"><title lang="ru">CNN Newsroom Sunday</title><desc lang="ru">Свежая мировая информационная сводка от CNN. О политике, экономике, общественной жизни, культуре, спорте.</desc><category lang="ru">Category1</category><category lang="ru">Category2</category></programme>
 <programme start="20220110010000 +0000" stop="20220110020000 +0000" channel="CNNInternationalEurope.us"><title lang="ru">Fareed Zakaria GPS</title><desc lang="ru">Интервью с главными игроками мировой политики.</desc><category lang="ru">Category1</category></programme>
 <programme start="20220110020000 +0000" stop="20220110023000 +0000" channel="CNNInternationalEurope.us"><title lang="ru">African Voices Changemakers. 114-я серия</title><desc lang="ru">114-я серия. Африка сегодня - люди, новости, события.</desc></programme>

tests/commands/update-guides.test.js

@@ -6,10 +6,7 @@ beforeEach(() => {
   fs.rmdirSync('tests/__data__/output', { recursive: true })
   fs.mkdirSync('tests/__data__/output')
   fs.mkdirSync('tests/__data__/temp/database', { recursive: true })
-  fs.copyFileSync(
+  fs.copyFileSync('tests/__data__/input/database/queue.db', 'tests/__data__/temp/database/queue.db')
-    'tests/__data__/input/database/channels.db',
-    'tests/__data__/temp/database/channels.db'
-  )
   fs.copyFileSync(
     'tests/__data__/input/database/programs.db',
     'tests/__data__/temp/database/programs.db'