Merge pull request #26389 from iptv-org/patch-2025.08.4

Patch 2025.08.4

Author: Alstruit

.readme/template.md

@@ -50,7 +50,7 @@ Playlists in which channels are grouped by broadcast area.
 #### Countries
 
 ```
-https://iptv-org.github.io/iptv/index.countries.m3u
+https://iptv-org.github.io/iptv/index.country.m3u
 ```
 
 Same thing, but split up into separate files:
@@ -60,12 +60,6 @@ Same thing, but split up into separate files:
 
 #### Regions
 
-```
-https://iptv-org.github.io/iptv/index.regions.m3u
-```
-
-Same thing, but split up into separate files:
-
 <!-- prettier-ignore -->
 #include "./.readme/_regions.md"
 

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
         }
       }
     })

scripts/models/broadcastArea.ts

@@ -3,5 +3,7 @@
 http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
 #EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i)
 http://146.59.85.40:89/dunaworld/index.m3u8
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8
 #EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7]
 http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8

tests/__data__/expected/playlist_generate/.gh-pages/countries/int.m3u

@@ -7,6 +7,8 @@ http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8
 http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
 #EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="International",Duna World (576i)
 http://146.59.85.40:89/dunaworld/index.m3u8
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="International",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8
 #EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="International",ЭлТР (480p) [Not 24/7]
 http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7]