Update scripts

scripts/core/dataLoader.ts

@@ -47,6 +47,7 @@ export class DataLoader {
       blocklist,
       channels,
       feeds,
+      logos,
       timezones,
       guides,
       streams
@@ -59,6 +60,7 @@ export class DataLoader {
       this.storage.json('blocklist.json'),
       this.storage.json('channels.json'),
       this.storage.json('feeds.json'),
+      this.storage.json('logos.json'),
       this.storage.json('timezones.json'),
       this.storage.json('guides.json'),
       this.storage.json('streams.json')
@@ -73,6 +75,7 @@ export class DataLoader {
       blocklist,
       channels,
       feeds,
+      logos,
       timezones,
       guides,
       streams

scripts/core/dataProcessor.ts

@@ -11,7 +11,8 @@ import {
   Region,
   Stream,
   Guide,
-  Feed
+  Feed,
+  Logo
 } from '../models'
 
 export class DataProcessor {
@@ -21,6 +22,9 @@ export class DataProcessor {
     const categories = new Collection(data.categories).map(data => new Category(data))
     const categoriesKeyById = categories.keyBy((category: Category) => category.id)
 
+    const languages = new Collection(data.languages).map(data => new Language(data))
+    const languagesKeyByCode = languages.keyBy((language: Language) => language.code)
+
     const subdivisions = new Collection(data.subdivisions).map(data => new Subdivision(data))
     const subdivisionsKeyByCode = subdivisions.keyBy((subdivision: Subdivision) => subdivision.code)
     const subdivisionsGroupedByCountryCode = subdivisions.groupBy(
@@ -30,20 +34,6 @@ export class DataProcessor {
     let regions = new Collection(data.regions).map(data => new Region(data))
     const regionsKeyByCode = regions.keyBy((region: Region) => region.code)
 
-    const blocklistRecords = new Collection(data.blocklist).map(data => new BlocklistRecord(data))
-    const blocklistRecordsGroupedByChannelId = blocklistRecords.groupBy(
-      (blocklistRecord: BlocklistRecord) => blocklistRecord.channelId
-    )
-
-    const streams = new Collection(data.streams).map(data => new Stream(data))
-    const streamsGroupedById = streams.groupBy((stream: Stream) => stream.getId())
-
-    const guides = new Collection(data.guides).map(data => new Guide(data))
-    const guidesGroupedByStreamId = guides.groupBy((guide: Guide) => guide.getStreamId())
-
-    const languages = new Collection(data.languages).map(data => new Language(data))
-    const languagesKeyByCode = languages.keyBy((language: Language) => language.code)
-
     const countries = new Collection(data.countries).map(data =>
       new Country(data)
         .withRegions(regions)
@@ -52,13 +42,16 @@ export class DataProcessor {
     )
     const countriesKeyByCode = countries.keyBy((country: Country) => country.code)
 
-    regions = regions.map((region: Region) => region.withCountries(countriesKeyByCode))
-
     const timezones = new Collection(data.timezones).map(data =>
       new Timezone(data).withCountries(countriesKeyByCode)
     )
     const timezonesKeyById = timezones.keyBy((timezone: Timezone) => timezone.id)
 
+    const blocklistRecords = new Collection(data.blocklist).map(data => new BlocklistRecord(data))
+    const blocklistRecordsGroupedByChannelId = blocklistRecords.groupBy(
+      (blocklistRecord: BlocklistRecord) => blocklistRecord.channelId
+    )
+
     let channels = new Collection(data.channels).map(data =>
       new Channel(data)
         .withCategories(categoriesKeyById)
@@ -66,6 +59,7 @@ export class DataProcessor {
         .withSubdivision(subdivisionsKeyByCode)
         .withCategories(categoriesKeyById)
     )
+
     const channelsKeyById = channels.keyBy((channel: Channel) => channel.id)
 
     const feeds = new Collection(data.feeds).map(data =>
@@ -78,14 +72,32 @@ export class DataProcessor {
         .withBroadcastSubdivisions(subdivisionsKeyByCode)
     )
     const feedsGroupedByChannelId = feeds.groupBy((feed: Feed) => feed.channelId)
+    const feedsGroupedById = feeds.groupBy((feed: Feed) => feed.id)
 
-    channels = channels.map((channel: Channel) => channel.withFeeds(feedsGroupedByChannelId))
+    let logos = new Collection(data.logos).map(data => new Logo(data).withFeed(feedsGroupedById))
+    const logosGroupedByChannelId = logos.groupBy((logo: Logo) => logo.channelId)
+    const logosGroupedByStreamId = logos.groupBy((logo: Logo) => logo.getStreamId())
+
+    const streams = new Collection(data.streams).map(data =>
+      new Stream(data).withLogos(logosGroupedByStreamId)
+    )
+    const streamsGroupedById = streams.groupBy((stream: Stream) => stream.getId())
+
+    const guides = new Collection(data.guides).map(data => new Guide(data))
+    const guidesGroupedByStreamId = guides.groupBy((guide: Guide) => guide.getStreamId())
+
+    regions = regions.map((region: Region) => region.withCountries(countriesKeyByCode))
+
+    channels = channels.map((channel: Channel) =>
+      channel.withFeeds(feedsGroupedByChannelId).withLogos(logosGroupedByChannelId)
+    )
 
     return {
       blocklistRecordsGroupedByChannelId,
       subdivisionsGroupedByCountryCode,
       feedsGroupedByChannelId,
       guidesGroupedByStreamId,
+      logosGroupedByStreamId,
       subdivisionsKeyByCode,
       countriesKeyByCode,
       languagesKeyByCode,
@@ -104,7 +116,8 @@ export class DataProcessor {
       regions,
       streams,
       guides,
-      feeds
+      feeds,
+      logos
     }
   }
 }

scripts/core/issueData.ts

@@ -24,9 +24,11 @@ export class IssueData {
     return this._data.get(key) === deleteSymbol ? '' : this._data.get(key)
   }
 
-  getArray(key: string): string[] {
+  getArray(key: string): string[] | undefined {
     const deleteSymbol = '~'
 
+    if (this._data.missing(key)) return undefined
+
     return this._data.get(key) === deleteSymbol ? [] : this._data.get(key).split('\r\n')
   }
 }

scripts/core/issueLoader.ts

@@ -16,7 +16,7 @@ export class IssueLoader {
     }
     let issues: object[] = []
     if (TESTING) {
-      issues = (await import('../../tests/__data__/input/playlist_update/issues.js')).default
+      issues = (await import('../../tests/__data__/input/issues.js')).default
     } else {
       issues = await octokit.paginate(octokit.rest.issues.listForRepo, {
         owner: OWNER,

scripts/core/issueParser.ts

@@ -16,7 +16,8 @@ const FIELDS = new Dictionary({
   'HTTP Referrer': 'httpReferrer',
   'What happened to the stream?': 'reason',
   Reason: 'reason',
-  Notes: 'notes'
+  Notes: 'notes',
+  Directives: 'directives'
 })
 
 export class IssueParser {

scripts/core/playlistParser.ts

@@ -5,17 +5,25 @@ import { Stream } from '../models'
 type PlaylistPareserProps = {
   storage: Storage
   feedsGroupedByChannelId: Dictionary
+  logosGroupedByStreamId: Dictionary
   channelsKeyById: Dictionary
 }
 
 export class PlaylistParser {
   storage: Storage
   feedsGroupedByChannelId: Dictionary
+  logosGroupedByStreamId: Dictionary
   channelsKeyById: Dictionary
 
-  constructor({ storage, feedsGroupedByChannelId, channelsKeyById }: PlaylistPareserProps) {
+  constructor({
+    storage,
+    feedsGroupedByChannelId,
+    logosGroupedByStreamId,
+    channelsKeyById
+  }: PlaylistPareserProps) {
     this.storage = storage
     this.feedsGroupedByChannelId = feedsGroupedByChannelId
+    this.logosGroupedByStreamId = logosGroupedByStreamId
     this.channelsKeyById = channelsKeyById
   }
 
@@ -41,6 +49,7 @@ export class PlaylistParser {
         .fromPlaylistItem(data)
         .withFeed(this.feedsGroupedByChannelId)
         .withChannel(this.channelsKeyById)
+        .withLogos(this.logosGroupedByStreamId)
         .setFilepath(filepath)
 
       return stream