Update scripts

scripts/commands/channels/edit.ts

@@ -1,17 +1,17 @@
 import { Storage, Collection, Logger, Dictionary } from '@freearhey/core'
+import type { DataProcessorData } from '../../types/dataProcessor'
+import type { DataLoaderData } from '../../types/dataLoader'
+import { ChannelSearchableData } from '../../types/channel'
+import { Channel, ChannelList, Feed } from '../../models'
+import { DataProcessor, DataLoader } from '../../core'
 import { select, input } from '@inquirer/prompts'
-import { ChannelsParser, XML } from '../../core'
-import { Channel, Feed } from '../../models'
+import { ChannelsParser } from '../../core'
 import { DATA_DIR } from '../../constants'
 import nodeCleanup from 'node-cleanup'
+import sjs from '@freearhey/search-js'
+import epgGrabber from 'epg-grabber'
 import { Command } from 'commander'
 import readline from 'readline'
-import sjs from '@freearhey/search-js'
-import { DataProcessor, DataLoader } from '../../core'
-import type { DataLoaderData } from '../../types/dataLoader'
-import type { DataProcessorData } from '../../types/dataProcessor'
-import epgGrabber from 'epg-grabber'
-import { ChannelSearchableData } from '../../types/channel'
 
 type ChoiceValue = { type: string; value?: Feed | Channel }
 type Choice = { name: string; short?: string; value: ChoiceValue; default?: boolean }
@@ -34,11 +34,11 @@ program.argument('<filepath>', 'Path to *.channels.xml file to edit').parse(proc
 const filepath = program.args[0]
 const logger = new Logger()
 const storage = new Storage()
-let parsedChannels = new Collection()
+let channelList = new ChannelList({ channels: [] })
 
 main(filepath)
 nodeCleanup(() => {
-  save(filepath)
+  save(filepath, channelList)
 })
 
 export default async function main(filepath: string) {
@@ -51,18 +51,18 @@ export default async function main(filepath: string) {
   const dataStorage = new Storage(DATA_DIR)
   const loader = new DataLoader({ storage: dataStorage })
   const data: DataLoaderData = await loader.load()
-  const { feedsGroupedByChannelId, channels, channelsKeyById }: DataProcessorData =
+  const { channels, channelsKeyById, feedsGroupedByChannelId }: DataProcessorData =
     processor.process(data)
 
   logger.info('loading channels...')
   const parser = new ChannelsParser({ storage })
-  parsedChannels = await parser.parse(filepath)
-  const parsedChannelsWithoutId = parsedChannels.filter(
+  channelList = await parser.parse(filepath)
+  const parsedChannelsWithoutId = channelList.channels.filter(
     (channel: epgGrabber.Channel) => !channel.xmltv_id
   )
 
   logger.info(
-    `found ${parsedChannels.count()} channels (including ${parsedChannelsWithoutId.count()} without ID)`
+    `found ${channelList.channels.count()} channels (including ${parsedChannelsWithoutId.count()} without ID)`
   )
 
   logger.info('creating search index...')
@@ -73,10 +73,10 @@ export default async function main(filepath: string) {
 
   logger.info('starting...\n')
 
-  for (const parsedChannel of parsedChannelsWithoutId.all()) {
+  for (const channel of parsedChannelsWithoutId.all()) {
     try {
-      parsedChannel.xmltv_id = await selectChannel(
-        parsedChannel,
+      channel.xmltv_id = await selectChannel(
+        channel,
         searchIndex,
         feedsGroupedByChannelId,
         channelsKeyById
@@ -124,8 +124,8 @@ async function selectChannel(
     case 'channel': {
       const selectedChannel = selected.value
       if (!selectedChannel) return ''
-      const selectedFeedId = await selectFeed(selectedChannel.id, feedsGroupedByChannelId)
-      if (selectedFeedId === '-') return selectedChannel.id
+      const selectedFeedId = await selectFeed(selectedChannel.id || '', feedsGroupedByChannelId)
+      if (selectedFeedId === '-') return selectedChannel.id || ''
       return [selectedChannel.id, selectedFeedId].join('@')
     }
   }
@@ -153,7 +153,7 @@ async function selectFeed(channelId: string, feedsGroupedByChannelId: Dictionary
     case 'feed':
       const selectedFeed = selected.value
       if (!selectedFeed) return ''
-      return selectedFeed.id
+      return selectedFeed.id || ''
   }
 
   return ''
@@ -205,10 +205,9 @@ function getFeedChoises(feeds: Collection): Choice[] {
   return choises
 }
 
-function save(filepath: string) {
+function save(filepath: string, channelList: ChannelList) {
   if (!storage.existsSync(filepath)) return
-  const xml = new XML(parsedChannels)
-  storage.saveSync(filepath, xml.toString())
+  storage.saveSync(filepath, channelList.toString())
   logger.info(`\nFile '${filepath}' successfully saved`)
 }
 

scripts/commands/channels/parse.ts

@@ -1,8 +1,9 @@
-import { Logger, File, Collection, Storage } from '@freearhey/core'
-import { ChannelsParser, XML } from '../../core'
-import { Channel } from 'epg-grabber'
-import { Command } from 'commander'
+import { Logger, File, Storage } from '@freearhey/core'
+import { ChannelsParser } from '../../core'
+import { ChannelList } from '../../models'
 import { pathToFileURL } from 'node:url'
+import epgGrabber from 'epg-grabber'
+import { Command } from 'commander'
 
 const program = new Command()
 program
@@ -21,17 +22,25 @@ type ParseOptions = {
 const options: ParseOptions = program.opts()
 
 async function main() {
+  function isPromise(promise: object[] | Promise<object[]>) {
+    return (
+      !!promise &&
+      typeof promise === 'object' &&
+      typeof (promise as Promise<object[]>).then === 'function'
+    )
+  }
+
   const storage = new Storage()
-  const parser = new ChannelsParser({ storage })
   const logger = new Logger()
+  const parser = new ChannelsParser({ storage })
   const file = new File(options.config)
   const dir = file.dirname()
   const config = (await import(pathToFileURL(options.config).toString())).default
   const outputFilepath = options.output || `${dir}/${config.site}.channels.xml`
 
-  let channels = new Collection()
+  let channelList = new ChannelList({ channels: [] })
   if (await storage.exists(outputFilepath)) {
-    channels = await parser.parse(outputFilepath)
+    channelList = await parser.parse(outputFilepath)
   }
 
   const args: {
@@ -49,45 +58,31 @@ async function main() {
   if (isPromise(parsedChannels)) {
     parsedChannels = await parsedChannels
   }
-  parsedChannels = parsedChannels.map((channel: Channel) => {
+  parsedChannels = parsedChannels.map((channel: epgGrabber.Channel) => {
     channel.site = config.site
 
     return channel
   })
 
-  let output = new Collection()
-  parsedChannels.forEach((channel: Channel) => {
-    const found: Channel | undefined = channels.first(
-      (_channel: Channel) => _channel.site_id == channel.site_id
-    )
+  const newChannelList = new ChannelList({ channels: [] })
+  parsedChannels.forEach((channel: epgGrabber.Channel) => {
+    if (!channel.site_id) return
+
+    const found: epgGrabber.Channel | undefined = channelList.get(channel.site_id)
 
     if (found) {
       channel.xmltv_id = found.xmltv_id
       channel.lang = found.lang
     }
 
-    output.add(channel)
+    newChannelList.add(channel)
   })
 
-  output = output.orderBy([
-    (channel: Channel) => channel.lang || '_',
-    (channel: Channel) => (channel.xmltv_id ? channel.xmltv_id.toLowerCase() : '0'),
-    (channel: Channel) => channel.site_id
-  ])
+  newChannelList.sort()
 
-  const xml = new XML(output)
-
-  await storage.save(outputFilepath, xml.toString())
+  await storage.save(outputFilepath, newChannelList.toString())
 
   logger.info(`File '${outputFilepath}' successfully saved`)
 }
 
 main()
-
-function isPromise(promise: object[] | Promise<object[]>) {
-  return (
-    !!promise &&
-    typeof promise === 'object' &&
-    typeof (promise as Promise<object[]>).then === 'function'
-  )
-}

scripts/commands/channels/validate.ts

@@ -1,11 +1,13 @@
-import { Storage, Collection, Dictionary, File } from '@freearhey/core'
-import { ChannelsParser } from '../../core'
-import { Channel, Feed } from '../../models'
+import { ChannelsParser, DataLoader, DataProcessor } from '../../core'
+import { DataProcessorData } from '../../types/dataProcessor'
+import { Storage, Dictionary, File } from '@freearhey/core'
+import { DataLoaderData } from '../../types/dataLoader'
+import { ChannelList } from '../../models'
+import { DATA_DIR } from '../../constants'
+import epgGrabber from 'epg-grabber'
 import { program } from 'commander'
 import chalk from 'chalk'
 import langs from 'langs'
-import { DATA_DIR } from '../../constants'
-import epgGrabber from 'epg-grabber'
 
 program.argument('[filepath]', 'Path to *.channels.xml files to validate').parse(process.argv)
 
@@ -19,15 +21,14 @@ type ValidationError = {
 }
 
 async function main() {
-  const parser = new ChannelsParser({ storage: new Storage() })
-
+  const processor = new DataProcessor()
   const dataStorage = new Storage(DATA_DIR)
-  const channelsData = await dataStorage.json('channels.json')
-  const channels = new Collection(channelsData).map(data => new Channel(data))
-  const channelsKeyById = channels.keyBy((channel: Channel) => channel.id)
-  const feedsData = await dataStorage.json('feeds.json')
-  const feeds = new Collection(feedsData).map(data => new Feed(data))
-  const feedsKeyByStreamId = feeds.keyBy((feed: Feed) => feed.getStreamId())
+  const loader = new DataLoader({ storage: dataStorage })
+  const data: DataLoaderData = await loader.load()
+  const { channelsKeyById, feedsKeyByStreamId }: DataProcessorData = processor.process(data)
+  const parser = new ChannelsParser({
+    storage: new Storage()
+  })
 
   let totalFiles = 0
   let totalErrors = 0
@@ -38,11 +39,11 @@ async function main() {
     const file = new File(filepath)
     if (file.extension() !== 'xml') continue
 
-    const parsedChannels = await parser.parse(filepath)
+    const channelList: ChannelList = await parser.parse(filepath)
 
     const bufferBySiteId = new Dictionary()
     const errors: ValidationError[] = []
-    parsedChannels.forEach((channel: epgGrabber.Channel) => {
+    channelList.channels.forEach((channel: epgGrabber.Channel) => {
       const bufferId: string = channel.site_id
       if (bufferBySiteId.missing(bufferId)) {
         bufferBySiteId.set(bufferId, true)