Update scripts

Author: freearhey

scripts/commands/playlist/generate.ts

@@ -10,7 +10,6 @@ import {
   IndexLanguageGenerator,
   IndexCountryGenerator,
   SubdivisionsGenerator,
-  IndexRegionGenerator,
   CategoriesGenerator,
   CountriesGenerator,
   LanguagesGenerator,
@@ -124,9 +123,6 @@ async function main() {
   logger.info('generating index.language.m3u...')
   await new IndexLanguageGenerator({ streams, logFile }).generate()
 
-  logger.info('generating index.region.m3u...')
-  await new IndexRegionGenerator({ streams, regions, logFile }).generate()
-
   logger.info('saving generators.log...')
   const logStorage = new Storage(LOGS_DIR)
   logStorage.saveFile(logFile)

scripts/generators/index.ts

@@ -6,7 +6,6 @@ export * from './indexCountryGenerator'
 export * from './indexGenerator'
 export * from './indexLanguageGenerator'
 export * from './indexNsfwGenerator'
-export * from './indexRegionGenerator'
 export * from './languagesGenerator'
 export * from './rawGenerator'
 export * from './regionsGenerator'

scripts/generators/indexCountryGenerator.ts

@@ -26,13 +26,6 @@ export class IndexCountryGenerator implements Generator {
       .orderBy((stream: Stream) => stream.getTitle())
       .filter((stream: Stream) => stream.isSFW())
       .forEach((stream: Stream) => {
-        if (stream.isInternational()) {
-          const streamClone = stream.clone()
-          streamClone.groupTitle = 'International'
-          groupedStreams.add(streamClone)
-          return
-        }
-
         if (!stream.hasBroadcastArea()) {
           const streamClone = stream.clone()
           streamClone.groupTitle = 'Undefined'
@@ -45,6 +38,12 @@ export class IndexCountryGenerator implements Generator {
           streamClone.groupTitle = country.name
           groupedStreams.add(streamClone)
         })
+
+        if (stream.isInternational()) {
+          const streamClone = stream.clone()
+          streamClone.groupTitle = 'International'
+          groupedStreams.add(streamClone)
+        }
       })
 
     groupedStreams = groupedStreams.orderBy((stream: Stream) => {

scripts/generators/indexRegionGenerator.ts

@@ -28,8 +28,6 @@ export class RegionsGenerator implements Generator {
       .filter((stream: Stream) => stream.isSFW())
 
     this.regions.forEach(async (region: Region) => {
-      if (region.isWorldwide()) return
-
       const regionStreams = streams.filter((stream: Stream) => stream.isBroadcastInRegion(region))
 
       const playlist = new Playlist(regionStreams, { public: true })

scripts/generators/regionsGenerator.ts

@@ -32,23 +32,27 @@ export class BroadcastArea {
           if (!city) return
           citiesIncluded.add(city)
           regionsIncluded = regionsIncluded.concat(city.getRegions())
+          break
         }
         case 's': {
           const subdivision: Subdivision = subdivisionsKeyByCode.get(code)
           if (!subdivision) return
           subdivisionsIncluded.add(subdivision)
           regionsIncluded = regionsIncluded.concat(subdivision.getRegions())
+          break
         }
         case 'c': {
           const country: Country = countriesKeyByCode.get(code)
           if (!country) return
           countriesIncluded.add(country)
           regionsIncluded = regionsIncluded.concat(country.getRegions())
+          break
         }
         case 'r': {
           const region: Region = regionsKeyByCode.get(code)
           if (!region) return
           regionsIncluded = regionsIncluded.concat(region.getRegions())
+          break
         }
       }
     })