fix: handle favorites with special chars for topFavorites and customT…

…humbnail (+ifMissing)
punxaphil · Sep 27, 2023 · 52cc78c · 52cc78c
1 parent 78b32f0
commit 52cc78c
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 5 deletions.
diff --git a/src/sections/media-browser.ts b/src/sections/media-browser.ts
@@ -11,6 +11,7 @@ import { CardConfig, MediaPlayerItem, Section } from '../types';
 import { dispatchShowSection } from '../utils/utils';
 import { BROWSE_CLICKED, BROWSE_STATE, MEDIA_ITEM_SELECTED, PLAY_DIR } from '../constants';
 import { MediaPlayer } from '../model/media-player';
+import { indexOfWithoutSpecialChars } from '../utils/media-browser-utils';
 
 const LOCAL_STORAGE_CURRENT_DIR = 'custom-sonos-card_currentDir';
 
@@ -141,8 +142,8 @@ export class MediaBrowser extends LitElement {
     );
     allFavorites = allFavorites.sort((a, b) => {
       const topFavorites = this.config.topFavorites ?? [];
-      const aIndex = topFavorites.indexOf(a.title);
-      const bIndex = topFavorites.indexOf(b.title);
+      const aIndex = indexOfWithoutSpecialChars(topFavorites, a.title);
+      const bIndex = indexOfWithoutSpecialChars(topFavorites, b.title);
       if (aIndex > -1 && bIndex > -1) {
         return aIndex - bIndex;
       } else {

diff --git a/src/services/media-browse-service.ts b/src/services/media-browse-service.ts
@@ -1,12 +1,13 @@
 import { MediaPlayerItem } from '../types';
 import HassService from './hass-service';
 import { MediaPlayer } from '../model/media-player';
+import { indexOfWithoutSpecialChars } from '../utils/media-browser-utils';
 
 function mediaBrowserFilter(ignoredTitles: string[] = [], items?: MediaPlayerItem[]) {
   return items?.filter(
     (item) =>
       ['media-source://tts', 'media-source://camera'].indexOf(item.media_content_id || '') === -1 &&
-      ignoredTitles.indexOf(item.title) === -1,
+      indexOfWithoutSpecialChars(ignoredTitles, item.title) === -1,
   );
 }
 

diff --git a/src/utils/media-browser-utils.ts b/src/utils/media-browser-utils.ts
@@ -7,10 +7,20 @@ const DEFAULT_MEDIA_THUMBNAIL =
 function hasItemsWithImage(items: MediaPlayerItem[]) {
   return items.some((item) => item.thumbnail);
 }
+
+function getValueFromKeyIgnoreSpecialChars(array: { [title: string]: string } | undefined, str: string) {
+  for (const key in array) {
+    if (removeSpecialChars(key) === removeSpecialChars(str)) {
+      return array[key];
+    }
+  }
+  return undefined;
+}
+
 function getThumbnail(mediaItem: MediaPlayerItem, config: CardConfig, itemsWithImage: boolean) {
-  let thumbnail = config.customThumbnail?.[mediaItem.title] ?? mediaItem.thumbnail;
+  let thumbnail = getValueFromKeyIgnoreSpecialChars(config.customThumbnail, mediaItem.title) ?? mediaItem.thumbnail;
   if (!thumbnail) {
-    thumbnail = config.customThumbnailIfMissing?.[mediaItem.title];
+    thumbnail = getValueFromKeyIgnoreSpecialChars(config.customThumbnailIfMissing, mediaItem.title);
     if (itemsWithImage && !thumbnail) {
       thumbnail = config.customThumbnailIfMissing?.['default'] || DEFAULT_MEDIA_THUMBNAIL;
     }
@@ -20,6 +30,20 @@ function getThumbnail(mediaItem: MediaPlayerItem, config: CardConfig, itemsWithI
   return thumbnail || '';
 }
 
+function removeSpecialChars(str: string) {
+  return str.replace(/[^a-zA-Z ]/g, '');
+}
+
+export function indexOfWithoutSpecialChars(array: string[], str: string) {
+  let result = -1;
+  array.forEach((value, index) => {
+    if (removeSpecialChars(value) === removeSpecialChars(str)) {
+      result = index;
+    }
+  });
+  return result;
+}
+
 export function itemsWithFallbacks(mediaPlayerItems: MediaPlayerItem[], config: CardConfig) {
   const itemsWithImage = hasItemsWithImage(mediaPlayerItems);
   return mediaPlayerItems.map((item) => {