Skip to content

Commit d050649

Browse files
authored
Miscellaneous fixes (#357)
* Simplify purge jobs logic * Fix GraphQL unmarshal of nullable enum * Improve queue batch UI * Miscellaneous UI tweaks * Round estimates to 2 significant figures * Use default cursor for file sizes * Add padding to bottom of layout * Rebuild webui * Add missing files
1 parent a397c47 commit d050649

File tree

72 files changed

+229
-80
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+229
-80
lines changed

internal/model/content_type_enum.go

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/model/enums.gql.tmpl

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,8 @@ func (n *Null{{.enum.Name}}) UnmarshalGQL(v any) error {
1515
if !ok {
1616
return errors.New("value is not a string")
1717
}
18-
return n.UnmarshalJSON([]byte(str))
18+
if str == "null" {
19+
return nil
20+
}
21+
return n.UnmarshalJSON([]byte("\""+str+"\""))
1922
}

internal/model/facet_logic_enum.go

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/model/file_type_enum.go

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/model/files_status_enum.go

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/model/queue_job_status_enum.go

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/model/video_3d_enum.go

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/model/video_codec_enum.go

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/model/video_modifier_enum.go

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/model/video_resolution_enum.go

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/model/video_source_enum.go

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/queue/manager/purge_jobs.go

+2-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package manager
22

33
import (
44
"context"
5-
"github.com/bitmagnet-io/bitmagnet/internal/model"
65
)
76

87
func (m manager) PurgeJobs(ctx context.Context, req PurgeJobsRequest) error {
@@ -11,22 +10,16 @@ func (m manager) PurgeJobs(ctx context.Context, req PurgeJobsRequest) error {
1110
return err
1211
}
1312
q := m.dao.QueueJob.WithContext(ctx)
14-
where := false
1513
if len(req.Queues) > 0 {
1614
q = q.Where(m.dao.QueueJob.Queue.In(req.Queues...))
17-
where = true
1815
}
1916
if len(req.Statuses) > 0 {
2017
statuses := make([]string, len(req.Statuses))
2118
for i, s := range req.Statuses {
2219
statuses[i] = string(s)
2320
}
2421
q = q.Where(m.dao.QueueJob.Status.In(statuses...))
25-
where = true
2622
}
27-
db := q.UnderlyingDB()
28-
if !where {
29-
db = db.Where("true")
30-
}
31-
return db.Delete(&model.QueueJob{}).Error
23+
_, err := q.Delete()
24+
return err
3225
}

webui/dist/bitmagnet/browser/chunk-2CPKEXRV.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webui/dist/bitmagnet/browser/chunk-2UGY5BM5.js

-1
This file was deleted.

webui/dist/bitmagnet/browser/chunk-42PJPEMD.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webui/dist/bitmagnet/browser/chunk-ZSXTRDMO.js renamed to webui/dist/bitmagnet/browser/chunk-52V76PPN.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webui/dist/bitmagnet/browser/chunk-5NUKGQ2Y.js

-1
This file was deleted.

webui/dist/bitmagnet/browser/chunk-5WNI2BDG.js

-1
This file was deleted.

webui/dist/bitmagnet/browser/chunk-772M27O6.js

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webui/dist/bitmagnet/browser/chunk-7BG6QBRU.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webui/dist/bitmagnet/browser/chunk-7GA5RIIW.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)