iptv-org · PopeyeTheSai10r · Mar 31, 2025 · Mar 29, 2025 · Mar 29, 2025 · Mar 29, 2025
diff --git a/.github/ISSUE_TEMPLATE/1_streams_add.yml b/.github/ISSUE_TEMPLATE/1_streams_add.yml
@@ -6,9 +6,9 @@ labels: ['streams:add']
 body:
   - type: input
     attributes:
-      label: Channel ID (required)
-      description: Unique channel ID from [iptv-org.github.io](https://iptv-org.github.io/). If you can't find the channel you want in the list, please let us know through this [form](https://github.com/iptv-org/database/issues/new?assignees=&labels=channels%3Aadd&projects=&template=channels_add.yml&title=Add%3A+) before posting your request.
-      placeholder: 'BBCAmericaEast.us'
+      label: Stream ID (required)
+      description: "ID of the stream consisting of `<channel_id>` or `<channel_id>@<feed_id>`. Full list of supported channels with corresponding ID could be found on [iptv-org.github.io](https://iptv-org.github.io/). If you can't find the channel you want in the list, please let us know through this [form](https://github.com/iptv-org/database/issues/new?assignees=&labels=channels%3Aadd&projects=&template=channels_add.yml&title=Add%3A+) before posting your request."
+      placeholder: 'BBCAmerica.us@East'
     validations:
       required: true
 
@@ -28,9 +28,12 @@ body:
         - 2160p
         - 1280p
         - 1080p
+        - 1080i
         - 720p
         - 576p
+        - 576i
         - 480p
+        - 480i
         - 360p
 
   - type: dropdown

diff --git a/.github/ISSUE_TEMPLATE/2_streams_edit.yml b/.github/ISSUE_TEMPLATE/2_streams_edit.yml
@@ -19,9 +19,9 @@ body:
 
   - type: input
     attributes:
-      label: Channel ID 
-      description: Channel ID from [iptv-org.github.io](https://iptv-org.github.io/).
-      placeholder: 'BBCAmericaEast.us'
+      label: Stream ID
+      description: "ID of the stream consisting of `<channel_id>` or `<channel_id>@<feed_id>`. Full list of supported channels with corresponding ID could be found on [iptv-org.github.io](https://iptv-org.github.io/). If you can't find the channel you want in the list, please let us know through this [form](https://github.com/iptv-org/database/issues/new?assignees=&labels=channels%3Aadd&projects=&template=channels_add.yml&title=Add%3A+) before posting your request."
+      placeholder: 'BBCAmerica.us@East'
 
   - type: dropdown
     attributes:
@@ -31,9 +31,12 @@ body:
         - 2160p
         - 1280p
         - 1080p
+        - 1080i
         - 720p
         - 576p
+        - 576i
         - 480p
+        - 480i
         - 360p
         - '~'
 

diff --git a/.github/ISSUE_TEMPLATE/3_broken-stream.yml b/.github/ISSUE_TEMPLATE/3_broken-stream.yml
@@ -1,7 +1,7 @@
 name: 🚧 Report broken stream
 description: Report a broken or unstable stream
 title: 'Broken: '
-labels: ['broken stream']
+labels: ['broken stream', 'streams:remove']
 
 body:
   - type: markdown

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -20,15 +20,23 @@ Regardless of which option you choose, before posting your request please do the
 
 - Make sure the link you want to add works stably. To check this, open it in one of the players (for example, [VLC player](https://www.videolan.org/vlc/index.html)) and watch the broadcast for at least a minute (some test streams are interrupted after 15-30 seconds).
 - Make sure the link is not already in the playlist. This can be done by [searching](https://github.com/search?q=repo%3Aiptv-org%2Fiptv+http%3A%2F%2Fexample.com&type=code) the repository.
-- Find the ID of the channel you want to add in our [database](https://iptv-org.github.io/). If this particular channel is not in the database, then leave a request to add it [here](https://github.com/iptv-org/database/issues/new/choose) and wait until it is approved before continuing.
-- Make sure the channel is not blocklisted. This can be done by checking the [blocklist.csv](https://github.com/iptv-org/database/blob/master/data/blocklist.csv) file.
+- Find the ID of the channel you want on [iptv-org.github.io](https://iptv-org.github.io/). If your desired channel is not on the list you can leave a request to add it [here](https://github.com/iptv-org/database/issues/new/choose).
+- Make sure the channel is not blocklisted. It can also be done through [iptv-org.github.io](https://iptv-org.github.io/).
 - The link does not lead to the Xtream Codes server. [Why don't you accept links to Xtream Codes server?](FAQ.md#why-dont-you-accept-links-to-xtream-codes-server)
 - If you know that the broadcast only works in certain countries or it is periodically interrupted, do not forget to indicate this in the request.
 
-A requests without a valid channel ID or working link to the stream will be closed immediately.
+A requests without a valid stream ID or working link to the stream will be closed immediately.
 
 Note all links in playlists are sorted automatically by scripts so there is no need to sort them manually. For more info, see [Scripts](#scripts).
 
+### How to fix the stream description?
+
+Most of the stream description (channel name, categories, languages, broadcast area, logo) we load from the [iptv-org/database](https://github.com/iptv-org/database) using the stream ID.
+
+So first of all, make sure that the desired stream has the correct ID. A full list of all supported channels and their corresponding IDs can be found on [iptv-org.github.io](https://iptv-org.github.io/). To change the stream ID of any link in the playlist, just fill out this [form](https://github.com/iptv-org/iptv/issues/new?assignees=&labels=streams%3Aedit&projects=&template=2_streams_edit.yml&title=Edit%3A+).
+
+If, however, you have found an error in the database itself, this is the place to go: [How to edit channel description?](https://github.com/iptv-org/database/blob/master/CONTRIBUTING.md#how-to-edit-channel-description)
+
 ### How to distinguish a link to an Xtream Codes server from a regular one?
 
 Most of them have this form:
@@ -52,6 +60,37 @@ The only thing before publishing your report is to make sure that:
 
 An issue without a valid link will be closed immediately.
 
+### How to find a broken stream?
+
+For starters, you can just try to open the playlist in [VLC player](https://www.videolan.org/vlc/). The player outputs all errors to the log (Tools -> Messages) so you'll be able to determine pretty accurately why a link isn't working.
+
+Another way to test links is to use the NPM script. To do this, first make sure you have [Node.js](https://nodejs.org/en) installed on your system. Then go to the `iptv` folder using [Console](https://en.wikipedia.org/wiki/Windows_Console) (or [Terminal](<https://en.wikipedia.org/wiki/Terminal_(macOS)>) if you have macOS) and run the command:
+
+```sh
+npm run playlist:test path/to/playlist.m3u
+```
+
+This command will run an automatic check of all links in the playlist and display their status:
+
+```sh
+npm run playlist:test streams/fr.m3u
+
+streams/fr.m3u
+┌─────┬───────────────────────────┬──────────────────────────────────────────────────────────────────────────────────────────────────────┬───────────────────────────┐
+│     │ tvg-id                    │ url                                                                                                  │ status                    │
+├─────┼───────────────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────┼───────────────────────────┤
+│  0  │ 6ter.fr                   │ https://origin-caf900c010ea8046.live.6cloud.fr/out/v1/29c7a579af3348b48230f76cd75699a5/dash_short... │ LOADING...                │
+│  1  │ 20MinutesTV.fr            │ https://lives.digiteka.com/stream/86d3e867-a272-496b-8412-f59aa0104771/index.m3u8                    │ FFMPEG_STREAMS_NOT_FOUND  │
+│  2  │                           │ https://video1.getstreamhosting.com:1936/8420/8420/playlist.m3u8                                     │ OK                        │
+│  3  │ ADNTVPlus.fr              │ https://samsunguk-adn-samsung-fre-qfrlc.amagi.tv/playlist/samsunguk-adn-samsung-fre/playlist.m3u8    │ HTTP_FORBIDDEN            │
+│  4  │ Africa24.fr               │ https://edge12.vedge.infomaniak.com/livecast/ik:africa24/manifest.m3u8                               │ OK                        │
+│  5  │ Africa24English.fr        │ https://edge17.vedge.infomaniak.com/livecast/ik:africa24sport/manifest.m3u8                          │ OK                        │
+│  6  │ AfricanewsEnglish.fr      │ https://37c774660687468c821a51190046facf.mediatailor.us-east-1.amazonaws.com/v1/master/04fd913bb2... │ HTTP_GATEWAY_TIMEOUT      │
+│  7  │ AlpedHuezTV.fr            │ https://edge.vedge.infomaniak.com/livecast/ik:adhtv/chunklist.m3u8                                   │ HTTP_NOT_FOUND            │
+```
+
+After that, all you have to do is report any broken streams you find.
+
 ### How do I remove my channel from playlist?
 
 To request removal of a link to a channel from the repository, you need to fill out this [form](https://github.com/iptv-org/iptv/issues/new?assignees=&labels=removal+request&projects=&template=-removal-request.yml&title=Remove%3A+) and wait for the request to be reviewed (this usually takes no more than 1 business day). And if the request is approved, links to the channel will be immediately removed from the repository.
@@ -65,22 +104,22 @@ Please note that we only accept removal requests from channel owners and their o
 For a stream to be approved, its description must follow this template:
 
 ```
-#EXTINF:-1 tvg-id="CHANNEL_ID",CHANNEL_NAME (RESOLUTION) [LABEL]
+#EXTINF:-1 tvg-id="STREAM_ID",CHANNEL_NAME (RESOLUTION) [LABEL]
 STREAM_URL
 ```
 
-| Attribute      | Description                                                                                | Required | Valid values                                                                                                               |
-| -------------- | ------------------------------------------------------------------------------------------ | -------- | -------------------------------------------------------------------------------------------------------------------------- |
-| `CHANNEL_ID`   | Channel ID.                                                                                | Optional | Full list of supported channels with corresponding ID could be found on [iptv-org.github.io](https://iptv-org.github.io/). |
-| `CHANNEL_NAME` | Full name of the channel. May contain any characters except: `,`, `[`, `]`.                | Required | -                                                                                                                          |
-| `RESOLUTION`   | Maximum stream resolution.                                                                 | Optional | `2160p`, `1080p`, `720p`, `480p`, `360p` etc                                                                               |
-| `LABEL`        | Specified in cases where the broadcast for some reason may not be available to some users. | Optional | `Geo-blocked` or `Not 24/7`                                                                                                |
-| `STREAM_URL`   | Stream URL.                                                                                | Required | -                                                                                                                          |
+| Attribute      | Description                                                                                                                                  | Required | Valid values                                 |
+| -------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | -------- | -------------------------------------------- |
+| `STREAM_ID`    | ID of the stream. Full list of supported channels with corresponding ID could be found on [iptv-org.github.io](https://iptv-org.github.io/). | Optional | `<channel_id>` or `<channel_id>@<feed_id>`   |
+| `CHANNEL_NAME` | Full name of the channel. May contain any characters except: `,`, `[`, `]`.                                                                  | Required | -                                            |
+| `RESOLUTION`   | Maximum stream resolution.                                                                                                                   | Optional | `2160p`, `1080p`, `720p`, `480p`, `360p` etc |
+| `LABEL`        | Specified in cases where the broadcast for some reason may not be available to some users.                                                   | Optional | `Geo-blocked` or `Not 24/7`                  |
+| `STREAM_URL`   | Stream URL.                                                                                                                                  | Required | -                                            |
 
 Example:
 
 ```xml
-#EXTINF:-1 tvg-id="ExampleTV.ua",Example TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="ExampleTV.ua@HD",Example TV (720p) [Not 24/7]
 https://example.com/playlist.m3u8
 ```
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
   "dependencies": {
     "@eslint/eslintrc": "^3.3.0",
     "@eslint/js": "^9.21.0",
-    "@freearhey/core": "^0.2.1",
+    "@freearhey/core": "^0.7.0",
     "@octokit/core": "^6.1.4",
     "@octokit/plugin-paginate-rest": "^11.4.3",
     "@octokit/plugin-rest-endpoint-methods": "^7.1.3",

diff --git a/scripts/commands/api/generate.ts b/scripts/commands/api/generate.ts
@@ -1,21 +1,37 @@
-import { Logger, Storage } from '@freearhey/core'
-import { API_DIR, STREAMS_DIR } from '../../constants'
+import { Logger, Storage, Collection } from '@freearhey/core'
+import { API_DIR, STREAMS_DIR, DATA_DIR } from '../../constants'
 import { PlaylistParser } from '../../core'
-import { Stream } from '../../models'
+import { Stream, Channel, Feed } from '../../models'
+import { uniqueId } from 'lodash'
 
 async function main() {
   const logger = new Logger()
 
+  logger.info('loading api data...')
+  const dataStorage = new Storage(DATA_DIR)
+  const channelsData = await dataStorage.json('channels.json')
+  const channels = new Collection(channelsData).map(data => new Channel(data))
+  const channelsGroupedById = channels.keyBy((channel: Channel) => channel.id)
+  const feedsData = await dataStorage.json('feeds.json')
+  const feeds = new Collection(feedsData).map(data =>
+    new Feed(data).withChannel(channelsGroupedById)
+  )
+  const feedsGroupedByChannelId = feeds.groupBy((feed: Feed) =>
+    feed.channel ? feed.channel.id : uniqueId()
+  )
+
   logger.info('loading streams...')
   const streamsStorage = new Storage(STREAMS_DIR)
-  const parser = new PlaylistParser({ storage: streamsStorage })
+  const parser = new PlaylistParser({
+    storage: streamsStorage,
+    channelsGroupedById,
+    feedsGroupedByChannelId
+  })
   const files = await streamsStorage.list('**/*.m3u')
   let streams = await parser.parse(files)
   streams = streams
-    .map(data => new Stream(data))
-    .orderBy([(stream: Stream) => stream.channel])
+    .orderBy((stream: Stream) => stream.getId())
     .map((stream: Stream) => stream.toJSON())
-
   logger.info(`found ${streams.count()} streams`)
 
   logger.info('saving to .api/streams.json...')

diff --git a/scripts/commands/api/load.ts b/scripts/commands/api/load.ts
@@ -12,7 +12,9 @@ async function main() {
     client.download('countries.json'),
     client.download('languages.json'),
     client.download('regions.json'),
-    client.download('subdivisions.json')
+    client.download('subdivisions.json'),
+    client.download('feeds.json'),
+    client.download('timezones.json')
   ]
 
   await Promise.all(requests)