Use displayName for order of tune list, and for search by text #118
Conversation
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
cdauth
requested changes
Mar 28, 2025
src/ui/pattern-list-filter.vue
Outdated
| export function filterPatternList(state: State, params?: Filter | null): string[] { | ||
| params = params || DEFAULT_FILTER; | ||
|
|
||
| const ret: string[] = [ ]; | ||
| const tuneNames = getSortedTuneList(state); | ||
| const text = params && params.text.trim().toLowerCase() || ""; | ||
| for(let i = 0; i < tuneNames.length; i++) { | ||
| if(text ? (tuneNames[i].toLowerCase().indexOf(text) != -1) : tuneIsInCategory(state.tunes[tuneNames[i]], params.cat)) | ||
| const toSearch = tuneSearchText(state, tuneNames[i]); | ||
| if(text ? (toSearch.toLowerCase().indexOf(text) != -1) : tuneIsInCategory(state.tunes[tuneNames[i]], params.cat)) |
There was a problem hiding this comment.
I would prefer tuneSearchText to return an array of strings ([...tune.displayName ? [tune.displayName] : [], name]) and do toSearch.some((s) => s.toLowerCase().indexOf(text) != -1). I feel like concatenating the two search strings might lead to unexpected search results in some combinations.
There was a problem hiding this comment.
Yeah good point!
I've combined the "what to search" and the actual searching into a function; I think that makes it easier to read (it took me a while to figure out what was going on...)
bit of refactoring for readability
cdauth
approved these changes
Apr 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
For issue #117
Turns out that the order of appearance in defaultTunes.ts does not affect the order the tunes appear in in the player :)
To fix the ordering, I edited the 'getSortedTuneList' function in state.ts. After considering the "firstInSorting" (for the collections of breaks), it uses displayName if available, and otherwise the regular name as before.
To improve the searching, I edited 'filterPatternList' in patter-list-filter.vue. We search in displayName + name if displayName is available, otherwise only in name.
I ran the server locally:
the order of tunes looks good - and "Sound of da Police" appears under S (after Sheffield before Tequila).
I tried a bunch of search terms, and they all work as expected. For example, you can now find "Sound of da police" by searching for "sound".