v1.0.1 (#1)

* v1.0.1 - Implemented taskbar media controls - Fixed taskbar icon - Cleaned code - Fixes when building windows dist
DorvakOff · Jan 9, 2024 · 645f697 · 645f697
1 parent 2b1fcd8
commit 645f697
Show file tree

Hide file tree

Showing 39 changed files with 146 additions and 417 deletions.
diff --git a/.gitignore b/.gitignore
@@ -159,5 +159,6 @@ $RECYCLE.BIN/
 # End of https://www.gitignore.io/api/node,linux,macos,windows
 
 # Custom
-dist/*
-build/*
+dist/
+build/
+.idea/
diff --git a/.idea/DeezerRPC.iml b/.idea/DeezerRPC.iml
diff --git a/.idea/discord.xml b/.idea/discord.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -6,8 +6,7 @@
 ## Installation
 1. Download the latest release from [here](https://github.com/DorvakOff/DeezerRPC/releases/latest).
 2. Extract the archive.
-3. Run `DeezerRPC.exe`.
-4. Enjoy!
+3. On Windows, run `DeezerRPC.exe`. On Linux, run `DeezerRPC`. And on macOS, run `DeezerRPC.app`.
 
 # Shortcuts (keyboard)
 - Play/Pause : Pause/Resume the current song.

diff --git a/assets/rpc/default.png → RPC-ASSETS/default.png b/assets/rpc/default.png → RPC-ASSETS/default.png
diff --git a/assets/rpc/listening.png b/assets/rpc/listening.png
diff --git a/assets/rpc/paused.png b/assets/rpc/paused.png
diff --git a/assets/rpc/streaming.png b/assets/rpc/streaming.png
diff --git a/package-assets.js b/package-assets.js
@@ -1,4 +1,4 @@
 const shell = require('shelljs');
 
-shell.cp('-R', './src/web', './build/');
+shell.cp('-R', './src/assets', './build/');
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "deezer-rpc",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Deezer integrated with the Discord Rich Presence.",
   "main": "build/main.js",
   "scripts": {
@@ -18,7 +18,7 @@
     "appId": "com.dorvak.deezerrpc",
     "asar": "true",
     "productName": "DeezerRPC",
-    "icon": "./assets/deezer.png",
+    "icon": "./assets/images/deezer.png",
     "files": [
       "build/**/*"
     ],

diff --git a/src/assets/images/deezer.ico b/src/assets/images/deezer.ico
diff --git a/src/assets/images/deezer.png b/src/assets/images/deezer.png
diff --git a/src/assets/images/next.png b/src/assets/images/next.png
diff --git a/src/assets/images/pause.png b/src/assets/images/pause.png
diff --git a/src/assets/images/play.png b/src/assets/images/play.png
diff --git a/src/assets/images/previous.png b/src/assets/images/previous.png
diff --git a/src/web/titlebar.html → src/assets/titlebar.html b/src/web/titlebar.html → src/assets/titlebar.html
@@ -3,6 +3,5 @@
   <head>
     <meta charset="UTF-8">
     <title>Deezer</title>
-    <link rel="icon" href="./images/deezer.png" type="image/x-icon">
   </head>
 </html>
diff --git a/src/main.ts b/src/main.ts
@@ -1,89 +1,100 @@
-import * as path from 'path';
-import { APP, RPC } from './app/app';
+import {APP, RPC} from './app/app';
 import * as Tray from './manager/tray';
-import * as Update from './util/update';
+import * as Update from './utils/update';
 import * as Player from './player/player';
-import * as Window from './manager/window';
-import * as Titlebar from './manager/titlebar';
-import * as Preferences from './util/preferences';
-import { app, BrowserWindow, dialog } from 'electron';
+import * as Window from './utils/http-utils';
+import * as TitleBar from './manager/title-bar';
+import * as Preferences from './utils/preferences';
+import {app, BrowserWindow, dialog} from 'electron';
+import path from "path";
+import {nativeImage} from "electron";
 
 // Entry
 function main() {
     createMainWindow();
 }
 
 function createMainWindow() {
-    // SplashWindow
-    let splashWindow: BrowserWindow;
-
     // Create MainWindow
-    global.__mainWindow = Window.createWindow(
-        false, {
-            titleBarStyle: 'hidden',
-            webPreferences: {
-                preload: path.join(__dirname, 'preload/deezer.js')
-            }
-        }
-    );
+    global.__mainWindow = new BrowserWindow({
+        width: APP.settings.windowWidth,
+        height: APP.settings.windowHeight,
+        show: false,
+        title: APP.name,
+        titleBarStyle: 'hidden',
+        icon: path.join(__dirname, 'assets/images/deezer.ico'),
+    });
 
     // Load URL
-    __mainWindow.loadURL(APP.settings.deezerUrl, { userAgent: Window.userAgent() });
+    __mainWindow.loadURL(APP.settings.deezerUrl, {userAgent: Window.userAgent()});
 
     // Events
-    __mainWindow.webContents.once('did-finish-load', () => {
-        __mainWindow.show();
+    __mainWindow.webContents.once('did-finish-load', () => handleLoadComplete());
+    __mainWindow.on('show', () => TitleBar.register());
+    __mainWindow.on('hide', () => TitleBar.unregister())
+
+    __mainWindow.on('minimize', () => {
+        if (Preferences.getPreference<boolean>(APP.preferences.minimizeToTray)) {
+            __mainWindow.hide();
+        }
+    });
+    __mainWindow.on('close', (event) => {
+        event.preventDefault();
+        if (Preferences.getPreference<boolean>(APP.preferences.closeToTray)) {
+            __mainWindow.hide();
+        } else {
+            app.exit();
+        }
+    });
+}
+
+function handleLoadComplete() {
+    __mainWindow.show();
 
-        let css = `
+    let css = `
             .page-topbar, .css-efpag6, .tempo-topbar, #dzr-app {
                 margin-top: 30px !important;
             }
         `;
 
-        __mainWindow.webContents.insertCSS(css);
-
-        setInterval(() => {
-            __mainWindow.webContents.insertCSS(css);
-        }, 1000);
+    __mainWindow.webContents.insertCSS(css);
 
-        splashWindow.close();
-
-        Tray.register();
-        Player.registerShortcuts();
-
-        if (Preferences.getPreference<boolean>(APP.preferences.checkUpdates)) Update.checkVersion(false);
-
-        // Initialize RPC
-        initializeRPC();
-    });
+    setInterval(() => {
+        __mainWindow.webContents.insertCSS(css);
+    }, 1000);
 
-    __mainWindow.on('show', () => {
-        Titlebar.register();
-    });
+    Tray.register();
+    Player.registerShortcuts();
+    loadThumbnailButtons()
 
-    __mainWindow.on('hide', () => {
-        Titlebar.unregister();
-    })
+    if (Preferences.getPreference<boolean>(APP.preferences.checkUpdates)) Update.checkVersion(false);
 
-    __mainWindow.on('minimize', () => {
-        if (Preferences.getPreference<boolean>(APP.preferences.minimizeToTray)) __mainWindow.hide();
-    });
-
-    __mainWindow.on('close', (event) => {
-        event.preventDefault();
-
-        if (Preferences.getPreference<boolean>(APP.preferences.closeToTray)) __mainWindow.hide(); else app.exit();
-    });
+    // Initialize RPC
+    initializeRPC();
+}
 
-    // Create SplashWindow
-    splashWindow = Window.createWindow(true);
-    splashWindow.setResizable(false);
-    splashWindow.setMaximizable(false);
-    splashWindow.loadFile(path.join(__dirname, './web/deezer.png'));
+export function loadThumbnailButtons(playing: boolean = false) {
+    __mainWindow.setThumbarButtons([
+        {
+            tooltip: 'Previous',
+            icon: nativeImage.createFromPath(path.join(__dirname, 'assets/images/previous.png')),
+            click: () => Player.previousSong()
+        },
+        {
+            tooltip: 'Play/Pause',
+            icon: nativeImage.createFromPath(path.join(__dirname, `assets/images/${playing ? 'pause' : 'play'}.png`)),
+            click: () => Player.togglePause()
+        },
+        {
+            tooltip: 'Next',
+            icon: nativeImage.createFromPath(path.join(__dirname, 'assets/images/next.png')),
+            click: () => Player.nextSong()
+        }
+    ])
 }
 
 function initializeRPC() {
-    RPC.login({ clientId: APP.settings.discordClientID }).then(() => {
+    RPC.login({clientId: APP.settings.discordClientID}).then(() => {
         setTimeout(Player.registerRPC, 3000);
     }).catch(() => {
         dialog.showErrorBox("Rich Presence Login Failed", "Please, verify if your discord app is opened/working and relaunch this application.");
-Original file line number
+Diff line change
@@ Expand Up / @@ -159,5 +159,6 @@ $RECYCLE.BIN/ @@
     # End of https://www.gitignore.io/api/node,linux,macos,windows
     # Custom
-    dist/*
-    build/*
+    dist/
+    build/
+    .idea/