Merge branch 'master' of github.com:Mastermindzh/tidal-hifi

* Update build version to fit with package.json electron version

* Update electron-builder.yml

* Use wvcus.2 for additional fixes

* Also use wvcus.2 for package.json

.github/workflows/build.yml

@@ -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

.github/workflows/release.yml

@@ -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

CHANGELOG.md

@@ -4,6 +4,11 @@ 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).
 
+## 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

README.md

@@ -58,7 +58,7 @@ 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
 ```
 
 ### Using source
@@ -129,7 +129,7 @@ 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

build/electron-builder.yml

@@ -1,7 +1,7 @@
 appId: com.rickvanlieshout.tidal-hifi
-electronVersion: 8.5.2
+electronVersion: 16.0.4
 electronDownload:
-  version: 8.5.2-wvvmp
+  version: 16.0.4+wvcus.2
   mirror: https://github.com/castlabs/electron-releases/releases/download/v
 snap:
   plugs:

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "tidal-hifi",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "tidal-hifi",
-      "version": "2.8.0",
+      "version": "2.8.1",
       "license": "MIT",
       "dependencies": {
         "discord-rpc": "^4.0.1",
@@ -8686,4 +8686,4 @@
       }
     }
   }
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tidal-hifi",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "src/main.js",
   "scripts": {
@@ -32,10 +32,10 @@
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",
-    "electron": "git+https://github.com/castlabs/electron-releases.git#v16.0.4+wvcus",
+    "electron": "git+https://github.com/castlabs/electron-releases.git#v16.0.4+wvcus.2",
     "electron-builder": "^22.14.5",
     "electron-reload": "^1.5.0",
     "prettier": "^2.5.0"
   },
   "prettier": "@mastermindzh/prettier-config"
-}
+}

src/preload.js

@@ -8,6 +8,7 @@ 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;
@@ -225,7 +226,7 @@ function handleLogout() {
 }
 
 function addFullScreenListeners() {
-  window.document.addEventListener("fullscreenchange", (event) => {
+  window.document.addEventListener("fullscreenchange", () => {
     ipcRenderer.send(globalEvents.refreshMenuBar);
   });
 }
@@ -236,7 +237,7 @@ function addFullScreenListeners() {
  */
 function addIPCEventListeners() {
   window.addEventListener("DOMContentLoaded", () => {
-    ipcRenderer.on("globalEvent", (event, args) => {
+    ipcRenderer.on("globalEvent", (_event, args) => {
       switch (args) {
         case globalEvents.playPause:
           playPause();
@@ -336,7 +337,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();

src/scripts/menu.js

@@ -1,4 +1,4 @@
-const { Menu } = require("electron");
+const { Menu, app } = require("electron");
 const { showSettingsWindow } = require("./settings");
 const isMac = process.platform === "darwin";
 
@@ -10,6 +10,14 @@ const settingsMenuEntry = {
   accelerator: "Control+/",
 };
 
+const quitMenuEntry = {
+  label: "Quit",
+  click() {
+    app.exit(0);
+  },
+  accelerator: "Control+Q"
+};
+
 const mainMenu = [
   ...(isMac
     ? [
@@ -25,7 +33,7 @@ const mainMenu = [
             { role: "hideothers" },
             { role: "unhide" },
             { type: "separator" },
-            { role: "quit" },
+            quitMenuEntry,
           ],
         },
       ]
@@ -33,7 +41,7 @@ const mainMenu = [
   // { role: 'fileMenu' }
   {
     label: "File",
-    submenu: [settingsMenuEntry, isMac ? { role: "close" } : { role: "quit" }],
+    submenu: [settingsMenuEntry, isMac ? { role: "close" } : quitMenuEntry],
   },
   // { role: 'editMenu' }
   {