ignore non music sources in root

punxaphil · punxaphil · commit c83af1a77bbd · 2025-12-28T16:21:38.000+01:00
diff --git a/README.md b/README.md
@@ -296,7 +296,6 @@ mediaBrowser:
     iconTitleBackgroundColor: blue # default is card background with opacity. Use this to change the background color of favorites icon titles.
     iconTitleColor: red # default is theme text color. Use this to change the color of favorites icon titles.
     numberToShow: 10 # Use this to limit the amount of favorites to show.
-    replaceHttpWithHttpsForThumbnails: true # default is false. Use this if you want to replace http with https for thumbnails.
     sortByType: true # default is false. Will group favorites by type (e.g. radio, playlist, album).
     topItems: # Show these favorites at the top of the list
       - Legendary
diff --git a/scripts/sync-upstream.sh b/scripts/sync-upstream.sh
@@ -63,6 +63,11 @@ sed -i '' \
   -e 's|from "\.\./\.\./types"|from "../../types"|g' \
   "$UPSTREAM_DIR/ha-media-player-browse.ts"
 
+# Use filterOutIgnoredMediaSources to filter children
+echo "Adding media source filter..."
+sed -i '' 's/let children = currentItem.children || \[\];/let children = filterOutIgnoredMediaSources(currentItem.children || []);/g' \
+  "$UPSTREAM_DIR/ha-media-player-browse.ts"
+
 # CRITICAL: Rename component to avoid registration conflicts with HA frontend
 echo "Renaming component to avoid conflicts..."
 sed -i '' 's/@customElement("ha-media-player-browse")/@customElement("sonos-ha-media-player-browse")/g' \
@@ -91,6 +96,11 @@ sed -i '' \
 echo "$RELEASE_TAG" > "$VERSION_FILE"
 echo "Synced: $(date -u +"%Y-%m-%d %H:%M:%S UTC")" >> "$VERSION_FILE"
 
+# Add filterOutIgnoredMediaSources import to ha-media-player-browse.ts
+echo "Adding filterOutIgnoredMediaSources import..."
+sed -i '' '1s/^/import { filterOutIgnoredMediaSources } from '\''..\/utils\/media-browse-utils'\'';\n/' \
+  "$UPSTREAM_DIR/ha-media-player-browse.ts"
+
 # Add @ts-nocheck to all upstream TypeScript files
 echo "Adding @ts-nocheck to all upstream files..."
 for file in $(find "$UPSTREAM_DIR" -name "*.ts" -type f); do
@@ -103,6 +113,7 @@ echo ""
 echo "✅ Synced from HA frontend release: $RELEASE_TAG"
 echo "✅ Component renamed to 'sonos-ha-media-player-browse'"
 echo "✅ Grid customizations applied (100px items, 8px gap)"
+echo "✅ Non-audio media sources filtered (TTS, camera, images)"
 echo "✅ @ts-nocheck added to all upstream files"
 echo "✅ Version saved to $VERSION_FILE"
 echo ""
diff --git a/src/components/favorites-icons.ts b/src/components/favorites-icons.ts
@@ -4,7 +4,7 @@ import Store from '../model/store';
 import { FavoritesConfig, MediaBrowserConfig, MediaPlayerItem } from '../types';
 import { customEvent } from '../utils/utils';
 import { MEDIA_ITEM_SELECTED, mediaItemTitleStyle } from '../constants';
-import { itemsWithFallbacks, renderFavoritesItem } from '../utils/favorites-utils';
+import { itemsWithFallbacks, renderFavoritesItem } from '../utils/media-browse-utils';
 import { styleMap } from 'lit-html/directives/style-map.js';
 
 export class FavoritesIcons extends LitElement {
diff --git a/src/components/favorites-list.ts b/src/components/favorites-list.ts
@@ -4,7 +4,7 @@ import Store from '../model/store';
 import { CardConfig, MediaPlayerItem } from '../types';
 import { customEvent } from '../utils/utils';
 import { listStyle, MEDIA_ITEM_SELECTED } from '../constants';
-import { itemsWithFallbacks } from '../utils/favorites-utils';
+import { itemsWithFallbacks } from '../utils/media-browse-utils';
 
 export class FavoritesList extends LitElement {
   @property({ attribute: false }) store!: Store;
diff --git a/src/components/media-row.ts b/src/components/media-row.ts
@@ -3,7 +3,7 @@ import { property } from 'lit/decorators.js';
 import Store from '../model/store';
 import { MediaPlayerItem } from '../types';
 import { mediaItemTitleStyle } from '../constants';
-import { renderFavoritesItem } from '../utils/favorites-utils';
+import { renderFavoritesItem } from '../utils/media-browse-utils';
 import './playing-bars';
 
 class MediaRow extends LitElement {
diff --git a/src/editor/editor.ts b/src/editor/editor.ts
@@ -63,6 +63,9 @@ class CardEditor extends BaseEditor {
   };
 
   protected render(): TemplateResult {
+    if (!this.config) {
+      return html``;
+    }
     if (!this.config.sections || this.config.sections.length === 0) {
       this.config.sections = [Section.PLAYER, Section.VOLUMES, Section.GROUPS, Section.GROUPING, Section.MEDIA_BROWSER];
       if (isSonosCard(this.config)) {
@@ -83,15 +86,15 @@ class CardEditor extends BaseEditor {
         ></ha-icon-button>
         <div class="tabs-list">
           ${tabs.map(
-            (tab) => html`
+      (tab) => html`
               <button
                 class="tab-button ${this.activeTab === tab ? 'active' : ''}"
                 @click=${() => (this.activeTab = tab)}
               >
                 ${tab}
               </button>
             `,
-          )}
+    )}
         </div>
         <ha-icon-button
           class="nav-arrow ${showRightArrow ? '' : 'hidden'}"
diff --git a/src/editor/schema/media-browser-schema.ts b/src/editor/schema/media-browser-schema.ts
@@ -1,68 +1,64 @@
 export const MEDIA_BROWSER_SCHEMA = [
-  {
-    name: 'hideHeader',
-    selector: { boolean: {} },
-  },
-  {
-    name: 'itemsPerRow',
-    type: 'integer',
-    valueMin: 1,
-  },
-  {
-    name: 'onlyFavorites',
-    selector: { boolean: {} },
-  },
+    {
+        name: 'hideHeader',
+        selector: { boolean: {} },
+    },
+    {
+        name: 'itemsPerRow',
+        type: 'integer',
+        valueMin: 1,
+    },
+    {
+        name: 'onlyFavorites',
+        selector: { boolean: {} },
+    },
 ];
 
 export const FAVORITES_SUB_SCHEMA = [
-  {
-    name: 'title',
-    type: 'string',
-  },
-  {
-    name: 'exclude',
-    type: 'string',
-  },
-  {
-    name: 'hideTitleForThumbnailIcons',
-    selector: { boolean: {} },
-  },
-  {
-    name: 'iconBorder',
-    type: 'string',
-    help: 'Border for favorites icons (e.g., 1px solid white)',
-  },
-  {
-    name: 'iconPadding',
-    type: 'float',
-    help: 'Padding around favorites icon artwork (rem)',
-    valueMin: 0,
-  },
-  {
-    name: 'iconTitleBackgroundColor',
-    type: 'string',
-    help: 'Background color for favorites icon titles',
-  },
-  {
-    name: 'iconTitleColor',
-    type: 'string',
-    help: 'Color for favorites icon titles (e.g., red, #ff0000)',
-  },
-  {
-    name: 'numberToShow',
-    type: 'integer',
-    valueMin: 1,
-  },
-  {
-    name: 'replaceHttpWithHttpsForThumbnails',
-    selector: { boolean: {} },
-  },
-  {
-    name: 'sortByType',
-    selector: { boolean: {} },
-  },
-  {
-    name: 'topItems',
-    type: 'string',
-  },
+    {
+        name: 'title',
+        type: 'string',
+    },
+    {
+        name: 'exclude',
+        type: 'string',
+    },
+    {
+        name: 'hideTitleForThumbnailIcons',
+        selector: { boolean: {} },
+    },
+    {
+        name: 'iconBorder',
+        type: 'string',
+        help: 'Border for favorites icons (e.g., 1px solid white)',
+    },
+    {
+        name: 'iconPadding',
+        type: 'float',
+        help: 'Padding around favorites icon artwork (rem)',
+        valueMin: 0,
+    },
+    {
+        name: 'iconTitleBackgroundColor',
+        type: 'string',
+        help: 'Background color for favorites icon titles',
+    },
+    {
+        name: 'iconTitleColor',
+        type: 'string',
+        help: 'Color for favorites icon titles (e.g., red, #ff0000)',
+    },
+    {
+        name: 'numberToShow',
+        type: 'integer',
+        valueMin: 1,
+    },
+    {
+        name: 'sortByType',
+        selector: { boolean: {} },
+    },
+    {
+        name: 'topItems',
+        type: 'string',
+    },
 ];
diff --git a/src/model/store.ts b/src/model/store.ts
@@ -51,9 +51,9 @@ export default class Store {
       [],
     );
     this.activePlayer = this.determineActivePlayer(activePlayerId);
-    this.hassService = new HassService(this.hass, currentSection, card, config);
+    this.hassService = new HassService(this.hass, currentSection, card);
     this.mediaControlService = new MediaControlService(this.hassService, config);
-    this.mediaBrowseService = new MediaBrowseService(this.hassService, config);
+    this.mediaBrowseService = new MediaBrowseService(this.hass, config);
     this.predefinedGroups = this.createPredefinedGroups();
   }
 
diff --git a/src/sections/media-browser.ts b/src/sections/media-browser.ts
@@ -19,7 +19,7 @@ import { MEDIA_ITEM_SELECTED } from '../constants';
 import { customEvent } from '../utils/utils';
 import { FavoritesConfig, MediaBrowserConfig, MediaPlayerItem } from '../types';
 import { until } from 'lit-html/directives/until.js';
-import { indexOfWithoutSpecialChars } from '../utils/favorites-utils';
+import { indexOfWithoutSpecialChars } from '../utils/media-browse-utils';
 
 type LayoutType = 'auto' | 'grid' | 'list';
 type ViewType = 'favorites' | 'browser';
@@ -180,8 +180,8 @@ export class MediaBrowser extends LitElement {
             <div class="spacer"></div>
             <span class="title">${title}</span>
             ${onlyFavorites
-              ? ''
-              : html`<ha-icon-button
+            ? ''
+            : html`<ha-icon-button
                     .path=${mdiPlayBoxMultiple}
                     @click=${this.goToBrowser}
                     title="Browse Media"
@@ -231,32 +231,32 @@ export class MediaBrowser extends LitElement {
 
     return html`
       ${until(
-        this.getFavorites()
-          .then((items) => {
-            if (items?.length) {
-              if (useGrid) {
-                return html`
+      this.getFavorites()
+        .then((items) => {
+          if (items?.length) {
+            if (useGrid) {
+              return html`
                   <sonos-favorites-icons
                     .items=${items}
                     .store=${this.store}
                     @item-selected=${this.onFavoriteSelected}
                   ></sonos-favorites-icons>
                 `;
-              } else {
-                return html`
+            } else {
+              return html`
                   <sonos-favorites-list
                     .items=${items}
                     .store=${this.store}
                     @item-selected=${this.onFavoriteSelected}
                   ></sonos-favorites-list>
                 `;
-              }
-            } else {
-              return html`<div class="no-items">No favorites found</div>`;
             }
-          })
-          .catch((e) => html`<div class="no-items">Failed to fetch favorites. ${e.message ?? JSON.stringify(e)}</div>`),
-      )}
+          } else {
+            return html`<div class="no-items">No favorites found</div>`;
+          }
+        })
+        .catch((e) => html`<div class="no-items">Failed to fetch favorites. ${e.message ?? JSON.stringify(e)}</div>`),
+    )}
     `;
   }
 
@@ -318,8 +318,8 @@ export class MediaBrowser extends LitElement {
         ? ''
         : html`<div class="header">
             ${canGoBack
-              ? html`<ha-icon-button .path=${mdiArrowLeft} @click=${this.goBack}></ha-icon-button>`
-              : html`<div class="spacer"></div>`}
+            ? html`<ha-icon-button .path=${mdiArrowLeft} @click=${this.goBack}></ha-icon-button>`
+            : html`<div class="spacer"></div>`}
             <span class="title">${title}</span>
             <ha-icon-button .path=${mdiStar} @click=${this.goToFavorites} title="Favorites"></ha-icon-button>
             <ha-icon-button
diff --git a/src/services/hass-service.ts b/src/services/hass-service.ts
@@ -1,5 +1,5 @@
 import { HomeAssistant } from 'custom-card-helpers';
-import { CardConfig, GetQueueResponse, MediaPlayerItem, Section, TemplateResult } from '../types';
+import { GetQueueResponse, MediaPlayerItem, Section, TemplateResult } from '../types';
 import { ServiceCallRequest } from 'custom-card-helpers/dist/types';
 import { CALL_MEDIA_DONE, CALL_MEDIA_STARTED } from '../constants';
 import { MediaPlayer } from '../model/media-player';
@@ -9,13 +9,11 @@ export default class HassService {
   private readonly hass: HomeAssistant;
   private readonly currentSection: Section;
   private readonly card: Element;
-  private readonly config: CardConfig;
 
-  constructor(hass: HomeAssistant, section: Section, card: Element, config: CardConfig) {
+  constructor(hass: HomeAssistant, section: Section, card: Element) {
     this.hass = hass;
     this.currentSection = section;
     this.card = card;
-    this.config = config;
   }
 
   async callMediaService(service: string, inOptions: ServiceCallRequest['serviceData']) {
@@ -27,22 +25,6 @@ export default class HassService {
     }
   }
 
-  async browseMedia(mediaPlayer: MediaPlayer, media_content_type?: string, media_content_id?: string) {
-    const mediaPlayerItem = await this.hass.callWS<MediaPlayerItem>({
-      type: 'media_player/browse_media',
-      entity_id: mediaPlayer.id,
-      media_content_id,
-      media_content_type,
-    });
-    if (this.config.mediaBrowser?.favorites?.replaceHttpWithHttpsForThumbnails) {
-      mediaPlayerItem.children = mediaPlayerItem.children?.map((child) => ({
-        ...child,
-        thumbnail: child.thumbnail?.replace('http://', 'https://'),
-      }));
-    }
-    return mediaPlayerItem;
-  }
-
   async renderTemplate<T>(template: string, defaultValue: T): Promise<T> {
     return new Promise<T>((resolve) => {
       const subscribeMessage = {
diff --git a/src/services/media-browse-service.ts b/src/services/media-browse-service.ts
diff --git a/src/types.ts b/src/types.ts
diff --git a/src/upstream/ha-media-player-browse.ts b/src/upstream/ha-media-player-browse.ts
diff --git a/src/utils/favorites-utils.ts b/src/utils/favorites-utils.ts
diff --git a/src/utils/media-browse-utils.ts b/src/utils/media-browse-utils.ts
