Update scripts

scripts/commands/api/generate.ts

@@ -13,13 +13,15 @@ async function main() {
   const dataStorage = new Storage(DATA_DIR)
   const dataLoader = new DataLoader({ storage: dataStorage })
   const data: DataLoaderData = await dataLoader.load()
-  const { channelsKeyById, feedsGroupedByChannelId }: DataProcessorData = processor.process(data)
+  const { channelsKeyById, feedsGroupedByChannelId, logosGroupedByStreamId }: DataProcessorData =
+    processor.process(data)
 
   logger.info('loading streams...')
   const streamsStorage = new Storage(STREAMS_DIR)
   const parser = new PlaylistParser({
     storage: streamsStorage,
     channelsKeyById,
+    logosGroupedByStreamId,
     feedsGroupedByChannelId
   })
   const files = await streamsStorage.list('**/*.m3u')

scripts/commands/api/load.ts

@@ -15,6 +15,7 @@ async function main() {
     loader.download('regions.json'),
     loader.download('subdivisions.json'),
     loader.download('feeds.json'),
+    loader.download('logos.json'),
     loader.download('timezones.json'),
     loader.download('guides.json'),
     loader.download('streams.json')

scripts/commands/playlist/edit.ts

@@ -49,11 +49,20 @@ 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 { channels, channelsKeyById, feedsGroupedByChannelId }: DataProcessorData =
-    processor.process(data)
+  const {
+    channels,
+    channelsKeyById,
+    feedsGroupedByChannelId,
+    logosGroupedByStreamId
+  }: DataProcessorData = processor.process(data)
 
   logger.info('loading streams...')
-  const parser = new PlaylistParser({ storage, feedsGroupedByChannelId, channelsKeyById })
+  const parser = new PlaylistParser({
+    storage,
+    feedsGroupedByChannelId,
+    logosGroupedByStreamId,
+    channelsKeyById
+  })
   parsedStreams = await parser.parseFile(filepath)
   const streamsWithoutId = parsedStreams.filter((stream: Stream) => !stream.id)
 

scripts/commands/playlist/format.ts

@@ -16,14 +16,16 @@ async function main() {
   const dataStorage = new Storage(DATA_DIR)
   const loader = new DataLoader({ storage: dataStorage })
   const data: DataLoaderData = await loader.load()
-  const { channelsKeyById, feedsGroupedByChannelId }: DataProcessorData = processor.process(data)
+  const { channelsKeyById, feedsGroupedByChannelId, logosGroupedByStreamId }: DataProcessorData =
+    processor.process(data)
 
   logger.info('loading streams...')
   const streamsStorage = new Storage(STREAMS_DIR)
   const parser = new PlaylistParser({
     storage: streamsStorage,
     channelsKeyById,
-    feedsGroupedByChannelId
+    feedsGroupedByChannelId,
+    logosGroupedByStreamId
   })
   const files = program.args.length ? program.args : await streamsStorage.list('**/*.m3u')
   let streams = await parser.parse(files)

scripts/commands/playlist/generate.ts

@@ -14,7 +14,8 @@ import {
   CountriesGenerator,
   LanguagesGenerator,
   RegionsGenerator,
-  IndexGenerator
+  IndexGenerator,
+  SourcesGenerator
 } from '../../generators'
 
 async function main() {
@@ -28,6 +29,7 @@ async function main() {
   const data: DataLoaderData = await loader.load()
   const {
     feedsGroupedByChannelId,
+    logosGroupedByStreamId,
     channelsKeyById,
     categories,
     countries,
@@ -39,15 +41,18 @@ async function main() {
   const parser = new PlaylistParser({
     storage: streamsStorage,
     feedsGroupedByChannelId,
+    logosGroupedByStreamId,
     channelsKeyById
   })
   const files = await streamsStorage.list('**/*.m3u')
   let streams = await parser.parse(files)
   const totalStreams = streams.count()
+  logger.info(`found ${totalStreams} streams`)
+
+  logger.info('filtering streams...')
   streams = streams.uniqBy((stream: Stream) =>
     stream.hasId() ? stream.getChannelId() + stream.getFeedId() : uniqueId()
   )
-  logger.info(`found ${totalStreams} streams (including ${streams.count()} unique)`)
 
   logger.info('sorting streams...')
   streams = streams.orderBy(
@@ -79,6 +84,9 @@ async function main() {
     logFile
   }).generate()
 
+  logger.info('generating sources/...')
+  await new SourcesGenerator({ streams, logFile }).generate()
+
   logger.info('generating index.m3u...')
   await new IndexGenerator({ streams, logFile }).generate()
 

scripts/commands/playlist/test.ts

@@ -61,14 +61,16 @@ async function main() {
   const dataStorage = new Storage(DATA_DIR)
   const loader = new DataLoader({ storage: dataStorage })
   const data: DataLoaderData = await loader.load()
-  const { channelsKeyById, feedsGroupedByChannelId }: DataProcessorData = processor.process(data)
+  const { channelsKeyById, feedsGroupedByChannelId, logosGroupedByStreamId }: DataProcessorData =
+    processor.process(data)
 
   logger.info('loading streams...')
   const rootStorage = new Storage(ROOT_DIR)
   const parser = new PlaylistParser({
     storage: rootStorage,
     channelsKeyById,
-    feedsGroupedByChannelId
+    feedsGroupedByChannelId,
+    logosGroupedByStreamId
   })
   const files = program.args.length ? program.args : await rootStorage.list(`${STREAMS_DIR}/*.m3u`)
   streams = await parser.parse(files)

scripts/commands/playlist/update.ts

@@ -20,13 +20,15 @@ async function main() {
   const dataStorage = new Storage(DATA_DIR)
   const dataLoader = new DataLoader({ storage: dataStorage })
   const data: DataLoaderData = await dataLoader.load()
-  const { channelsKeyById, feedsGroupedByChannelId }: DataProcessorData = processor.process(data)
+  const { channelsKeyById, feedsGroupedByChannelId, logosGroupedByStreamId }: DataProcessorData =
+    processor.process(data)
 
   logger.info('loading streams...')
   const streamsStorage = new Storage(STREAMS_DIR)
   const parser = new PlaylistParser({
     storage: streamsStorage,
     feedsGroupedByChannelId,
+    logosGroupedByStreamId,
     channelsKeyById
   })
   const files = await streamsStorage.list('**/*.m3u')
@@ -168,6 +170,7 @@ async function addStreams({
     const quality = data.getString('quality') || null
     const httpUserAgent = data.getString('httpUserAgent') || null
     const httpReferrer = data.getString('httpReferrer') || null
+    const directives = data.getArray('directives') || []
 
     const stream = new Stream({
       channel: channelId,
@@ -176,6 +179,7 @@ async function addStreams({
       url: streamUrl,
       user_agent: httpUserAgent,
       referrer: httpReferrer,
+      directives,
       quality,
       label
     })

scripts/commands/playlist/validate.ts

@@ -26,6 +26,7 @@ async function main() {
   const {
     channelsKeyById,
     feedsGroupedByChannelId,
+    logosGroupedByStreamId,
     blocklistRecordsGroupedByChannelId
   }: DataProcessorData = processor.process(data)
 
@@ -34,7 +35,8 @@ async function main() {
   const parser = new PlaylistParser({
     storage: rootStorage,
     channelsKeyById,
-    feedsGroupedByChannelId
+    feedsGroupedByChannelId,
+    logosGroupedByStreamId
   })
   const files = program.args.length ? program.args : await rootStorage.list('streams/**/*.m3u')
   const streams = await parser.parse(files)

scripts/commands/report/create.ts

@@ -21,6 +21,7 @@ async function main() {
   const {
     channelsKeyById,
     feedsGroupedByChannelId,
+    logosGroupedByStreamId,
     blocklistRecordsGroupedByChannelId
   }: DataProcessorData = processor.process(data)
 
@@ -29,7 +30,8 @@ async function main() {
   const parser = new PlaylistParser({
     storage: streamsStorage,
     channelsKeyById,
-    feedsGroupedByChannelId
+    feedsGroupedByChannelId,
+    logosGroupedByStreamId
   })
   const files = await streamsStorage.list('**/*.m3u')
   const streams = await parser.parse(files)
@@ -151,7 +153,7 @@ async function main() {
     else if (!feedId && streamsGroupedByChannelId.has(channelId)) result.status = 'fulfilled'
     else {
       const channelData = channelsKeyById.get(channelId)
-      if (channelData.length && channelData[0].closed) result.status = 'closed'
+      if (channelData && channelData.isClosed) result.status = 'closed'
     }
 
     channelSearchRequestsBuffer.set(streamId, true)