Merge pull request #118 from JayWearsSocks/sound-of-da-police-name-search

Use displayName for order of tune list, and for search by text

Author: cdauth

src/state/state.ts

@@ -326,6 +326,10 @@ export function getSongName(state: State, songIdx?: number): string | undefined
 	return getI18n().t("state.untitled-song", { no });
 }
 
+function getTuneSortName(tunes: Record<string, Tune>, name: string): string {
+	return (tunes[name].displayName ?? name).toLowerCase();
+}
+
 export function getSortedTuneList(state: State): Array<string> {
 	return Object.keys(state.tunes).sort(function(a, b) {
 		const idx1 = defaultTunes.firstInSorting.indexOf(a);
@@ -338,7 +342,7 @@ export function getSortedTuneList(state: State): Array<string> {
 		else if(idx2 != -1)
 			return 1;
 		else
-			return a.toLowerCase() < b.toLowerCase() ? -1 : 1;
+			return getTuneSortName(state.tunes, a) < getTuneSortName(state.tunes, b) ? -1 : 1;
 	});
 }
 

src/ui/pattern-list-filter.vue

@@ -12,14 +12,20 @@
 
 	export const DEFAULT_FILTER: Filter = { text: "", cat: "all" };
 
+	function textIsInTuneName(state: State, name: string, text: string): boolean {
+		const tune = state.tunes[name];
+		const toSearch = [...tune.displayName ? [tune.displayName] : [], name];
+		return toSearch.some(s => s.toLowerCase().indexOf(text) != -1);
+	}
+
 	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))
+			if(text ? textIsInTuneName(state, tuneNames[i], text) : tuneIsInCategory(state.tunes[tuneNames[i]], params.cat))
 				ret.push(tuneNames[i]);
 		}
 		return ret;