-
-
Notifications
You must be signed in to change notification settings - Fork 867
feat(search): collapse language/quality variants in global search #1215
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.
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
4gray
wants to merge
2
commits into
master
Choose a base branch
from
feat/search-variant-grouping
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
libs/portal/xtream/feature/src/lib/search-results/global-search-grouping.util.spec.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| import { XtreamSearchResultItem } from '@iptvnator/portal/xtream/data-access'; | ||
| import { groupResultsByVariant } from './global-search-grouping.util'; | ||
|
|
||
| function item( | ||
| title: string, | ||
| overrides: Partial<XtreamSearchResultItem> = {} | ||
| ): XtreamSearchResultItem { | ||
| return { | ||
| id: title, | ||
| title, | ||
| type: 'movie', | ||
| ...overrides, | ||
| } as unknown as XtreamSearchResultItem; | ||
| } | ||
|
|
||
| const displayType = (i: XtreamSearchResultItem): string => | ||
| (i as { type?: string }).type ?? 'movie'; | ||
|
|
||
| describe('groupResultsByVariant', () => { | ||
| it('collapses tagged variants of one title into a single group', () => { | ||
| const groups = groupResultsByVariant( | ||
| [ | ||
| item('DE| The Pitt'), | ||
| item('4K-TR - The Pitt (2025) (US)'), | ||
| item('The Pitt (2025)'), | ||
| item('|ALB| The Pitt'), | ||
| ], | ||
| displayType | ||
| ); | ||
|
|
||
| expect(groups).toHaveLength(1); | ||
| expect(groups[0].items).toHaveLength(4); | ||
| expect(groups[0].representative.title).toBe('DE| The Pitt'); | ||
| }); | ||
|
|
||
| it('labels the group with the cleanest member title', () => { | ||
| const groups = groupResultsByVariant( | ||
| [item('DE| The Pitt'), item('The Pitt (2025)'), item('|ALB| The Pitt')], | ||
| displayType | ||
| ); | ||
|
|
||
| expect(groups[0].displayTitle).toBe('The Pitt'); | ||
| }); | ||
|
|
||
| it('never merges different content types with the same title', () => { | ||
| const groups = groupResultsByVariant( | ||
| [ | ||
| item('The Pitt', { type: 'series' }), | ||
| item('The Pitt', { type: 'movie' }), | ||
| ], | ||
| displayType | ||
| ); | ||
|
|
||
| expect(groups).toHaveLength(2); | ||
| }); | ||
|
|
||
| it('keeps unrelated titles in separate groups', () => { | ||
| const groups = groupResultsByVariant( | ||
| [item('The Pitt'), item('The Pradeeps of Pittsburgh')], | ||
| displayType | ||
| ); | ||
|
|
||
| expect(groups).toHaveLength(2); | ||
| }); | ||
|
|
||
| it('preserves first-seen group order and ranked member order', () => { | ||
| const groups = groupResultsByVariant( | ||
| [ | ||
| item('EN| Fallout'), | ||
| item('The Last of Us'), | ||
| item('DE| Fallout'), | ||
| ], | ||
| displayType | ||
| ); | ||
|
|
||
| expect(groups.map((g) => g.displayTitle)).toEqual([ | ||
| 'Fallout', | ||
| 'The Last of Us', | ||
| ]); | ||
| expect(groups[0].items.map((i) => i.title)).toEqual([ | ||
| 'EN| Fallout', | ||
| 'DE| Fallout', | ||
| ]); | ||
| }); | ||
|
|
||
| it('gives titles that normalize to nothing their own group', () => { | ||
| const groups = groupResultsByVariant( | ||
| [item('|DE|', { id: 'a' }), item('|FR|', { id: 'b' })], | ||
| displayType | ||
| ); | ||
|
|
||
| expect(groups).toHaveLength(2); | ||
| }); | ||
| }); |
60 changes: 60 additions & 0 deletions
60
libs/portal/xtream/feature/src/lib/search-results/global-search-grouping.util.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| import { XtreamSearchResultItem } from '@iptvnator/portal/xtream/data-access'; | ||
| import { stripCountryPrefix } from '@iptvnator/shared/m3u-utils'; | ||
| import { normalizeTitleKeys } from '@iptvnator/shared/interfaces'; | ||
|
|
||
| /** | ||
| * A set of provider results that are the same title/type under different | ||
| * language, quality or provider tags ("DE| The Pitt", "4K-TR - The Pitt", | ||
| * "The Pitt (2025)"). Collapsing them turns a flood of near-duplicate | ||
| * cards into one entry the user can expand to pick a specific variant. | ||
| */ | ||
| export interface VariantGroup { | ||
| /** Stable key: content type + normalized title (or a unique fallback). */ | ||
| key: string; | ||
| /** Cleanest member title, used as the collapsed card label. */ | ||
| displayTitle: string; | ||
| /** Best-ranked member — opened when the group has a single variant. */ | ||
| representative: XtreamSearchResultItem; | ||
| /** All members, in the original (ranked) order. */ | ||
| items: XtreamSearchResultItem[]; | ||
| } | ||
|
|
||
| /** | ||
| * Group results that share a normalized title AND display type. Type is | ||
| * part of the key so a movie and a series with the same name never merge. | ||
| * Items whose title normalizes to an empty key (rare) each keep their own | ||
| * group so they are never silently collapsed together. Order is preserved: | ||
| * groups appear in first-seen order and members in their ranked order. | ||
| */ | ||
| export function groupResultsByVariant( | ||
| items: readonly XtreamSearchResultItem[], | ||
| getDisplayType: (item: XtreamSearchResultItem) => string | ||
| ): VariantGroup[] { | ||
| const groups = new Map<string, VariantGroup>(); | ||
|
|
||
| for (const item of items) { | ||
| const type = getDisplayType(item); | ||
| const base = normalizeTitleKeys(item.title).base; | ||
| const key = base ? `${type}::${base}` : `${type}::id:${item.id}`; | ||
| const cleaned = stripCountryPrefix(item.title) || item.title; | ||
|
|
||
| const existing = groups.get(key); | ||
| if (existing) { | ||
| existing.items.push(item); | ||
| // Prefer the shortest cleaned title — it is the least | ||
| // tag-polluted label ("The Pitt" over "The Pitt (2025) DE"). | ||
| if (cleaned.length < existing.displayTitle.length) { | ||
| existing.displayTitle = cleaned; | ||
| } | ||
| } else { | ||
| groups.set(key, { | ||
| key, | ||
| displayTitle: cleaned, | ||
| representative: item, | ||
|
greptile-apps[bot] marked this conversation as resolved.
Outdated
|
||
| items: [item], | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| return [...groups.values()]; | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.