melosh/mal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: shorten function names in jikan relations

Browse Source
This commit is contained in:
mkelvers
2026-06-23 17:38:07 +02:00
committed by Milas Holsting
parent f940c678d6
commit 496aea9d0d
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
integrations/jikan/relations.go
View File

@@ -185,7 +185,8 @@ func (c *Client) handleWatchOrderError(ctx context.Context, id int, err error) (
return c.currentOnlyRelation(ctx, id) return c.currentOnlyRelation(ctx, id)
} }
func buildAllowedWatchOrderEntries(result watchorder.WatchOrderResult, mode WatchOrderMode) ([]watchorder.WatchOrderEntry, map[int]bool) { // relation filter
func allowedWatchOrder(result watchorder.WatchOrderResult, mode WatchOrderMode) ([]watchorder.WatchOrderEntry, map[int]bool) {
allowedEntries := make([]watchorder.WatchOrderEntry, 0, len(result.WatchOrder)) allowedEntries := make([]watchorder.WatchOrderEntry, 0, len(result.WatchOrder))
seen := make(map[int]bool) seen := make(map[int]bool)
hasTVEntry := false hasTVEntry := false
@@ -216,7 +217,7 @@ func buildAllowedWatchOrderEntries(result watchorder.WatchOrderResult, mode Watc
return allowedEntries, seen return allowedEntries, seen
} }
func (c *Client) fetchRelationEntries(ctx context.Context, entries []watchorder.WatchOrderEntry) chan fetchResult { func (c *Client) fetchEntries(ctx context.Context, entries []watchorder.WatchOrderEntry) chan fetchResult {
g, gCtx := errgroup.WithContext(ctx) g, gCtx := errgroup.WithContext(ctx)
g.SetLimit(3) g.SetLimit(3)
@@ -262,8 +263,8 @@ func (c *Client) fetchRelationEntries(ctx context.Context, entries []watchorder.
return results return results
} }
func (c *Client) fetchRelationResults(ctx context.Context, entries []watchorder.WatchOrderEntry) []fetchResult { func (c *Client) fetchResults(ctx context.Context, entries []watchorder.WatchOrderEntry) []fetchResult {
results := c.fetchRelationEntries(ctx, entries) results := c.fetchEntries(ctx, entries)
fetched := make([]fetchResult, 0, len(entries)) fetched := make([]fetchResult, 0, len(entries))
for res := range results { for res := range results {
@@ -291,7 +292,7 @@ func (c *Client) fetchRelationResults(ctx context.Context, entries []watchorder.
return fetched return fetched
} }
func buildRelationsFromResults(results []fetchResult, id int) []RelationEntry { func buildRelations(results []fetchResult, id int) []RelationEntry {
relations := make([]RelationEntry, 0, len(results)+1) relations := make([]RelationEntry, 0, len(results)+1)
for _, res := range results { for _, res := range results {
relations = append(relations, RelationEntry{ relations = append(relations, RelationEntry{
@@ -305,7 +306,7 @@ func buildRelationsFromResults(results []fetchResult, id int) []RelationEntry {
return relations return relations
} }
func (c *Client) ensureCurrentRelation(ctx context.Context, id int, seen map[int]bool, relations []RelationEntry) ([]RelationEntry, error) { func (c *Client) ensureCurrent(ctx context.Context, id int, seen map[int]bool, relations []RelationEntry) ([]RelationEntry, error) {
if seen[id] { if seen[id] {
return relations, nil return relations, nil
} }
@@ -336,10 +337,10 @@ func (c *Client) GetFullRelations(ctx context.Context, id int, mode WatchOrderMo
return c.handleWatchOrderError(ctx, id, err) return c.handleWatchOrderError(ctx, id, err)
} }
allowedEntries, seen := buildAllowedWatchOrderEntries(result, mode) allowedEntries, seen := allowedWatchOrder(result, mode)
fetched := c.fetchRelationResults(ctx, allowedEntries) fetched := c.fetchResults(ctx, allowedEntries)
relations := buildRelationsFromResults(fetched, id) relations := buildRelations(fetched, id)
relations, err = c.ensureCurrentRelation(ctx, id, seen, relations) relations, err = c.ensureCurrent(ctx, id, seen, relations)
if err != nil { if err != nil {
return nil, err return nil, err
} }

6
integrations/jikan/relations_test.go
View File

@@ -38,7 +38,7 @@ func TestBuildAllowedWatchOrderEntriesKeepsDefaultTypesWhenTVExists(t *testing.T
}, },
} }
entries, seen := buildAllowedWatchOrderEntries(result, WatchOrderModeMain) entries, seen := allowedWatchOrder(result, WatchOrderModeMain)
if len(entries) != 2 { if len(entries) != 2 {
t.Fatalf("expected 2 entries, got %d", len(entries)) t.Fatalf("expected 2 entries, got %d", len(entries))
} }
@@ -62,7 +62,7 @@ func TestBuildAllowedWatchOrderEntriesIncludesAllTypesWhenNoTVExists(t *testing.
}, },
} }
entries, seen := buildAllowedWatchOrderEntries(result, WatchOrderModeMain) entries, seen := allowedWatchOrder(result, WatchOrderModeMain)
if len(entries) != 3 { if len(entries) != 3 {
t.Fatalf("expected 3 entries, got %d", len(entries)) t.Fatalf("expected 3 entries, got %d", len(entries))
} }
@@ -86,7 +86,7 @@ func TestBuildAllowedWatchOrderEntriesIncludesAllTypesInCompleteMode(t *testing.
}, },
} }
entries, seen := buildAllowedWatchOrderEntries(result, WatchOrderModeComplete) entries, seen := allowedWatchOrder(result, WatchOrderModeComplete)
if len(entries) != 4 { if len(entries) != 4 {
t.Fatalf("expected 4 entries, got %d", len(entries)) t.Fatalf("expected 4 entries, got %d", len(entries))
} }