split/monofile
1
0
Fork 0
mirror of https://github.com/mollersuite/monofile.git synced 2024-11-21 21:36:26 -08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

thtas enough cleanup actually fuck you

Browse source
This commit is contained in:
May 2024-03-04 23:18:40 -08:00
parent fb720bc4b7
commit 9ff8f645eb
1 changed files with 18 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/server/lib/files.ts
View file

@ -449,11 +449,11 @@ export default class Files {
// todo: figure out how to get typesccript to accept useRanges // todo: figure out how to get typesccript to accept useRanges
// i'm too tired to look it up or write whatever it wnats me to do // i'm too tired to look it up or write whatever it wnats me to do
if (range && file.chunkSize && file.sizeInBytes) { if (useRanges) {
// Calculate where to start file scans... // Calculate where to start file scans...
scan_files_begin = Math.floor(range.start / file.chunkSize) scan_files_begin = Math.floor(range!.start / file.chunkSize!)
scan_files_end = Math.ceil(range.end / file.chunkSize) - 1 scan_files_end = Math.ceil(range!.end / file.chunkSize!) - 1
scan_msg_begin = Math.floor(scan_files_begin / 10) scan_msg_begin = Math.floor(scan_files_begin / 10)
scan_msg_end = Math.ceil(scan_files_end / 10) scan_msg_end = Math.ceil(scan_files_end / 10)
@ -469,7 +469,7 @@ export default class Files {
if (ret) return ret if (ret) return ret
// oh, there's none left. let's fetch a new message, then. // oh, there's none left. let's fetch a new message, then.
if (!file.messageids[msgIdx]) return null if (!file.messageids[msgIdx] || msgIdx >= scan_msg_end) return null
let msg = await this.api let msg = await this.api
.fetchMessage(file.messageids[msgIdx]) .fetchMessage(file.messageids[msgIdx])
.catch(() => { .catch(() => {
@ -478,20 +478,14 @@ export default class Files {
if (msg?.attachments) { if (msg?.attachments) {
let attach = Array.from(msg.attachments.values()) let attach = Array.from(msg.attachments.values())
for ( attachments = useRanges ? attach.slice(
let i = msgIdx == scan_msg_begin
useRanges && msgIdx == scan_msg_begin
? scan_files_begin - msgIdx * 10 ? scan_files_begin - msgIdx * 10
: 0; : 0,
i < msgIdx == scan_msg_end
(useRanges && msgIdx == scan_msg_end
? scan_files_end - msgIdx * 10 + 1 ? scan_files_end - msgIdx * 10 + 1
: attach.length); : attach.length
i++ ) : attach
) {
attachments.push(attach[i])
}
} }
msgIdx++ msgIdx++
@ -502,38 +496,24 @@ export default class Files {
let getNextChunk = async () => { let getNextChunk = async () => {
let scanning_chunk = await getNextAttachment() let scanning_chunk = await getNextAttachment()
if (!scanning_chunk) { if (!scanning_chunk) return null
return null
}
console.log(msgIdx,position,scanning_chunk.size)
let headers: HeadersInit = let headers: HeadersInit =
useRanges useRanges
? { ? {
Range: `bytes=${ Range: `bytes=${
// If this is the first chunk of the file (position == 0) position == 0
// and both 'range' and 'file.chunkSize' are defined, ? range!.start - scan_files_begin * file.chunkSize!
// calculate the start of the range.
// Otherwise, default to "0".
position == 0 && range
&& file.chunkSize
? range.start - scan_files_begin * file.chunkSize
: "0" : "0"
}-${ }-${
// If this is the last chunk of the file (position == attachments.length - 1) position == attachments.length - 1
// and both 'range' and 'file.chunkSize' are defined, ? range!.end - scan_files_end * file.chunkSize!
// calculate the end of the range.
// Otherwise, default to an empty string.
position == attachments.length - 1 && range
&& file.chunkSize
? range.end - scan_files_end * file.chunkSize
: "" : ""
}`, }`,
} }
: {} : {}
let d = await fetch(scanning_chunk.url, {headers}) let response = await fetch(scanning_chunk.url, {headers})
.catch((e: Error) => { .catch((e: Error) => {
console.error(e) console.error(e)
return {body: e} return {body: e}
@ -541,7 +521,7 @@ export default class Files {
position++ position++
return d.body return response.body
} }
let currentPusher : (() => Promise<{readyForMore: boolean, streamDone: boolean }> | undefined) | undefined let currentPusher : (() => Promise<{readyForMore: boolean, streamDone: boolean }> | undefined) | undefined