Internet Radio (disabled for now)

Author: rekkyrosso

.vscode/settings.json

@@ -3,6 +3,7 @@
         "airsonic",
         "albumartist",
         "albumid",
+        "amazingtunes",
         "ambientvideo",
         "ambilight",
         "Ampache",
@@ -101,10 +102,13 @@
         "oembed",
         "oliveoil",
         "Omni",
+        "onlineradiobox",
         "otherworldy",
         "Pageable",
         "palepink",
         "phonk",
+        "Pinnable",
+        "pinnables",
         "playcount",
         "Playhead",
         "playlistsroot",
@@ -118,6 +122,7 @@
         "previoustrack",
         "purplelicious",
         "quasicrystal",
+        "radiojar",
         "ratelimit",
         "realname",
         "recenttracks",
@@ -145,6 +150,7 @@
         "skyblue",
         "soundcloud",
         "spacebar",
+        "spinitron",
         "splitcomplement",
         "spotify",
         "spotifyviz",

Dockerfile

@@ -5,7 +5,7 @@ LABEL org.opencontainers.image.title="ampcast" \
     org.opencontainers.image.description="A music player inspired by Winamp" \
     org.opencontainers.image.url="https://ampcast.app" \
     org.opencontainers.image.source="https://github.com/rekkyrosso/ampcast" \
-    org.opencontainers.image.version="0.9.16" \
+    org.opencontainers.image.version="0.9.17" \
     org.opencontainers.image.licenses="GPLv3"
 
 WORKDIR /app

app/package-lock.json

@@ -1,7 +1,7 @@
 {
     "name": "ampcast-app",
     "productName": "ampcast",
-    "version": "0.9.16",
+    "version": "0.9.17",
     "description": "Ampcast music player",
     "homepage": "https://ampcast.app",
     "repository": {

app/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ampcast",
-    "version": "0.9.16",
+    "version": "0.9.17",
     "description": "Ampcast music player",
     "homepage": "https://ampcast.app",
     "author": {

package-lock.json

@@ -1,6 +1,5 @@
 import React, {useCallback} from 'react';
 import Action from 'types/Action';
-import ItemType from 'types/ItemType';
 import LibraryAction from 'types/LibraryAction';
 import MediaObject from 'types/MediaObject';
 import MediaService from 'types/MediaService';
@@ -26,8 +25,8 @@ const defaultActionIcons: Record<LibraryAction, IconName> = {
 };
 
 const defaultActionLabels: Record<LibraryAction, string> = {
-    [Action.AddToLibrary]: 'Add to library',
-    [Action.RemoveFromLibrary]: 'Remove from library',
+    [Action.AddToLibrary]: 'Add to Library',
+    [Action.RemoveFromLibrary]: 'Remove from Library',
     [Action.Rate]: 'Rate',
     [Action.Like]: 'Like',
     [Action.Unlike]: 'Unlike',
@@ -38,12 +37,10 @@ export default function Actions({item, inline}: ActionsProps) {
     const tabIndex = inline ? -1 : undefined;
 
     const togglePin = useCallback(async () => {
-        if (item.itemType === ItemType.Playlist) {
-            if (item.isPinned) {
-                await performAction(Action.Unpin, [item]);
-            } else {
-                await performAction(Action.Pin, [item]);
-            }
+        if (item.isPinned) {
+            await performAction(Action.Unpin, [item]);
+        } else {
+            await performAction(Action.Pin, [item]);
         }
     }, [item]);
 
@@ -93,7 +90,7 @@ export default function Actions({item, inline}: ActionsProps) {
                 />
             ) : null}
 
-            {item.itemType === ItemType.Playlist && service?.createSourceFromPin ? (
+            {service?.canPin?.(item, inline) ? (
                 <IconButton
                     icon={item.isPinned ? 'pin-fill' : 'pin'}
                     title={item.isPinned ? 'Unpin' : 'Pin to sidebar'}

package.json

@@ -3,7 +3,7 @@ import ItemType from 'types/ItemType';
 import LibraryAction from 'types/LibraryAction';
 import MediaItem from 'types/MediaItem';
 import MediaObject from 'types/MediaObject';
-import MediaPlaylist from 'types/MediaPlaylist';
+import {Pinnable} from 'types/Pin';
 import PlayAction from 'types/PlayAction';
 import actionsStore from 'services/actions/actionsStore';
 import mediaPlayback from 'services/mediaPlayback';
@@ -28,8 +28,6 @@ export default async function performAction<T extends MediaObject>(
         return;
     }
 
-    const itemType = item.itemType;
-
     switch (action) {
         case Action.PlayNow:
         case Action.PlayNext:
@@ -46,15 +44,11 @@ export default async function performAction<T extends MediaObject>(
             break;
 
         case Action.Pin:
-            if (itemType === ItemType.Playlist) {
-                await pinStore.pin(items as readonly MediaPlaylist[]);
-            }
+            await pinStore.pin(items as readonly Pinnable[]);
             break;
 
         case Action.Unpin:
-            if (itemType === ItemType.Playlist) {
-                await pinStore.unpin(items as readonly MediaPlaylist[]);
-            }
+            await pinStore.unpin(items as readonly Pinnable[]);
             break;
 
         case Action.Info:

src/components/Actions/Actions.tsx

@@ -18,18 +18,16 @@ export default function usePlaylistItemsByService<T extends MediaItem>(
         } else {
             const listenbrainz = itemsByService[index];
             const items = listenbrainz.items;
-            const subscription = from(musicbrainzApi.addMetadata(items, false)).subscribe(
-                (items) => {
-                    items = items.filter((item) => item.recording_mbid);
-                    if (items.length === 0) {
-                        itemsByService.splice(index, 1);
-                    } else {
-                        const service = listenbrainz.service;
-                        itemsByService[index] = {service, items};
-                    }
-                    setItemsByService(itemsByService);
+            const subscription = from(musicbrainzApi.addMetadata(items)).subscribe((items) => {
+                items = items.filter((item) => item.recording_mbid);
+                if (items.length === 0) {
+                    itemsByService.splice(index, 1);
+                } else {
+                    const service = listenbrainz.service;
+                    itemsByService[index] = {service, items};
                 }
-            );
+                setItemsByService(itemsByService);
+            });
             return () => subscription.unsubscribe();
         }
     }, [items]);

src/components/Actions/performAction.ts

@@ -5,7 +5,7 @@ import {MAX_DURATION} from 'services/constants';
 import {pause, play, seek, stop, prev, next} from 'services/mediaPlayback';
 import {observePlaybackState} from 'services/mediaPlayback/playback';
 import miniPlayer from 'services/mediaPlayback/miniPlayer';
-import {getThumbnailUrl} from 'components/CoverArt';
+import {getThumbnailUrl} from 'services/metadata';
 import useObservable from 'hooks/useObservable';
 
 const logger = new Logger('useMediaSession');