Update scripts

scripts/core/apiChannel.ts

@@ -1,79 +0,0 @@
-import { Collection } from '@freearhey/core'
-
-type ApiChannelProps = {
-  id: string
-  name: string
-  alt_names: string[]
-  network: string
-  owners: string[]
-  country: string
-  subdivision: string
-  city: string
-  broadcast_area: string[]
-  languages: string[]
-  categories: string[]
-  is_nsfw: boolean
-  launched: string
-  closed: string
-  replaced_by: string
-  website: string
-  logo: string
-}
-
-export class ApiChannel {
-  id: string
-  name: string
-  altNames: Collection
-  network: string
-  owners: Collection
-  country: string
-  subdivision: string
-  city: string
-  broadcastArea: Collection
-  languages: Collection
-  categories: Collection
-  isNSFW: boolean
-  launched: string
-  closed: string
-  replacedBy: string
-  website: string
-  logo: string
-
-  constructor({
-    id,
-    name,
-    alt_names,
-    network,
-    owners,
-    country,
-    subdivision,
-    city,
-    broadcast_area,
-    languages,
-    categories,
-    is_nsfw,
-    launched,
-    closed,
-    replaced_by,
-    website,
-    logo
-  }: ApiChannelProps) {
-    this.id = id
-    this.name = name
-    this.altNames = new Collection(alt_names)
-    this.network = network
-    this.owners = new Collection(owners)
-    this.country = country
-    this.subdivision = subdivision
-    this.city = city
-    this.broadcastArea = new Collection(broadcast_area)
-    this.languages = new Collection(languages)
-    this.categories = new Collection(categories)
-    this.isNSFW = is_nsfw
-    this.launched = launched
-    this.closed = closed
-    this.replacedBy = replaced_by
-    this.website = website
-    this.logo = logo
-  }
-}

scripts/core/index.ts

@@ -7,7 +7,6 @@ export * from './job'
 export * from './queue'
 export * from './guideManager'
 export * from './guide'
-export * from './apiChannel'
 export * from './apiClient'
 export * from './queueCreator'
 export * from './issueLoader'

scripts/core/issueLoader.ts

@@ -1,27 +1,22 @@
-import { Collection } from '@freearhey/core'
 import { restEndpointMethods } from '@octokit/plugin-rest-endpoint-methods'
 import { paginateRest } from '@octokit/plugin-paginate-rest'
+import { TESTING, OWNER, REPO } from '../constants'
+import { Collection } from '@freearhey/core'
 import { Octokit } from '@octokit/core'
 import { IssueParser } from './'
-import { TESTING, OWNER, REPO } from '../constants'
 
 const CustomOctokit = Octokit.plugin(paginateRest, restEndpointMethods)
 const octokit = new CustomOctokit()
 
 export class IssueLoader {
-  async load({ labels }: { labels: string[] | string }) {
-    labels = Array.isArray(labels) ? labels.join(',') : labels
+  async load(props?: { labels: string[] | string }) {
+    let labels = ''
+    if (props && props.labels) {
+      labels = Array.isArray(props.labels) ? props.labels.join(',') : props.labels
+    }
     let issues: object[] = []
     if (TESTING) {
-      switch (labels) {
-        case 'broken guide,status:warning':
-          issues = (await import('../../tests/__data__/input/issues/broken_guide_warning.mjs'))
-            .default
-          break
-        case 'broken guide,status:down':
-          issues = (await import('../../tests/__data__/input/issues/broken_guide_down.mjs')).default
-          break
-      }
+      issues = (await import('../../tests/__data__/input/sites_update/issues.mjs')).default
     } else {
       issues = await octokit.paginate(octokit.rest.issues.listForRepo, {
         owner: OWNER,

scripts/core/queueCreator.ts

@@ -1,9 +1,10 @@
 import { Storage, Collection, DateTime, Logger } from '@freearhey/core'
-import { ChannelsParser, ConfigLoader, ApiChannel, Queue } from './'
+import { ChannelsParser, ConfigLoader, Queue } from './'
 import { SITES_DIR, DATA_DIR } from '../constants'
 import { SiteConfig } from 'epg-grabber'
 import path from 'path'
 import { GrabOptions } from '../commands/epg/grab'
+import { Channel } from '../models'
 
 type QueueCreatorProps = {
   logger: Logger
@@ -32,7 +33,7 @@ export class QueueCreator {
 
   async create(): Promise<Queue> {
     const channelsContent = await this.dataStorage.json('channels.json')
-    const channels = new Collection(channelsContent).map(data => new ApiChannel(data))
+    const channels = new Collection(channelsContent).map(data => new Channel(data))
 
     const queue = new Queue()
     for (const channel of this.parsedChannels.all()) {
@@ -44,8 +45,8 @@ export class QueueCreator {
 
       if (channel.xmltv_id) {
         if (!channel.icon) {
-          const found: ApiChannel = channels.first(
-            (_channel: ApiChannel) => _channel.id === channel.xmltv_id
+          const found: Channel = channels.first(
+            (_channel: Channel) => _channel.id === channel.xmltv_id
           )
 
           if (found) {