Skip to content

DRY and Clean Client code #18

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
jolynch merged 1 commit into from
Apr 10, 2026
Merged

DRY and Clean Client code #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 18 additions & 24 deletions server/filexfer/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,18 @@ type GetFilesRequest struct {
ProgressUpdates chan<- DownloadProgressUpdate
}

// emitProgress sends a progress update on the ProgressUpdates channel if set.
// The send is non-blocking so a slow consumer never stalls downloads.
func (r *GetFilesRequest) emitProgress(update DownloadProgressUpdate) {
if r.ProgressUpdates == nil {
return
}
select {
case r.ProgressUpdates <- update:
default:
}
}

type GetFilesResponse struct {
Files []DownloadFileResponse
}
Expand Down Expand Up @@ -1107,15 +1119,6 @@ func (c *Client) downloadManifestBatchSequential(
if ackTimeout <= 0 {
ackTimeout = defaultClientAckRequestTimeout
}
emitProgressUpdate := func(update DownloadProgressUpdate) {
if req.ProgressUpdates == nil {
return
}
select {
case req.ProgressUpdates <- update:
default:
}
}

windowBytes := c.FileRequestWindowBytes
if windowBytes <= 0 {
Expand All @@ -1130,7 +1133,7 @@ func (c *Client) downloadManifestBatchSequential(
)

if k <= 1 {
files, acks, progresses, err := c.downloadManifestGroupSequential(ctx, req, plans, targets, emitProgressUpdate)
files, acks, progresses, err := c.downloadManifestGroupSequential(ctx, req, plans, targets, req.emitProgress)
if err != nil {
return GetFilesResponse{}, err
}
Expand All @@ -1153,7 +1156,7 @@ func (c *Client) downloadManifestBatchSequential(
wg.Add(1)
go func(i int, pg []downloadBatchPlan, tg []FetchFileTarget) {
defer wg.Done()
files, acks, progresses, err := c.downloadManifestGroupSequential(groupCtx, req, pg, tg, emitProgressUpdate)
files, acks, progresses, err := c.downloadManifestGroupSequential(groupCtx, req, pg, tg, req.emitProgress)
results[i] = groupResult{files, acks, progresses}
errs[i] = err
if err != nil {
Expand Down Expand Up @@ -1189,7 +1192,7 @@ func (c *Client) downloadManifestBatchSequential(
}

for _, progress := range allProgress {
emitProgressUpdate(DownloadProgressUpdate{
req.emitProgress(DownloadProgressUpdate{
TransferID: req.Manifest.TransferID,
FileID: progress.fileID,
TargetBytes: progress.targetBytes,
Expand All @@ -1215,17 +1218,8 @@ func (c *Client) downloadManifestBatchWindows(
if ackTimeout <= 0 {
ackTimeout = defaultClientAckRequestTimeout
}
emitProgressUpdate := func(update DownloadProgressUpdate) {
if req.ProgressUpdates == nil {
return
}
select {
case req.ProgressUpdates <- update:
default:
}
}
if plan.resumeFrom > 0 {
emitProgressUpdate(DownloadProgressUpdate{
req.emitProgress(DownloadProgressUpdate{
TransferID: req.Manifest.TransferID,
FileID: plan.entry.ID,
CopiedBytes: plan.resumeFrom,
Expand Down Expand Up @@ -1287,7 +1281,7 @@ func (c *Client) downloadManifestBatchWindows(
}
defer func() { <-limiter }()

result, err := c.downloadSplitWindow(ctx, req, plan, window, w, s, emitProgressUpdate)
result, err := c.downloadSplitWindow(ctx, req, plan, window, w, s, req.emitProgress)
if err != nil {
setErr(err)
return
Expand Down Expand Up @@ -1343,7 +1337,7 @@ func (c *Client) downloadManifestBatchWindows(
}
delete(pending, ready.window.start)
nextAckOffset = ready.window.end
emitProgressUpdate(DownloadProgressUpdate{
req.emitProgress(DownloadProgressUpdate{
TransferID: req.Manifest.TransferID,
FileID: plan.entry.ID,
TargetBytes: plan.entry.Size,
Expand Down
Loading
Loading