Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions lib/actions/appleMusic.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
'use strict';

function getMetadata(id, parentUri, type, title) {
return `<DIDL-Lite xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/"
xmlns:r="urn:schemas-rinconnetworks-com:metadata-1-0/" xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/">
<item id="${id}" parentID="${parentUri}" restricted="true"><dc:title>"${title}"</dc:title><upnp:class>object.item.audioItem.${type}</upnp:class>
<item id="${id}" parentID="${parentUri}" restricted="true"><dc:title>"${title}"</dc:title><upnp:class>${type}</upnp:class>
<desc id="cdudn" nameSpace="urn:schemas-rinconnetworks-com:metadata-1-0/">SA_RINCON52231_X_#Svc52231-0-Token</desc></item></DIDL-Lite>`;
}

Expand All @@ -14,53 +15,63 @@ function getAlbumUri(id) {
return `x-rincon-cpcontainer:0004206c${id}`;
}

function getPlaylistUri(id) {
return `x-rincon-cpcontainer:1006206c${id}`;
}

const uriTemplates = {
song: getSongUri,
album: getAlbumUri
album: getAlbumUri,
playlist: getPlaylistUri,
};

const CLASSES = {
song: 'musicTrack',
album: 'musicAlbum'
song: 'object.item.audioItem.musicTrack',
album: 'object.item.audioItem.musicAlbum',
playlist: 'object.container.playlistContainer.#PlaylistView'
};

const METADATA_URI_STARTERS = {
song: '00032020',
album: '0004206c'
album: '0004206c',
playlist: '1006206c'
};

const PARENTS = {
song: '0004206calbum%3a',
album: '00020000album%3a'
album: '00020000album%3a',
playlist: '1006206cplaylist%3a'
};

function appleMusic(player, values) {
const action = values[0];
const trackID = values[1];
const type = trackID.split(':')[0];
var nextTrackNo = 0;
let nextTrackNo = 0;

const metadataID = METADATA_URI_STARTERS[type] + encodeURIComponent(trackID);
const metadata = getMetadata(metadataID, PARENTS[type], CLASSES[type], '');
const uri = uriTemplates[type](encodeURIComponent(trackID));

if (action == 'queue') {
if (action === 'queue') {
return player.coordinator.addURIToQueue(uri, metadata);
} else if (action == 'now') {
} else if (action === 'now') {
nextTrackNo = player.coordinator.state.trackNo + 1;
let promise = Promise.resolve();
if (player.coordinator.avTransportUri.startsWith('x-rincon-queue') === false) {
promise = promise.then(() => player.coordinator.setAVTransport(`x-rincon-queue:${player.coordinator.uuid}#0`));
}
return promise.then(() => player.coordinator.addURIToQueue(uri, metadata, true, nextTrackNo))
.then(() => { if (nextTrackNo != 1) player.coordinator.nextTrack() })
.then(() => { if (nextTrackNo !== 1) player.coordinator.nextTrack(); })
.then(() => player.coordinator.play());
} else if (action == 'next') {
} else if (action === 'next') {
nextTrackNo = player.coordinator.state.trackNo + 1;
return player.coordinator.addURIToQueue(uri, metadata, true, nextTrackNo);
}

return null;
}

module.exports = function (api) {
module.exports = function appleMusicAction(api) {
api.registerAction('applemusic', appleMusic);
};