danvics/zerobyte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Refines bandwidth limit handling for rclone copy

Browse source 
Simplifies bandwidth limit configuration for rclone source backends by considering only the source download limit.

Ensures correct type casting when comparing upload and download limits, using base 10 for parsing.

Makes the temporary keys cleanup function available for external use.
This commit is contained in:
Raj Dave 2026-01-10 18:34:34 +03:00
parent 07a925b9f3
commit 145c321fa1
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/server/utils/restic.ts
View file

@ -856,16 +856,9 @@ const copy = async (
const destUploadLimit = formatBandwidthLimit(destConfig.uploadLimit);
if (sourceConfig.backend === "rclone") {
// For rclone source backends, use rclone.from.bwlimit with effective source limit
const sourceUploadLimit = formatBandwidthLimit(sourceConfig.uploadLimit);
// Determine effective limit for source (pick smaller numeric value if both exist)
// For rclone source backends, use rclone.from.bwlimit with source download limit only
let effectiveSourceLimit = "";
if (sourceUploadLimit && sourceDownloadLimit) {
effectiveSourceLimit = parseInt(sourceUploadLimit) < parseInt(sourceDownloadLimit) ? sourceUploadLimit : sourceDownloadLimit;
} else if (sourceUploadLimit) {
effectiveSourceLimit = sourceUploadLimit;
} else if (sourceDownloadLimit) {
if (sourceDownloadLimit) {
effectiveSourceLimit = sourceDownloadLimit;
}
@ -960,7 +953,7 @@ export const addCommonArgs = (args: string[], env: Record<string, string>, confi
// Determine effective limit (choose more restrictive when both exist)
let effectiveLimit = "";
if (uploadLimit && downloadLimit) {
effectiveLimit = parseInt(uploadLimit) < parseInt(downloadLimit) ? uploadLimit : downloadLimit;
effectiveLimit = parseInt(uploadLimit, 10) < parseInt(downloadLimit, 10) ? uploadLimit : downloadLimit;
} else if (uploadLimit) {
effectiveLimit = uploadLimit;
} else if (downloadLimit) {
@ -1003,7 +996,7 @@ export const restic = {
};
// Helper function to clean up temporary files
const cleanupTemporaryKeys = async (env: Record<string, string>) => {
export const cleanupTemporaryKeys = async (env: Record<string, string>) => {
const keysToClean = ["_SFTP_KEY_PATH", "_SFTP_KNOWN_HOSTS_PATH", "RESTIC_CACERT", "GOOGLE_APPLICATION_CREDENTIALS"];
for (const key of keysToClean) {