Skip to content

Fix/backup upload empty files #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patricioxavier8 merged 3 commits into from
Feb 11, 2026
+26 −14
Merged

Fix/backup upload empty files #197

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19911c3
fix: remove network call when user upload zero files size
patricioxavier8 Feb 10, 2026
cd73236
fix: update bucket when network call is available
patricioxavier8 Feb 10, 2026
4cf3380
Replace redundant fileURL.fileSize access with uploadSize variable
patricioxavier8 Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions XPCBackupService/Services/BackupUploadService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,27 @@ class BackupUploadService: BackupUploadServiceProtocol, ObservableObject {
self.logger.info("Remote parent id \(remoteParentId)")

do {
let result = try await networkFacade.uploadFile(
input: inputStream,
encryptedOutput: safeEncryptedContentURL,
fileSize: Int(fileURL.fileSize),
bucketId: self.bucketId,
progressHandler: { _ in }
)

self.logger.info("Upload completed with id \(result.id)")
var uploadFileId: String? = nil
var uploadSize: Int = Int(fileURL.fileSize)
var uploadBucketId: String = self.bucketId

if uploadSize > 0 {
let result = try await networkFacade.uploadFile(
input: inputStream,
encryptedOutput: safeEncryptedContentURL,
fileSize: uploadSize,
bucketId: self.bucketId,
progressHandler: { _ in }
)

uploadFileId = result.id
uploadSize = result.size
uploadBucketId = result.bucket

self.logger.info("Upload completed with id \(result.id)")
} else {
self.logger.info("⚠️ Skipping network upload for empty file: \(filename)")
}

if node.syncStatus == .NEEDS_UPDATE {
guard let remoteUuid = node.remoteUuid, let remoteId = node.remoteId else {
Expand All @@ -252,8 +264,8 @@ class BackupUploadService: BackupUploadServiceProtocol, ObservableObject {

let updatedFile = try await backupNewAPI.replaceFileId(
fileUuid: remoteUuid,
newFileId: result.id,
newSize: result.size
newFileId: uploadFileId,
newSize: uploadSize
)

self.logger.info("✅ Updated file correctly with identifier \(updatedFile.fileId)")
Expand All @@ -279,10 +291,10 @@ class BackupUploadService: BackupUploadServiceProtocol, ObservableObject {

let createdFile = try await backupNewAPI.createBackupFileNew(
createFileData: CreateFileDataNew(
fileId: result.id,
fileId: uploadFileId,
type: filename.pathExtension,
bucket: result.bucket,
size: result.size,
bucket: uploadBucketId,
size: uploadSize,
folderId: remoteParentId,
name: encryptedFilename.base64EncodedString(),
plainName: filename.deletingPathExtension,
Expand Down