mirror of
https://github.com/Mastermindzh/tidal-hifi.git
synced 2025-09-10 05:45:04 +02:00
Compare commits
29 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1439a11969 | |||
|
3a3e0e1a2d | ||
| fa9ab22867 | |||
| 207a61d199 | |||
|
|
7b18322e17 | ||
| 8f47756244 | |||
|
cdcf9431bf | ||
| 374f3da740 | |||
| 3965ada0a2 | |||
| 79ff02d06c | |||
| 7b2afd2290 | |||
| 5fde20ace1 | |||
| 7f5f5e7f62 | |||
| 6a1a1efe74 | |||
| 94e1bb1780 | |||
| d66dd8cc9e | |||
|
de97ac8a00 | ||
|
|
82ac5edf22 | ||
|
909c8ee8ba | ||
|
|
15b6b13e14 | ||
| 89589b75e1 | |||
| 6a7b3eefd4 | |||
|
0583c4a188 | ||
|
|
8855e7f89f | ||
|
|
4fbb598c50 | ||
| 101fe967d3 | |||
|
|
53468e0dc3 | ||
| 53cecbcd18 | |||
| 5a65f60cc5 |
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -9,6 +9,8 @@ jobs:
|
||||
build_on_linux:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: update apt
|
||||
run: sudo apt-get update
|
||||
- name: Install libarchive-tools
|
||||
run: sudo apt-get install -y libarchive-tools
|
||||
- uses: actions/checkout@master
|
||||
|
||||
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@@ -9,6 +9,8 @@ jobs:
|
||||
build_on_linux:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: update apt
|
||||
run: sudo apt-get update
|
||||
- name: Install libarchive-tools
|
||||
run: sudo apt-get install -y libarchive-tools
|
||||
- uses: actions/checkout@master
|
||||
|
||||
3
.vscode/settings.json
vendored
Normal file
3
.vscode/settings.json
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"cSpell.words": ["hifi", "rescrobbler", "widevine"]
|
||||
}
|
||||
77
CHANGELOG.md
77
CHANGELOG.md
@@ -4,6 +4,69 @@ 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).
|
||||
|
||||
## 4.1.0
|
||||
|
||||
- Added `tidal://` protocol support
|
||||
- Switched icon strategies to fix bugs with icons
|
||||
- Fixed tray icon bugs
|
||||
- Menu now shows in KDE as well
|
||||
- Toggle window is supported from tray icon
|
||||
- regular click is still ignored, see [this issue](https://github.com/electron/electron/issues/6773)
|
||||
- Fixed about tab not showing
|
||||
- Fixed playback, mpris and API issues
|
||||
|
||||
## 4.0.1
|
||||
|
||||
- Updated build config to make use of a base file that doesn't build anything.
|
||||
- This fixes the issue of unwanted extra build targets that were introduced with the electron-builder update
|
||||
|
||||
## 4.0.0
|
||||
|
||||
- Updated to Electron 19.0.5
|
||||
|
||||
## 3.1.1
|
||||
|
||||
- Media update timeout set to 500 instead of 200
|
||||
- Updated property name for duration because of a tidal update
|
||||
- flag for "disable hardware media keys" now working again
|
||||
|
||||
## 3.1.0
|
||||
|
||||
- Added a separate advanced options settings panel with flags
|
||||
- Added gpu-rasterization flag
|
||||
- config setting `disableHardwareMediaKeys` moved to `flags.disableHardwareMediaKeys`, it will be migrated automatically
|
||||
|
||||
## 3.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 HardwareMediaKeyHandling (defaults to false)
|
||||
|
||||
## 2.8.2
|
||||
|
||||
- Updated dependencies
|
||||
- Downgraded packaged version of electron to 8.5.2, doesn't seem to like a newer build
|
||||
- Fixed the annoying (and useless) terminal warning about `allowRendererProcessReuse`
|
||||
|
||||
## 2.8.1
|
||||
|
||||
- Mar0xy fixed some build issues (thanks!)
|
||||
- vincens2005 fixed the quit button in the menubar
|
||||
|
||||
## 2.8.0
|
||||
|
||||
- Added the ability to mute artists automatically
|
||||
- Added better error handling for discord rpc
|
||||
|
||||
## 2.7.2
|
||||
|
||||
- Disabled sandboxing to fix a display compositor issue on Linux.
|
||||
|
||||
## 2.7.1
|
||||
|
||||
- Fixed bug: Triggering full screen from the Tidal web app would cause the menubar to be visible even if it was disabled in the settings
|
||||
|
||||
## 2.7.0
|
||||
|
||||
- Switched to the native Notifier (removed node-notifier)
|
||||
@@ -11,11 +74,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
|
||||
## 2.6.0
|
||||
|
||||
- Add album images to mediainfo and discord
|
||||
- Add album images to media info and discord
|
||||
|
||||
## 2.5.0
|
||||
|
||||
- Notify-send now correctly shows "Tidal Hifi" as the program name
|
||||
- Notify-send now correctly shows "Tidal HiFi" as the program name
|
||||
- Updated dependencies (including electron itself)
|
||||
|
||||
### known issues
|
||||
@@ -28,13 +91,13 @@ updated to nodejs 16 in actions
|
||||
|
||||
## 2.4.0
|
||||
|
||||
- Added more mpris settings
|
||||
- Added more MPRIS settings
|
||||
- Added instruction for rescrobbler to get last.fm working without sandbox mode
|
||||
|
||||
## 2.3.0
|
||||
|
||||
- Added a setting to minimize to tray on app close (off by default)
|
||||
- Added the main menu to the trayicon
|
||||
- Added the main menu to the tray icon
|
||||
|
||||
## 2.2.1
|
||||
|
||||
@@ -51,7 +114,7 @@ moved to: [https://github.com/Mastermindzh/tidal-hifi-aur](https://github.com/Ma
|
||||
- All fields (current, remaining, and url are also available in the API\*)
|
||||
- the artist field is now correctly identified
|
||||
|
||||
* current time only updates on play/pause.
|
||||
\* current time only updates on play/pause.
|
||||
|
||||
## 2.1.1
|
||||
|
||||
@@ -76,7 +139,7 @@ moved to: [https://github.com/Mastermindzh/tidal-hifi-aur](https://github.com/Ma
|
||||
|
||||
## 1.3.0
|
||||
|
||||
-- re-enabled mpris-service wit the electron downloader fixes
|
||||
-- re-enabled MPRIS-service wit the electron downloader fixes
|
||||
|
||||
## 1.2.0
|
||||
|
||||
@@ -91,7 +154,7 @@ Bugfixes:
|
||||
## 1.1.0
|
||||
|
||||
- updated to electron 8.0.0
|
||||
- Added a beta-version of the mpris service
|
||||
- Added a beta-version of the MPRIS service
|
||||
|
||||
- Bugfixes:
|
||||
- icon on gnome not showing in launcher
|
||||
|
||||
56
README.md
56
README.md
@@ -12,22 +12,23 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
|
||||
<!-- toc -->
|
||||
|
||||
- [Installation](#installation)
|
||||
- [Using releases](#using-releases)
|
||||
- [Snap install](#snap-install)
|
||||
- [Arch Linux](#arch-linux)
|
||||
- [Using source](#using-source)
|
||||
- [features](#features)
|
||||
* [Using releases](#using-releases)
|
||||
* [Snap](#snap)
|
||||
* [Arch Linux](#arch-linux)
|
||||
* [Flatpak](#flatpak)
|
||||
* [Nix](#nix)
|
||||
* [Using source](#using-source)
|
||||
- [Features](#features)
|
||||
- [Integrations](#integrations)
|
||||
- [not included](#not-included)
|
||||
- [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)
|
||||
* [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)
|
||||
- [Why](#why)
|
||||
- [Why not extend existing projects?](#why-not-extend-existing-projects)
|
||||
- [Special thanks to...](#special-thanks-to)
|
||||
- [Buy me a coffee? Please don't](#buy-me-a-coffee-please-dont)
|
||||
- [Images](#images)
|
||||
- [settings window](#settings-window)
|
||||
- [user setups](#user-setups)
|
||||
* [Settings window](#settings-window)
|
||||
* [User setups](#user-setups)
|
||||
|
||||
<!-- tocstop -->
|
||||
|
||||
@@ -37,7 +38,7 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
|
||||
|
||||
Various packaged versions of the software are available on the [releases](https://github.com/Mastermindzh/tidal-hifi/releases) tab.
|
||||
|
||||
#### Snap install
|
||||
### Snap
|
||||
|
||||
To install with `snap` you need to download the pre-packaged snap-package from this repository, found under releases:
|
||||
|
||||
@@ -58,7 +59,23 @@ snap install --dangerous <path> #for instance: tidal-hifi_1.0.0_amd64.snap
|
||||
Arch Linux users can use the AUR to install tidal-hifi:
|
||||
|
||||
```sh
|
||||
trizen tidal-hifi
|
||||
trizen tidal-hifi-bin
|
||||
```
|
||||
|
||||
### Flatpak
|
||||
|
||||
To install via [Flatpak](https://flathub.org/apps/details/com.mastermindzh.tidal-hifi) run the following command:
|
||||
|
||||
```sh
|
||||
flatpak install flathub com.mastermindzh.tidal-hifi
|
||||
```
|
||||
|
||||
### Nix
|
||||
|
||||
To install with Nix run the following command:
|
||||
|
||||
```sh
|
||||
nix-env -iA nixpkgs.tidal-hifi
|
||||
```
|
||||
|
||||
### Using source
|
||||
@@ -70,14 +87,15 @@ To install and work with the code on this project follow these steps:
|
||||
- npm install
|
||||
- npm start
|
||||
|
||||
## features
|
||||
## Features
|
||||
|
||||
- HiFi playback
|
||||
- Notifications
|
||||
- Custom hotkeys ([source](https://defkey.com/tidal-desktop-shortcuts))
|
||||
- API for status and playback
|
||||
- [Mute artists automatically (defaults to "Tidal")]("./docs/muting-artists.md")
|
||||
- Custom [integrations](#integrations)
|
||||
- [Settings feature](./docs/settings.png) to disable certain functionality. (`ctrl+=`)
|
||||
- [Settings feature](./docs/settings.png) to disable certain functionality. (`ctrl+=` or `ctrl+0`)
|
||||
- AlbumArt in integrations ([best-effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847))
|
||||
|
||||
## Integrations
|
||||
@@ -89,10 +107,10 @@ You can find these in the settings menu (`ctrl + =` by default) under the "integ
|
||||
|
||||
It currently includes:
|
||||
|
||||
- mpris - mpris media player controls/status
|
||||
- MPRIS - MPRIS media player controls/status
|
||||
- Discord - Shows what you're listening to on Discord.
|
||||
|
||||
### not included
|
||||
Not included:
|
||||
|
||||
- [i3 blocks config](https://github.com/Mastermindzh/dotfiles/commit/9714b2fa1d670108ce811d5511fd3b7a43180647) - My dotfiles where I use this app to fetch currently playing music (direct commit)
|
||||
|
||||
@@ -128,16 +146,16 @@ Sometimes it's just easier to start over, cover my own needs and then making it
|
||||
|
||||
## Buy me a coffee? Please don't
|
||||
|
||||
Instead spend some money on a charity I care for: [kwf.nl](https://secure.kwf.nl/donation).
|
||||
Instead spend some money on a charity I care for: [kwf.nl](https://www.kwf.nl/donatie/donation).
|
||||
Inspired by [haydenjames' issue](https://github.com/Mastermindzh/tidal-hifi/issues/27#issuecomment-704198429)
|
||||
|
||||
## Images
|
||||
|
||||
### settings window
|
||||
### Settings window
|
||||
|
||||
|
||||
|
||||
### user setups
|
||||
### User setups
|
||||
|
||||
Some of our users are kind enough to share their usage pictures.
|
||||
If you want to see them or possibly even add one please do so in the following issue: [#3 - image thread](https://github.com/Mastermindzh/tidal-hifi/issues/3).
|
||||
|
||||
39
build/electron-builder.base.yml
Normal file
39
build/electron-builder.base.yml
Normal file
@@ -0,0 +1,39 @@
|
||||
appId: com.rickvanlieshout.tidal-hifi
|
||||
electronVersion: 19.0.5
|
||||
electronDownload:
|
||||
version: 19.0.5+wvcus
|
||||
mirror: https://github.com/castlabs/electron-releases/releases/download/v
|
||||
snap:
|
||||
plugs:
|
||||
- default
|
||||
- screen-inhibit-control
|
||||
linux:
|
||||
category: Audio
|
||||
target:
|
||||
- dir
|
||||
executableName: tidal-hifi
|
||||
desktop:
|
||||
Encoding: UTF-8
|
||||
Name: tidal-hifi
|
||||
GenericName: tidal-hifi
|
||||
Comment: The web version of listen.tidal.com running in electron with hifi support thanks to widevine.
|
||||
Icon: icon.png
|
||||
StartupNotify: true
|
||||
Terminal: false
|
||||
Type: Application
|
||||
Categories: Network;Application;AudioVideo;Audio;Video
|
||||
StartupWMClass: tidal-hifi
|
||||
X-PulseAudio-Properties: media.role=music
|
||||
MimeType: x-scheme-handler/tidal;
|
||||
|
||||
mac:
|
||||
category: public.app-category.entertainment
|
||||
win:
|
||||
icon: icon.png
|
||||
artifactName: "tidalhifi"
|
||||
appId: com.rickvanlieshout.tidalhifi
|
||||
executableName: tidalhifi
|
||||
protocols:
|
||||
name: "tidal"
|
||||
role: "Viewer"
|
||||
schemes: ["tidal"]
|
||||
@@ -1,6 +1,6 @@
|
||||
extends: ./build/electron-builder.yml
|
||||
extends: ./build/electron-builder.base.yml
|
||||
linux:
|
||||
category: Audio
|
||||
icon: ./assets/icon.png
|
||||
icon: icon.png
|
||||
target:
|
||||
- deb
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
extends: ./build/electron-builder.yml
|
||||
extends: ./build/electron-builder.base.yml
|
||||
linux:
|
||||
category: Audio
|
||||
icon: ./assets/icon.png
|
||||
icon: icon.png
|
||||
target:
|
||||
- pacman
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
extends: ./build/electron-builder.yml
|
||||
extends: ./build/electron-builder.base.yml
|
||||
linux:
|
||||
category: Audio
|
||||
icon: ./assets/TIDAL.icns
|
||||
target:
|
||||
- rpm
|
||||
category: Audio
|
||||
icon: icon.png
|
||||
target:
|
||||
- rpm
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
extends: ./build/electron-builder.yml
|
||||
extends: ./build/electron-builder.base.yml
|
||||
linux:
|
||||
category: Audio
|
||||
icon: ./assets/icon.png
|
||||
icon: icon.png
|
||||
target:
|
||||
- snap
|
||||
|
||||
4
build/electron-builder.unpacked.yml
Normal file
4
build/electron-builder.unpacked.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
extends: ./build/electron-builder.base.yml
|
||||
linux:
|
||||
target:
|
||||
- dir
|
||||
@@ -1,12 +1,7 @@
|
||||
appId: com.rickvanlieshout.tidal-hifi
|
||||
electronVersion: 8.5.2
|
||||
electronVersion: 19.0.5
|
||||
electronDownload:
|
||||
version: 8.5.2-wvvmp
|
||||
version: 19.0.5+wvcus
|
||||
mirror: https://github.com/castlabs/electron-releases/releases/download/v
|
||||
snap:
|
||||
plugs:
|
||||
- default
|
||||
- screen-inhibit-control
|
||||
linux:
|
||||
category: Audio
|
||||
target:
|
||||
@@ -17,24 +12,9 @@ linux:
|
||||
- AppImage
|
||||
- snap
|
||||
- freebsd
|
||||
executableName: tidal-hifi
|
||||
desktop:
|
||||
Encoding: UTF-8
|
||||
Name: tidal-hifi
|
||||
GenericName: tidal-hifi
|
||||
Comment: The web version of listen.tidal.com running in electron with hifi support thanks to widevine.
|
||||
Icon: assets/icon.png
|
||||
StartupNotify: true
|
||||
Terminal: false
|
||||
Type: Application
|
||||
Categories: Network;Application;Audio;Video
|
||||
StartupWMClass: tidal-hifi
|
||||
X-PulseAudio-Properties: media.role=music
|
||||
mac:
|
||||
category: public.app-category.entertainment
|
||||
win:
|
||||
target: msi
|
||||
icon: build/icon.png
|
||||
icon: icon.png
|
||||
artifactName: "tidalhifi"
|
||||
appId: com.rickvanlieshout.tidalhifi
|
||||
executableName: tidalhifi
|
||||
|
||||
BIN
build/icon-inverted.png
Normal file
BIN
build/icon-inverted.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 102 KiB |
BIN
build/icon.icns
Executable file
BIN
build/icon.icns
Executable file
Binary file not shown.
11
docs/muting-artists.md
Normal file
11
docs/muting-artists.md
Normal file
@@ -0,0 +1,11 @@
|
||||
# Muting artists
|
||||
|
||||
If you feel that some of your music is embarrassing for others you can mute specific artists in the settings window.
|
||||
This functionality is inspired by the [adblock ticket](https://github.com/Mastermindzh/tidal-hifi/issues/112), and whilst I personally feel you should simply buy Tidal, I also believe in muting sound that you don't want to hear.
|
||||
|
||||
Anyway, to block an artist, open the settings window (see image below) and enter a list of artists in the textarea as seen below.
|
||||
Don't forget to turn the feature on and Tidal-hifi will automatically mute the player whenever that artist is playing.
|
||||
|
||||
This will allow you to skip the song without anyone noticing. (you can always say "no idea, it seems to have no audio").
|
||||
|
||||
|
||||
BIN
docs/settings-muted-artists.png
Normal file
BIN
docs/settings-muted-artists.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 103 KiB |
3810
package-lock.json
generated
3810
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
20
package.json
20
package.json
@@ -1,17 +1,19 @@
|
||||
{
|
||||
"name": "tidal-hifi",
|
||||
"version": "2.7.0",
|
||||
"version": "4.1.0",
|
||||
"description": "Tidal on Electron with widevine(hifi) support",
|
||||
"main": "src/main.js",
|
||||
"scripts": {
|
||||
"start": "electron .",
|
||||
"build": "electron-builder --publish=never -c ./build/electron-builder.yml",
|
||||
"build-deb": "electron-builder --publish=never -c ./build/electron-builder.deb.yml",
|
||||
"build-unpacked": "electron-builder --publish=never -c ./build/electron-builder.unpacked.yml",
|
||||
"build-rpm": "electron-builder --publish=never -c ./build/electron-builder.rpm.yml",
|
||||
"build-snap": "electron-builder --publish=never -c ./build/electron-builder.snap.yml",
|
||||
"build-arch": "electron-builder --publish=never -c ./build/electron-builder.pacman.yml",
|
||||
"build-wl": "electron-builder --publish=never -c ./build/electron-builder.yml -wl",
|
||||
"build-mac": "electron-builder --publish=never -c ./build/electron-builder.yml -m"
|
||||
"build-mac": "electron-builder --publish=never -c ./build/electron-builder.yml -m",
|
||||
"build-base": "electron-builder --publish=never -c ./build/electron-builder.base.yml"
|
||||
},
|
||||
"keywords": [
|
||||
"electron",
|
||||
@@ -23,19 +25,19 @@
|
||||
"homepage": "https://github.com/Mastermindzh/tidal-hifi",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@electron/remote": "^2.0.8",
|
||||
"discord-rpc": "^4.0.1",
|
||||
"electron-store": "^8.0.1",
|
||||
"express": "^4.17.1",
|
||||
"hotkeys-js": "^3.8.7",
|
||||
"electron-store": "^8.1.0",
|
||||
"express": "^4.18.1",
|
||||
"hotkeys-js": "^3.9.4",
|
||||
"mpris-service": "^2.1.2",
|
||||
"request": "^2.88.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@mastermindzh/prettier-config": "^1.0.0",
|
||||
"electron": "git+https://github.com/castlabs/electron-releases.git#v16.0.4+wvcus",
|
||||
"electron-builder": "^22.14.5",
|
||||
"electron-reload": "^1.5.0",
|
||||
"prettier": "^2.5.0"
|
||||
"electron": "git+https://github.com/castlabs/electron-releases.git#v19.0.5+wvcus",
|
||||
"electron-builder": "^23.3.3",
|
||||
"prettier": "^2.7.1"
|
||||
},
|
||||
"prettier": "@mastermindzh/prettier-config"
|
||||
}
|
||||
|
||||
6
src/constants/flags.js
Normal file
6
src/constants/flags.js
Normal file
@@ -0,0 +1,6 @@
|
||||
const flags = {
|
||||
gpuRasterization: [{ flag: "enable-gpu-rasterization", value: undefined }],
|
||||
disableHardwareMediaKeys: [{ flag: "disable-features", value: "HardwareMediaKeyHandling" }],
|
||||
};
|
||||
|
||||
module.exports = flags;
|
||||
@@ -6,6 +6,7 @@ const globalEvents = {
|
||||
previous: "previous",
|
||||
updateInfo: "update-info",
|
||||
hideSettings: "hideSettings",
|
||||
refreshMenuBar: "refreshMenubar",
|
||||
showSettings: "showSettings",
|
||||
storeChanged: "storeChanged",
|
||||
error: "error",
|
||||
|
||||
@@ -13,10 +13,18 @@ const settings = {
|
||||
api: "api",
|
||||
menuBar: "menuBar",
|
||||
playBackControl: "playBackControl",
|
||||
muteArtists: "muteArtists",
|
||||
mutedArtists: "mutedArtists",
|
||||
apiSettings: {
|
||||
root: "apiSettings",
|
||||
port: "apiSettings.port",
|
||||
},
|
||||
singleInstance: "singleInstance",
|
||||
disableHardwareMediaKeys: "disableHardwareMediaKeys",
|
||||
flags: {
|
||||
disableHardwareMediaKeys: "flags.disableHardwareMediaKeys",
|
||||
gpuRasterization: "flags.gpuRasterization",
|
||||
},
|
||||
mpris: "mpris",
|
||||
enableCustomHotkeys: "enableCustomHotkeys",
|
||||
trayIcon: "trayIcon",
|
||||
|
||||
3
src/constants/values.js
Normal file
3
src/constants/values.js
Normal file
@@ -0,0 +1,3 @@
|
||||
module.exports = {
|
||||
name: "tidal-hifi",
|
||||
};
|
||||
109
src/main.js
109
src/main.js
@@ -1,4 +1,5 @@
|
||||
const { app, BrowserWindow, globalShortcut, ipcMain } = require("electron");
|
||||
require("@electron/remote/main").initialize();
|
||||
const { app, BrowserWindow, components, globalShortcut, ipcMain, protocol } = require("electron");
|
||||
const {
|
||||
settings,
|
||||
store,
|
||||
@@ -16,17 +17,56 @@ const mediaKeys = require("./constants/mediaKeys");
|
||||
const mediaInfoModule = require("./scripts/mediaInfo");
|
||||
const discordModule = require("./scripts/discord");
|
||||
const globalEvents = require("./constants/globalEvents");
|
||||
const flagValues = require("./constants/flags");
|
||||
|
||||
let mainWindow;
|
||||
let icon = path.join(__dirname, "../assets/icon.png");
|
||||
const PROTOCOL_PREFIX = "tidal";
|
||||
|
||||
setFlags();
|
||||
|
||||
function setFlags() {
|
||||
const flags = store.get().flags;
|
||||
if (flags) {
|
||||
for (const [key, value] of Object.entries(flags)) {
|
||||
if (value) {
|
||||
flagValues[key].forEach((flag) => {
|
||||
console.log(`enabling command line switch ${flag.flag} with value ${flag.value}`);
|
||||
app.commandLine.appendSwitch(flag.flag, flag.value);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Fix Display Compositor issue.
|
||||
*/
|
||||
app.commandLine.appendSwitch("disable-seccomp-filter-sandbox");
|
||||
}
|
||||
|
||||
/**
|
||||
* Enable live reload in development builds
|
||||
* Update the menuBarVisbility according to the store value
|
||||
*
|
||||
*/
|
||||
if (!app.isPackaged) {
|
||||
require("electron-reload")(`${__dirname}`, {
|
||||
electron: require(`${__dirname}/../node_modules/electron`),
|
||||
});
|
||||
function syncMenuBarWithStore() {
|
||||
mainWindow.setMenuBarVisibility(store.get(settings.menuBar));
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine whether the current window is the main window
|
||||
* if singleInstance is requested.
|
||||
* If singleInstance isn't requested simply return true
|
||||
* @returns true if singInstance is not requested, otherwise true/false based on whether the current window is the main window
|
||||
*/
|
||||
function isMainInstanceOrMultipleInstancesAllowed() {
|
||||
if (store.get(settings.singleInstance)) {
|
||||
const gotTheLock = app.requestSingleInstanceLock();
|
||||
|
||||
if (!gotTheLock) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function createWindow(options = {}) {
|
||||
@@ -37,18 +77,16 @@ function createWindow(options = {}) {
|
||||
width: store && store.get(settings.windowBounds.width),
|
||||
height: store && store.get(settings.windowBounds.height),
|
||||
icon,
|
||||
tray: true,
|
||||
backgroundColor: options.backgroundColor,
|
||||
webPreferences: {
|
||||
affinity: "window",
|
||||
preload: path.join(__dirname, "preload.js"),
|
||||
plugins: true,
|
||||
devTools: true, // I like tinkering, others might too
|
||||
enableRemoteModule: true,
|
||||
},
|
||||
});
|
||||
|
||||
mainWindow.setMenuBarVisibility(store.get(settings.menuBar));
|
||||
require("@electron/remote/main").enable(mainWindow.webContents);
|
||||
registerHttpProtocols();
|
||||
syncMenuBarWithStore();
|
||||
|
||||
// load the Tidal website
|
||||
mainWindow.loadURL(tidalUrl);
|
||||
@@ -76,6 +114,13 @@ function createWindow(options = {}) {
|
||||
});
|
||||
}
|
||||
|
||||
function registerHttpProtocols() {
|
||||
protocol.registerHttpProtocol(PROTOCOL_PREFIX, (request, _callback) => {
|
||||
mainWindow.loadURL(`${tidalUrl}/${request.url.substring(PROTOCOL_PREFIX.length + 3)}`);
|
||||
});
|
||||
app.setAsDefaultProtocolClient(PROTOCOL_PREFIX);
|
||||
}
|
||||
|
||||
function addGlobalShortcuts() {
|
||||
Object.keys(mediaKeys).forEach((key) => {
|
||||
globalShortcut.register(`${key}`, () => {
|
||||
@@ -87,14 +132,20 @@ function addGlobalShortcuts() {
|
||||
// This method will be called when Electron has finished
|
||||
// initialization and is ready to create browser windows.
|
||||
// Some APIs can only be used after this event occurs.
|
||||
app.on("ready", () => {
|
||||
createWindow();
|
||||
addMenu();
|
||||
createSettingsWindow();
|
||||
addGlobalShortcuts();
|
||||
store.get(settings.trayIcon) && addTray({ icon }) && refreshTray();
|
||||
store.get(settings.api) && expressModule.run(mainWindow);
|
||||
store.get(settings.enableDiscord) && discordModule.initRPC();
|
||||
app.on("ready", async () => {
|
||||
if (isMainInstanceOrMultipleInstancesAllowed()) {
|
||||
await components.whenReady();
|
||||
createWindow();
|
||||
addMenu();
|
||||
createSettingsWindow();
|
||||
addGlobalShortcuts();
|
||||
store.get(settings.trayIcon) && addTray(mainWindow, { icon }) && refreshTray();
|
||||
store.get(settings.api) && expressModule.run(mainWindow);
|
||||
store.get(settings.enableDiscord) && discordModule.initRPC();
|
||||
// mainWindow.webContents.openDevTools();
|
||||
} else {
|
||||
app.quit();
|
||||
}
|
||||
});
|
||||
|
||||
app.on("activate", function () {
|
||||
@@ -105,20 +156,28 @@ app.on("activate", function () {
|
||||
}
|
||||
});
|
||||
|
||||
app.on("browser-window-created", (_, window) => {
|
||||
require("@electron/remote/main").enable(window.webContents);
|
||||
});
|
||||
|
||||
// IPC
|
||||
ipcMain.on(globalEvents.updateInfo, (event, arg) => {
|
||||
ipcMain.on(globalEvents.updateInfo, (_event, arg) => {
|
||||
mediaInfoModule.update(arg);
|
||||
});
|
||||
|
||||
ipcMain.on(globalEvents.hideSettings, (event, arg) => {
|
||||
ipcMain.on(globalEvents.hideSettings, (_event, _arg) => {
|
||||
hideSettingsWindow();
|
||||
});
|
||||
ipcMain.on(globalEvents.showSettings, (event, arg) => {
|
||||
ipcMain.on(globalEvents.showSettings, (_event, _arg) => {
|
||||
showSettingsWindow();
|
||||
});
|
||||
|
||||
ipcMain.on(globalEvents.storeChanged, (event, arg) => {
|
||||
mainWindow.setMenuBarVisibility(store.get(settings.menuBar));
|
||||
ipcMain.on(globalEvents.refreshMenuBar, (_event, _arg) => {
|
||||
syncMenuBarWithStore();
|
||||
});
|
||||
|
||||
ipcMain.on(globalEvents.storeChanged, (_event, _arg) => {
|
||||
syncMenuBarWithStore();
|
||||
|
||||
if (store.get(settings.enableDiscord) && !discordModule.rpc) {
|
||||
discordModule.initRPC();
|
||||
@@ -127,6 +186,6 @@ ipcMain.on(globalEvents.storeChanged, (event, arg) => {
|
||||
}
|
||||
});
|
||||
|
||||
ipcMain.on(globalEvents.error, (event, arg) => {
|
||||
ipcMain.on(globalEvents.error, (event, _arg) => {
|
||||
console.log(event);
|
||||
});
|
||||
|
||||
@@ -1,13 +1,24 @@
|
||||
let notifications;
|
||||
let playBackControl;
|
||||
let api;
|
||||
let port;
|
||||
let menuBar;
|
||||
let trayIcon,
|
||||
minimizeOnClose,
|
||||
mpris,
|
||||
enableCustomHotkeys,
|
||||
enableDiscord,
|
||||
muteArtists,
|
||||
notifications,
|
||||
playBackControl,
|
||||
api,
|
||||
port,
|
||||
menuBar,
|
||||
mutedArtists,
|
||||
singleInstance,
|
||||
disableHardwareMediaKeys,
|
||||
gpuRasterization;
|
||||
|
||||
const { store, settings } = require("./../../scripts/settings");
|
||||
const { ipcRenderer } = require("electron");
|
||||
const globalEvents = require("./../../constants/globalEvents");
|
||||
|
||||
const remote = require("@electron/remote");
|
||||
const { app } = remote;
|
||||
/**
|
||||
* Sync the UI forms with the current settings
|
||||
*/
|
||||
@@ -22,31 +33,35 @@ function refreshSettings() {
|
||||
enableCustomHotkeys.checked = store.get(settings.enableCustomHotkeys);
|
||||
enableDiscord.checked = store.get(settings.enableDiscord);
|
||||
minimizeOnClose.checked = store.get(settings.minimizeOnClose);
|
||||
muteArtists.checked = store.get(settings.muteArtists);
|
||||
mutedArtists.value = store.get(settings.mutedArtists).join("\n");
|
||||
singleInstance.checked = store.get(settings.singleInstance);
|
||||
disableHardwareMediaKeys.checked = store.get(settings.flags.disableHardwareMediaKeys);
|
||||
gpuRasterization.checked = store.get(settings.flags.gpuRasterization);
|
||||
}
|
||||
|
||||
/**
|
||||
* Open an url in the default browsers
|
||||
*/
|
||||
window.openExternal = function (url) {
|
||||
function openExternal(url) {
|
||||
const { shell } = require("electron");
|
||||
shell.openExternal(url);
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* hide the settings window
|
||||
*/
|
||||
window.hide = function () {
|
||||
function hide() {
|
||||
ipcRenderer.send(globalEvents.hideSettings);
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Restart tidal-hifi after changes
|
||||
*/
|
||||
window.restart = function () {
|
||||
const remote = require("electron").remote;
|
||||
remote.app.relaunch();
|
||||
remote.app.exit(0);
|
||||
};
|
||||
function restart() {
|
||||
app.relaunch();
|
||||
app.quit();
|
||||
}
|
||||
|
||||
/**
|
||||
* Bind UI components to functions after DOMContentLoaded
|
||||
@@ -56,8 +71,16 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
return document.getElementById(id);
|
||||
}
|
||||
|
||||
document.getElementById("close").addEventListener("click", hide);
|
||||
document.getElementById("restart").addEventListener("click", restart);
|
||||
document.querySelectorAll("#openExternal").forEach((elem) =>
|
||||
elem.addEventListener("click", function (event) {
|
||||
openExternal(event.target.getAttribute("data-url"));
|
||||
})
|
||||
);
|
||||
|
||||
function addInputListener(source, key) {
|
||||
source.addEventListener("input", function (event, data) {
|
||||
source.addEventListener("input", function (_event, _data) {
|
||||
if (this.value === "on") {
|
||||
store.set(key, source.checked);
|
||||
} else {
|
||||
@@ -67,6 +90,13 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
});
|
||||
}
|
||||
|
||||
function addTextAreaListener(source, key) {
|
||||
source.addEventListener("input", function (_event, _data) {
|
||||
store.set(key, source.value.split("\n"));
|
||||
ipcRenderer.send(globalEvents.storeChanged);
|
||||
});
|
||||
}
|
||||
|
||||
ipcRenderer.on("refreshData", () => {
|
||||
refreshSettings();
|
||||
});
|
||||
@@ -85,6 +115,11 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
mpris = get("mprisCheckbox");
|
||||
enableCustomHotkeys = get("enableCustomHotkeys");
|
||||
enableDiscord = get("enableDiscord");
|
||||
muteArtists = get("muteArtists");
|
||||
mutedArtists = get("mutedArtists");
|
||||
singleInstance = get("singleInstance");
|
||||
disableHardwareMediaKeys = get("disableHardwareMediaKeys");
|
||||
gpuRasterization = get("gpuRasterization");
|
||||
|
||||
refreshSettings();
|
||||
|
||||
@@ -98,4 +133,9 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
addInputListener(enableCustomHotkeys, settings.enableCustomHotkeys);
|
||||
addInputListener(enableDiscord, settings.enableDiscord);
|
||||
addInputListener(minimizeOnClose, settings.minimizeOnClose);
|
||||
addInputListener(muteArtists, settings.muteArtists);
|
||||
addTextAreaListener(mutedArtists, settings.mutedArtists);
|
||||
addInputListener(singleInstance, settings.singleInstance);
|
||||
addInputListener(disableHardwareMediaKeys, settings.flags.disableHardwareMediaKeys);
|
||||
addInputListener(gpuRasterization, settings.flags.gpuRasterization);
|
||||
});
|
||||
|
||||
@@ -2,472 +2,557 @@
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
|
||||
<title>Tidal-hifi settings</title>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div class="header">
|
||||
<h1 class="title">Settings</h1>
|
||||
<a href="javascript:hide();" class="exitWindow">
|
||||
<div class="header">
|
||||
<h1 class="title">Settings</h1>
|
||||
<a id="close" style="cursor: pointer;" class="exitWindow">
|
||||
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="18px" height="18px" viewBox="0 0 348.333 348.334">
|
||||
<g>
|
||||
<path fill="white" d="M336.559,68.611L231.016,174.165l105.543,105.549c15.699,15.705,15.699,41.145,0,56.85
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="18px" height="18px" viewBox="0 0 348.333 348.334">
|
||||
<g>
|
||||
<path fill="white" d="M336.559,68.611L231.016,174.165l105.543,105.549c15.699,15.705,15.699,41.145,0,56.85
|
||||
c-7.844,7.844-18.128,11.769-28.407,11.769c-10.296,0-20.581-3.919-28.419-11.769L174.167,231.003L68.609,336.563
|
||||
c-7.843,7.844-18.128,11.769-28.416,11.769c-10.285,0-20.563-3.919-28.413-11.769c-15.699-15.698-15.699-41.139,0-56.85
|
||||
l105.54-105.549L11.774,68.611c-15.699-15.699-15.699-41.145,0-56.844c15.696-15.687,41.127-15.687,56.829,0l105.563,105.554
|
||||
L279.721,11.767c15.705-15.687,41.139-15.687,56.832,0C352.258,27.466,352.258,52.912,336.559,68.611z" />
|
||||
</svg>
|
||||
</svg>
|
||||
|
||||
</a>
|
||||
</div>
|
||||
<div class="body">
|
||||
<div class="tabset">
|
||||
<!-- Tab 1 -->
|
||||
<input type="radio" name="tabset" id="general" checked />
|
||||
<label for="general">General</label>
|
||||
<!-- Tab 2 -->
|
||||
<input type="radio" name="tabset" id="api" />
|
||||
<label for="api">Api</label>
|
||||
</a>
|
||||
</div>
|
||||
<div class="body">
|
||||
<div class="tabset">
|
||||
|
||||
<!-- Integrations tab -->
|
||||
<input type="radio" name="tabset" id="integrations" />
|
||||
<label for="integrations">Integrations</label>
|
||||
<input type="radio" name="tabset" id="general" checked />
|
||||
<label for="general">General</label>
|
||||
|
||||
<!-- about tab -->
|
||||
<input type="radio" name="tabset" id="about" />
|
||||
<label for="about">About</label>
|
||||
<input type="radio" name="tabset" id="api" />
|
||||
<label for="api">Api</label>
|
||||
|
||||
<div class="tab-panels">
|
||||
<section id="general" class="tab-panel">
|
||||
<div class="section">
|
||||
<h3>Playback</h3>
|
||||
<div class="option">
|
||||
<h4>Notifications</h4>
|
||||
<p>
|
||||
Whether to show a notification when a new song starts.
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="notifications" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="section">
|
||||
<h3>UI</h3>
|
||||
<div class="option">
|
||||
<h4>Menubar</h4>
|
||||
<p>
|
||||
Show Tidal-hifi's menu bar
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="menuBar" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="section">
|
||||
<h3>System</h3>
|
||||
<div class="option">
|
||||
<h4>Tray icon</h4>
|
||||
<p>
|
||||
Show Tidal-hifi's tray icon<br />
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="trayIcon" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="option">
|
||||
<h4>Minimize on Close</h4>
|
||||
<p>
|
||||
Minimize window on close instead <br />
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="minimizeOnClose" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="option">
|
||||
<h4>Hotkeys</h4>
|
||||
<p>
|
||||
Enables extra hotkeys to achieve feature parity with the <a href = "javascript:openExternal('https://defkey.com/tidal-desktop-shortcuts')">desktop apps</a><br />
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="enableCustomHotkeys" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<section id="api" class="tab-panel">
|
||||
<div class="section">
|
||||
<h3>Api</h3>
|
||||
<p style="margin-bottom: 15px;">
|
||||
Tidal-hifi has a web api built in to allow users to get current song information. You can optionally enable playback control as well.
|
||||
</p>
|
||||
<!-- Integrations tab -->
|
||||
<input type="radio" name="tabset" id="integrations" />
|
||||
<label for="integrations">Integrations</label>
|
||||
|
||||
<div class="option">
|
||||
<h4>Web API</h4>
|
||||
<p>
|
||||
Whether to enable the Tidal-hifi web api
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="apiCheckbox" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="option">
|
||||
<h4 style="margin-bottom: 5px;">API port</h4>
|
||||
<input id="port" type="text" class="freeTextInput" name="port">
|
||||
</div>
|
||||
<div class="option">
|
||||
<h4>Playback control</h4>
|
||||
<p>
|
||||
Whether to enable playback control from the api
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="playBackControl" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<section id="integrations" class="tab-panel">
|
||||
<div class="section">
|
||||
<h3>integrations</h3>
|
||||
<p style="margin-bottom: 15px;">
|
||||
Tidal-hifi is extensible trough the use of integrations. You can enable or disable integrations here
|
||||
</p>
|
||||
<div class="option">
|
||||
<h4>mpris-player</h4>
|
||||
<p>
|
||||
Whether to enable the mpris media player controls for Linux systems
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="mprisCheckbox" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="option">
|
||||
<h4>Discord RPC</h4>
|
||||
<p>
|
||||
Show what you're listening to on Discord
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="enableDiscord" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<section id="about" class="tab-panel">
|
||||
<div class="section">
|
||||
<img style="width: 100px; height: auto; display: block; margin: 0 auto; margin-bottom: 20px; margin-top: 20px;" src = "./icon.png">
|
||||
<p style="max-width: 350px; display:block; margin: 0 auto; text-align: center;">
|
||||
<a href ="javascript:openExternal('https://github.com/Mastermindzh/tidal-hifi');">Tidal-hifi</a> is made by <a href ="javascript:openExternal('https://www.rickvanlieshout.com')">Rick van Lieshout</a>.<br />
|
||||
It uses <a href="javascript:openExternal('https://castlabs.com/');">castlabs</a> versions of Electron for widevine support.
|
||||
</p>
|
||||
<!-- advanced tab -->
|
||||
<input type="radio" name="tabset" id="advanced" />
|
||||
<label for="advanced">Advanced</label>
|
||||
<!-- about tab -->
|
||||
<input type="radio" name="tabset" id="about" />
|
||||
<label for="about">About</label>
|
||||
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<small>Some settings require a restart of Tidal-hifi. To do so click the button below:</small>
|
||||
<button onClick="restart()" style ="width: 100%">Restart Tidal-hifi</button>
|
||||
<div class="tab-panels">
|
||||
<section id="general" class="tab-panel">
|
||||
<div class="section">
|
||||
<h3>Playback</h3>
|
||||
<div class="option">
|
||||
<h4>Notifications</h4>
|
||||
<p>
|
||||
Whether to show a notification when a new song starts.
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="notifications" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="option">
|
||||
<h4>Mute Artists automatically</h4>
|
||||
<p>
|
||||
The following list of artists (1 per line) will be muted automatically.
|
||||
</p>
|
||||
<label class="switch" style="margin-bottom:10px">
|
||||
<input id="muteArtists" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
<textarea id="mutedArtists" cols="40" rows="5"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="section">
|
||||
<h3>UI</h3>
|
||||
<div class="option">
|
||||
<h4>Menubar</h4>
|
||||
<p>
|
||||
Show Tidal-hifi's menu bar
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="menuBar" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="section">
|
||||
<h3>System</h3>
|
||||
<div class="option">
|
||||
<h4>Tray icon</h4>
|
||||
<p>
|
||||
Show Tidal-hifi's tray icon<br />
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="trayIcon" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="option">
|
||||
<h4>Minimize on Close</h4>
|
||||
<p>
|
||||
Minimize window on close instead <br />
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="minimizeOnClose" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="option">
|
||||
<h4>Hotkeys</h4>
|
||||
<p>
|
||||
Enables extra hotkeys to achieve feature parity with the <a id="openExternal"
|
||||
style="text-decoration: underline; cursor: pointer;"
|
||||
data-url="https://defkey.com/tidal-desktop-shortcuts">desktop apps</a><br />
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="enableCustomHotkeys" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="option">
|
||||
<h4>Single instance</h4>
|
||||
<p>
|
||||
Prevent opening multiple tidal-hifi instances
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="singleInstance" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<section id="api" class="tab-panel">
|
||||
<div class="section">
|
||||
<h3>Api</h3>
|
||||
<p style="margin-bottom: 15px;">
|
||||
Tidal-hifi has a web api built in to allow users to get current song information. You can optionally
|
||||
enable playback control as well.
|
||||
</p>
|
||||
|
||||
<div class="option">
|
||||
<h4>Web API</h4>
|
||||
<p>
|
||||
Whether to enable the Tidal-hifi web api
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="apiCheckbox" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="option">
|
||||
<h4 style="margin-bottom: 5px;">API port</h4>
|
||||
<input id="port" type="text" class="freeTextInput" name="port">
|
||||
</div>
|
||||
<div class="option">
|
||||
<h4>Playback control</h4>
|
||||
<p>
|
||||
Whether to enable playback control from the api
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="playBackControl" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<section id="integrations" class="tab-panel">
|
||||
<div class="section">
|
||||
<h3>integrations</h3>
|
||||
<p style="margin-bottom: 15px;">
|
||||
Tidal-hifi is extensible through the use of integrations. You can enable or disable integrations here
|
||||
</p>
|
||||
<div class="option">
|
||||
<h4>MPRIS-player</h4>
|
||||
<p>
|
||||
Whether to enable the MPRIS media player controls for Linux systems
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="mprisCheckbox" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="option">
|
||||
<h4>Discord RPC</h4>
|
||||
<p>
|
||||
Show what you're listening to on Discord
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="enableDiscord" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<section id="advanced" class="tab-panel">
|
||||
<div class="section">
|
||||
<h3>Flags</h3>
|
||||
<div class="option">
|
||||
<h4>Disable hardware media keys</h4>
|
||||
<p>
|
||||
Disable built-in media keys. <br />
|
||||
Also prevents certain desktop environments from recognizing the chrome MPRIS client separetely from the
|
||||
custom MPRIS client.
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="disableHardwareMediaKeys" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="option">
|
||||
<h4>Enable GPU rasterization</h4>
|
||||
<p>
|
||||
Move a part of the rendering to the GPU for increased performance.
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="gpuRasterization" type="checkbox">
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<section id="about" class="tab-panel">
|
||||
<div class="section">
|
||||
<img alt="tidal icon"
|
||||
style="width: 100px; height: auto; display: block; margin: 0 auto; margin-bottom: 20px; margin-top: 20px;"
|
||||
src="./icon.png">
|
||||
<p style="max-width: 350px; display:block; margin: 0 auto; text-align: center;">
|
||||
<a id="openExternal" style="text-decoration: underline; cursor: pointer;"
|
||||
data-url="https://github.com/Mastermindzh/tidal-hifi">Tidal-hifi</a> is made by <a id="openExternal"
|
||||
data-url="https://www.rickvanlieshout.com" style="text-decoration: underline; cursor: pointer;">Rick van
|
||||
Lieshout</a>.<br />
|
||||
It uses <a style="text-decoration: underline; cursor: pointer;" id="openExternal"
|
||||
data-url="https://castlabs.com/">Castlabs'</a> versions of Electron for widevine support.
|
||||
</p>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<small>Some settings require a restart of Tidal-hifi. To do so, click the button below:</small>
|
||||
<button id="restart" style="width: 100%">Restart Tidal-hifi</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
<style>
|
||||
.header {
|
||||
-webkit-user-select: none;
|
||||
-webkit-app-region: drag;
|
||||
}
|
||||
.header a {
|
||||
-webkit-app-region: no-drag;
|
||||
}
|
||||
.header {
|
||||
-webkit-user-select: none;
|
||||
-webkit-app-region: drag;
|
||||
}
|
||||
|
||||
* {
|
||||
margin: 0%;
|
||||
padding: 0%;
|
||||
color: #ffffff;
|
||||
font-weight: 400;
|
||||
font-stretch: normal;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
font-family: nationale, nationale-regular, Helvetica, sans-serif;
|
||||
}
|
||||
.header a {
|
||||
-webkit-app-region: no-drag;
|
||||
}
|
||||
|
||||
html,
|
||||
body {
|
||||
height: 100%;
|
||||
background-color: black;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
* {
|
||||
margin: 0%;
|
||||
padding: 0%;
|
||||
color: #ffffff;
|
||||
font-weight: 400;
|
||||
font-stretch: normal;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
font-family: nationale, nationale-regular, Helvetica, sans-serif;
|
||||
}
|
||||
|
||||
h2 {
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
html,
|
||||
body {
|
||||
height: 100%;
|
||||
background-color: black;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
small {
|
||||
font-style: italic;
|
||||
color: #72777f;
|
||||
}
|
||||
h2 {
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
|
||||
.header {
|
||||
background-color: #242528;
|
||||
border-bottom: 1px solid #5a5a5a;
|
||||
height: 50px;
|
||||
}
|
||||
small {
|
||||
font-style: italic;
|
||||
color: #72777f;
|
||||
}
|
||||
|
||||
.title {
|
||||
float: left;
|
||||
line-height: 50px;
|
||||
margin-left: 15px;
|
||||
}
|
||||
.header {
|
||||
background-color: #242528;
|
||||
border-bottom: 1px solid #5a5a5a;
|
||||
height: 50px;
|
||||
}
|
||||
|
||||
.accent {
|
||||
color: #0ff;
|
||||
}
|
||||
.title {
|
||||
float: left;
|
||||
line-height: 50px;
|
||||
margin-left: 15px;
|
||||
}
|
||||
|
||||
.exitWindow {
|
||||
border: none;
|
||||
outline: none;
|
||||
text-decoration: none;
|
||||
font-size: 1.4rem;
|
||||
float: right;
|
||||
margin-right: 15px;
|
||||
height: 50px;
|
||||
line-height: 50px;
|
||||
}
|
||||
.accent {
|
||||
color: #0ff;
|
||||
}
|
||||
|
||||
.exitWindow:focus {
|
||||
border: none;
|
||||
outline: none;
|
||||
}
|
||||
.exitWindow {
|
||||
border: none;
|
||||
outline: none;
|
||||
text-decoration: none;
|
||||
font-size: 1.4rem;
|
||||
float: right;
|
||||
margin-right: 15px;
|
||||
height: 50px;
|
||||
line-height: 50px;
|
||||
}
|
||||
|
||||
.exitWindow svg {
|
||||
height: 50px;
|
||||
color: white;
|
||||
}
|
||||
.exitWindow:focus {
|
||||
border: none;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.section {
|
||||
padding-top: 10px;
|
||||
padding-bottom: 10px;
|
||||
border-bottom: 1px solid rgba(246, 245, 255, .1);
|
||||
}
|
||||
.exitWindow svg {
|
||||
height: 50px;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.section .option {
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
.section {
|
||||
padding-top: 10px;
|
||||
padding-bottom: 10px;
|
||||
border-bottom: 1px solid rgba(246, 245, 255, .1);
|
||||
}
|
||||
|
||||
.section .option p {
|
||||
max-width: 75%;
|
||||
float: left
|
||||
}
|
||||
.section .option {
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.section .option label {
|
||||
float: right;
|
||||
}
|
||||
.section .option p {
|
||||
max-width: 75%;
|
||||
float: left
|
||||
}
|
||||
|
||||
.section:after,
|
||||
.section .option:after {
|
||||
content: "";
|
||||
display: table;
|
||||
clear: both;
|
||||
}
|
||||
.section .option label {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.section h3 {
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
.section:after,
|
||||
.section .option:after {
|
||||
content: "";
|
||||
display: table;
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.section h4 {
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
.section h3 {
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.section p {
|
||||
color: #72777f;
|
||||
}
|
||||
.section h4 {
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
.bottom-border {
|
||||
border-bottom: 1px solid #0ff;
|
||||
}
|
||||
.section p {
|
||||
color: #72777f;
|
||||
}
|
||||
|
||||
.body {
|
||||
padding: 15px;
|
||||
flex: 1 1 auto;
|
||||
position: relative;
|
||||
overflow-y: auto;
|
||||
}
|
||||
.bottom-border {
|
||||
border-bottom: 1px solid #0ff;
|
||||
}
|
||||
|
||||
.body::-webkit-scrollbar-track {
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
|
||||
box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
|
||||
border-radius: 5px;
|
||||
background-color: 2a2a2a;
|
||||
}
|
||||
.body {
|
||||
padding: 15px;
|
||||
flex: 1 1 auto;
|
||||
position: relative;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.body::-webkit-scrollbar {
|
||||
width: 10px;
|
||||
background-color: #2a2a2a;
|
||||
}
|
||||
.body::-webkit-scrollbar-track {
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
|
||||
box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
|
||||
border-radius: 5px;
|
||||
background-color: 2a2a2a;
|
||||
}
|
||||
|
||||
.body::-webkit-scrollbar-thumb {
|
||||
border-radius: 10px;
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
|
||||
box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
|
||||
background-color: #5a5a5a;
|
||||
}
|
||||
/* Tabs */
|
||||
.body::-webkit-scrollbar {
|
||||
width: 10px;
|
||||
background-color: #2a2a2a;
|
||||
}
|
||||
|
||||
.tabset > input[type="radio"] {
|
||||
position: absolute;
|
||||
left: -200vw;
|
||||
}
|
||||
.body::-webkit-scrollbar-thumb {
|
||||
border-radius: 10px;
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
|
||||
box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
|
||||
background-color: #5a5a5a;
|
||||
}
|
||||
|
||||
.tabset .tab-panel {
|
||||
display: none;
|
||||
}
|
||||
/* Tabs */
|
||||
|
||||
.tabset > input:first-child:checked ~ .tab-panels > .tab-panel:first-child,
|
||||
.tabset > input:nth-child(3):checked ~ .tab-panels > .tab-panel:nth-child(2),
|
||||
.tabset > input:nth-child(5):checked ~ .tab-panels > .tab-panel:nth-child(3),
|
||||
.tabset > input:nth-child(7):checked ~ .tab-panels > .tab-panel:nth-child(4)
|
||||
{
|
||||
display: block;
|
||||
}
|
||||
.tabset>input[type="radio"] {
|
||||
position: absolute;
|
||||
left: -200vw;
|
||||
}
|
||||
|
||||
.tabset > label {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
padding: 15px 0px 10px;
|
||||
border-bottom: 0;
|
||||
cursor: pointer;
|
||||
}
|
||||
.tabset .tab-panel {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.tabset > input + label {
|
||||
color: #e0e0e0;
|
||||
margin-right: 30px;
|
||||
}
|
||||
.tabset>input:first-child:checked~.tab-panels>.tab-panel:first-child,
|
||||
.tabset>input:nth-child(3):checked~.tab-panels>.tab-panel:nth-child(2),
|
||||
.tabset>input:nth-child(5):checked~.tab-panels>.tab-panel:nth-child(3),
|
||||
.tabset>input:nth-child(7):checked~.tab-panels>.tab-panel:nth-child(4),
|
||||
.tabset>input:nth-child(9):checked~.tab-panels>.tab-panel:nth-child(5) {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.tabset > input:checked + label {
|
||||
color: #0ff;
|
||||
border-bottom: 2px solid #0ff;
|
||||
}
|
||||
.tabset>label {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
padding: 15px 0px 10px;
|
||||
border-bottom: 0;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.tab-panel {
|
||||
padding: 10px 0;
|
||||
}
|
||||
/* switches */
|
||||
/* The switch - the box around the slider */
|
||||
.tabset>input+label {
|
||||
color: #e0e0e0;
|
||||
margin-right: 30px;
|
||||
}
|
||||
|
||||
.switch {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
width: 50px;
|
||||
height: 28px;
|
||||
}
|
||||
/* Hide default HTML checkbox */
|
||||
.tabset>input:checked+label {
|
||||
color: #0ff;
|
||||
border-bottom: 2px solid #0ff;
|
||||
}
|
||||
|
||||
.switch input {
|
||||
opacity: 0;
|
||||
width: 0;
|
||||
height: 0;
|
||||
}
|
||||
/* The slider */
|
||||
.tab-panel {
|
||||
padding: 10px 0;
|
||||
}
|
||||
|
||||
.slider {
|
||||
position: absolute;
|
||||
cursor: pointer;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background-color: rgba(246, 245, 255, .1);
|
||||
-webkit-transition: .4s;
|
||||
transition: .4s;
|
||||
}
|
||||
/* switches */
|
||||
/* The switch - the box around the slider */
|
||||
|
||||
.slider:before {
|
||||
position: absolute;
|
||||
content: "";
|
||||
height: 24px;
|
||||
width: 24px;
|
||||
left: 2px;
|
||||
bottom: 2px;
|
||||
background-color: white;
|
||||
-webkit-transition: .4s;
|
||||
transition: .4s;
|
||||
}
|
||||
.switch {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
width: 50px;
|
||||
height: 28px;
|
||||
}
|
||||
|
||||
input:checked + .slider {
|
||||
background-color: #0ff;
|
||||
}
|
||||
/* Hide default HTML checkbox */
|
||||
|
||||
input:focus + .slider {
|
||||
box-shadow: 0 0 1px #0ff;
|
||||
}
|
||||
.switch input {
|
||||
opacity: 0;
|
||||
width: 0;
|
||||
height: 0;
|
||||
}
|
||||
|
||||
input:checked + .slider:before {
|
||||
-webkit-transform: translateX(22px);
|
||||
-ms-transform: translateX(22px);
|
||||
transform: translateX(22px);
|
||||
}
|
||||
/* Rounded sliders */
|
||||
/* The slider */
|
||||
|
||||
.slider.round {
|
||||
border-radius: 34px;
|
||||
}
|
||||
.slider {
|
||||
position: absolute;
|
||||
cursor: pointer;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background-color: rgba(246, 245, 255, .1);
|
||||
-webkit-transition: .4s;
|
||||
transition: .4s;
|
||||
}
|
||||
|
||||
.slider.round:before {
|
||||
border-radius: 50%;
|
||||
}
|
||||
/* input field */
|
||||
.slider:before {
|
||||
position: absolute;
|
||||
content: "";
|
||||
height: 24px;
|
||||
width: 24px;
|
||||
left: 2px;
|
||||
bottom: 2px;
|
||||
background-color: white;
|
||||
-webkit-transition: .4s;
|
||||
transition: .4s;
|
||||
}
|
||||
|
||||
input {
|
||||
background: transparent;
|
||||
border: 0;
|
||||
border-bottom: 1px solid rgba(246, 245, 255, .1);
|
||||
color: rgba(229, 238, 255, .6);
|
||||
width: 100%;
|
||||
display: block;
|
||||
padding: 0 0 12px;
|
||||
}
|
||||
input:checked+.slider {
|
||||
background-color: #0ff;
|
||||
}
|
||||
|
||||
.freeTextInput:focus {
|
||||
outline: none;
|
||||
border-bottom: 1px solid #0ff;
|
||||
}
|
||||
input:focus+.slider {
|
||||
box-shadow: 0 0 1px #0ff;
|
||||
}
|
||||
|
||||
/* buttons */
|
||||
button{
|
||||
border:none;
|
||||
background:none;
|
||||
align-items: center;
|
||||
background-color: rgba(229,238,255,.2);
|
||||
display: inline-flex;
|
||||
justify-content: center;
|
||||
border-radius: 12px;
|
||||
height: 48px;
|
||||
line-height: 49px;
|
||||
padding: 0 24px;
|
||||
text-align: center;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
transition: background .35s ease;
|
||||
min-height: 0;
|
||||
min-width: 0;
|
||||
font-size: 1.14286rem;
|
||||
font-family: nationale,nationale-regular,Helvetica,sans-serif;
|
||||
margin-top: 10px;
|
||||
cursor: pointer;
|
||||
}
|
||||
button:hover{
|
||||
background-color: rgba(229,238,255,.3);
|
||||
}
|
||||
input:checked+.slider:before {
|
||||
-webkit-transform: translateX(22px);
|
||||
-ms-transform: translateX(22px);
|
||||
transform: translateX(22px);
|
||||
}
|
||||
|
||||
/* Rounded sliders */
|
||||
|
||||
.slider.round {
|
||||
border-radius: 34px;
|
||||
}
|
||||
|
||||
.slider.round:before {
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
/* input field */
|
||||
|
||||
input {
|
||||
background: transparent;
|
||||
border: 0;
|
||||
border-bottom: 1px solid rgba(246, 245, 255, .1);
|
||||
color: rgba(229, 238, 255, .6);
|
||||
width: 100%;
|
||||
display: block;
|
||||
padding: 0 0 12px;
|
||||
}
|
||||
|
||||
.freeTextInput:focus {
|
||||
outline: none;
|
||||
border-bottom: 1px solid #0ff;
|
||||
}
|
||||
|
||||
/* buttons */
|
||||
button {
|
||||
border: none;
|
||||
background: none;
|
||||
align-items: center;
|
||||
background-color: rgba(229, 238, 255, .2);
|
||||
display: inline-flex;
|
||||
justify-content: center;
|
||||
border-radius: 12px;
|
||||
height: 48px;
|
||||
line-height: 49px;
|
||||
padding: 0 24px;
|
||||
text-align: center;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
transition: background .35s ease;
|
||||
min-height: 0;
|
||||
min-width: 0;
|
||||
font-size: 1.14286rem;
|
||||
font-family: nationale, nationale-regular, Helvetica, sans-serif;
|
||||
margin-top: 10px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
background-color: rgba(229, 238, 255, .3);
|
||||
}
|
||||
|
||||
textarea {
|
||||
color: #72777f;
|
||||
background: #242528;
|
||||
border: 0;
|
||||
width: 100%;
|
||||
color: rgba(229, 238, 255, .6);
|
||||
padding: 0 0 12px;
|
||||
display: block;
|
||||
}
|
||||
|
||||
textarea:focus {
|
||||
outline: none;
|
||||
border: 0;
|
||||
border-bottom: 1px solid #0ff;
|
||||
}
|
||||
</style>
|
||||
|
||||
</html>
|
||||
|
||||
175
src/preload.js
175
src/preload.js
@@ -1,20 +1,18 @@
|
||||
const { setTitle } = require("./scripts/window-functions");
|
||||
const { dialog, process, Notification } = require("electron").remote;
|
||||
const { dialog, process, Notification } = require("@electron/remote");
|
||||
const { store, settings } = require("./scripts/settings");
|
||||
const { ipcRenderer } = require("electron");
|
||||
const { app } = require("electron").remote;
|
||||
const { app } = require("@electron/remote");
|
||||
const { downloadFile } = require("./scripts/download");
|
||||
const statuses = require("./constants/statuses");
|
||||
const hotkeys = require("./scripts/hotkeys");
|
||||
const globalEvents = require("./constants/globalEvents");
|
||||
const notificationPath = `${app.getPath("userData")}/notification.jpg`;
|
||||
const appName = "Tidal Hifi";
|
||||
let currentSong = "";
|
||||
let player;
|
||||
let currentPlayStatus = statuses.paused;
|
||||
let progressBarTime;
|
||||
let currentTimeChanged = false;
|
||||
let currentTime;
|
||||
let currentURL = undefined;
|
||||
let isMutedArtist = false;
|
||||
|
||||
const elements = {
|
||||
play: '*[data-test="play"]',
|
||||
@@ -35,14 +33,14 @@ const elements = {
|
||||
media: '*[data-test="current-media-imagery"]',
|
||||
image: "img",
|
||||
current: '*[data-test="current-time"]',
|
||||
duration: '*[data-test="duration-time"]',
|
||||
duration: '*[data-test="duration"]',
|
||||
bar: '*[data-test="progress-bar"]',
|
||||
footer: "#footerPlayer",
|
||||
album_header_title: '.header-details [data-test="title"]',
|
||||
playing_title: 'span[data-test="table-cell-title"].css-geqnfr',
|
||||
album_name_cell: '[data-test="table-cell-album"]',
|
||||
tracklist_row: '[data-test="tracklist-row"]',
|
||||
|
||||
volume: '*[data-test="volume"]',
|
||||
/**
|
||||
* Get an element from the dom
|
||||
* @param {*} key key in elements object to fetch
|
||||
@@ -82,17 +80,20 @@ const elements = {
|
||||
|
||||
getAlbumName: function () {
|
||||
//If listening to an album, get its name from the header title
|
||||
if(window.location.href.includes('/album/')) {
|
||||
if (window.location.href.includes("/album/")) {
|
||||
const albumName = window.document.querySelector(this.album_header_title);
|
||||
if(albumName) {
|
||||
if (albumName) {
|
||||
return albumName.textContent;
|
||||
}
|
||||
//If listening to a playlist or a mix, get album name from the list
|
||||
} else if(window.location.href.includes('/playlist/') || window.location.href.includes('/mix/')) {
|
||||
if(currentPlayStatus === statuses.playing) {
|
||||
} else if (
|
||||
window.location.href.includes("/playlist/") ||
|
||||
window.location.href.includes("/mix/")
|
||||
) {
|
||||
if (currentPlayStatus === statuses.playing) {
|
||||
const row = window.document.querySelector(this.playing_title).closest(this.tracklist_row);
|
||||
if(row) {
|
||||
return row.querySelector(this.album_name_cell).textContent;
|
||||
if (row) {
|
||||
return row.querySelector(this.album_name_cell).textContent;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -100,6 +101,10 @@ const elements = {
|
||||
return "";
|
||||
},
|
||||
|
||||
isMuted: function () {
|
||||
return this.get("volume").getAttribute("aria-checked") === "false"; // it's muted if aria-checked is false
|
||||
},
|
||||
|
||||
/**
|
||||
* Shorthand function to get the text of a dom element
|
||||
* @param {*} key key in elements object to fetch
|
||||
@@ -180,6 +185,9 @@ function addHotKeys() {
|
||||
hotkeys.add("control+=", function () {
|
||||
ipcRenderer.send(globalEvents.showSettings);
|
||||
});
|
||||
hotkeys.add("control+0", function () {
|
||||
ipcRenderer.send(globalEvents.showSettings);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -213,13 +221,19 @@ function handleLogout() {
|
||||
);
|
||||
}
|
||||
|
||||
function addFullScreenListeners() {
|
||||
window.document.addEventListener("fullscreenchange", () => {
|
||||
ipcRenderer.send(globalEvents.refreshMenuBar);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Add ipc event listeners.
|
||||
* Some actions triggered outside of the site need info from the site.
|
||||
*/
|
||||
function addIPCEventListeners() {
|
||||
window.addEventListener("DOMContentLoaded", () => {
|
||||
ipcRenderer.on("globalEvent", (event, args) => {
|
||||
ipcRenderer.on("globalEvent", (_event, args) => {
|
||||
switch (args) {
|
||||
case globalEvents.playPause:
|
||||
playPause();
|
||||
@@ -274,8 +288,8 @@ function convertDuration(duration) {
|
||||
function updateMediaInfo(options, notify) {
|
||||
if (options) {
|
||||
ipcRenderer.send(globalEvents.updateInfo, options);
|
||||
if(store.get(settings.notifications) && notify) {
|
||||
new Notification({ title: options.title, body: options.message, icon: options.icon}).show();
|
||||
if (store.get(settings.notifications) && notify) {
|
||||
new Notification({ title: options.title, body: options.message, icon: options.icon }).show();
|
||||
}
|
||||
if (player) {
|
||||
player.metadata = {
|
||||
@@ -295,19 +309,16 @@ function updateMediaInfo(options, notify) {
|
||||
|
||||
/**
|
||||
* Checks if Tidal is playing a video or song by grabbing the "a" element from the title.
|
||||
* If it's a song it sets the track URL as currentURL, If it's a video it will set currentURL to undefined.
|
||||
* If it's a song it returns the track URL, if not it will return undefined
|
||||
*/
|
||||
function updateURL() {
|
||||
function getTrackURL() {
|
||||
const URLelement = elements.get("title").querySelector("a");
|
||||
switch (URLelement) {
|
||||
case null:
|
||||
currentURL = undefined;
|
||||
break;
|
||||
default:
|
||||
const id = URLelement.href.replace(/[^0-9]/g, "");
|
||||
currentURL = `https://tidal.com/browse/track/${id}`;
|
||||
break;
|
||||
if (URLelement !== null) {
|
||||
const id = URLelement.href.replace(/[^0-9]/g, "");
|
||||
return `https://tidal.com/browse/track/${id}`;
|
||||
}
|
||||
|
||||
return window.location;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -319,8 +330,6 @@ setInterval(function () {
|
||||
const album = elements.getAlbumName();
|
||||
const current = elements.getText("current");
|
||||
const duration = elements.getText("duration");
|
||||
const appName = "Tidal Hifi";
|
||||
const progressBarcurrentTime = elements.get("bar").getAttribute("aria-valuenow");
|
||||
const songDashArtistTitle = `${title} - ${artists}`;
|
||||
const currentStatus = getCurrentlyPlayingStatus();
|
||||
const options = {
|
||||
@@ -328,71 +337,66 @@ setInterval(function () {
|
||||
message: artists,
|
||||
album: album,
|
||||
status: currentStatus,
|
||||
url: currentURL,
|
||||
current: current,
|
||||
duration: duration,
|
||||
'app-name': appName,
|
||||
url: getTrackURL(),
|
||||
current,
|
||||
duration,
|
||||
"app-name": appName,
|
||||
};
|
||||
|
||||
const playStatusChanged = currentStatus !== currentPlayStatus;
|
||||
const progressBarTimeChanged = progressBarcurrentTime !== progressBarTime;
|
||||
const titleOrArtistChanged = currentSong !== songDashArtistTitle;
|
||||
|
||||
if (titleOrArtistChanged || playStatusChanged || progressBarTimeChanged || currentTimeChanged) {
|
||||
// update title, url and play info with new info
|
||||
setTitle(songDashArtistTitle);
|
||||
updateURL();
|
||||
currentSong = songDashArtistTitle;
|
||||
currentPlayStatus = currentStatus;
|
||||
muteArtistIfFoundInMutedArtistsList();
|
||||
|
||||
// check progress bar value and make sure current stays up to date after switch
|
||||
if (progressBarTime != progressBarcurrentTime && !titleOrArtistChanged) {
|
||||
progressBarTime = progressBarcurrentTime;
|
||||
currentTime = options.current;
|
||||
options.duration = duration;
|
||||
currentTimeChanged = true;
|
||||
// update title, url and play info with new info
|
||||
setTitle(songDashArtistTitle);
|
||||
getTrackURL();
|
||||
currentSong = songDashArtistTitle;
|
||||
currentPlayStatus = currentStatus;
|
||||
|
||||
const image = elements.getSongIcon();
|
||||
|
||||
new Promise((resolve) => {
|
||||
if (image.startsWith("http")) {
|
||||
options.image = image;
|
||||
downloadFile(image, notificationPath).then(
|
||||
() => {
|
||||
options.icon = notificationPath;
|
||||
resolve();
|
||||
},
|
||||
() => {
|
||||
// if the image can't be downloaded then continue without it
|
||||
resolve();
|
||||
}
|
||||
);
|
||||
} else {
|
||||
// if the image can't be found on the page continue without it
|
||||
resolve();
|
||||
}
|
||||
}).then(
|
||||
() => {
|
||||
updateMediaInfo(options, titleOrArtistChanged);
|
||||
},
|
||||
() => {}
|
||||
);
|
||||
|
||||
if (currentTimeChanged) {
|
||||
if (options.current == currentTime && currentStatus != "paused") return;
|
||||
currentTime = options.current;
|
||||
currentTimeChanged = false;
|
||||
}
|
||||
|
||||
// make sure current is set to 0 if title changes
|
||||
if (titleOrArtistChanged) {
|
||||
options.current = "0:00";
|
||||
currentTime = options.current;
|
||||
progressBarTime = progressBarcurrentTime;
|
||||
}
|
||||
|
||||
const image = elements.getSongIcon();
|
||||
|
||||
new Promise((resolve) => {
|
||||
if (image.startsWith("http")) {
|
||||
options.image = image;
|
||||
downloadFile(image, notificationPath).then(
|
||||
() => {
|
||||
options.icon = notificationPath;
|
||||
resolve();
|
||||
},
|
||||
() => {
|
||||
// if the image can't be downloaded then continue without it
|
||||
resolve();
|
||||
}
|
||||
);
|
||||
} else {
|
||||
// if the image can't be found on the page continue without it
|
||||
resolve();
|
||||
/**
|
||||
* Checks whether the current artist is included in the "muted artists" list and if so it will automatically mute the player
|
||||
*/
|
||||
function muteArtistIfFoundInMutedArtistsList() {
|
||||
if (store.get(settings.muteArtists)) {
|
||||
const mutedArtists = store.get(settings.mutedArtists);
|
||||
if (mutedArtists.find((artist) => artist === artists) !== undefined) {
|
||||
if (!elements.isMuted()) {
|
||||
isMutedArtist = true;
|
||||
elements.click("volume");
|
||||
}
|
||||
} else if (currentStatus === statuses.playing && isMutedArtist && elements.isMuted()) {
|
||||
elements.click("volume");
|
||||
isMutedArtist = false;
|
||||
}
|
||||
}).then(
|
||||
() => {
|
||||
updateMediaInfo(options, titleOrArtistChanged);
|
||||
},
|
||||
() => {}
|
||||
);
|
||||
}
|
||||
}
|
||||
}, 200);
|
||||
}, 1000);
|
||||
|
||||
if (process.platform === "linux" && store.get(settings.mpris)) {
|
||||
try {
|
||||
@@ -452,3 +456,4 @@ if (process.platform === "linux" && store.get(settings.mpris)) {
|
||||
|
||||
addHotKeys();
|
||||
addIPCEventListeners();
|
||||
addFullScreenListeners();
|
||||
|
||||
@@ -32,7 +32,9 @@ const observer = (event, arg) => {
|
||||
startTimestamp: parseInt(now),
|
||||
endTimestamp: parseInt(remaining),
|
||||
largeImageKey: mediaInfoModule.mediaInfo.image,
|
||||
largeImageText: (mediaInfoModule.mediaInfo.album) ? mediaInfoModule.mediaInfo.album : `${idleStatus.largeImageText}`,
|
||||
largeImageText: mediaInfoModule.mediaInfo.album
|
||||
? mediaInfoModule.mediaInfo.album
|
||||
: `${idleStatus.largeImageText}`,
|
||||
buttons: [{ label: "Play on Tidal", url: mediaInfoModule.mediaInfo.url }],
|
||||
},
|
||||
});
|
||||
@@ -62,24 +64,32 @@ const idleStatus = {
|
||||
*/
|
||||
discordModule.initRPC = function () {
|
||||
rpc = new discordrpc.Client({ transport: "ipc" });
|
||||
rpc.login({ clientId }).catch(console.error);
|
||||
discordModule.rpc = rpc;
|
||||
rpc.login({ clientId }).then(
|
||||
() => {
|
||||
discordModule.rpc = rpc;
|
||||
|
||||
rpc.on("ready", () => {
|
||||
rpc.setActivity(idleStatus);
|
||||
});
|
||||
ipcMain.on(globalEvents.updateInfo, observer);
|
||||
rpc.on("ready", () => {
|
||||
rpc.setActivity(idleStatus);
|
||||
});
|
||||
ipcMain.on(globalEvents.updateInfo, observer);
|
||||
},
|
||||
() => {
|
||||
console.error("Can't connect to Discord, is it running?");
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
/**
|
||||
* Remove any RPC connection with discord and remove the event listener on globalEvents.updateInfo
|
||||
*/
|
||||
discordModule.unRPC = function () {
|
||||
rpc.clearActivity();
|
||||
rpc.destroy();
|
||||
rpc = false;
|
||||
discordModule.rpc = rpc;
|
||||
ipcMain.removeListener(globalEvents.updateInfo, observer);
|
||||
if (rpc) {
|
||||
rpc.clearActivity();
|
||||
rpc.destroy();
|
||||
rpc = false;
|
||||
discordModule.rpc = undefined;
|
||||
ipcMain.removeListener(globalEvents.updateInfo, observer);
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = discordModule;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
const { Menu } = require("electron");
|
||||
const { Menu, app } = require("electron");
|
||||
const { showSettingsWindow } = require("./settings");
|
||||
const isMac = process.platform === "darwin";
|
||||
const { name } = require("./../constants/values");
|
||||
|
||||
const settingsMenuEntry = {
|
||||
label: "Settings",
|
||||
@@ -10,93 +11,107 @@ const settingsMenuEntry = {
|
||||
accelerator: "Control+/",
|
||||
};
|
||||
|
||||
const mainMenu = [
|
||||
...(isMac
|
||||
? [
|
||||
{
|
||||
label: app.name,
|
||||
submenu: [
|
||||
{ role: "about" },
|
||||
settingsMenuEntry,
|
||||
{ type: "separator" },
|
||||
{ role: "services" },
|
||||
{ type: "separator" },
|
||||
{ role: "hide" },
|
||||
{ role: "hideothers" },
|
||||
{ role: "unhide" },
|
||||
{ type: "separator" },
|
||||
{ role: "quit" },
|
||||
],
|
||||
},
|
||||
]
|
||||
: []),
|
||||
// { role: 'fileMenu' }
|
||||
{
|
||||
label: "File",
|
||||
submenu: [settingsMenuEntry, isMac ? { role: "close" } : { role: "quit" }],
|
||||
const quitMenuEntry = {
|
||||
label: "Quit",
|
||||
click() {
|
||||
app.exit(0);
|
||||
},
|
||||
// { role: 'editMenu' }
|
||||
{
|
||||
label: "Edit",
|
||||
submenu: [
|
||||
{ role: "undo" },
|
||||
{ role: "redo" },
|
||||
{ type: "separator" },
|
||||
{ role: "cut" },
|
||||
{ role: "copy" },
|
||||
{ role: "paste" },
|
||||
...(isMac
|
||||
? [
|
||||
{ role: "pasteAndMatchStyle" },
|
||||
{ role: "delete" },
|
||||
{ role: "selectAll" },
|
||||
{ type: "separator" },
|
||||
{
|
||||
label: "Speech",
|
||||
submenu: [{ role: "startspeaking" }, { role: "stopspeaking" }],
|
||||
},
|
||||
]
|
||||
: [{ role: "delete" }, { type: "separator" }, { role: "selectAll" }]),
|
||||
{ type: "separator" },
|
||||
settingsMenuEntry,
|
||||
],
|
||||
},
|
||||
// { role: 'viewMenu' }
|
||||
{
|
||||
label: "View",
|
||||
submenu: [
|
||||
{ role: "reload" },
|
||||
{ role: "forcereload" },
|
||||
{ type: "separator" },
|
||||
{ role: "resetzoom" },
|
||||
{ role: "zoomin" },
|
||||
{ role: "zoomout" },
|
||||
{ type: "separator" },
|
||||
{ role: "togglefullscreen" },
|
||||
],
|
||||
},
|
||||
// { role: 'windowMenu' }
|
||||
{
|
||||
label: "Window",
|
||||
submenu: [
|
||||
{ role: "minimize" },
|
||||
...(isMac
|
||||
? [{ type: "separator" }, { role: "front" }, { type: "separator" }, { role: "window" }]
|
||||
: [{ role: "close" }]),
|
||||
],
|
||||
},
|
||||
settingsMenuEntry,
|
||||
{
|
||||
label: "About",
|
||||
click() {
|
||||
showSettingsWindow("about");
|
||||
accelerator: "Control+Q",
|
||||
};
|
||||
|
||||
const menuModule = {};
|
||||
|
||||
menuModule.getMenu = function (mainWindow) {
|
||||
const toggleWindow = {
|
||||
label: "Toggle Window",
|
||||
click: function () {
|
||||
mainWindow.isVisible() ? mainWindow.hide() : mainWindow.show();
|
||||
},
|
||||
},
|
||||
];
|
||||
};
|
||||
|
||||
const menuModule = { mainMenu };
|
||||
const mainMenu = [
|
||||
...(isMac
|
||||
? [
|
||||
{
|
||||
label: name,
|
||||
submenu: [
|
||||
{ role: "about" },
|
||||
settingsMenuEntry,
|
||||
{ type: "separator" },
|
||||
{ role: "services" },
|
||||
{ type: "separator" },
|
||||
{ role: "hide" },
|
||||
{ role: "hideothers" },
|
||||
{ role: "unhide" },
|
||||
{ type: "separator" },
|
||||
quitMenuEntry,
|
||||
],
|
||||
},
|
||||
]
|
||||
: []),
|
||||
{
|
||||
label: "File",
|
||||
submenu: [settingsMenuEntry, isMac ? { role: "close" } : quitMenuEntry],
|
||||
},
|
||||
{
|
||||
label: "Edit",
|
||||
submenu: [
|
||||
{ role: "undo" },
|
||||
{ role: "redo" },
|
||||
{ type: "separator" },
|
||||
{ role: "cut" },
|
||||
{ role: "copy" },
|
||||
{ role: "paste" },
|
||||
...(isMac
|
||||
? [
|
||||
{ role: "pasteAndMatchStyle" },
|
||||
{ role: "delete" },
|
||||
{ role: "selectAll" },
|
||||
{ type: "separator" },
|
||||
{
|
||||
label: "Speech",
|
||||
submenu: [{ role: "startspeaking" }, { role: "stopspeaking" }],
|
||||
},
|
||||
]
|
||||
: [{ role: "delete" }, { type: "separator" }, { role: "selectAll" }]),
|
||||
{ type: "separator" },
|
||||
settingsMenuEntry,
|
||||
],
|
||||
},
|
||||
{
|
||||
label: "View",
|
||||
submenu: [
|
||||
{ role: "reload" },
|
||||
{ role: "forcereload" },
|
||||
{ type: "separator" },
|
||||
{ role: "resetzoom" },
|
||||
{ role: "zoomin" },
|
||||
{ role: "zoomout" },
|
||||
{ type: "separator" },
|
||||
{ role: "togglefullscreen" },
|
||||
{ role: "toggledevtools" },
|
||||
],
|
||||
},
|
||||
{
|
||||
label: "Window",
|
||||
submenu: [
|
||||
{ role: "minimize" },
|
||||
toggleWindow,
|
||||
...(isMac
|
||||
? [{ type: "separator" }, { role: "front" }, { type: "separator" }, { role: "window" }]
|
||||
: [{ role: "close" }]),
|
||||
],
|
||||
},
|
||||
settingsMenuEntry,
|
||||
{
|
||||
label: "About",
|
||||
click() {
|
||||
showSettingsWindow("about");
|
||||
},
|
||||
},
|
||||
toggleWindow,
|
||||
];
|
||||
|
||||
menuModule.getMenu = function () {
|
||||
return Menu.buildFromTemplate(mainMenu);
|
||||
};
|
||||
|
||||
|
||||
@@ -10,16 +10,33 @@ const store = new Store({
|
||||
notifications: true,
|
||||
api: true,
|
||||
playBackControl: true,
|
||||
muteArtists: false,
|
||||
mutedArtists: ["TIDAL"],
|
||||
menuBar: true,
|
||||
apiSettings: {
|
||||
port: 47836,
|
||||
},
|
||||
singleInstance: true,
|
||||
disableHardwareMediaKeys: false,
|
||||
trayIcon: true,
|
||||
minimizeOnClose : false,
|
||||
minimizeOnClose: false,
|
||||
mpris: false,
|
||||
enableCustomHotkeys: false,
|
||||
enableDiscord: false,
|
||||
windowBounds: { width: 800, height: 600 },
|
||||
flags: {
|
||||
gpuRasterization: true,
|
||||
disableHardwareMediaKeys: false,
|
||||
},
|
||||
},
|
||||
migrations: {
|
||||
"3.1.0": (migrationStore) => {
|
||||
console.log("running migrations for 3.1.0");
|
||||
migrationStore.set(
|
||||
settings.flags.disableHardwareMediaKeys,
|
||||
migrationStore.get("disableHardwareMediaKeys") ?? false
|
||||
);
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
@@ -37,7 +54,6 @@ settingsModule.createSettingsWindow = function () {
|
||||
frame: false,
|
||||
title: "Tidal-hifi - settings",
|
||||
webPreferences: {
|
||||
affinity: "window",
|
||||
preload: path.join(__dirname, "../pages/settings/preload.js"),
|
||||
plugins: true,
|
||||
nodeIntegration: true,
|
||||
|
||||
@@ -1,48 +1,21 @@
|
||||
const { Tray, app } = require("electron");
|
||||
const { Menu } = require("electron");
|
||||
const { getMenu, mainMenu } = require("./menu");
|
||||
const { store, settings } = require("./settings");
|
||||
const { Tray } = require("electron");
|
||||
const { getMenu } = require("./menu");
|
||||
const trayModule = {};
|
||||
let tray;
|
||||
|
||||
trayModule.addTray = function (options = { icon: "" }) {
|
||||
trayModule.addTray = function (mainWindow, options = { icon: "" }) {
|
||||
tray = new Tray(options.icon);
|
||||
tray.setIgnoreDoubleClickEvents(true);
|
||||
tray.setToolTip("Tidal-hifi");
|
||||
|
||||
const menu = getMenu(mainWindow);
|
||||
|
||||
tray.setContextMenu(menu);
|
||||
};
|
||||
|
||||
trayModule.refreshTray = function (mainWindow) {
|
||||
if (!tray) {
|
||||
trayModule.addTray();
|
||||
}
|
||||
|
||||
tray.on("click", function (e) {
|
||||
if (mainWindow) {
|
||||
mainWindow.show();
|
||||
}
|
||||
});
|
||||
|
||||
tray.setToolTip("Tidal-hifi");
|
||||
|
||||
if (mainWindow && store.get(settings.minimizeOnClose)) {
|
||||
tray.setContextMenu(
|
||||
Menu.buildFromTemplate([
|
||||
{
|
||||
label: "Toggle Window",
|
||||
click: function () {
|
||||
mainWindow.isVisible() ? mainWindow.hide() : mainWindow.show();
|
||||
},
|
||||
},
|
||||
{
|
||||
label: "Quit",
|
||||
click: function () {
|
||||
mainWindow.destroy();
|
||||
app.quit();
|
||||
},
|
||||
},
|
||||
...mainMenu, //we add menu items from the other context
|
||||
])
|
||||
);
|
||||
} else {
|
||||
tray.setContextMenu(getMenu());
|
||||
trayModule.addTray(mainWindow);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user