wkulhanek/bonob
1
0
Fork 0
mirror of https://github.com/wkulhanek/bonob.git synced 2025-12-21 17:33:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix bug where sonos app cannot navigate from track to artist when subsonic returns null artistId on song (#79)

Browse Source
This commit is contained in:
Simon J
2021-11-20 18:22:24 +11:00
committed by GitHub
parent 6321cb71a4
commit 89340dd454
6 changed files with 101 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/in_memory_music_service.test.ts
View File

@@ -126,8 +126,8 @@ describe("InMemoryMusicService", () => {
describe("when it exists", () => {
it("should provide an artist", async () => {
expect(await musicLibrary.artist(artist1.id)).toEqual(artist1);
expect(await musicLibrary.artist(artist2.id)).toEqual(artist2);
expect(await musicLibrary.artist(artist1.id!)).toEqual(artist1);
expect(await musicLibrary.artist(artist2.id!)).toEqual(artist2);
});
});

54
tests/smapi.test.ts
View File

@@ -398,6 +398,60 @@ describe("track", () => {
},
});
});
describe("when there is no artistId from subsonic", () => {
it("should not send an artist id to sonos", () => {
const bonobUrl = url("http://localhost:4567/foo?access-token=1234");
const someTrack = aTrack({
id: uuid(),
// audio/x-flac should be mapped to audio/flac
mimeType: "audio/x-flac",
name: "great song",
duration: randomInt(1000),
number: randomInt(100),
album: anAlbum({
name: "great album",
id: uuid(),
genre: { id: "genre101", name: "some genre" },
}),
artist: anArtist({ name: "great artist", id: undefined }),
coverArt: { system: "subsonic", resource: "887766" },
rating: {
love: true,
stars: 5
}
});
expect(track(bonobUrl, someTrack)).toEqual({
itemType: "track",
id: `track:${someTrack.id}`,
mimeType: "audio/flac",
title: someTrack.name,
trackMetadata: {
album: someTrack.album.name,
albumId: `album:${someTrack.album.id}`,
albumArtist: someTrack.artist.name,
albumArtistId: undefined,
albumArtURI: `http://localhost:4567/foo/art/${encodeURIComponent(formatForURL(someTrack.coverArt!))}/size/180?access-token=1234`,
artist: someTrack.artist.name,
artistId: undefined,
duration: someTrack.duration,
genre: someTrack.album.genre?.name,
genreId: someTrack.album.genre?.id,
trackNumber: someTrack.number,
},
dynamic: {
property: [
{
name: "rating",
value: `${ratingAsInt(someTrack.rating)}`,
},
],
},
});
});
});
});
describe("album", () => {

48
tests/subsonic.test.ts
View File

@@ -18,6 +18,7 @@ import {
asTrack,
artistImageURN,
images,
song,
} from "../src/subsonic";
import axios from "axios";
@@ -627,10 +628,33 @@ describe("artistURN", () => {
});
describe("asTrack", () => {
const album = anAlbum();
const track = aTrack();
describe("when the song has no artistId", () => {
const album = anAlbum();
const track = aTrack({ artist: { id: undefined, name: "Not in library so no id", image: undefined }});
it("should provide no artistId", () => {
const result = asTrack(album, { ...asSongJson(track) });
expect(result.artist.id).toBeUndefined();
expect(result.artist.name).toEqual("Not in library so no id");
expect(result.artist.image).toBeUndefined();
});
});
describe("when the song has no artist name", () => {
const album = anAlbum();
it("should provide a ? to sonos", () => {
const result = asTrack(album, { id: '1' } as any as song);
expect(result.artist.id).toBeUndefined();
expect(result.artist.name).toEqual("?");
expect(result.artist.image).toBeUndefined();
});
});
describe("invalid rating.stars values", () => {
const album = anAlbum();
const track = aTrack();
describe("a value greater than 5", () => {
it("should be returned as 0", () => {
const result = asTrack(album, { ...asSongJson(track), userRating: 6 });
@@ -861,7 +885,7 @@ describe("Subsonic", () => {
.generateToken({ username, password })
.then((it) => it as AuthSuccess)
.then((it) => navidrome.login(it.authToken))
.then((it) => it.artist(artist.id));
.then((it) => it.artist(artist.id!));
expect(result).toEqual({
id: `${artist.id}`,
@@ -923,7 +947,7 @@ describe("Subsonic", () => {
.generateToken({ username, password })
.then((it) => it as AuthSuccess)
.then((it) => navidrome.login(it.authToken))
.then((it) => it.artist(artist.id));
.then((it) => it.artist(artist.id!));
expect(result).toEqual({
id: artist.id,
@@ -979,7 +1003,7 @@ describe("Subsonic", () => {
.generateToken({ username, password })
.then((it) => it as AuthSuccess)
.then((it) => navidrome.login(it.authToken))
.then((it) => it.artist(artist.id));
.then((it) => it.artist(artist.id!));
expect(result).toEqual({
id: artist.id,
@@ -1033,7 +1057,7 @@ describe("Subsonic", () => {
.generateToken({ username, password })
.then((it) => it as AuthSuccess)
.then((it) => navidrome.login(it.authToken))
.then((it) => it.artist(artist.id));
.then((it) => it.artist(artist.id!));
expect(result).toEqual({
id: artist.id,
@@ -1090,7 +1114,7 @@ describe("Subsonic", () => {
.generateToken({ username, password })
.then((it) => it as AuthSuccess)
.then((it) => navidrome.login(it.authToken))
.then((it) => it.artist(artist.id));
.then((it) => it.artist(artist.id!));
expect(result).toEqual({
id: artist.id,
@@ -1144,7 +1168,7 @@ describe("Subsonic", () => {
.generateToken({ username, password })
.then((it) => it as AuthSuccess)
.then((it) => navidrome.login(it.authToken))
.then((it) => it.artist(artist.id));
.then((it) => it.artist(artist.id!));
expect(result).toEqual({
id: artist.id,
@@ -1199,7 +1223,7 @@ describe("Subsonic", () => {
.generateToken({ username, password })
.then((it) => it as AuthSuccess)
.then((it) => navidrome.login(it.authToken))
.then((it) => it.artist(artist.id));
.then((it) => it.artist(artist.id!));
expect(result).toEqual({
id: artist.id,
@@ -1255,7 +1279,7 @@ describe("Subsonic", () => {
.generateToken({ username, password })
.then((it) => it as AuthSuccess)
.then((it) => navidrome.login(it.authToken))
.then((it) => it.artist(artist.id));
.then((it) => it.artist(artist.id!));
expect(result).toEqual({
id: artist.id,
@@ -1309,7 +1333,7 @@ describe("Subsonic", () => {
.generateToken({ username, password })
.then((it) => it as AuthSuccess)
.then((it) => navidrome.login(it.authToken))
.then((it) => it.artist(artist.id));
.then((it) => it.artist(artist.id!));
expect(result).toEqual({
id: artist.id,
@@ -1361,7 +1385,7 @@ describe("Subsonic", () => {
.generateToken({ username, password })
.then((it) => it as AuthSuccess)
.then((it) => navidrome.login(it.authToken))
.then((it) => it.artist(artist.id));
.then((it) => it.artist(artist.id!));
expect(result).toEqual({
id: artist.id,