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

more fixed issues

Browse source
This commit is contained in:
Raj Dave 2026-01-10 17:19:02 +03:00
parent c91bce7814
commit 51e0526622
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -851,8 +851,9 @@ const copy = async (
addCommonArgs(args, env, destConfig); addCommonArgs(args, env, destConfig);
// Then explicitly apply source-side bandwidth limits for the from-repo operation // Then explicitly apply source-side bandwidth limits for the from-repo operation
const sourceUploadLimit = formatBandwidthLimit(sourceConfig.uploadLimit); // Guard the formatBandwidthLimit calls and compute values upfront
const sourceDownloadLimit = formatBandwidthLimit(sourceConfig.downloadLimit); const sourceUploadLimit = sourceConfig.uploadLimit ? formatBandwidthLimit(sourceConfig.uploadLimit) : "";
const sourceDownloadLimit = sourceConfig.downloadLimit ? formatBandwidthLimit(sourceConfig.downloadLimit) : "";
// Determine effective limit for source (pick smaller numeric value if both exist) // Determine effective limit for source (pick smaller numeric value if both exist)
let effectiveLimit = ""; let effectiveLimit = "";
@ -870,11 +871,11 @@ const copy = async (
args.push("-o", `rclone.from.bwlimit=${effectiveLimit}`); args.push("-o", `rclone.from.bwlimit=${effectiveLimit}`);
} }
} else { } else {
// For restic source backends, apply individual limits // For restic source backends, apply individual limits using the computed values
if (sourceConfig.uploadLimit?.enabled && sourceUploadLimit) { if (sourceUploadLimit) {
args.push("--limit-upload", sourceUploadLimit); args.push("--limit-upload", sourceUploadLimit);
} }
if (sourceConfig.downloadLimit?.enabled && sourceDownloadLimit) { if (sourceDownloadLimit) {
args.push("--limit-download", sourceDownloadLimit); args.push("--limit-download", sourceDownloadLimit);
} }
} }
@ -906,8 +907,8 @@ const copy = async (
}; };
// Helper function to convert bandwidth limit to restic/rclone format // Helper function to convert bandwidth limit to restic/rclone format
const formatBandwidthLimit = (limit: BandwidthLimit): string => { const formatBandwidthLimit = (limit?: BandwidthLimit): string => {
if (!limit.enabled || limit.value <= 0) { if (!limit || !limit.enabled || limit.value <= 0) {
return ""; return "";
} }
@ -971,18 +972,14 @@ export const addCommonArgs = (args: string[], env: Record<string, string>, confi
} }
} else { } else {
// For restic backends, handle upload and download limits separately // For restic backends, handle upload and download limits separately
if (config.uploadLimit?.enabled) { const uploadLimit = formatBandwidthLimit(config.uploadLimit);
const uploadLimit = formatBandwidthLimit(config.uploadLimit); if (uploadLimit) {
if (uploadLimit) { args.push("--limit-upload", uploadLimit);
args.push("--limit-upload", uploadLimit);
}
} }
if (config.downloadLimit?.enabled) { const downloadLimit = formatBandwidthLimit(config.downloadLimit);
const downloadLimit = formatBandwidthLimit(config.downloadLimit); if (downloadLimit) {
if (downloadLimit) { args.push("--limit-download", downloadLimit);
args.push("--limit-download", downloadLimit);
}
} }
} }
} }