mirror of
https://github.com/Mastermindzh/tidal-hifi.git
synced 2024-11-22 13:32:42 +01:00
GitHub
commit
33070c157a
8
.vscode/settings.json
vendored
8
.vscode/settings.json
vendored
@ -6,8 +6,10 @@
|
||||
"Flatpak",
|
||||
"geqnfr",
|
||||
"hifi",
|
||||
"libnotify",
|
||||
"listenbrainz",
|
||||
"playpause",
|
||||
"prs",
|
||||
"rescrobbler",
|
||||
"scrobble",
|
||||
"scrobbling",
|
||||
@ -16,5 +18,9 @@
|
||||
"tracklist",
|
||||
"widevine",
|
||||
"xesam"
|
||||
]
|
||||
],
|
||||
"sonarlint.connectedMode.project": {
|
||||
"connectionId": "public-sonarcloud",
|
||||
"projectKey": "Mastermindzh_tidal-hifi"
|
||||
}
|
||||
}
|
||||
|
||||
21
CHANGELOG.md
21
CHANGELOG.md
@ -4,10 +4,23 @@ All notable changes to this project will be documented in this file.
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [5.7.0]
|
||||
|
||||
- Renamed app to TIDAL Hi-Fi.
|
||||
- Made sure all windows run with the same web preferences set (compared to main app).
|
||||
- Fixes the last.fm bug.
|
||||
- Added settings to customize the Discord rich presence information
|
||||
- Discord settings are now also collapsible like the ListenBrainz ones are
|
||||
- Restyled settings menu to include version number and useful links on the about page
|
||||
|
||||
- The ListenBrainz integration has been extended with a configurable (5 seconds by default) delay in song reporting so that it doesn't spam the API when you are cycling through songs.
|
||||
- Custom CSS now also applies to settings window
|
||||
|
||||
|
||||
## [5.6.0]
|
||||
|
||||
- Added support for Wayland (on by default) fixes [#262](https://github.com/Mastermindzh/tidal-hifi/issues/262) and [#157](https://github.com/Mastermindzh/tidal-hifi/issues/157)
|
||||
- Made it clear in the readme that this tidal-hifi client supports High & Max audio settings. fixes [#261](https://github.com/Mastermindzh/tidal-hifi/issues/261)
|
||||
- Made it clear in the readme that this TIDAL Hi-Fi client supports High & Max audio settings. fixes [#261](https://github.com/Mastermindzh/tidal-hifi/issues/261)
|
||||
- Added app suspension inhibitors when music is playing. fixes [#257](https://github.com/Mastermindzh/tidal-hifi/issues/257)
|
||||
- Fixed bug with theme files from user directory trying to load: "an error occurred reading the theme file"
|
||||
- Fixed: config flags not being set correctly
|
||||
@ -89,7 +102,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
- New settings window by BlueManCZ
|
||||
- Fixed the desktop files in electron-builder
|
||||
- icon is set to new static path based on Arch/Debian
|
||||
- Name has changed to Tidal-Hifi
|
||||
- Name has changed to TIDAL Hi-Fi
|
||||
|
||||
## 4.1.2
|
||||
|
||||
@ -137,7 +150,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
|
||||
- Updated to Electron 15
|
||||
- Fixed the develop "build-unpacked" command
|
||||
- Added setting to disable multiple tidal-hifi windows (defaults to true)
|
||||
- Added setting to disable multiple TIDAL Hi-Fi windows (defaults to true)
|
||||
- Added setting to disable HardwareMediaKeyHandling (defaults to false)
|
||||
|
||||
## 2.8.2
|
||||
@ -175,7 +188,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
|
||||
## 2.5.0
|
||||
|
||||
- Notify-send now correctly shows "Tidal HiFi" as the program name
|
||||
- Notify-send now correctly shows "Tidal Hi-Fi" as the program name
|
||||
- Updated dependencies (including electron itself)
|
||||
|
||||
### known issues
|
||||
|
||||
33
README.md
33
README.md
@ -1,20 +1,20 @@
|
||||
# Tidal-hifi<img src = "./build/icon.png" height="40" align="right"/>
|
||||
# TIDAL Hi-Fi (Max quality)<img src = "./build/icon.png" height="40" align="right"/>
|
||||
|
||||
 [](https://github.com/Mastermindzh/tidal-hifi/actions) [](https://ci.mastermindzh.tech/Mastermindzh/tidal-hifi) [](https://discord.gg/yhNwf4v4He)
|
||||
|
||||
The web version of [listen.tidal.com](https://listen.tidal.com) running in electron with hifi (High & Max) support thanks to widevine.
|
||||
The web version of [listen.tidal.com](https://listen.tidal.com) running in electron with Hi-Fi (High & Max) support thanks to widevine.
|
||||
|
||||
|
||||
|
||||
|
||||
## Table of Contents
|
||||
|
||||
<!-- toc -->
|
||||
|
||||
- [Tidal-hifi](#tidal-hifi)
|
||||
- [TIDAL Hi-Fi (Max quality)](#tidal-hi-fi-max-quality)
|
||||
- [Table of Contents](#table-of-contents)
|
||||
- [Features](#features)
|
||||
- [Contributions](#contributions)
|
||||
- [Why did I create tidal-hifi?](#why-did-i-create-tidal-hifi)
|
||||
- [Why did I create TIDAL Hi-Fi?](#why-did-i-create-tidal-hi-fi)
|
||||
- [Why not extend existing projects?](#why-not-extend-existing-projects)
|
||||
- [Installation](#installation)
|
||||
- [Dependencies](#dependencies)
|
||||
@ -26,7 +26,6 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
|
||||
- [Using source](#using-source)
|
||||
- [Integrations](#integrations)
|
||||
- [Known bugs](#known-bugs)
|
||||
- [last.fm doesn't work out of the box. Use rescrobbler as a workaround](#lastfm-doesnt-work-out-of-the-box-use-rescrobbler-as-a-workaround)
|
||||
- [DRM not working on Windows](#drm-not-working-on-windows)
|
||||
- [Special thanks to](#special-thanks-to)
|
||||
- [Donations](#donations)
|
||||
@ -42,6 +41,7 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
|
||||
- Notifications
|
||||
- Custom [theming](./docs/theming.md)
|
||||
- Custom hotkeys ([source](https://defkey.com/tidal-desktop-shortcuts))
|
||||
- Better icons thanks to [Papirus-icon-theme](https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/)
|
||||
- [Settings feature](./docs/images/settings.png) to disable certain functionality. (`ctrl+=` or `ctrl+0`)
|
||||
- API for status and playback
|
||||
- Disabled audio & visual ads, unlocked lyrics, suggested track, track info, and unlimited skips thanks to uBlockOrigin custom filters ([source](https://github.com/uBlockOrigin/uAssets/issues/17495))
|
||||
@ -51,14 +51,15 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
|
||||
- Songwhip.com integration (hotkey `ctrl + w`)
|
||||
- Discord RPC integration (showing "now listening", "Browsing", etc)
|
||||
- MPRIS integration
|
||||
- UI + Json config (`~/.config/tidal-hifi/`, or `~/.var/app/com.mastermindzh.tidal-hifi/` for Flatpak)
|
||||
|
||||
## Contributions
|
||||
|
||||
To contribute you can use the standard GitHub features (issues, prs, etc) or join the discord server to talk with like-minded individuals.
|
||||
To contribute you can use the standard GitHub features (issues, prs, etc.) or join the discord server to talk with like-minded individuals.
|
||||
|
||||
-  [Join the Discord server](https://discord.gg/yhNwf4v4He)
|
||||
|
||||
## Why did I create tidal-hifi?
|
||||
## Why did I create TIDAL Hi-Fi?
|
||||
|
||||
I moved from Spotify over to Tidal and found Linux support to be lacking.
|
||||
When I started this project there weren't any Linux apps that offered Tidal's "hifi" options nor any scripts to control it.
|
||||
@ -103,10 +104,10 @@ To install with `snap` you need to download the pre-packaged snap-package from t
|
||||
|
||||
### Arch Linux
|
||||
|
||||
Arch Linux users can use the AUR to install tidal-hifi:
|
||||
Arch Linux users can use the AUR to install TIDAL Hi-Fi:
|
||||
|
||||
```sh
|
||||
trizen tidal-hifi-bin
|
||||
trizen tidal-hifi-git
|
||||
```
|
||||
|
||||
### Flatpak
|
||||
@ -130,13 +131,13 @@ nix-env -iA nixpkgs.tidal-hifi
|
||||
To install and work with the code on this project follow these steps:
|
||||
|
||||
- git clone [https://github.com/Mastermindzh/tidal-hifi.git](https://github.com/Mastermindzh/tidal-hifi.git)
|
||||
- cd tidal-hifi
|
||||
- cd TIDAL Hi-Fi
|
||||
- npm install
|
||||
- npm start
|
||||
|
||||
## Integrations
|
||||
|
||||
tidal-hifi comes with several integrations out of the box.
|
||||
TIDAL Hi-Fi comes with several integrations out of the box.
|
||||
You can find these in the settings menu (`ctrl + =` by default) under the "integrations" tab.
|
||||
|
||||
|
||||
@ -148,15 +149,9 @@ Integrations with other projects that are not included natively:
|
||||
|
||||
## Known bugs
|
||||
|
||||
### last.fm doesn't work out of the box. Use rescrobbler as a workaround
|
||||
|
||||
The last.fm login doesn't work, as is evident from the following issue: [Last.fm login doesn't work](https://github.com/Mastermindzh/tidal-hifi/issues/4).
|
||||
However, in that same issue you can read about a workaround using [rescrobbler](https://github.com/InputUsername/rescrobbled).
|
||||
For now, that will be the default workaround.
|
||||
|
||||
### DRM not working on Windows
|
||||
|
||||
Most Windows users run into DRM issues when trying to use tidal-hifi.
|
||||
Most Windows users run into DRM issues when trying to use TIDAL Hi-Fi.
|
||||
Nothing I can do about that I'm afraid... Tidal is working on removing/changing DRM so when they finish with that we can give it another shot.
|
||||
|
||||
## Special thanks to
|
||||
|
||||
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 102 KiB After Width: | Height: | Size: 24 KiB |
BIN
assets/icon.png
BIN
assets/icon.png
Binary file not shown.
|
Before Width: | Height: | Size: 102 KiB After Width: | Height: | Size: 32 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 4.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.8 KiB After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 9.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 102 KiB After Width: | Height: | Size: 24 KiB |
BIN
build/icon.icns
Executable file → Normal file
BIN
build/icon.icns
Executable file → Normal file
Binary file not shown.
BIN
build/icon.png
BIN
build/icon.png
Binary file not shown.
|
Before Width: | Height: | Size: 102 KiB After Width: | Height: | Size: 32 KiB |
BIN
docs/images/customcss-menu.png
Normal file
BIN
docs/images/customcss-menu.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 262 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 63 KiB |
BIN
docs/images/new-about.png
Normal file
BIN
docs/images/new-about.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 41 KiB |
@ -1,10 +1,10 @@
|
||||
# Theming tidal-hifi
|
||||
# Theming TIDAL Hi-Fi
|
||||
|
||||
## Table of contents
|
||||
|
||||
<!-- toc -->
|
||||
|
||||
- [Theming tidal-hifi](#theming-tidal-hifi)
|
||||
- [Theming TIDAL Hi-Fi](#theming-TIDAL Hi-Fi)
|
||||
- [Table of contents](#table-of-contents)
|
||||
- [Custom CSS](#custom-css)
|
||||
- [config](#config)
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
<!-- tocstop -->
|
||||
|
||||
By default tidal-hifi comes with a few themes.
|
||||
By default TIDAL Hi-Fi comes with a few themes.
|
||||
You can select these in the settings window under the theming tab as shown below.
|
||||
|
||||
|
||||
|
||||
12
package-lock.json
generated
12
package-lock.json
generated
@ -1,11 +1,11 @@
|
||||
{
|
||||
"name": "tidal-hifi",
|
||||
"name": "TIDAL Hi-Fi",
|
||||
"version": "5.6.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "tidal-hifi",
|
||||
"name": "TIDAL Hi-Fi",
|
||||
"version": "5.6.0",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@ -14,7 +14,7 @@
|
||||
"discord-rpc": "^4.0.1",
|
||||
"electron-store": "^8.1.0",
|
||||
"express": "^4.18.2",
|
||||
"hotkeys-js": "^3.11.2",
|
||||
"hotkeys-js": "^3.12.0",
|
||||
"mpris-service": "^2.1.2",
|
||||
"request": "^2.88.2",
|
||||
"sass": "^1.64.1"
|
||||
@ -4855,9 +4855,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/hotkeys-js": {
|
||||
"version": "3.11.2",
|
||||
"resolved": "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.11.2.tgz",
|
||||
"integrity": "sha512-hLuR+wtvrVrVFHku5cud44cPXQf5ke+96TonRaGzlNSt22rh2LH65avLYFNsc+QpzMuOEQG/IxJT5mEop99rvg=="
|
||||
"version": "3.12.0",
|
||||
"resolved": "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.12.0.tgz",
|
||||
"integrity": "sha512-Z+N573ycUKIGwFYS3ID1RzMJiGmtWMGKMiaNLyJS8B1ei+MllF4ZYmKS2T0kMWBktOz+WZLVNikftEgnukOrXg=="
|
||||
},
|
||||
"node_modules/html-tags": {
|
||||
"version": "3.3.1",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "tidal-hifi",
|
||||
"version": "5.6.0",
|
||||
"version": "5.7.0",
|
||||
"description": "Tidal on Electron with widevine(hifi) support",
|
||||
"main": "ts-dist/main.js",
|
||||
"scripts": {
|
||||
@ -43,7 +43,7 @@
|
||||
"discord-rpc": "^4.0.1",
|
||||
"electron-store": "^8.1.0",
|
||||
"express": "^4.18.2",
|
||||
"hotkeys-js": "^3.11.2",
|
||||
"hotkeys-js": "^3.12.0",
|
||||
"mpris-service": "^2.1.2",
|
||||
"request": "^2.88.2",
|
||||
"sass": "^1.64.1"
|
||||
|
||||
16
scripts/resize-icons.sh
Normal file
16
scripts/resize-icons.sh
Normal file
@ -0,0 +1,16 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [ "$1" != "" ]; then # check if arg 1 is present
|
||||
FILE=$1
|
||||
else
|
||||
echo "Please provide a file as an argument."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
SIZES=("16x16" "22x22" "24x24" "32x32" "48x48" "64x64" "128x128" "256x256" "384x384")
|
||||
|
||||
echo "Resizing $FILE..."
|
||||
|
||||
for i in "${SIZES[@]}"; do
|
||||
convert "$FILE" -resize "$i" "$i.png"
|
||||
done
|
||||
@ -20,11 +20,16 @@ export const settings = {
|
||||
disableHardwareMediaKeys: "disableHardwareMediaKeys",
|
||||
enableCustomHotkeys: "enableCustomHotkeys",
|
||||
enableDiscord: "enableDiscord",
|
||||
discord: {
|
||||
detailsPrefix: "discord.detailsPrefix",
|
||||
buttonText: "discord.buttonText",
|
||||
},
|
||||
ListenBrainz: {
|
||||
root: "ListenBrainz",
|
||||
enabled: "ListenBrainz.enabled",
|
||||
api: "ListenBrainz.api",
|
||||
token: "ListenBrainz.token",
|
||||
delay: "ListenBrainz.delay",
|
||||
},
|
||||
flags: {
|
||||
root: "flags",
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
export default {
|
||||
name: "tidal-hifi",
|
||||
name: "TIDAL Hi-Fi",
|
||||
};
|
||||
|
||||
@ -21,7 +21,6 @@ export function setManagedFlagsFromSettings(app: App) {
|
||||
for (const [key, value] of Object.entries(flagsFromSettings)) {
|
||||
if (value) {
|
||||
flags[key].forEach((flag) => {
|
||||
Logger.log(`enabling command line option ${flag.flag} with value ${flag.value}`);
|
||||
setFlag(app, flag.flag, flag.value);
|
||||
});
|
||||
}
|
||||
@ -37,5 +36,6 @@ export function setManagedFlagsFromSettings(app: App) {
|
||||
*/
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
function setFlag(app: App, flag: string, value?: any) {
|
||||
Logger.log(`enabling command line option ${flag} with value ${value}`);
|
||||
app.commandLine.appendSwitch(flag, value);
|
||||
}
|
||||
|
||||
31
src/features/theming/theming.ts
Normal file
31
src/features/theming/theming.ts
Normal file
@ -0,0 +1,31 @@
|
||||
import fs from "fs";
|
||||
import { settings } from "../../constants/settings";
|
||||
import { settingsStore } from "../../scripts/settings";
|
||||
import { Logger } from "../logger";
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
export function addCustomCss(app: any, logger: typeof Logger) {
|
||||
window.addEventListener("DOMContentLoaded", () => {
|
||||
const selectedTheme = settingsStore.get<string, string>(settings.theme);
|
||||
if (selectedTheme !== "none") {
|
||||
const userThemePath = `${app.getPath("userData")}/themes/${selectedTheme}`;
|
||||
const resourcesThemePath = `${process.resourcesPath}/${selectedTheme}`;
|
||||
const themeFile = fs.existsSync(userThemePath) ? userThemePath : resourcesThemePath;
|
||||
fs.readFile(themeFile, "utf-8", (err, data) => {
|
||||
if (err) {
|
||||
logger.alert("An error ocurred reading the theme file.", err, alert);
|
||||
return;
|
||||
}
|
||||
|
||||
const themeStyle = document.createElement("style");
|
||||
themeStyle.innerHTML = data;
|
||||
document.head.appendChild(themeStyle);
|
||||
});
|
||||
}
|
||||
|
||||
// read customCSS (it will override the theme)
|
||||
const style = document.createElement("style");
|
||||
style.innerHTML = settingsStore.get<string, string[]>(settings.customCSS).join("\n");
|
||||
document.head.appendChild(style);
|
||||
});
|
||||
}
|
||||
24
src/main.ts
24
src/main.ts
@ -37,10 +37,14 @@ const tidalUrl = "https://listen.tidal.com";
|
||||
let mainInhibitorId = -1;
|
||||
|
||||
initialize();
|
||||
|
||||
let mainWindow: BrowserWindow;
|
||||
const icon = path.join(__dirname, "../assets/icon.png");
|
||||
const PROTOCOL_PREFIX = "tidal";
|
||||
const windowPreferences = {
|
||||
sandbox: false,
|
||||
plugins: true,
|
||||
devTools: true, // I like tinkering, others might too
|
||||
};
|
||||
|
||||
setDefaultFlags(app);
|
||||
setManagedFlagsFromSettings(app);
|
||||
@ -84,10 +88,10 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
|
||||
backgroundColor: options.backgroundColor,
|
||||
autoHideMenuBar: true,
|
||||
webPreferences: {
|
||||
sandbox: false,
|
||||
...windowPreferences,
|
||||
...{
|
||||
preload: path.join(__dirname, "preload.js"),
|
||||
plugins: true,
|
||||
devTools: true, // I like tinkering, others might too
|
||||
},
|
||||
},
|
||||
});
|
||||
enable(mainWindow.webContents);
|
||||
@ -120,6 +124,18 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
|
||||
const { width, height } = mainWindow.getBounds();
|
||||
settingsStore.set(settings.windowBounds.root, { width, height });
|
||||
});
|
||||
mainWindow.webContents.setWindowOpenHandler(() => {
|
||||
return {
|
||||
action: "allow",
|
||||
overrideBrowserWindowOptions: {
|
||||
webPreferences: {
|
||||
sandbox: false,
|
||||
plugins: true,
|
||||
devTools: true, // I like tinkering, others might too
|
||||
},
|
||||
},
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
function registerHttpProtocols() {
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 102 KiB After Width: | Height: | Size: 32 KiB |
@ -4,9 +4,24 @@ import fs from "fs";
|
||||
import { globalEvents } from "../../constants/globalEvents";
|
||||
import { settings } from "../../constants/settings";
|
||||
import { Logger } from "../../features/logger";
|
||||
import { addCustomCss } from "../../features/theming/theming";
|
||||
import { settingsStore } from "./../../scripts/settings";
|
||||
import { getOptions, getOptionsHeader, getThemeListFromDirectory } from "./theming";
|
||||
|
||||
// All switches on the settings screen that show additional options based on their state
|
||||
const switchesWithSettings = {
|
||||
listenBrainz: {
|
||||
switch: "enableListenBrainz",
|
||||
classToHide: "listenbrainz__options",
|
||||
settingsKey: settings.ListenBrainz.enabled,
|
||||
},
|
||||
discord: {
|
||||
switch: "enableDiscord",
|
||||
classToHide: "discord_options",
|
||||
settingsKey: settings.enableDiscord,
|
||||
},
|
||||
};
|
||||
|
||||
let adBlock: HTMLInputElement,
|
||||
api: HTMLInputElement,
|
||||
customCSS: HTMLInputElement,
|
||||
@ -30,7 +45,12 @@ let adBlock: HTMLInputElement,
|
||||
enableListenBrainz: HTMLInputElement,
|
||||
ListenBrainzAPI: HTMLInputElement,
|
||||
ListenBrainzToken: HTMLInputElement,
|
||||
enableWaylandSupport: HTMLInputElement;
|
||||
listenbrainz_delay: HTMLInputElement,
|
||||
enableWaylandSupport: HTMLInputElement,
|
||||
discord_details_prefix: HTMLInputElement,
|
||||
discord_button_text: HTMLInputElement;
|
||||
|
||||
addCustomCss(app, Logger.bind(this));
|
||||
|
||||
function getThemeFiles() {
|
||||
const selectElement = document.getElementById("themesList") as HTMLSelectElement;
|
||||
@ -59,6 +79,7 @@ function handleFileUploads() {
|
||||
const fileMessage = document.getElementById("file-message");
|
||||
fileMessage.innerText = "or drag and drop files here";
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
document.getElementById("theme-files").addEventListener("change", function (e: any) {
|
||||
Array.from(e.target.files).forEach((file: File) => {
|
||||
const destination = `${app.getPath("userData")}/themes/${file.name}`;
|
||||
@ -69,6 +90,20 @@ function handleFileUploads() {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* hide or unhide an element
|
||||
* @param checked
|
||||
* @param toggleOptions
|
||||
*/
|
||||
function setElementHidden(
|
||||
checked: boolean,
|
||||
toggleOptions: { switch: string; classToHide: string }
|
||||
) {
|
||||
const element = document.getElementById(toggleOptions.classToHide);
|
||||
|
||||
checked ? element.classList.remove("hidden") : element.classList.add("hidden");
|
||||
}
|
||||
|
||||
/**
|
||||
* Sync the UI forms with the current settings
|
||||
*/
|
||||
@ -98,6 +133,14 @@ function refreshSettings() {
|
||||
enableListenBrainz.checked = settingsStore.get(settings.ListenBrainz.enabled);
|
||||
ListenBrainzAPI.value = settingsStore.get(settings.ListenBrainz.api);
|
||||
ListenBrainzToken.value = settingsStore.get(settings.ListenBrainz.token);
|
||||
listenbrainz_delay.value = settingsStore.get(settings.ListenBrainz.delay);
|
||||
discord_details_prefix.value = settingsStore.get(settings.discord.detailsPrefix);
|
||||
discord_button_text.value = settingsStore.get(settings.discord.buttonText);
|
||||
|
||||
// set state of all switches with additional settings
|
||||
Object.values(switchesWithSettings).forEach((settingSwitch) => {
|
||||
setElementHidden(settingsStore.get(settingSwitch.settingsKey), settingSwitch);
|
||||
});
|
||||
} catch (error) {
|
||||
Logger.log("Refreshing settings failed.", error);
|
||||
}
|
||||
@ -117,14 +160,6 @@ function hide() {
|
||||
ipcRenderer.send(globalEvents.hideSettings);
|
||||
}
|
||||
|
||||
/**
|
||||
* Restart tidal-hifi after changes
|
||||
*/
|
||||
function restart() {
|
||||
app.relaunch();
|
||||
app.exit();
|
||||
}
|
||||
|
||||
/**
|
||||
* Bind UI components to functions after DOMContentLoaded
|
||||
*/
|
||||
@ -137,25 +172,28 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
handleFileUploads();
|
||||
|
||||
document.getElementById("close").addEventListener("click", hide);
|
||||
document.getElementById("restart").addEventListener("click", restart);
|
||||
document.querySelectorAll(".external-link").forEach((elem) =>
|
||||
elem.addEventListener("click", function (event) {
|
||||
openExternal((event.target as HTMLElement).getAttribute("data-url"));
|
||||
})
|
||||
);
|
||||
|
||||
function addInputListener(source: HTMLInputElement, key: string) {
|
||||
function addInputListener(
|
||||
source: HTMLInputElement,
|
||||
key: string,
|
||||
toggleOptions?: { switch: string; classToHide: string }
|
||||
) {
|
||||
source.addEventListener("input", () => {
|
||||
if (source.value === "on") {
|
||||
settingsStore.set(key, source.checked);
|
||||
} else {
|
||||
settingsStore.set(key, source.value);
|
||||
}
|
||||
// Live update the view for ListenBrainz input, hide if disabled/show if enabled
|
||||
if (source.value === "on" && source.id === "enableListenBrainz") {
|
||||
source.checked
|
||||
? document.getElementById("listenbrainz__options").removeAttribute("hidden")
|
||||
: document.getElementById("listenbrainz__options").setAttribute("hidden", "true");
|
||||
|
||||
if (toggleOptions) {
|
||||
if (source.value === "on" && source.id === toggleOptions.switch) {
|
||||
setElementHidden(source.checked, toggleOptions);
|
||||
}
|
||||
}
|
||||
ipcRenderer.send(globalEvents.storeChanged);
|
||||
});
|
||||
@ -207,19 +245,18 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
enableListenBrainz = get("enableListenBrainz");
|
||||
ListenBrainzAPI = get("ListenBrainzAPI");
|
||||
ListenBrainzToken = get("ListenBrainzToken");
|
||||
discord_details_prefix = get("discord_details_prefix");
|
||||
listenbrainz_delay = get("listenbrainz_delay");
|
||||
discord_button_text = get("discord_button_text");
|
||||
|
||||
refreshSettings();
|
||||
enableListenBrainz.checked
|
||||
? document.getElementById("listenbrainz__options").removeAttribute("hidden")
|
||||
: document.getElementById("listenbrainz__options").setAttribute("hidden", "true");
|
||||
|
||||
addInputListener(adBlock, settings.adBlock);
|
||||
addInputListener(api, settings.api);
|
||||
addTextAreaListener(customCSS, settings.customCSS);
|
||||
addInputListener(disableBackgroundThrottle, settings.disableBackgroundThrottle);
|
||||
addInputListener(disableHardwareMediaKeys, settings.flags.disableHardwareMediaKeys);
|
||||
addInputListener(enableCustomHotkeys, settings.enableCustomHotkeys);
|
||||
addInputListener(enableDiscord, settings.enableDiscord);
|
||||
addInputListener(enableDiscord, settings.enableDiscord, switchesWithSettings.discord);
|
||||
addInputListener(enableWaylandSupport, settings.flags.enableWaylandSupport);
|
||||
addInputListener(gpuRasterization, settings.flags.gpuRasterization);
|
||||
addInputListener(menuBar, settings.menuBar);
|
||||
@ -234,7 +271,14 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
addSelectListener(theme, settings.theme);
|
||||
addInputListener(trayIcon, settings.trayIcon);
|
||||
addInputListener(updateFrequency, settings.updateFrequency);
|
||||
addInputListener(enableListenBrainz, settings.ListenBrainz.enabled);
|
||||
addTextAreaListener(ListenBrainzAPI, settings.ListenBrainz.api);
|
||||
addTextAreaListener(ListenBrainzToken, settings.ListenBrainz.token);
|
||||
addInputListener(
|
||||
enableListenBrainz,
|
||||
settings.ListenBrainz.enabled,
|
||||
switchesWithSettings.listenBrainz
|
||||
);
|
||||
addInputListener(ListenBrainzAPI, settings.ListenBrainz.api);
|
||||
addInputListener(ListenBrainzToken, settings.ListenBrainz.token);
|
||||
addInputListener(listenbrainz_delay, settings.ListenBrainz.delay);
|
||||
addInputListener(discord_details_prefix, settings.discord.detailsPrefix);
|
||||
addInputListener(discord_button_text, settings.discord.buttonText);
|
||||
});
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
|
||||
<link rel="stylesheet" href="./settings.css" />
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
|
||||
</head>
|
||||
|
||||
<body class="settings-window">
|
||||
@ -201,6 +202,9 @@
|
||||
<span class="switch__slider"></span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="group">
|
||||
<p class="group__title">Discord</p>
|
||||
<div class="group__option">
|
||||
<div class="group__description">
|
||||
<h4>Discord RPC</h4>
|
||||
@ -211,6 +215,23 @@
|
||||
<span class="switch__slider"></span>
|
||||
</label>
|
||||
</div>
|
||||
<div id="discord_options">
|
||||
<div class="group__option" class="hidden">
|
||||
<div class="group__description">
|
||||
<h4>Details prefix</h4>
|
||||
<p>Prefix for the "details" field of Discord's rich presence.</p>
|
||||
<input id="discord_details_prefix" type="text" class="text-input" name="discord_details_prefix" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="group__option">
|
||||
<div class="group__description">
|
||||
<h4>Button text</h4>
|
||||
<p>Text to display on the button below the song information.</p>
|
||||
<input id="discord_button_text" type="text" class="text-input" name="discord_button_text" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="group">
|
||||
<p class="group__title">ListenBrainz</p>
|
||||
@ -224,21 +245,27 @@
|
||||
<span class="switch__slider"></span>
|
||||
</label>
|
||||
</div>
|
||||
<div id="listenbrainz__options" hidden="true">
|
||||
<div id="listenbrainz__options" class="hidden">
|
||||
<div class="group__option">
|
||||
<div class="group__description">
|
||||
<h4>ListenBrainz API Url</h4>
|
||||
<p>There are multiple instances for ListenBrainz you can set the corresponding API url below.</p>
|
||||
<input id="ListenBrainzAPI" type="text" class="text-input" name="ListenBrainzAPI" />
|
||||
</div>
|
||||
</div>
|
||||
<textarea id="ListenBrainzAPI" class="textarea" cols="1" rows="1" spellcheck="false"></textarea>
|
||||
<div class="group__option">
|
||||
<div class="group__description">
|
||||
<h4>ListenBrainz User Token</h4>
|
||||
<p>Provide the user token you can get from the settings page.</p>
|
||||
<input id="ListenBrainzToken" type="text" class="text-input" name="ListenBrainzToken" />
|
||||
</div>
|
||||
</div>
|
||||
<textarea id="ListenBrainzToken" class="textarea" cols="1" rows="1" spellcheck="false"></textarea>
|
||||
</div>
|
||||
<div class="group__description">
|
||||
<h4>ScrobbleDelay</h4>
|
||||
<p>The delay (in ms) to send a song to ListenBrainz. Prevents spamming the API when you fast forward
|
||||
immediately</p>
|
||||
<input id="listenbrainz_delay" type="number" class="text-input" name="listenbrainz_delay" />
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
@ -250,7 +277,7 @@
|
||||
<div class="group__description">
|
||||
<h4>Update frequency</h4>
|
||||
<p>
|
||||
The amount of time, in milliseconds, that tidal-hifi will refresh its playback info by scraping the
|
||||
The amount of time, in milliseconds, that TIDAL Hi-Fi will refresh its playback info by scraping the
|
||||
website.
|
||||
The default of 500 seems to work in more cases but if you are fine with a bit more resource usage you
|
||||
can decrease it as well.
|
||||
@ -300,7 +327,7 @@
|
||||
<div class="group__description">
|
||||
<h4>Wayland support</h4>
|
||||
<p>
|
||||
Adds a couple of Electron flags to help Tidal-hifi run smoothly on the Wayland window system.
|
||||
Adds a couple of Electron flags to help TIDAL Hi-Fi run smoothly on the Wayland window system.
|
||||
</p>
|
||||
</div>
|
||||
<label class="switch">
|
||||
@ -360,21 +387,24 @@
|
||||
|
||||
<section id="about-section" class="tabs__section about-section">
|
||||
<img alt="tidal icon" class="about-section__icon" src="./icon.png" />
|
||||
<p class="about-section__text">
|
||||
<a class="external-link" data-url="https://github.com/Mastermindzh/tidal-hifi">TIDAL Hi-Fi</a>
|
||||
is made by
|
||||
<a class="external-link" data-url="https://www.rickvanlieshout.com">
|
||||
Rick van Lieshout</a>. <br />It uses
|
||||
<a class="external-link" data-url="https://castlabs.com/">Castlabs'</a>
|
||||
version of Electron for widevine support.
|
||||
</p>
|
||||
<h4>TIDAL Hi-Fi</h4>
|
||||
<div class="about-section__version">
|
||||
<a href="">5.7.0</a>
|
||||
</div>
|
||||
<div class="about-section__links">
|
||||
<a href="https://github.com/mastermindzh/tidal-hifi/" class="about-section__button">Github <i
|
||||
class="fa fa-external-link"></i></a>
|
||||
<a href="https://github.com/Mastermindzh/tidal-hifi/issues" class="about-section__button">Report an issue <i
|
||||
class="fa fa-external-link"></i></a>
|
||||
<a href="https://github.com/Mastermindzh/tidal-hifi/graphs/contributors"
|
||||
class="about-section__button">Contributors <i class="fa fa-external-link"></i></a>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<footer class="footer">
|
||||
<p class="footer__note">
|
||||
Some settings may require a restart of TIDAL Hi-Fi. To do so, click the button below:
|
||||
<strong>Note</strong>: some settings may require a restart of TIDAL Hi-Fi.
|
||||
</p>
|
||||
<button class="footer__button" id="restart">Restart TIDAL Hi-Fi</button>
|
||||
</footer>
|
||||
</div>
|
||||
</main>
|
||||
|
||||
@ -8,6 +8,7 @@ $tidal-grey: #72777f;
|
||||
$tidal-grey-darker: #404248;
|
||||
$tidal-grey-darker-focus: #55585f;
|
||||
$tidal-grey-darkest: #242528;
|
||||
$tidal-grey-darkest-focus: #2e2f33;
|
||||
|
||||
// --- Fonts ---
|
||||
|
||||
@ -309,26 +310,75 @@ html {
|
||||
}
|
||||
|
||||
.about-section {
|
||||
padding-top: 120px;
|
||||
padding-top: 40px;
|
||||
text-align: center;
|
||||
|
||||
&__icon {
|
||||
display: inline-block;
|
||||
width: 100px;
|
||||
width: 200px;
|
||||
}
|
||||
|
||||
&__text {
|
||||
display: block;
|
||||
max-width: 350px;
|
||||
margin: 20px auto 0;
|
||||
max-width: 500px;
|
||||
margin: -15px auto 0;
|
||||
}
|
||||
&__table {
|
||||
width: 120px;
|
||||
margin: 0 auto 0;
|
||||
|
||||
td {
|
||||
text-align: left;
|
||||
}
|
||||
}
|
||||
&__version {
|
||||
margin: -10px 0px 30px 0px;
|
||||
a {
|
||||
background-color: $tidal-grey-darker;
|
||||
border: none;
|
||||
color: $tidal-blue;
|
||||
padding: 8px 20px;
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
text-decoration: none;
|
||||
display: inline-block;
|
||||
border-radius: 100px;
|
||||
}
|
||||
}
|
||||
|
||||
// --- Footer ---
|
||||
&__links {
|
||||
width: 300px;
|
||||
margin: 0 auto;
|
||||
a {
|
||||
border-radius: 10px;
|
||||
border: none;
|
||||
color: $white;
|
||||
padding: 10px 10px 10px 20px;
|
||||
margin: 8px;
|
||||
text-align: left;
|
||||
font-size: 16px;
|
||||
line-height: 30px;
|
||||
display: flex;
|
||||
text-decoration: none;
|
||||
justify-content: space-between;
|
||||
background-color: $tidal-grey-darkest;
|
||||
|
||||
i {
|
||||
color: $white;
|
||||
line-height: 30px;
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background-color: $tidal-grey-darkest-focus;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// --- Footer ---
|
||||
.footer {
|
||||
position: sticky;
|
||||
top: calc(100% - 120px);
|
||||
height: 100px;
|
||||
padding-top: 20px;
|
||||
text-align: center;
|
||||
@ -443,3 +493,7 @@ html {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.hidden {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
import { app, dialog, Notification } from "@electron/remote";
|
||||
import { clipboard, ipcRenderer } from "electron";
|
||||
import fs from "fs";
|
||||
import Player from "mpris-service";
|
||||
import { globalEvents } from "./constants/globalEvents";
|
||||
import { settings } from "./constants/settings";
|
||||
@ -12,6 +11,7 @@ import {
|
||||
import { StoreData } from "./features/listenbrainz/models/storeData";
|
||||
import { Logger } from "./features/logger";
|
||||
import { Songwhip } from "./features/songwhip/songwhip";
|
||||
import { addCustomCss } from "./features/theming/theming";
|
||||
import { MediaStatus } from "./models/mediaStatus";
|
||||
import { Options } from "./models/options";
|
||||
import { downloadFile } from "./scripts/download";
|
||||
@ -20,10 +20,12 @@ import { settingsStore } from "./scripts/settings";
|
||||
import { setTitle } from "./scripts/window-functions";
|
||||
|
||||
const notificationPath = `${app.getPath("userData")}/notification.jpg`;
|
||||
const appName = "Tidal Hifi";
|
||||
const appName = "TIDAL Hi-Fi";
|
||||
let currentSong = "";
|
||||
let player: Player;
|
||||
let currentPlayStatus = MediaStatus.paused;
|
||||
let currentListenBrainzDelayId: ReturnType<typeof setTimeout>;
|
||||
let scrobbleWaitingForDelay = false;
|
||||
|
||||
const elements = {
|
||||
play: '*[data-test="play"]',
|
||||
@ -156,32 +158,6 @@ const elements = {
|
||||
},
|
||||
};
|
||||
|
||||
function addCustomCss() {
|
||||
window.addEventListener("DOMContentLoaded", () => {
|
||||
const selectedTheme = settingsStore.get<string, string>(settings.theme);
|
||||
if (selectedTheme !== "none") {
|
||||
const userThemePath = `${app.getPath("userData")}/themes/${selectedTheme}`;
|
||||
const resourcesThemePath = `${process.resourcesPath}/${selectedTheme}`;
|
||||
const themeFile = fs.existsSync(userThemePath) ? userThemePath : resourcesThemePath;
|
||||
fs.readFile(themeFile, "utf-8", (err, data) => {
|
||||
if (err) {
|
||||
Logger.alert("An error ocurred reading the theme file.", err, alert);
|
||||
return;
|
||||
}
|
||||
|
||||
const themeStyle = document.createElement("style");
|
||||
themeStyle.innerHTML = data;
|
||||
document.head.appendChild(themeStyle);
|
||||
});
|
||||
}
|
||||
|
||||
// read customCSS (it will override the theme)
|
||||
const style = document.createElement("style");
|
||||
style.innerHTML = settingsStore.get<string, string[]>(settings.customCSS).join("\n");
|
||||
document.head.appendChild(style);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the update frequency from the store
|
||||
* make sure it returns a number, if not use the default
|
||||
@ -395,6 +371,9 @@ function updateMpris(options: Options) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the listenbrainz service with new data based on a few conditions
|
||||
*/
|
||||
function updateListenBrainz(options: Options) {
|
||||
if (settingsStore.get(settings.ListenBrainz.enabled)) {
|
||||
const oldData = ListenBrainzStore.get(ListenBrainzConstants.oldData) as StoreData;
|
||||
@ -402,12 +381,22 @@ function updateListenBrainz(options: Options) {
|
||||
(!oldData && options.status === MediaStatus.playing) ||
|
||||
(oldData && oldData.title !== options.title)
|
||||
) {
|
||||
if (!scrobbleWaitingForDelay) {
|
||||
scrobbleWaitingForDelay = true;
|
||||
clearTimeout(currentListenBrainzDelayId);
|
||||
currentListenBrainzDelayId = setTimeout(
|
||||
() => {
|
||||
ListenBrainz.scrobble(
|
||||
options.title,
|
||||
options.artists,
|
||||
options.status,
|
||||
convertDuration(options.duration)
|
||||
);
|
||||
scrobbleWaitingForDelay = false;
|
||||
},
|
||||
settingsStore.get(settings.ListenBrainz.delay) ?? 0
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -531,8 +520,8 @@ setInterval(function () {
|
||||
if (process.platform === "linux" && settingsStore.get(settings.mpris)) {
|
||||
try {
|
||||
player = Player({
|
||||
name: "tidal-hifi",
|
||||
identity: "tidal-hifi",
|
||||
name: "TIDAL Hi-Fi",
|
||||
identity: "TIDAL Hi-Fi",
|
||||
supportedUriSchemes: ["file"],
|
||||
supportedMimeTypes: [
|
||||
"audio/mpeg",
|
||||
@ -544,7 +533,6 @@ if (process.platform === "linux" && settingsStore.get(settings.mpris)) {
|
||||
supportedInterfaces: ["player"],
|
||||
desktopEntry: "tidal-hifi",
|
||||
});
|
||||
|
||||
// Events
|
||||
const events = {
|
||||
next: "next",
|
||||
@ -582,7 +570,8 @@ if (process.platform === "linux" && settingsStore.get(settings.mpris)) {
|
||||
console.log("player api not working");
|
||||
}
|
||||
}
|
||||
addCustomCss();
|
||||
|
||||
addCustomCss(app, Logger.bind(this));
|
||||
addHotKeys();
|
||||
addIPCEventListeners();
|
||||
addFullScreenListeners();
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
import { Client } from "discord-rpc";
|
||||
import { app, ipcMain } from "electron";
|
||||
import { globalEvents } from "../constants/globalEvents";
|
||||
import { settings } from "../constants/settings";
|
||||
import { Logger } from "../features/logger";
|
||||
import { MediaStatus } from "../models/mediaStatus";
|
||||
import { mediaInfo } from "./mediaInfo";
|
||||
import { settingsStore } from "./settings";
|
||||
|
||||
const clientId = "833617820704440341";
|
||||
|
||||
@ -15,7 +18,7 @@ function timeToSeconds(timeArray: string[]) {
|
||||
export let rpc: Client;
|
||||
|
||||
const observer = () => {
|
||||
if (mediaInfo.status == MediaStatus.paused && rpc) {
|
||||
if (mediaInfo.status === MediaStatus.paused && rpc) {
|
||||
rpc.setActivity(idleStatus);
|
||||
} else if (rpc) {
|
||||
const currentSeconds = timeToSeconds(mediaInfo.current.split(":"));
|
||||
@ -23,17 +26,21 @@ const observer = () => {
|
||||
const date = new Date();
|
||||
const now = (date.getTime() / 1000) | 0;
|
||||
const remaining = date.setSeconds(date.getSeconds() + (durationSeconds - currentSeconds));
|
||||
const detailsPrefix =
|
||||
settingsStore.get<string, string>(settings.discord.detailsPrefix) ?? "Listening to ";
|
||||
const buttonText =
|
||||
settingsStore.get<string, string>(settings.discord.buttonText) ?? "Play on TIDAL";
|
||||
if (mediaInfo.url) {
|
||||
rpc.setActivity({
|
||||
...idleStatus,
|
||||
...{
|
||||
details: `Listening to ${mediaInfo.title}`,
|
||||
details: `${detailsPrefix}${mediaInfo.title}`,
|
||||
state: mediaInfo.artists ? mediaInfo.artists : "unknown artist(s)",
|
||||
startTimestamp: now,
|
||||
endTimestamp: remaining,
|
||||
largeImageKey: mediaInfo.image,
|
||||
largeImageText: mediaInfo.album ? mediaInfo.album : `${idleStatus.largeImageText}`,
|
||||
buttons: [{ label: "Play on Tidal", url: mediaInfo.url }],
|
||||
buttons: [{ label: buttonText, url: mediaInfo.url }],
|
||||
},
|
||||
});
|
||||
} else {
|
||||
@ -53,7 +60,7 @@ const observer = () => {
|
||||
const idleStatus = {
|
||||
details: `Browsing Tidal`,
|
||||
largeImageKey: "tidal-hifi-icon",
|
||||
largeImageText: `Tidal HiFi ${app.getVersion()}`,
|
||||
largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
|
||||
instance: false,
|
||||
};
|
||||
|
||||
@ -70,7 +77,7 @@ export const initRPC = () => {
|
||||
ipcMain.on(globalEvents.updateInfo, observer);
|
||||
},
|
||||
() => {
|
||||
console.error("Can't connect to Discord, is it running?");
|
||||
Logger.log("Can't connect to Discord, is it running?");
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
@ -8,7 +8,7 @@ import { mediaInfo } from "./mediaInfo";
|
||||
import { settingsStore } from "./settings";
|
||||
|
||||
/**
|
||||
* Function to enable tidal-hifi's express api
|
||||
* Function to enable TIDAL Hi-Fi's express api
|
||||
*/
|
||||
|
||||
// expressModule.run = function (mainWindow)
|
||||
|
||||
@ -33,7 +33,6 @@ export const getMenu = function (mainWindow: BrowserWindow) {
|
||||
{
|
||||
label: name,
|
||||
submenu: [
|
||||
{ role: "about" },
|
||||
settingsMenuEntry,
|
||||
{ type: "separator" },
|
||||
{ role: "services" },
|
||||
@ -101,12 +100,6 @@ export const getMenu = function (mainWindow: BrowserWindow) {
|
||||
],
|
||||
},
|
||||
settingsMenuEntry,
|
||||
{
|
||||
label: "About",
|
||||
click() {
|
||||
showSettingsWindow("about");
|
||||
},
|
||||
},
|
||||
toggleWindow,
|
||||
quitMenuEntry,
|
||||
];
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
import Store from "electron-store";
|
||||
|
||||
import { settings } from "../constants/settings";
|
||||
import path from "path";
|
||||
import { BrowserWindow } from "electron";
|
||||
import path from "path";
|
||||
import { settings } from "../constants/settings";
|
||||
|
||||
let settingsWindow: BrowserWindow;
|
||||
|
||||
@ -18,10 +18,15 @@ export const settingsStore = new Store({
|
||||
disableHardwareMediaKeys: false,
|
||||
enableCustomHotkeys: false,
|
||||
enableDiscord: false,
|
||||
discord: {
|
||||
detailsPrefix: "Listening to ",
|
||||
buttonText: "Play on Tidal",
|
||||
},
|
||||
ListenBrainz: {
|
||||
enabled: false,
|
||||
api: "https://api.listenbrainz.org",
|
||||
token: "",
|
||||
delay: 5000,
|
||||
},
|
||||
flags: {
|
||||
disableHardwareMediaKeys: false,
|
||||
@ -49,6 +54,13 @@ export const settingsStore = new Store({
|
||||
migrationStore.get("disableHardwareMediaKeys") ?? false
|
||||
);
|
||||
},
|
||||
"5.7.0": (migrationStore) => {
|
||||
console.log("running migrations for 5.7.0");
|
||||
migrationStore.set(
|
||||
settings.ListenBrainz.delay,
|
||||
migrationStore.get(settings.ListenBrainz.delay) ?? 5000
|
||||
);
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
@ -59,8 +71,8 @@ const settingsModule = {
|
||||
|
||||
export const createSettingsWindow = function () {
|
||||
settingsWindow = new BrowserWindow({
|
||||
width: 700,
|
||||
height: 600,
|
||||
width: 650,
|
||||
height: 700,
|
||||
resizable: true,
|
||||
show: false,
|
||||
transparent: true,
|
||||
|
||||
@ -74,7 +74,7 @@ button.feedBell--kvAbD {
|
||||
.container--PFTHk {
|
||||
background-color: var(--right-queue-background);
|
||||
}
|
||||
.container--cl4MJ{
|
||||
.container--cl4MJ {
|
||||
background-color: var(--search-background);
|
||||
}
|
||||
.searchFieldHighlighted--Fitvs {
|
||||
@ -83,3 +83,122 @@ button.feedBell--kvAbD {
|
||||
.searchField--EGBSq {
|
||||
background-color: var(--search-background);
|
||||
}
|
||||
|
||||
// Settings window styling
|
||||
|
||||
.settings-window {
|
||||
color: var(--sidebar-menu-playlist-text);
|
||||
}
|
||||
.settings-window__wrapper {
|
||||
background: var(--main-background);
|
||||
box-shadow: inset 0 0 2px 0 var(--main-feed-button-background);
|
||||
}
|
||||
|
||||
.settings-window__close-button:hover {
|
||||
background: var(--main-feed-button-background);
|
||||
}
|
||||
|
||||
.settings input:checked + label {
|
||||
border-bottom: 2px solid var(--player-control-active-button);
|
||||
color: var(--player-control-active-button);
|
||||
}
|
||||
|
||||
.tabs::-webkit-scrollbar-thumb {
|
||||
background-color: #404248;
|
||||
box-shadow: inset 0 0 10px 2px var(--search-background);
|
||||
}
|
||||
|
||||
.group {
|
||||
border-bottom: 1px solid #333;
|
||||
}
|
||||
|
||||
.group__description p {
|
||||
color: var(--sidebar-menu-top-text);
|
||||
}
|
||||
.group__description .text-input {
|
||||
border-bottom: solid 1px #333;
|
||||
color: var(--sidebar-menu-top-text);
|
||||
}
|
||||
.group__description .text-input:focus {
|
||||
border-color: var(--player-control-active-button);
|
||||
color: var(--sidebar-menu-playlist-text);
|
||||
}
|
||||
|
||||
.switch input:checked + .switch__slider {
|
||||
background-color: var(--player-control-active-button);
|
||||
}
|
||||
.switch input:checked + .switch__slider::before {
|
||||
background-color: var(--sidebar-menu-playlist-text);
|
||||
}
|
||||
.switch input:focus + .switch__slider {
|
||||
box-shadow: inset 0 0 0 1px var(--player-control-active-button);
|
||||
}
|
||||
.switch__slider {
|
||||
background-color: var(--search-background);
|
||||
}
|
||||
.switch__slider::before {
|
||||
background-color: var(--sidebar-menu-playlist-text);
|
||||
}
|
||||
|
||||
.textarea {
|
||||
background: var(--search-background);
|
||||
color: var(--sidebar-menu-top-text);
|
||||
}
|
||||
.textarea:focus {
|
||||
border-color: var(--player-control-active-button);
|
||||
color: var(--sidebar-menu-playlist-text);
|
||||
}
|
||||
|
||||
.about-section__version a {
|
||||
background-color: #404248;
|
||||
color: var(--player-control-active-button);
|
||||
}
|
||||
.about-section__links a {
|
||||
color: var(--sidebar-menu-playlist-text);
|
||||
|
||||
background-color: var(--search-background);
|
||||
}
|
||||
.about-section__links a i {
|
||||
color: var(--sidebar-menu-playlist-text);
|
||||
}
|
||||
.about-section__links a:hover {
|
||||
background-color: var(--player-control-favorite);
|
||||
}
|
||||
|
||||
.footer__note {
|
||||
color: var(--sidebar-menu-top-text);
|
||||
}
|
||||
.footer__button {
|
||||
background: #404248;
|
||||
color: var(--sidebar-menu-playlist-text);
|
||||
}
|
||||
.footer__button:hover {
|
||||
background: #55585f;
|
||||
}
|
||||
|
||||
.file-drop-area {
|
||||
border: 1px dashed var(--sidebar-menu-top-text);
|
||||
}
|
||||
.file-drop-area.is-active {
|
||||
background-color: #17171a;
|
||||
}
|
||||
|
||||
.file-btn {
|
||||
background-color: #17171a;
|
||||
border: 1px solid var(--sidebar-menu-top-text);
|
||||
}
|
||||
|
||||
.select-input {
|
||||
border-bottom: solid 1px #333;
|
||||
color: var(--sidebar-menu-top-text);
|
||||
}
|
||||
.select-input:focus {
|
||||
border-color: var(--player-control-active-button);
|
||||
color: var(--sidebar-menu-playlist-text);
|
||||
}
|
||||
.select-input option {
|
||||
background-color: var(--search-background);
|
||||
}
|
||||
.select-input option:disabled {
|
||||
color: var(--sidebar-menu-playlist-text);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user