Skip to content

Remove empty directories on Clean Generated Files with Blobs #6749

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

Open
SandiyosDev wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Remove empty directories on Clean Generated Files with Blobs #6749

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a73d59
clean empty dirs
SandiyosDev Mar 24, 2026
b19aa3d
clean emp dir thumbs
SandiyosDev Mar 27, 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
31 changes: 31 additions & 0 deletions internal/manager/task/clean_generated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,36 @@ func (j *CleanGeneratedJob) cleanBlobFiles(ctx context.Context, progress *job.Pr
return err
}

// remove empty hash prefix subdirectories
j.removeEmptyDirs(j.Paths.Blobs)

return nil
}

func (j *CleanGeneratedJob) removeEmptyDirs(root string) {
entries, err := os.ReadDir(root)
if err != nil {
return
}

for _, entry := range entries {
if !entry.IsDir() {
continue
}

dirPath := filepath.Join(root, entry.Name())
subEntries, err := os.ReadDir(dirPath)
if err != nil {
continue
}

if len(subEntries) == 0 {
j.logDelete("removing empty directory: %s", entry.Name())
j.deleteDir(dirPath)
}
}
}

func (j *CleanGeneratedJob) getScenesWithHash(ctx context.Context, hash string) ([]*models.Scene, error) {
fp := models.Fingerprint{
Fingerprint: hash,
Expand Down Expand Up @@ -637,6 +664,8 @@ func (j *CleanGeneratedJob) cleanMarkerFiles(ctx context.Context, progress *job.
return err
}

j.removeEmptyDirs(j.Paths.Generated.Markers)

return nil
}

Expand Down Expand Up @@ -730,5 +759,7 @@ func (j *CleanGeneratedJob) cleanThumbnailFiles(ctx context.Context, progress *j
return err
}

j.removeEmptyDirs(j.Paths.Generated.Thumbnails)

return nil
}
Loading