feat: update UI to show estimated deletion date instead of default by walbertus · Pull Request #205 · jon4hz/jellysweep

walbertus · 2025-11-14T07:38:25Z

this is done by adding new job schedule to recalculate the estimate for deletion date. This function also called during the cleanup job

close #203

walbertus · 2025-11-17T12:45:49Z

@jon4hz please take a look at this when you're available, thanks

jon4hz · 2025-11-17T15:59:04Z

Hi, thank you so much for the PR!
I will try to review it throughout the week but no promise, my sideproject time is currently a bit limited I'm afraid.

internal/api/models/converter.go

internal/api/handler/plugin.go

internal/api/models/converter.go

internal/engine/scheduler.go

walbertus · 2026-01-05T08:57:57Z

updated, sorry for the delay @jon4hz

jon4hz · 2026-01-05T12:37:55Z

can you rebase the branch to main please?

walbertus · 2026-01-06T01:58:44Z

updated @jon4hz

internal/database/media.go

Copilot

Pull request overview

This pull request implements functionality to display estimated deletion dates in the UI that take into account disk usage policies, not just the default cleanup delay. Previously, the UI only showed DefaultDeleteAt, which didn't reflect when disk usage policies might trigger earlier deletion.

Changes:

Added EstimatedDeleteAt field to database Media model and API models
Implemented GetEstimatedDeleteAt method in policy interface to calculate earliest deletion time considering all policies
Created scheduled job (every 6 hours) and cleanup job hook to recalculate estimated deletion dates
Updated all frontend JavaScript/TypeScript code to use EstimatedDeleteAt instead of DefaultDeleteAt with fallback logic

Reviewed changes

Copilot reviewed 19 out of 19 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
internal/database/media.go	Added `EstimatedDeleteAt` field to Media model and `SetMediaEstimatedDeleteAt` method
internal/database/interface.go	Added `SetMediaEstimatedDeleteAt` to MediaDB interface
internal/policy/policy.go	Added `GetEstimatedDeleteAt` to Policy interface and implemented in Engine
internal/policy/default.go	Implemented `GetEstimatedDeleteAt` to return `DefaultDeleteAt`
internal/policy/disk_usage.go	Implemented `GetEstimatedDeleteAt` to return earliest deletion date when threshold exceeded, refactored disk usage logic
internal/engine/estimate.go	New file implementing the estimation job that updates `EstimatedDeleteAt` for all media items
internal/engine/engine.go	Integrated estimation job to run at end of cleanup job
internal/engine/scheduler.go	Added scheduled job to run estimation every 6 hours
internal/api/models/models.go	Added `EstimatedDeleteAt` field to UserMediaItem and AdminMediaItem
internal/api/models/converter.go	Updated converters to include `EstimatedDeleteAt` with fallback to `DefaultDeleteAt`
internal/api/handler/plugin.go	Updated CheckMediaItem to use `EstimatedDeleteAt` with fallback
web/templates/pages/dashboard.templ	Updated JavaScript to use `EstimatedDeleteAt` instead of `DefaultDeleteAt`
web/templates/pages/dashboard_templ.go	Generated file reflecting dashboard.templ changes
web/templates/components/stats.templ	Updated stats calculations to use `EstimatedDeleteAt`
web/templates/components/stats_templ.go	Generated file reflecting stats.templ changes
web/templates/components/dashboard-media-grid.templ	Updated media grid to use `EstimatedDeleteAt`
web/templates/components/dashboard-media-grid_templ.go	Generated file reflecting dashboard-media-grid.templ changes
web/templates/components/admin-media-grid.templ	Updated admin media grid to use `EstimatedDeleteAt`
web/templates/components/admin-media-grid_templ.go	Generated file reflecting admin-media-grid.templ changes

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

internal/database/media.go

Copilot · 2026-02-01T17:07:21Z

internal/engine/estimate.go

+	for _, item := range mediaItems {
+		estimatedDeleteAt, err := e.policy.GetEstimatedDeleteAt(ctx, item)
+		if err != nil {
+			log.Error("failed to estimate delete at for media item", "itemID", item.ID, "error", err)
+			continue
+		}
+		err = e.db.SetMediaEstimatedDeleteAt(ctx, item.ID, estimatedDeleteAt)
+		if err != nil {
+			log.Error("failed to set estimated delete at for media item", "itemID", item.ID, "error", err)
+			continue
+		}
+		log.Debug("estimated delete at set for media item", "itemID", item.ID, "estimatedDeleteAt", estimatedDeleteAt)
+	}
+
+	log.Info("estimate deletions job completed successfully")
+	return nil
+}


The estimate deletions job calls GetEstimatedDeleteAt for each media item, which in turn calls getCurrentDiskUsage for each item. If multiple media items belong to the same library, the disk usage will be queried repeatedly for the same library folders. Consider caching disk usage results per library within the estimation job to improve performance, especially for libraries with many media items.

Copilot

Pull request overview

Copilot reviewed 19 out of 19 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

internal/engine/estimate.go

internal/engine/scheduler.go

internal/engine/engine.go

jon4hz · 2026-03-17T17:29:41Z

internal/policy/disk_usage.go

+func (p *DiskUsageDelete) GetEstimatedDeleteAt(ctx context.Context, media database.Media) (time.Time, error) {
+	if len(media.DiskUsageDeletePolicies) == 0 {
+		return time.Time{}, nil
+	}
+
+	currentDiskUsage, err := p.getCurrentDiskUsage(ctx, media.LibraryName)
 	if err != nil {
-		return 0, err
+		return time.Time{}, err
+	}


I'll see what I can do about this in a different PR. Copilot has a point that querying the disk usage for every library item isn't very efficient.

jon4hz · 2026-03-17T17:39:36Z

Hi @walbertus,

Would you mind taking a look at the conflict?

- Simplify redundant function in internal/database/media.go - Checked internal/engine/estimate.go for hidden Unicode (none found)

- Add Select() to Updates() calls to ensure zero values are saved - Affects SetMediaEstimatedDeleteAt, SetMediaProtectedUntil, and MarkMediaAsUnkeepable - Without Select(), GORM skips zero-value fields (zero time, nil pointers, false bools) - Fixes potential data inconsistency when clearing or setting zero values

walbertus · 2026-03-20T14:08:30Z

I'll recheck this in a moment ya, it seem my last force push is wrong. It's been few months, I need time to revisit this

jon4hz · 2026-03-20T22:22:18Z

Hi @walbertus,

Thanks for rebasing, and sorry that I couldn't give this PR more attention sooner. I'll try to test this in the next few days and if everything looks fine, we'll

walbertus mentioned this pull request Nov 14, 2025

Deletion date shown in the UI does not consider disk usage policy #203

Open

jon4hz requested changes Dec 19, 2025

View reviewed changes

internal/api/models/converter.go Show resolved Hide resolved

internal/api/handler/plugin.go Outdated Show resolved Hide resolved

internal/api/models/converter.go Show resolved Hide resolved

internal/engine/scheduler.go Show resolved Hide resolved

walbertus force-pushed the feat/estimate-delete-at branch from c4fd19f to 8a9a175 Compare January 6, 2026 01:57

jon4hz mentioned this pull request Feb 1, 2026

Grace period isn't affected by low disk space in webUI #259

Closed

jon4hz reviewed Feb 1, 2026

View reviewed changes

internal/database/media.go Outdated Show resolved Hide resolved

jon4hz requested a review from Copilot February 1, 2026 17:01

Copilot started reviewing on behalf of jon4hz February 1, 2026 17:02 View session

Copilot AI reviewed Feb 1, 2026

View reviewed changes

jon4hz requested a review from Copilot March 17, 2026 16:17

Copilot started reviewing on behalf of jon4hz March 17, 2026 16:18 View session

Copilot AI reviewed Mar 17, 2026

View reviewed changes

walbertus added 9 commits March 20, 2026 14:04

feat: add job to estimate media deletion date

b61f37b

feat: replace the deletion date in UI with estimated deletion date

c9cfc3f

chore: update naming related to deletion estimation

dbf0fea

fix: disable estimate instant after start

3290569

fix: default the deleted at to prevent zero

25bd9e4

chore: rerun make build

81befa7

fix: apply Copilot-suggested fixes

614b86d

- Simplify redundant function in internal/database/media.go - Checked internal/engine/estimate.go for hidden Unicode (none found)

chore: rerun make build

5f7c3b9

walbertus force-pushed the feat/estimate-delete-at branch from 9dd4293 to 5f7c3b9 Compare March 20, 2026 07:12

fix: restore disk usage guard, fix err overwrite, add godoc

53f99ed

Conversation

walbertus commented Nov 14, 2025

Uh oh!

walbertus commented Nov 17, 2025

Uh oh!

jon4hz commented Nov 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

walbertus commented Jan 5, 2026

Uh oh!

jon4hz commented Jan 5, 2026

Uh oh!

walbertus commented Jan 6, 2026

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Copilot AI Feb 1, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jon4hz Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

jon4hz commented Mar 17, 2026

Uh oh!

walbertus commented Mar 20, 2026

Uh oh!

jon4hz commented Mar 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

jon4hz commented Nov 17, 2025 •

edited

Loading