mirror of
https://git.wetfence.xyz/RandyTheSilly/jellyPod.git
synced 2026-10-26 23:39:56 -04:00
Extend lookupMap to contain artist to album mapping
This commit is contained in:
1 parent
f7b4805ba1
commit
198f18e5a2
2 files changed
+40
-26
No files matched your search
+28
-18
@@ -21,7 +21,7 @@ Pebble.addEventListener("ready", function () {
|
||||
|
||||
// get library response from Jellyfin
|
||||
callAPI("GET", cfg.PRIV_BASE_URL + "/Items?userId=" + userId + "&recursive=true&includeItemTypes=Audio&sortBy=AlbumArtist,Artist,ProductionYear,Album,IndexNumber,Name", function (libResp) {
|
||||
if (libResp === null) { return; }
|
||||
if (libResp === null) return;
|
||||
const libObj = JSON.parse(libResp);
|
||||
|
||||
// format response for jellyPod
|
||||
@@ -30,31 +30,41 @@ Pebble.addEventListener("ready", function () {
|
||||
const lookupMap = new Map();
|
||||
let lastAlbumInfo = {AlbumArtist: "", AlbumName: "", AlbumYear: 0};
|
||||
for (const track of libObj.Items) {
|
||||
if (!track.Name) {
|
||||
continue;
|
||||
}
|
||||
if (!track.Name) continue;
|
||||
|
||||
let albumArtist = "unknown artist";
|
||||
if (track.AlbumArtist) {
|
||||
albumArtist = track.AlbumArtist;
|
||||
} else if (track.Artists.length > 0) {
|
||||
albumArtist = track.Artists[0]
|
||||
albumArtist = track.Artists[0];
|
||||
}
|
||||
const albumName = track.Album ? track.Album : "unknown album";
|
||||
if (lastAlbumInfo.AlbumArtist != albumArtist) {
|
||||
firstChar = Array.from(albumArtist)[0].toUpperCase();
|
||||
|
||||
// register album in lookupMap whenever the album changes (new artist OR new album)
|
||||
if (lastAlbumInfo.AlbumArtist !== albumArtist || lastAlbumInfo.AlbumName !== albumName) {
|
||||
const firstChar = Array.from(albumArtist)[0].toUpperCase();
|
||||
if (!lookupMap.has(firstChar)) {
|
||||
lookupMap.set(firstChar, [albumArtist]);
|
||||
} else {
|
||||
lookupMap.get(firstChar).push(albumArtist);
|
||||
};
|
||||
if (lastAlbumInfo.AlbumName != albumName) {
|
||||
lastAlbumInfo = {
|
||||
AlbumArtist: albumArtist,
|
||||
AlbumName: track.Album ? track.Album : "unknown album",
|
||||
AlbumYear: track.ProductionYear ? track.ProductionYear : 1970
|
||||
};
|
||||
lookupMap.set(firstChar, new Map());
|
||||
}
|
||||
const artistMap = lookupMap.get(firstChar);
|
||||
if (!artistMap.has(albumArtist)) {
|
||||
artistMap.set(albumArtist, []);
|
||||
}
|
||||
const albums = artistMap.get(albumArtist);
|
||||
if (!albums.includes(albumName)) {
|
||||
albums.push(albumName);
|
||||
}
|
||||
}
|
||||
|
||||
// keep lastAlbumInfo in sync for every album change
|
||||
if (lastAlbumInfo.AlbumArtist !== albumArtist || lastAlbumInfo.AlbumName !== albumName) {
|
||||
lastAlbumInfo = {
|
||||
AlbumArtist: albumArtist,
|
||||
AlbumName: albumName,
|
||||
AlbumYear: track.ProductionYear ? track.ProductionYear : 1970
|
||||
};
|
||||
}
|
||||
|
||||
jpTracksArr.push({
|
||||
TrackName: track.Name,
|
||||
JfId: track.Id,
|
||||
@@ -64,7 +74,7 @@ Pebble.addEventListener("ready", function () {
|
||||
|
||||
//console.log(jpTracksArr);
|
||||
//console.log("Items:", libObj.Items.length, "Tracks:", jpTracksArr.length);
|
||||
//console.log(...lookupMap);
|
||||
console.log(JSON.stringify([...lookupMap].map(([ch, m]) => [ch, [...m]])));
|
||||
|
||||
Pebble.sendAppMessage({ PKJS_READY: 1 });
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user