iptv-org/iptv
1
0
Fork 0
mirror of https://github.com/iptv-org/iptv synced 2026-09-06 03:50:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into patch-2026.09.1

Browse Source 
Resolved conflict in scripts/models/stream.ts: kept the branch's
labels/isNot247/isGeoBlocked handling in fromPlaylistItem while adopting
master's optional-chaining guards for data.tvg / data.http.
This commit is contained in:
Sanaei
2026-09-04 18:01:12 +02:00
parent 016c6ec540 d4d4ff9ebc
commit 3448e44b7e
17 changed files with 276 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/models/stream.ts
+5 -4
View File
@@ -93,7 +93,8 @@ export class Stream extends sdk.Models.Stream {
if (!data.name) throw new Error('"name" property is required')
if (!data.url) throw new Error('"url" property is required')
const [channelId, feedId] = data.tvg.id.split('@')
const tvgId = data.tvg?.id || ''
const [channelId, feedId] = tvgId.split('@')
const { title, labels, quality } = parseName(data.name)
const stream = new Stream({
@@ -102,12 +103,12 @@ export class Stream extends sdk.Models.Stream {
title: title,
quality: quality || null,
url: data.url,
referrer: data.http.referrer || null,
user_agent: data.http['user-agent'] || null,
referrer: data.http?.referrer || null,
user_agent: data.http?.['user-agent'] || null,
label: null
})
stream.tvgId = data.tvg.id
stream.tvgId = tvgId
stream.line = data.line
stream.isNot247 = labels.includes('Not 24/7')
stream.isGeoBlocked = labels.includes('Geo-blocked')