teacat/chaturbate-dvr
1
0
Fork 0
mirror of https://github.com/teacat/chaturbate-dvr.git synced 2025-10-29 16:59:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #114, Fixed #128, cleanup file when RecordStream ends

Browse Source
This commit is contained in:
Yami Odymel 2025-06-25 04:09:59 +08:00
parent 8b55209273
commit 9999afa9ed
No known key found for this signature in database
GPG Key ID: 68E469836934DB36
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
channel/channel_file.go
View File

@ -44,9 +44,12 @@ func (ch *Channel) Cleanup() error {
if ch.File == nil {
return nil
}
filename := ch.File.Name()
defer func() {
ch.Filesize = 0
ch.Duration = 0
ch.File = nil
}()
// Sync the file to ensure data is written to disk
@ -58,13 +61,15 @@ func (ch *Channel) Cleanup() error {
}
// Delete the empty file
if ch.Filesize <= 0 {
if err := os.Remove(ch.File.Name()); err != nil {
fileInfo, err := os.Stat(filename)
if err != nil && !os.IsNotExist(err) {
return fmt.Errorf("stat file delete zero file: %w", err)
}
if fileInfo != nil && fileInfo.Size() == 0 {
if err := os.Remove(filename); err != nil {
return fmt.Errorf("remove zero file: %w", err)
}
}
ch.File = nil
return nil
}

22
channel/channel_record.go
View File

@ -54,13 +54,14 @@ func (ch *Channel) Monitor() {
}
}
if err != nil {
if !errors.Is(err, context.Canceled) {
ch.Error("record stream: %s", err.Error())
}
if err := ch.Cleanup(); err != nil {
ch.Error("cleanup canceled channel: %s", err.Error())
}
// Always cleanup when monitor exits, regardless of error
if err := ch.Cleanup(); err != nil {
ch.Error("cleanup on monitor exit: %s", err.Error())
}
// Log error if it's not a context cancellation
if err != nil && !errors.Is(err, context.Canceled) {
ch.Error("record stream: %s", err.Error())
}
}
@ -85,6 +86,13 @@ func (ch *Channel) RecordStream(ctx context.Context, client *chaturbate.Client)
return fmt.Errorf("next file: %w", err)
}
// Ensure file is cleaned up when this function exits in any case
defer func() {
if err := ch.Cleanup(); err != nil {
ch.Error("cleanup on record stream exit: %s", err.Error())
}
}()
playlist, err := stream.GetPlaylist(ctx, ch.Config.Resolution, ch.Config.Framerate)
if err != nil {
return fmt.Errorf("get playlist: %w", err)