mirror of
https://github.com/Mastermindzh/tidal-hifi.git
synced 2024-11-22 13:32:42 +01:00
Add shuffle and repeat to current state api
This commit is contained in:
parent
6e43cbb4d7
commit
2d94b4bf49
@ -1,4 +1,5 @@
|
|||||||
import { MediaStatus } from "./mediaStatus";
|
import { MediaStatus } from "./mediaStatus";
|
||||||
|
import {MediaPlayerInfo} from "./mediaPlayerInfo";
|
||||||
|
|
||||||
export interface MediaInfo {
|
export interface MediaInfo {
|
||||||
title: string;
|
title: string;
|
||||||
@ -13,4 +14,5 @@ export interface MediaInfo {
|
|||||||
durationInSeconds?: number;
|
durationInSeconds?: number;
|
||||||
image: string;
|
image: string;
|
||||||
favorite: boolean;
|
favorite: boolean;
|
||||||
|
player: MediaPlayerInfo;
|
||||||
}
|
}
|
||||||
|
8
src/models/mediaPlayerInfo.ts
Normal file
8
src/models/mediaPlayerInfo.ts
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
import {RepeatState} from "./repeatState";
|
||||||
|
import {MediaStatus} from "./mediaStatus";
|
||||||
|
|
||||||
|
export interface MediaPlayerInfo {
|
||||||
|
status: MediaStatus;
|
||||||
|
shuffle: boolean;
|
||||||
|
repeat: RepeatState;
|
||||||
|
}
|
5
src/models/repeatState.ts
Normal file
5
src/models/repeatState.ts
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
export enum RepeatState {
|
||||||
|
off = "off",
|
||||||
|
all = "all",
|
||||||
|
single = "single",
|
||||||
|
}
|
@ -19,6 +19,7 @@ import { downloadFile } from "./scripts/download";
|
|||||||
import { addHotkey } from "./scripts/hotkeys";
|
import { addHotkey } from "./scripts/hotkeys";
|
||||||
import { settingsStore } from "./scripts/settings";
|
import { settingsStore } from "./scripts/settings";
|
||||||
import { setTitle } from "./scripts/window-functions";
|
import { setTitle } from "./scripts/window-functions";
|
||||||
|
import {RepeatState} from "./models/repeatState";
|
||||||
|
|
||||||
const notificationPath = `${app.getPath("userData")}/notification.jpg`;
|
const notificationPath = `${app.getPath("userData")}/notification.jpg`;
|
||||||
const appName = "TIDAL Hi-Fi";
|
const appName = "TIDAL Hi-Fi";
|
||||||
@ -29,6 +30,8 @@ let currentListenBrainzDelayId: ReturnType<typeof setTimeout>;
|
|||||||
let scrobbleWaitingForDelay = false;
|
let scrobbleWaitingForDelay = false;
|
||||||
|
|
||||||
let currentlyPlaying = MediaStatus.paused;
|
let currentlyPlaying = MediaStatus.paused;
|
||||||
|
let currentRepeatState: RepeatState = RepeatState.off;
|
||||||
|
let currentShuffleState = false;
|
||||||
let currentMediaInfo: Options;
|
let currentMediaInfo: Options;
|
||||||
let currentNotification: Electron.Notification;
|
let currentNotification: Electron.Notification;
|
||||||
|
|
||||||
@ -348,6 +351,23 @@ function getCurrentlyPlayingStatus() {
|
|||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getCurrentShuffleState() {
|
||||||
|
const shuffle = elements.get("shuffle");
|
||||||
|
return shuffle?.getAttribute("aria-checked") === "true";
|
||||||
|
}
|
||||||
|
|
||||||
|
function getCurrentRepeatState() {
|
||||||
|
const repeat = elements.get("repeat");
|
||||||
|
switch (repeat?.getAttribute("data-type")) {
|
||||||
|
case "button__repeatAll":
|
||||||
|
return RepeatState.all;
|
||||||
|
case "button__repeatSingle":
|
||||||
|
return RepeatState.single;
|
||||||
|
default:
|
||||||
|
return RepeatState.off;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert the duration from MM:SS to seconds
|
* Convert the duration from MM:SS to seconds
|
||||||
* @param {*} duration
|
* @param {*} duration
|
||||||
@ -511,14 +531,21 @@ setInterval(function () {
|
|||||||
const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
|
const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
|
||||||
const current = elements.getText("current");
|
const current = elements.getText("current");
|
||||||
const currentStatus = getCurrentlyPlayingStatus();
|
const currentStatus = getCurrentlyPlayingStatus();
|
||||||
|
const shuffleState = getCurrentShuffleState();
|
||||||
|
const repeatState = getCurrentRepeatState();
|
||||||
|
|
||||||
const playStateChanged = currentStatus != currentlyPlaying;
|
const playStateChanged = currentStatus != currentlyPlaying;
|
||||||
|
const shuffleStateChanged = shuffleState != currentShuffleState;
|
||||||
|
const repeatStateChanged = repeatState != currentRepeatState;
|
||||||
|
|
||||||
|
const hasStateChanged = playStateChanged || shuffleStateChanged || repeatStateChanged;
|
||||||
|
|
||||||
// update info if song changed or was just paused/resumed
|
// update info if song changed or was just paused/resumed
|
||||||
if (titleOrArtistsChanged || playStateChanged) {
|
if (titleOrArtistsChanged || hasStateChanged) {
|
||||||
if (playStateChanged) {
|
if (playStateChanged) currentlyPlaying = currentStatus;
|
||||||
currentlyPlaying = currentStatus;
|
if (shuffleStateChanged) currentShuffleState = shuffleState;
|
||||||
}
|
if (repeatStateChanged) currentRepeatState = repeatState;
|
||||||
|
|
||||||
skipArtistsIfFoundInSkippedArtistsList(artistsArray);
|
skipArtistsIfFoundInSkippedArtistsList(artistsArray);
|
||||||
|
|
||||||
const album = elements.getAlbumName();
|
const album = elements.getAlbumName();
|
||||||
@ -537,6 +564,12 @@ setInterval(function () {
|
|||||||
image: "",
|
image: "",
|
||||||
icon: "",
|
icon: "",
|
||||||
favorite: elements.isFavorite(),
|
favorite: elements.isFavorite(),
|
||||||
|
|
||||||
|
player: {
|
||||||
|
status: currentStatus,
|
||||||
|
shuffle: shuffleState,
|
||||||
|
repeat: repeatState,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
// update title, url and play info with new info
|
// update title, url and play info with new info
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
import { MediaInfo } from "../models/mediaInfo";
|
import { MediaInfo } from "../models/mediaInfo";
|
||||||
import { MediaStatus } from "../models/mediaStatus";
|
import { MediaStatus } from "../models/mediaStatus";
|
||||||
|
import {RepeatState} from "../models/repeatState";
|
||||||
|
|
||||||
export const mediaInfo = {
|
export const mediaInfo = {
|
||||||
title: "",
|
title: "",
|
||||||
@ -14,6 +15,12 @@ export const mediaInfo = {
|
|||||||
durationInSeconds: 0,
|
durationInSeconds: 0,
|
||||||
image: "tidal-hifi-icon",
|
image: "tidal-hifi-icon",
|
||||||
favorite: false,
|
favorite: false,
|
||||||
|
|
||||||
|
player: {
|
||||||
|
status: MediaStatus.paused as string,
|
||||||
|
shuffle: false,
|
||||||
|
repeat: RepeatState.off as string,
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const updateMediaInfo = (arg: MediaInfo) => {
|
export const updateMediaInfo = (arg: MediaInfo) => {
|
||||||
@ -29,6 +36,10 @@ export const updateMediaInfo = (arg: MediaInfo) => {
|
|||||||
mediaInfo.durationInSeconds = arg.durationInSeconds ?? 0;
|
mediaInfo.durationInSeconds = arg.durationInSeconds ?? 0;
|
||||||
mediaInfo.image = propOrDefault(arg.image);
|
mediaInfo.image = propOrDefault(arg.image);
|
||||||
mediaInfo.favorite = arg.favorite;
|
mediaInfo.favorite = arg.favorite;
|
||||||
|
|
||||||
|
mediaInfo.player.status = propOrDefault(arg.player?.status);
|
||||||
|
mediaInfo.player.shuffle = arg.player.shuffle;
|
||||||
|
mediaInfo.player.repeat = propOrDefault(arg.player?.repeat);
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user