Merge branch 'master' into patch-2026.09.1

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
17 changed files with 276 additions and 226 deletions
@@ -0,0 +1,3 @@
#EXTM3U
#EXTINF:-1 tvg-id="",Example (720p)
http://example.com/a%ZZ
@@ -0,0 +1,3 @@
#EXTM3U
#EXTINF:-1,Example
https://example.com/live.m3u8
+29 -12
View File
@@ -1,10 +1,14 @@
import issues from '../../__data__/input/issues'
import { pathToFileURL } from 'node:url'
import { execSync } from 'child_process'
import { execFileSync } from 'child_process'
import * as fs from 'fs-extra'
const ENV_VAR =
'cross-env DATA_DIR=tests/__data__/input/data STREAMS_DIR=tests/__data__/output/streams LOGS_DIR=tests/__data__/output/logs'
const ENV = {
...process.env,
DATA_DIR: 'tests/__data__/input/data',
STREAMS_DIR: 'tests/__data__/output/streams',
LOGS_DIR: 'tests/__data__/output/logs'
}
beforeEach(() => {
fs.emptyDirSync('tests/__data__/output')
@@ -14,11 +18,10 @@ beforeEach(() => {
describe('issue:validate', () => {
it('can handle streams:add request', () => {
const body = issues.find(issue => issue.number === 14179)?.body
const cmd = `${ENV_VAR} npm run issue:validate --- --body="${body}" --labels="approved,streams:add"`
try {
const stdout = execSync(cmd, { encoding: 'utf8' })
if (process.env.DEBUG === 'true') console.log(cmd, stdout)
const stdout = runIssueValidate(body, 'approved,streams:add')
if (process.env.DEBUG === 'true') console.log(stdout)
throw new Error('Failed')
} catch {
expect(content('tests/__data__/output/logs/errors.txt')).toBe(
@@ -29,11 +32,10 @@ describe('issue:validate', () => {
it('can handle streams:remove request', () => {
const body = issues.find(issue => issue.number === 14150)?.body
const cmd = `${ENV_VAR} npm run issue:validate --- --body="${body}" --labels="approved,streams:remove"`
try {
const stdout = execSync(cmd, { encoding: 'utf8' })
if (process.env.DEBUG === 'true') console.log(cmd, stdout)
const stdout = runIssueValidate(body, 'approved,streams:remove')
if (process.env.DEBUG === 'true') console.log(stdout)
throw new Error('Failed')
} catch {
expect(content('tests/__data__/output/logs/errors.txt')).toBe(
@@ -44,11 +46,10 @@ describe('issue:validate', () => {
it('can handle streams:edit request', () => {
const body = issues.find(issue => issue.number === 39097)?.body
const cmd = `${ENV_VAR} npm run issue:validate --- --body="${body}" --labels="approved,streams:edit"`
try {
const stdout = execSync(cmd, { encoding: 'utf8' })
if (process.env.DEBUG === 'true') console.log(cmd, stdout)
const stdout = runIssueValidate(body, 'approved,streams:edit')
if (process.env.DEBUG === 'true') console.log(stdout)
throw new Error('Failed')
} catch {
expect(content('tests/__data__/output/logs/errors.txt')).toBe(
@@ -58,6 +59,22 @@ describe('issue:validate', () => {
})
})
function runIssueValidate(body: string | undefined, labels: string) {
return execFileSync(
process.execPath,
[
'--import',
'tsx',
'scripts/commands/issue/validate.ts',
'--body',
`${body}`,
'--labels',
labels
],
{ encoding: 'utf8', env: ENV }
)
}
function content(filepath: string) {
return fs.readFileSync(pathToFileURL(filepath), { encoding: 'utf8' })
}
+13
View File
@@ -30,6 +30,19 @@ describe('playlist:format', () => {
)
})
})
it('keeps links with malformed percent escapes', () => {
fs.emptyDirSync('tests/__data__/output')
fs.copySync('tests/__data__/input/playlist_normalize', 'tests/__data__/output/streams')
const cmd =
'cross-env STREAMS_DIR=tests/__data__/output/streams DATA_DIR=tests/__data__/input/data npm run playlist:format'
execSync(cmd, { encoding: 'utf8' })
expect(content('tests/__data__/output/streams/bad_encoding.m3u')).toContain(
'http://example.com/a%ZZ'
)
})
})
function content(filepath: string) {
+8
View File
@@ -101,4 +101,12 @@ describe('playlist:validate', () => {
const stdout = execSync(cmd, { encoding: 'utf8' })
if (process.env.DEBUG === 'true') console.log(cmd, stdout)
})
it('accepts a playlist without optional metadata attributes', () => {
const cmd = `${ENV_VAR} npm run playlist:validate -- missing_metadata.m3u`
const stdout = execSync(cmd, { encoding: 'utf8' })
if (process.env.DEBUG === 'true') console.log(cmd, stdout)
expect(stdout).toContain('missing_metadata.m3u')
expect(stdout).toContain('is missing a channel ID')
})
})