TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Manav Rathi
2025-05-22 20:30:48 +05:30
parent a72041b8ba
commit 8cdbb737dc
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
desktop/src/main/services/ffmpeg-worker.ts
View File

@@ -919,7 +919,7 @@ const uploadVideoSegmentsMultipart = async (
partUploadURLs: string[],
completionURL: string,
) => {
const partSize = Math.floor(videoSize / partUploadURLs.length);
const partSize = Math.ceil(videoSize / partUploadURLs.length);
let partNumber = 0;
let nextStart = 0;
// See `createMultipartUploadRequestBody` in the web code for a more
@@ -941,7 +941,7 @@ const uploadVideoSegmentsMultipart = async (
body: Readable.toWeb(
fs_.createReadStream(videoFilePath, {
start: nextStart,
end: size - 1,
end: nextStart + size - 1,
}),
),
}),

2
desktop/src/main/stream.ts
View File

@@ -291,7 +291,7 @@ const handleGenerateHLSWrite = async (
params: URLSearchParams,
) => {
const uploadURLs = params.getAll("url");
if (uploadURLs.length) throw new Error("Missing upload URL(s)");
if (!uploadURLs.length) throw new Error("Missing upload URL(s)");
let inputItem: Parameters<typeof makeFileForStreamOrPathOrZipItem>[0];
const path = params.get("path");

13
web/packages/gallery/services/file-data.ts
View File

@@ -445,7 +445,7 @@ export const getFilePreviewDataUploadURL = async (file: EnteFile) => {
//
// The eventual part size will then be:
//
// partSize = (totalSize, count) => Math.floor(totalSize / count)
// partSize = (totalSize, count) => Math.ceil(totalSize / count)
//
// As an example, for a 200 MB file, we'll estimate partCount of 2, and
// suppose the generated file is 50% of the original, then each part size
@@ -454,10 +454,13 @@ export const getFilePreviewDataUploadURL = async (file: EnteFile) => {
// As a sanity check of the other extreme, if the generated file is 10% of
// the original, we still end up with 10 MB parts.
let partCount = 1; // Default is single object upload.
const fileSize = file.info?.fileSize;
if (fileSize && fileSize > 100 * 1024 /* 100 MB */) {
// For files larger than 100 MB, estimate the number of 100 MB parts.
partCount = Math.ceil((0.7 * fileSize) / (100 * 1024));
const fileSize = file.info?.fileSize; /* bytes */
if (fileSize) {
const fileSizeMB = fileSize / 1024 / 1024;
// For files larger than 100 MB, estimate the number of ~100 MB parts.
if (fileSizeMB > 100) {
partCount = Math.ceil((0.7 * fileSize) / (100 * 1024));
}
}
const params = new URLSearchParams({