Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update m3u-prune scriptlet

This commit is contained in:
Raymond Hill 2022-09-26 22:37:11 -04:00
parent 7f4744b10a
commit ec83127f6c
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
assets/resources/scriptlets.js
View File

@ -1758,21 +1758,43 @@
}; };
const reM3u = regexFromArg(m3uPattern); const reM3u = regexFromArg(m3uPattern);
const reUrl = regexFromArg(urlPattern); const reUrl = regexFromArg(urlPattern);
const pruneSpliceoutBlock = (lines, i) => {
if ( lines[i].startsWith('#EXT-X-CUE:TYPE="SpliceOut"') === false ) {
return false;
}
lines[i] = undefined; i += 1;
if ( lines[i].startsWith('#EXT-X-ASSET:CAID') ) {
lines[i] = undefined; i += 1;
}
if ( lines[i].startsWith('#EXT-X-SCTE35:') ) {
lines[i] = undefined; i += 1;
}
if ( lines[i].startsWith('#EXT-X-CUE-IN') ) {
lines[i] = undefined; i += 1;
}
if ( lines[i].startsWith('#EXT-X-SCTE35:') ) {
lines[i] = undefined; i += 1;
}
return true;
};
const pruneInfBlock = (lines, i) => {
if ( lines[i].startsWith('#EXTINF') === false ) { return false; }
if ( reM3u.test(lines[i+1]) === false ) { return false; }
lines[i] = lines[i+1] = undefined; i += 2;
if ( lines[i].startsWith('#EXT-X-DISCONTINUITY') ) {
lines[i] = undefined; i += 1;
}
return true;
};
const pruner = text => { const pruner = text => {
if ( (/^\s*#EXTM3U/.test(text)) === false ) { return text; } if ( (/^\s*#EXTM3U/.test(text)) === false ) { return text; }
const toRemove = new Set(); const lines = text.split(/\n\r|\n|\r/);
const lines = text.trim().split(/\n\r|\n|\r/);
for ( let i = 0; i < lines.length; i++ ) { for ( let i = 0; i < lines.length; i++ ) {
const line = lines[i]; if ( lines[i] === undefined ) { continue; }
if ( reM3u.test(line) === false ) { continue; } if ( pruneSpliceoutBlock(lines, i) ) { continue; }
if ( i === 0 || /^#EXTINF\b/.test(lines[i-1]) === false ) { continue; } if ( pruneInfBlock(lines, i) ) { continue; }
toRemove.add(i-1).add(i);
if ( /^#EXT-X-DISCONTINUITY\b/.test(lines[i+1]) === false) { continue; }
toRemove.add(i+1);
i += 1;
} }
if ( toRemove.size === 0 ) { return text; } return lines.filter(l => l !== undefined).join('\n');
return lines.filter((l, i) => toRemove.has(i) === false).join('\n');
}; };
const urlFromArg = arg => { const urlFromArg = arg => {
if ( typeof arg === 'string' ) { return arg; } if ( typeof arg === 'string' ) { return arg; }
@ -1808,8 +1830,8 @@
const textin = thisArg.responseText; const textin = thisArg.responseText;
const textout = pruner(textin); const textout = pruner(textin);
if ( textout === textin ) { return; } if ( textout === textin ) { return; }
Object.defineProperty(thisArg, 'response', { value: textout, writable: true }); Object.defineProperty(thisArg, 'response', { value: textout });
Object.defineProperty(thisArg, 'responseText', { value: textout, writable: true }); Object.defineProperty(thisArg, 'responseText', { value: textout });
}); });
return Reflect.apply(target, thisArg, args); return Reflect.apply(target, thisArg, args);
} }