Skip to content

Fix list popping issue #518

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
biodrone merged 1 commit into from
Sep 28, 2025
Merged

Fix list popping issue #518

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
10 changes: 8 additions & 2 deletions download_stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ func downloadStream(user string, url string, outLoc string, moveLoc string, subf
sigint := make(chan bool)
t := time.Now().Format("2006-01-02_15-04-05")

// Always ensure the user is removed from the live list when this goroutine exits
defer func() {
delete(urls, user)
log.Debugf("Removed %s from live list", user)
}()

// Always ensure base directories have correct permissions first
if err := createDirWithUmask(outLoc); err != nil {
log.Errorf("Failed to create output directory %s: %v", outLoc, err)
Expand Down Expand Up @@ -208,6 +214,7 @@ func downloadStream(user string, url string, outLoc string, moveLoc string, subf
}
time.Sleep(time.Second * 2)
response <- true
return
case err := <-naturalFinish:
if err != nil {
// Emit a compact tail of FFmpeg logs to aid diagnosis
Expand All @@ -231,7 +238,7 @@ func downloadStream(user string, url string, outLoc string, moveLoc string, subf
}
}
log.Errorf("FFmpeg failed for %s after %d attempts: %v", user, attempt, err)
// Keep URL cached; another tick may attempt again
// Ensure cleanup so the next tick can retry fresh
return
}
log.Debugf("Stream For %v Ended", user)
Expand All @@ -241,7 +248,6 @@ func downloadStream(user string, url string, outLoc string, moveLoc string, subf
} else {
log.Debugf("Moved file to %v", newPath)
}
delete(urls, user)
return
}
}
Expand Down