Merge pull request #21384 from Snuffleupagus/Stream-getBytes-shorten

Shorten the `getBytes` method in the `Stream`/`ChunkedStream` classes
This commit is contained in:
Tim van der Meij 2026-06-04 20:41:07 +02:00 committed by GitHub
commit dc3696f23c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 31 deletions

View File

@ -182,28 +182,14 @@ class ChunkedStream extends Stream {
}
getBytes(length) {
const bytes = this.bytes;
const pos = this.pos;
const strEnd = this.end;
const endPos = !length ? this.end : Math.min(pos + length, this.end);
if (!length) {
if (strEnd > this.progressiveDataLength) {
this.ensureRange(pos, strEnd);
}
this.pos = strEnd;
return bytes.subarray(pos, strEnd);
if (endPos > this.progressiveDataLength) {
this.ensureRange(pos, endPos);
}
let end = pos + length;
if (end > strEnd) {
end = strEnd;
}
if (end > this.progressiveDataLength) {
this.ensureRange(pos, end);
}
this.pos = end;
return bytes.subarray(pos, end);
this.pos = endPos;
return this.bytes.subarray(pos, endPos);
}
getByteRange(begin, end) {

View File

@ -46,20 +46,11 @@ class Stream extends BaseStream {
}
getBytes(length) {
const bytes = this.bytes;
const pos = this.pos;
const strEnd = this.end;
const endPos = !length ? this.end : Math.min(pos + length, this.end);
if (!length) {
this.pos = strEnd;
return bytes.subarray(pos, strEnd);
}
let end = pos + length;
if (end > strEnd) {
end = strEnd;
}
this.pos = end;
return bytes.subarray(pos, end);
this.pos = endPos;
return this.bytes.subarray(pos, endPos);
}
getByteRange(begin, end) {