Finish media menu refactor

This commit is contained in:
Jas Singh
2024-07-10 01:58:18 -07:00
parent 6cda814d9b
commit e711d639b7
7 changed files with 154 additions and 141 deletions

View File

@@ -1,28 +1,6 @@
const media = await Service.import("mpris");
const MediaInfo = () => {
const curPlayer = Variable(media.players[0]);
media.connect("changed", () => {
const statusOrder = {
Playing: 1,
Paused: 2,
Stopped: 3,
};
const isPlaying = media.players.find(
(p) => p["play-back-status"] === "Playing",
);
if (isPlaying) {
curPlayer.value = media.players.sort(
(a, b) =>
statusOrder[a["play-back-status"]] -
statusOrder[b["play-back-status"]],
)[0];
}
console.log('changed');
});
const MediaInfo = (getPlayerInfo) => {
return Widget.Box({
class_name: "media-indicator-current-media-info",
hpack: "center",
@@ -35,13 +13,13 @@ const MediaInfo = () => {
children: [
Widget.Label({
truncate: "end",
max_width_chars: 35,
max_width_chars: 31,
wrap: true,
class_name: "media-indicator-current-song-name-label",
setup: (self) => {
self.hook(curPlayer, () => {
console.log('did change')
return (self.label = curPlayer.value["track-title"]);
self.hook(media, () => {
const curPlayer = getPlayerInfo();
return (self.label = curPlayer !== undefined ? curPlayer["track-title"] : "No media currently playing");
});
},
}),
@@ -57,9 +35,9 @@ const MediaInfo = () => {
max_width_chars: 35,
class_name: "media-indicator-current-song-author-label",
setup: (self) => {
self.hook(curPlayer, () => {
console.log(JSON.stringify(curPlayer, null, 2));
return (self.label = curPlayer.value["track-title"]);
self.hook(media, () => {
const curPlayer = getPlayerInfo();
return (self.label = curPlayer !== undefined ? curPlayer["track-artists"].join(', ') : "-----");
});
},
}),
@@ -75,8 +53,9 @@ const MediaInfo = () => {
max_width_chars: 40,
class_name: "media-indicator-current-song-album-label",
setup: (self) => {
self.hook(curPlayer, () => {
return (self.label = curPlayer.value["track-album"]);
self.hook(media, () => {
const curPlayer = getPlayerInfo();
return (self.label = curPlayer !== undefined ? curPlayer["track-album"] : "---");
});
},
}),