From 7a358b7a879c1a627befc656eef5a7e61873c03c Mon Sep 17 00:00:00 2001 From: Adler Luiz Date: Sat, 8 Aug 2020 03:48:28 -0300 Subject: [PATCH 01/36] :sparkles: Improve remote control --- src/providers/companionServer.js | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/providers/companionServer.js b/src/providers/companionServer.js index c425acef2..21c61414d 100644 --- a/src/providers/companionServer.js +++ b/src/providers/companionServer.js @@ -5,6 +5,7 @@ const networkInterfaces = os.networkInterfaces() const qrcode = require('qrcode-generator') const infoPlayerProvider = require('../providers/infoPlayerProvider') const settingsProvider = require('../providers/settingsProvider') +const { deprecate } = require('util') const ip = '0.0.0.0' const port = 9863 @@ -212,10 +213,12 @@ var serverFunction = function (req, res) { ) { try { let headerAuth = req.headers.authorization - let auth = headerAuth.split(' ')[1] + let authToken = headerAuth + .split(' ')[1] + .toUpperCase() if ( - auth == + authToken == settingsProvider.get( 'settings-companion-server-token' ) @@ -375,14 +378,7 @@ function execCmd(cmd, value) { value = value || true switch (cmd) { - case 'track-play': - ipcMain.emit('media-command', { - command: 'media-play-pause', - value: true, - }) - break - - case 'track-pause': + case 'track-play-pause': ipcMain.emit('media-command', { command: 'media-play-pause', value: true, @@ -469,14 +465,14 @@ function execCmd(cmd, value) { case 'player-repeat': ipcMain.emit('media-command', { command: 'media-repeat', - value: value, + value: true, }) break case 'player-shuffle': ipcMain.emit('media-command', { command: 'media-shuffle', - value: value, + value: true, }) break From 6d897d668c12cca15b219a476f52f87ef874a214 Mon Sep 17 00:00:00 2001 From: Adler Luiz Date: Sat, 8 Aug 2020 11:24:50 -0300 Subject: [PATCH 02/36] :bug: Lyrics #298 --- src/pages/lyrics/lyrics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/lyrics/lyrics.js b/src/pages/lyrics/lyrics.js index 5aecd7d98..68068c0e0 100644 --- a/src/pages/lyrics/lyrics.js +++ b/src/pages/lyrics/lyrics.js @@ -37,7 +37,7 @@ setInterval(async () => { async function setData(data) { var scrollHeight = document.getElementById('content').scrollHeight - target = (scrollHeight * data.track.statePercent) / 1.4 + target = (scrollHeight * data.player.statePercent) / 1.4 if (toggled) { document.getElementById('content').scrollTo(0, target) } From 083cb2cf0d109d20eebd6b0508a26e3c7a546fbe Mon Sep 17 00:00:00 2001 From: Adler Luiz Date: Sat, 8 Aug 2020 15:56:43 -0300 Subject: [PATCH 03/36] :sparkles: Improve updateActivity data --- main.js | 95 +++++++++++++++-------------- src/providers/discordRpcProvider.js | 11 +--- 2 files changed, 51 insertions(+), 55 deletions(-) diff --git a/main.js b/main.js index a941dd54c..3582bdeb3 100644 --- a/main.js +++ b/main.js @@ -47,9 +47,10 @@ let mainWindow, customCSSPageKey, lastTrackId, lastTrackProgress, + lastIsPaused, + lastSeekbarCurrentPosition, doublePressPlayPause, updateTrackInfoTimeout, - activityIsPaused, activityLikeStatus, windowsMediaProvider @@ -366,6 +367,7 @@ function createWindow() { var trackInfo = infoPlayerProvider.getTrackInfo() var progress = playerInfo.statePercent + var seekbarCurrentPosition = playerInfo.seekbarCurrentPosition var trackId = trackInfo.id var title = trackInfo.title var author = trackInfo.author @@ -375,32 +377,9 @@ function createWindow() { var nowPlaying = `${title} - ${author}` if (title && author) { - discordRPC.setActivity(getAll()) rainmeterNowPlaying.setActivity(getAll()) mprisProvider.setActivity(getAll()) - if ( - playerInfo.isPaused != activityIsPaused || - playerInfo.likeStatus != activityLikeStatus - ) { - mediaControl.createThumbar( - mainWindow, - infoPlayerProvider.getAllInfo() - ) - - activityIsPaused = playerInfo.isPaused - activityLikeStatus = playerInfo.likeStatus - - if ( - isWindows() && - os.release().startsWith('10.') && - settingsProvider.get('settings-windows10-media-service') && - windowsMediaProvider != undefined - ) { - windowsMediaProvider.setPlaybackStatus(playerInfo.isPaused) - } - } - mediaControl.setProgress( mainWindow, settingsProvider.get('settings-enable-taskbar-progressbar') @@ -436,22 +415,15 @@ function createWindow() { } } - // Experimental - /*if (isWindows() && view.webContents.getURL().indexOf('v=') != -1) { - mainWindow.setThumbnailClip({ - x: 230, - y: 150, - width: 676, - height: 676, - }) - } else { - mainWindow.setThumbnailClip({ - x: 0, - y: 0, - width: mainWindow.getSize()[0], - height: mainWindow.getSize()[1], - }) - }*/ + /** + * Update only when change seekbar + */ + if ( + lastSeekbarCurrentPosition - seekbarCurrentPosition > 2 || + lastSeekbarCurrentPosition - seekbarCurrentPosition < -2 + ) { + discordRPC.setActivity(getAll()) + } /** * Update only when change track @@ -493,18 +465,49 @@ function createWindow() { ) } + writeLog({ type: 'info', data: `Listen: ${title} - ${author}` }) + discordRPC.setActivity(getAll()) + } + + /** + * Update only when change state play/pause + */ + if (lastIsPaused != playerInfo.isPaused) { + lastIsPaused = playerInfo.isPaused + + discordRPC.setActivity(getAll()) + if (!isMac() && !settingsProvider.get('settings-shiny-tray')) { - if (playerInfo.isPaused) { - tray.updateTrayIcon(iconPause) - } else { - tray.updateTrayIcon(iconPlay) - } + tray.updateTrayIcon( + playerInfo.isPaused ? iconPause : iconPlay + ) } - writeLog({ type: 'info', data: `Listen: ${title} - ${author}` }) + mediaControl.createThumbar( + mainWindow, + infoPlayerProvider.getAllInfo() + ) + + if ( + isWindows() && + os.release().startsWith('10.') && + settingsProvider.get('settings-windows10-media-service') && + windowsMediaProvider != undefined + ) { + windowsMediaProvider.setPlaybackStatus(playerInfo.isPaused) + } + } + + if (activityLikeStatus != playerInfo.likeStatus) { + mediaControl.createThumbar( + mainWindow, + infoPlayerProvider.getAllInfo() + ) + activityLikeStatus = playerInfo.likeStatus } lastTrackProgress = progress + lastSeekbarCurrentPosition = seekbarCurrentPosition } } diff --git a/src/providers/discordRpcProvider.js b/src/providers/discordRpcProvider.js index 813eaa6c8..336ae5160 100644 --- a/src/providers/discordRpcProvider.js +++ b/src/providers/discordRpcProvider.js @@ -3,7 +3,7 @@ const RPC = require('discord-rpc') const settingsProvider = require('./settingsProvider') var client -var _isStarted, _lastTrackId, _lastState +var _isStarted function isStarted() { return _isStarted @@ -40,11 +40,7 @@ function stop() { } function setActivity(info) { - if ( - isStarted() && - info.track.title && - (_lastTrackId != info.track.id || _lastState != info.player.isPaused) - ) { + if (isStarted() && info.track.title) { var now = Date.now() var activity = {} var discordSettings = settingsProvider.get('discord-presence-settings') @@ -82,9 +78,6 @@ function setActivity(info) { console.log(err) }) } - - _lastTrackId = info.track.id - _lastState = info.player.isPaused } } From faf5d4c3bf2d0d6c1a458af1e47807e5fd297dac Mon Sep 17 00:00:00 2001 From: Adler Luiz Date: Sat, 8 Aug 2020 18:36:45 -0300 Subject: [PATCH 04/36] :bug: Fix #296 --- main.js | 4 ++++ package.json | 6 +++--- src/providers/companionServer.js | 27 ++++++++++++++++++++------- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/main.js b/main.js index 3582bdeb3..cc466d8eb 100644 --- a/main.js +++ b/main.js @@ -1612,6 +1612,8 @@ if (!gotTheLock) { }) app.on('before-quit', function (e) { + mainWindow = null + view = null if (isMac()) { app.exit() } @@ -1619,6 +1621,8 @@ if (!gotTheLock) { }) app.on('quit', function () { + mainWindow = null + view = null tray.quit() }) } diff --git a/package.json b/package.json index fbd36e436..18f9460ee 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,9 @@ "start": "electron .", "rebuild": "electron-rebuild -f", "postinstall": "npx electron-builder install-app-deps", - "deploy:win": "npx electron-builder --win --config electron-builder-deploy64.yml", - "deploy:mac": "npx electron-builder --mac --config electron-builder-deploy64.yml", - "deploy:lin": "npx electron-builder --linux --config electron-builder-deploy64.yml", + "build:win": "npx electron-builder --win --config electron-builder-deploy64.yml", + "build:mac": "npx electron-builder --mac --config electron-builder-deploy64.yml", + "build:lin": "npx electron-builder --linux --config electron-builder-deploy64.yml", "publish:win": "npx electron-builder --win -p always --config electron-builder64.yml", "publish:mac": "npx electron-builder --mac -p always --config electron-builder64.yml", "publish:lin": "npx electron-builder --linux -p always --config electron-builder64.yml" diff --git a/src/providers/companionServer.js b/src/providers/companionServer.js index 21c61414d..cab10b633 100644 --- a/src/providers/companionServer.js +++ b/src/providers/companionServer.js @@ -5,13 +5,12 @@ const networkInterfaces = os.networkInterfaces() const qrcode = require('qrcode-generator') const infoPlayerProvider = require('../providers/infoPlayerProvider') const settingsProvider = require('../providers/settingsProvider') -const { deprecate } = require('util') const ip = '0.0.0.0' const port = 9863 const hostname = os.hostname() -const pattIgnoreInterface = /(virtual|wsl|vEthernet|Default Switch|VMware|Adapter)\w*/gim +const pattIgnoreInterface = /(Loopback|virtual|wsl|vEthernet|Default Switch|VMware|Adapter|Hamachi)\w*/gim let totalConnections = 0 let timerTotalConections @@ -34,7 +33,20 @@ function infoServer() { } function fetchNetworkInterfaces() { - Object.keys(networkInterfaces).forEach((v, k) => { + serverInterfaces = Object.entries(networkInterfaces) + .filter(([interfaces]) => !pattIgnoreInterface.test(interfaces)) + .map(([name, value]) => { + value = value.filter((data) => { + return data.family == 'IPv4' && data.internal == false + }) + return { + name: name, + ip: value[0].address, + isProtected: infoServer().isProtected, + } + }) + + /*Object.keys(networkInterfaces).forEach((v, k) => { if (!pattIgnoreInterface.test(v)) { networkInterfaces[v].forEach((vv, kk) => { if (vv.family == 'IPv4' && vv.internal == false) { @@ -47,15 +59,17 @@ function fetchNetworkInterfaces() { } }) } - }) + })*/ } var serverFunction = function (req, res) { if (req.url === '/') { - var collection = '' + let collection = '' + let isProtected = infoServer().isProtected serverInterfaces.forEach((value) => { - let qr = qrcode(6, 'H') + let qr = qrcode(0, 'H') + value['hostname'] = hostname qr.addData(JSON.stringify(value)) qr.make() @@ -88,7 +102,6 @@ var serverFunction = function (req, res) { res.setHeader('Access-Control-Allow-Origin', '*') res.writeHead(200) - let isProtected = infoServer().isProtected res.write(` YTMDesktop Remote Control From 7ab3dd1ce8c7c86feb27871a4f8d4adf28544201 Mon Sep 17 00:00:00 2001 From: Adler Luiz Date: Sat, 8 Aug 2020 19:56:12 -0300 Subject: [PATCH 05/36] :bug: remote control webpage, strange visual with multiples interfaces #300 --- src/providers/companionServer.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/providers/companionServer.js b/src/providers/companionServer.js index cab10b633..91738cc09 100644 --- a/src/providers/companionServer.js +++ b/src/providers/companionServer.js @@ -41,7 +41,7 @@ function fetchNetworkInterfaces() { }) return { name: name, - ip: value[0].address, + ip: value.length ? value[0].address : '', isProtected: infoServer().isProtected, } }) @@ -74,7 +74,7 @@ var serverFunction = function (req, res) { qr.make() collection += ` -
+
@@ -115,6 +115,7 @@ var serverFunction = function (req, res) { padding: 0; text-align: center; background: linear-gradient(to right top, #000 20%, #1d1d1d 80%); + background-attachment: fixed; font-family: sans-serif; } h5 { @@ -123,7 +124,6 @@ var serverFunction = function (req, res) { .center { width: 68%; - /*height: 400px;*/ position: absolute; left: 50%; top: 48%; @@ -156,7 +156,7 @@ var serverFunction = function (req, res) {
-
+
${collection} From 7d656c2beb8fea9e7bb2516d107dfc03efc09d30 Mon Sep 17 00:00:00 2001 From: Adler Luiz Date: Sun, 9 Aug 2020 01:01:34 -0300 Subject: [PATCH 06/36] :sparkles: Thumbs up behavior #259 (hotkeys) --- main.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/main.js b/main.js index cc466d8eb..2fb28871f 100644 --- a/main.js +++ b/main.js @@ -659,19 +659,17 @@ function createWindow() { } ) - globalShortcut.register( - settingsAccelerator['media-track-like'], - function () { + globalShortcut.register(settingsAccelerator['media-track-like'], () => { + if (infoPlayerProvider.getPlayerInfo().likeStatus != 'LIKE') { mediaControl.upVote(view) } - ) + }) - globalShortcut.register( - settingsAccelerator['media-track-dislike'], - function () { + globalShortcut.register(settingsAccelerator['media-track-dislike'], () => { + if (infoPlayerProvider.getPlayerInfo().likeStatus != 'DISLIKE') { mediaControl.downVote(view) } - ) + }) globalShortcut.register( settingsAccelerator['media-volume-up'], From 3b0ac53748fd2980bad1181dd2a4f74eee901f02 Mon Sep 17 00:00:00 2001 From: Adler Luiz Date: Sun, 9 Aug 2020 05:21:00 -0300 Subject: [PATCH 07/36] :sparkles: disable shortcuts setting #301 #3 --- main.js | 161 ++++++++++++++++--------------- src/assets/css/styles.css | 2 +- src/pages/settings/settings.css | 5 + src/pages/settings/settings.html | 9 +- src/pages/settings/settings.js | 14 +++ 5 files changed, 112 insertions(+), 79 deletions(-) diff --git a/main.js b/main.js index 2fb28871f..ed68f68cb 100644 --- a/main.js +++ b/main.js @@ -623,118 +623,121 @@ function createWindow() { } }) - globalShortcut.register('MediaStop', function () { - mediaControl.stopTrack(view) - }) - - globalShortcut.register('MediaPreviousTrack', function () { - mediaControl.previousTrack(view) - }) - - globalShortcut.register('MediaNextTrack', function () { - mediaControl.nextTrack(view) - }) - - // Custom accelerators - let settingsAccelerator = settingsProvider.get('settings-accelerators') - - globalShortcut.register( - settingsAccelerator['media-play-pause'], - function () { - mediaControl.playPauseTrack(view) - } - ) - - globalShortcut.register( - settingsAccelerator['media-track-next'], - function () { - mediaControl.nextTrack(view) - } - ) - - globalShortcut.register( - settingsAccelerator['media-track-previous'], - function () { - mediaControl.previousTrack(view) - } - ) - - globalShortcut.register(settingsAccelerator['media-track-like'], () => { - if (infoPlayerProvider.getPlayerInfo().likeStatus != 'LIKE') { - mediaControl.upVote(view) - } - }) - - globalShortcut.register(settingsAccelerator['media-track-dislike'], () => { - if (infoPlayerProvider.getPlayerInfo().likeStatus != 'DISLIKE') { - mediaControl.downVote(view) - } - }) - - globalShortcut.register( - settingsAccelerator['media-volume-up'], - function () { - mediaControl.volumeUp(view) - } - ) - - globalShortcut.register( - settingsAccelerator['media-volume-down'], - function () { - mediaControl.volumeDown(view) + ipcMain.on('change-accelerator', (dataMain, dataRenderer) => { + if (dataMain.type != undefined) { + args = dataMain + } else { + args = dataRenderer } - ) - ipcMain.on('change-accelerator', (event, args) => { try { globalShortcut.unregister(args.oldValue) } catch (_) {} switch (args.type) { case 'media-play-pause': - globalShortcut.register(args.newValue, () => { + registerGlobalShortcut(args.newValue, () => { mediaControl.playPauseTrack(view) }) break case 'media-track-next': - globalShortcut.register(args.newValue, () => { + registerGlobalShortcut(args.newValue, () => { mediaControl.nextTrack(view) }) break case 'media-track-previous': - globalShortcut.register(args.newValue, () => { + registerGlobalShortcut(args.newValue, () => { mediaControl.previousTrack(view) }) break case 'media-track-like': - globalShortcut.register(args.newValue, () => { - mediaControl.upVote(view) + registerGlobalShortcut(args.newValue, () => { + if ( + infoPlayerProvider.getPlayerInfo().likeStatus != 'LIKE' + ) { + mediaControl.upVote(view) + } }) break case 'media-track-dislike': - globalShortcut.register(args.newValue, () => { - mediaControl.downVote(view) + registerGlobalShortcut(args.newValue, () => { + if ( + infoPlayerProvider.getPlayerInfo().likeStatus != + 'DISLIKE' + ) { + mediaControl.downVote(view) + } }) break case 'media-volume-up': - globalShortcut.register(args.newValue, () => { + registerGlobalShortcut(args.newValue, () => { mediaControl.volumeUp(view) }) break case 'media-volume-down': - globalShortcut.register(args.newValue, () => { + registerGlobalShortcut(args.newValue, () => { mediaControl.volumeDown(view) }) break } }) + // Custom accelerators + let settingsAccelerator = settingsProvider.get('settings-accelerators') + + ipcMain.emit('change-accelerator', { + type: 'media-play-pause', + newValue: settingsAccelerator['media-play-pause'], + }) + + ipcMain.emit('change-accelerator', { + type: 'media-track-next', + newValue: settingsAccelerator['media-track-next'], + }) + + ipcMain.emit('change-accelerator', { + type: 'media-track-previous', + newValue: settingsAccelerator['media-track-previous'], + }) + + ipcMain.emit('change-accelerator', { + type: 'media-track-like', + newValue: settingsAccelerator['media-track-like'], + }) + + ipcMain.emit('change-accelerator', { + type: 'media-track-dislike', + newValue: settingsAccelerator['media-track-dislike'], + }) + + ipcMain.emit('change-accelerator', { + type: 'media-volume-up', + newValue: settingsAccelerator['media-volume-up'], + }) + + ipcMain.emit('change-accelerator', { + type: 'media-volume-down', + newValue: settingsAccelerator['media-volume-down'], + }) + + globalShortcut.register('MediaStop', function () { + mediaControl.stopTrack(view) + }) + + globalShortcut.register('MediaPreviousTrack', function () { + mediaControl.previousTrack(view) + }) + + globalShortcut.register('MediaNextTrack', function () { + mediaControl.nextTrack(view) + }) + ipcMain.handle('invoke-all-info', async (event, args) => { return infoPlayerProvider.getAllInfo() }) @@ -1729,13 +1732,11 @@ function loadCustomPageScript() { } } -ipcMain.on('log', (dataMain, dataRenderer) => { - if (dataMain.type !== undefined) { - writeLog(dataMain) - } else { - writeLog(dataRenderer) +function registerGlobalShortcut(value, fn) { + if (value != 'disabled') { + globalShortcut.register(`${value}`, fn) } -}) +} function writeLog(log) { switch (log.type) { @@ -1749,6 +1750,14 @@ function writeLog(log) { } } +ipcMain.on('log', (dataMain, dataRenderer) => { + if (dataMain.type !== undefined) { + writeLog(dataMain) + } else { + writeLog(dataRenderer) + } +}) + if (settingsProvider.get('settings-companion-server')) { companionServer.start() } diff --git a/src/assets/css/styles.css b/src/assets/css/styles.css index 8b7cc4747..4d7413262 100644 --- a/src/assets/css/styles.css +++ b/src/assets/css/styles.css @@ -114,5 +114,5 @@ html, body { } .text-initial { - text-transform: initial; + text-transform: capitalize; } \ No newline at end of file diff --git a/src/pages/settings/settings.css b/src/pages/settings/settings.css index a7b2eb6d8..3e440d460 100644 --- a/src/pages/settings/settings.css +++ b/src/pages/settings/settings.css @@ -238,4 +238,9 @@ input[type=range]+.thumb { .settings-item-child::before { color: #666; content: '└ '; +} + +.text-disabled { + text-decoration: line-through; + text-transform: capitalize; } \ No newline at end of file diff --git a/src/pages/settings/settings.html b/src/pages/settings/settings.html index dcc80dcb6..af8204322 100644 --- a/src/pages/settings/settings.html +++ b/src/pages/settings/settings.html @@ -738,14 +738,19 @@ >
+ Disable Cancel Save
diff --git a/src/pages/settings/settings.js b/src/pages/settings/settings.js index ea847b8f2..f9f4fe34b 100644 --- a/src/pages/settings/settings.js +++ b/src/pages/settings/settings.js @@ -531,6 +531,20 @@ document.querySelector('#saveAccelerator').addEventListener('click', () => { loadCustomKeys() }) +document.querySelector('#disableAccelerator').addEventListener('click', () => { + ipc.send('change-accelerator', { + type: typeAcceleratorSelected, + oldValue: settingsAccelerators[typeAcceleratorSelected], + newValue: 'disabled', + }) + + settingsAccelerators[typeAcceleratorSelected] = 'disabled' + + settingsProvider.set('settings-accelerators', settingsAccelerators) + + loadCustomKeys() +}) + document.querySelector('#release-notes').addEventListener('click', () => { ipc.send('window', { command: 'show-changelog' }) }) From 987d0c887268f37f2c7b8f7e1546082852479e34 Mon Sep 17 00:00:00 2001 From: "Felipe Guaycuru de C. B. Franco" Date: Mon, 10 Aug 2020 14:17:37 -0300 Subject: [PATCH 08/36] :bug: Fix clone instructions to use new repo URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 90a9daeae..aa825711d 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ To clone and run this repository you'll need [Git](https://git-scm.com) and [Nod ```bash # Clone this repository -git clone https://github.com/adlerluiz/ytmdesktop +git clone https://github.com/ytmdesktop/ytmdesktop # Go into the repository cd ytmdesktop # Install dependencies From 1e9bdf255aef1c543d1af89dcfcf1b9421f7b4fe Mon Sep 17 00:00:00 2001 From: Mingjun Yin Date: Mon, 10 Aug 2020 18:38:37 -0700 Subject: [PATCH 09/36] :globe_with_meridians: Refine Simplified Chinese translation. --- src/locales/zh.json | 46 +++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/src/locales/zh.json b/src/locales/zh.json index c7f45dff3..6677306f6 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -1,51 +1,51 @@ { "DOUBLE_CLICK_TO_RESET_POSITION": "双击重置位置", "LABEL_EXIT": "退出", - "LABEL_GUEST": "LABEL_GUEST", + "LABEL_GUEST": "匿名模式", "LABEL_LOADING": "载入中...", "LABEL_LYRICS": "歌词", "LABEL_LYRICS_NOT_FOUND": "找不到歌词", - "LABEL_MINIPLAYER": "LABEL_MINIPLAYER", + "LABEL_MINIPLAYER": "Mini播放器", "LABEL_PLAY_MUSIC": "播放音乐", "LABEL_SETTINGS": "设置", "LABEL_SETTINGS_RELAUNCH": "应用并重启", "LABEL_SETTINGS_SHOW_HIDE_WINDOW": "隐藏/显示主窗口", "LABEL_SETTINGS_TAB_ABOUT": "关于", - "LABEL_SETTINGS_TAB_APPEARANCE_TASKBAR_PROGRESSBAR": "LABEL_SETTINGS_TAB_APPEARANCE_TASKBAR_PROGRESSBAR", + "LABEL_SETTINGS_TAB_APPEARANCE_TASKBAR_PROGRESSBAR": "任务栏图标显示播放进度", "LABEL_SETTINGS_TAB_APPEARENCE": "显示", "LABEL_SETTINGS_TAB_GENERAL": "偏好设置", "LABEL_SETTINGS_TAB_GENERAL_COMPANION_SERVER": "远端控制", "LABEL_SETTINGS_TAB_GENERAL_COMPANION_SERVER_INFO": "点击此处扫码连接", - "LABEL_SETTINGS_TAB_GENERAL_COMPANION_SERVER_PROTECT": "LABEL_SETTINGS_TAB_GENERAL_COMPANION_SERVER_PROTECT", + "LABEL_SETTINGS_TAB_GENERAL_COMPANION_SERVER_PROTECT": "远端控制启用密码保护", "LABEL_SETTINGS_TAB_GENERAL_CONTINUE_WHERE_LEFT_OF": "退出时保存当前播放队列", - "LABEL_SETTINGS_TAB_GENERAL_CUSTOM_THEME": "LABEL_SETTINGS_TAB_GENERAL_CUSTOM_THEME", - "LABEL_SETTINGS_TAB_GENERAL_DISCORD_RICH_PRESENCE": "Discord Rich Presence", + "LABEL_SETTINGS_TAB_GENERAL_CUSTOM_THEME": "自定义主题", + "LABEL_SETTINGS_TAB_GENERAL_DISCORD_RICH_PRESENCE": "Discord集成", "LABEL_SETTINGS_TAB_GENERAL_KEEP_BACKGROUND": "关闭窗口时保持后台播放", "LABEL_SETTINGS_TAB_GENERAL_PAGE_ZOOM": "页面缩放", - "LABEL_SETTINGS_TAB_GENERAL_SELECT_AUDIO_OUTPUT": "LABEL_SETTINGS_TAB_GENERAL_SELECT_AUDIO_OUTPUT", + "LABEL_SETTINGS_TAB_GENERAL_SELECT_AUDIO_OUTPUT": "选择输出音频设备", "LABEL_SETTINGS_TAB_GENERAL_SELECT_LANGUAGE": "语言", - "LABEL_SETTINGS_TAB_GENERAL_SELECT_LYRICS_PROVIDER": "LABEL_SETTINGS_TAB_GENERAL_SELECT_LYRICS_PROVIDER", + "LABEL_SETTINGS_TAB_GENERAL_SELECT_LYRICS_PROVIDER": "选择歌词来源", "LABEL_SETTINGS_TAB_GENERAL_SELECT_TITLEBAR_TYPE": "标题栏风格", "LABEL_SETTINGS_TAB_GENERAL_SELECT_TITLEBAR_TYPE_NICE": "集成", "LABEL_SETTINGS_TAB_GENERAL_SELECT_TITLEBAR_TYPE_NONE": "禁用", "LABEL_SETTINGS_TAB_GENERAL_SELECT_TITLEBAR_TYPE_SYSTEM": "跟随系统", "LABEL_SETTINGS_TAB_GENERAL_SHINY_TRAY": "启用托盘区控制(仅Mac OS)", "LABEL_SETTINGS_TAB_GENERAL_SHOW_NOTIFICATIONS": "显示通知", - "LABEL_SETTINGS_TAB_GENERAL_START_MINIMIZED": "LABEL_SETTINGS_TAB_GENERAL_START_MINIMIZED", + "LABEL_SETTINGS_TAB_GENERAL_START_MINIMIZED": "开启最小化", "LABEL_SETTINGS_TAB_GENERAL_START_ON_BOOT": "开机启动 (实验功能, Mac/Win)", "LABEL_SETTINGS_TAB_INTEGRATION": "集成", - "LABEL_SETTINGS_TAB_LAST_FM_SCROBBLER": "LABEL_SETTINGS_TAB_LAST_FM_SCROBBLER", - "LABEL_SETTINGS_TAB_LAST_FM_SCROBBLER_AUTHORIZE": "LABEL_SETTINGS_TAB_LAST_FM_SCROBBLER_AUTHORIZE", + "LABEL_SETTINGS_TAB_LAST_FM_SCROBBLER": "LAST FM集成", + "LABEL_SETTINGS_TAB_LAST_FM_SCROBBLER_AUTHORIZE": "绑定LAST FM账号", "LABEL_SETTINGS_TAB_MACOS": "Mac OS X", "LABEL_SETTINGS_TAB_MINIPLAYER": "Mini播放器", - "LABEL_SETTINGS_TAB_MINIPLAYER_ALWAYS_ON_TOP": "LABEL_SETTINGS_TAB_MINIPLAYER_ALWAYS_ON_TOP", - "LABEL_SETTINGS_TAB_MINIPLAYER_ALWAYS_SHOW_CONTROLS": "LABEL_SETTINGS_TAB_MINIPLAYER_ALWAYS_SHOW_CONTROLS", - "LABEL_SETTINGS_TAB_MINIPLAYER_PAINT_CONTROLS": "LABEL_SETTINGS_TAB_MINIPLAYER_PAINT_CONTROLS", - "LABEL_SETTINGS_TAB_MINIPLAYER_SELECT_SIZE": "LABEL_SETTINGS_TAB_MINIPLAYER_SELECT_SIZE", - "LABEL_SETTINGS_TAB_MINIPLAYER_SELECT_SIZE_LARGE": "LABEL_SETTINGS_TAB_MINIPLAYER_SELECT_SIZE_LARGE", - "LABEL_SETTINGS_TAB_MINIPLAYER_SELECT_SIZE_NORMAL": "LABEL_SETTINGS_TAB_MINIPLAYER_SELECT_SIZE_NORMAL", - "LABEL_SETTINGS_TAB_MINIPLAYER_SELECT_SIZE_SMALL": "LABEL_SETTINGS_TAB_MINIPLAYER_SELECT_SIZE_SMALL", - "LABEL_SETTINGS_TAB_RAINMETER_WEB_NOW_PLAYING": "LABEL_SETTINGS_TAB_RAINMETER_WEB_NOW_PLAYING", + "LABEL_SETTINGS_TAB_MINIPLAYER_ALWAYS_ON_TOP": "Mini播放器窗口置顶", + "LABEL_SETTINGS_TAB_MINIPLAYER_ALWAYS_SHOW_CONTROLS": "Mini播放器控制显示锁定", + "LABEL_SETTINGS_TAB_MINIPLAYER_PAINT_CONTROLS": "Mini播放器绘制设置", + "LABEL_SETTINGS_TAB_MINIPLAYER_SELECT_SIZE": "Mini播放器大小", + "LABEL_SETTINGS_TAB_MINIPLAYER_SELECT_SIZE_LARGE": "大", + "LABEL_SETTINGS_TAB_MINIPLAYER_SELECT_SIZE_NORMAL": "中", + "LABEL_SETTINGS_TAB_MINIPLAYER_SELECT_SIZE_SMALL": "小", + "LABEL_SETTINGS_TAB_RAINMETER_WEB_NOW_PLAYING": "Rainmeter (WebNowPlaying)集成", "LABEL_SETTINGS_TAB_READ_CLIPBOARD": "阅读剪贴板的YouTube链接", "LABEL_SETTINGS_TAB_SHORTCUTS": "快捷键", "LABEL_SETTINGS_TAB_SHORTCUTS_GLOBAL": "全局", @@ -61,5 +61,11 @@ "MEDIA_CONTROL_SEARCH": "搜索", "MEDIA_CONTROL_SHUFFLE": "随机", "MEDIA_CONTROL_THUMBS_DOWN": "踩", - "MEDIA_CONTROL_THUMBS_UP": "赞" + "MEDIA_CONTROL_THUMBS_UP": "赞", + "LABEL_SETTINGS_TAB_GENERAL_DISABLE_HARDWARE_ACCELERATION": "禁用硬件加速", + "LABEL_SETTINGS_TAB_MINIPLAYER_RESIZABLE": "允许调整Mini播放器大小", + "LABEL_SETTINGS_TAB_MINIPLAYER_SHOW_TASK": "在任务栏显示Mini播放器", + "MEDIA_CONTROL_VOLUME_UP": "增大音量", + "MEDIA_CONTROL_VOLUME_DOWN": "减小音量", + "LABEL_CHANGELOG": "更新日志" } From 54832f81994cbcaefb4207e36d076d6bd62c2479 Mon Sep 17 00:00:00 2001 From: Adler Luiz Date: Tue, 11 Aug 2020 01:37:36 -0300 Subject: [PATCH 10/36] :sparkles: Improve code --- main.js | 2 +- src/pages/settings/settings.html | 2 +- src/providers/companionServer.js | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/main.js b/main.js index ed68f68cb..f9812282f 100644 --- a/main.js +++ b/main.js @@ -340,7 +340,7 @@ function createWindow() { if (global.on_the_road) { updateActivity() } - }, 500) + }, 100) } }) diff --git a/src/pages/settings/settings.html b/src/pages/settings/settings.html index af8204322..75f49ee2d 100644 --- a/src/pages/settings/settings.html +++ b/src/pages/settings/settings.html @@ -740,7 +740,7 @@
Disable Date: Thu, 13 Aug 2020 23:29:22 -0300 Subject: [PATCH 11/36] :sparkles: Notification when like and dislike song with hotkeys --- main.js | 84 ++++++++++----- src/assets/img/notification-thumbs-down.png | Bin 0 -> 1340 bytes src/assets/img/notification-thumbs-down.psd | Bin 0 -> 24475 bytes src/assets/img/notification-thumbs-up.png | Bin 0 -> 1333 bytes src/assets/img/notification-thumbs-up.psd | Bin 0 -> 24489 bytes src/locales/en.json | 4 +- src/locales/pt.json | 4 +- src/locales/scaffold.json | 4 +- src/pages/settings/settings.html | 107 +++++++++++--------- src/pages/settings/settings.js | 6 +- src/providers/companionServer.js | 2 +- src/providers/templateProvider.js | 31 ++++-- src/providers/trayProvider.js | 14 ++- src/utils/window.js | 2 - 14 files changed, 166 insertions(+), 92 deletions(-) create mode 100644 src/assets/img/notification-thumbs-down.png create mode 100644 src/assets/img/notification-thumbs-down.psd create mode 100644 src/assets/img/notification-thumbs-up.png create mode 100644 src/assets/img/notification-thumbs-up.psd diff --git a/main.js b/main.js index f9812282f..ff850cdb7 100644 --- a/main.js +++ b/main.js @@ -340,7 +340,7 @@ function createWindow() { if (global.on_the_road) { updateActivity() } - }, 100) + }, 300) } }) @@ -600,29 +600,6 @@ function createWindow() { }) // GLOBAL - globalShortcut.register('MediaPlayPause', function () { - if (settingsProvider.get('settings-enable-double-tapping-show-hide')) { - if (!doublePressPlayPause) { - // The first press - if (infoPlayerProvider.getTrackInfo().id == '') { - infoPlayerProvider.firstPlay(view.webContents) - } - - doublePressPlayPause = true - setTimeout(() => { - if (doublePressPlayPause) mediaControl.playPauseTrack(view) - doublePressPlayPause = false - }, 200) - } else { - // The second press - doublePressPlayPause = false - doBehavior(mainWindow) - } - } else { - mediaControl.playPauseTrack(view) - } - }) - ipcMain.on('change-accelerator', (dataMain, dataRenderer) => { if (dataMain.type != undefined) { args = dataMain @@ -637,7 +614,7 @@ function createWindow() { switch (args.type) { case 'media-play-pause': registerGlobalShortcut(args.newValue, () => { - mediaControl.playPauseTrack(view) + checkDoubleTapPlayPause() }) break @@ -659,6 +636,19 @@ function createWindow() { infoPlayerProvider.getPlayerInfo().likeStatus != 'LIKE' ) { mediaControl.upVote(view) + if ( + settingsProvider.get('settings-show-notifications') + ) { + tray.balloonEvents({ + title: `${songInfo().title} - ${ + songInfo().author + }`, + content: __.trans('LABEL_NOTIFICATION_LIKED'), + icon: assetsProvider.getLocal( + 'img/notification-thumbs-up.png' + ), + }) + } } }) break @@ -670,6 +660,21 @@ function createWindow() { 'DISLIKE' ) { mediaControl.downVote(view) + if ( + settingsProvider.get('settings-show-notifications') + ) { + tray.balloonEvents({ + title: `${songInfo().title} - ${ + songInfo().author + }`, + content: __.trans( + 'LABEL_NOTIFICATION_DISLIKED' + ), + icon: assetsProvider.getLocal( + 'img/notification-thumbs-down.png' + ), + }) + } } }) break @@ -726,6 +731,10 @@ function createWindow() { newValue: settingsAccelerator['media-volume-down'], }) + globalShortcut.register('MediaPlayPause', function () { + checkDoubleTapPlayPause() + }) + globalShortcut.register('MediaStop', function () { mediaControl.stopTrack(view) }) @@ -951,6 +960,29 @@ function createWindow() { } }) + function checkDoubleTapPlayPause() { + if (settingsProvider.get('settings-enable-double-tapping-show-hide')) { + if (!doublePressPlayPause) { + // The first press + if (infoPlayerProvider.getTrackInfo().id == '') { + infoPlayerProvider.firstPlay(view.webContents) + } + + doublePressPlayPause = true + setTimeout(() => { + if (doublePressPlayPause) mediaControl.playPauseTrack(view) + doublePressPlayPause = false + }, 200) + } else { + // The second press + doublePressPlayPause = false + doBehavior(mainWindow) + } + } else { + mediaControl.playPauseTrack(view) + } + } + function windowSettings() { if (settings) { settings.show() @@ -1552,12 +1584,14 @@ if (!gotTheLock) { app.whenReady().then(function () { checkWindowPosition(settingsProvider.get('window-position')).then( (visiblePosition) => { + console.log(visiblePosition) settingsProvider.set('window-position', visiblePosition) } ) checkWindowPosition(settingsProvider.get('lyrics-position')).then( (visiblePosition) => { + console.log(visiblePosition) settingsProvider.set('lyrics-position', visiblePosition) } ) diff --git a/src/assets/img/notification-thumbs-down.png b/src/assets/img/notification-thumbs-down.png new file mode 100644 index 0000000000000000000000000000000000000000..69b8b6aaf685602ff065ddbf3f68b5d0e66ea6f7 GIT binary patch literal 1340 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 Y$%Z(f`C<6uOq^pwoYrD*EYf8E0&=PtL;wH) literal 0 HcmV?d00001 diff --git a/src/locales/en.json b/src/locales/en.json index ad1cbaf2a..c1998127b 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -77,5 +77,7 @@ "MEDIA_CONTROL_VOLUME_DOWN": "Decrease volume", "MEDIA_CONTROL_VOLUME_UP": "Increase volume", "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE": "Enable Windows 10 media service", - "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE_SHOW_INFO": "Show track information next to the Windows 10 volume bar" + "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE_SHOW_INFO": "Show track information next to the Windows 10 volume bar", + "LABEL_NOTIFICATION_LIKED": "You liked this song", + "LABEL_NOTIFICATION_DISLIKED": "You disliked this song" } diff --git a/src/locales/pt.json b/src/locales/pt.json index 0dc6f0786..8aa5cac26 100644 --- a/src/locales/pt.json +++ b/src/locales/pt.json @@ -73,5 +73,7 @@ "MEDIA_CONTROL_VOLUME_DOWN": "Diminuir volume", "MEDIA_CONTROL_VOLUME_UP": "Aumentar volume", "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE": "Habilitar serviço de mídia do Windows 10", - "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE_SHOW_INFO": "Mostrar informação da faixa ao lado da barra de volume do Windows 10" + "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE_SHOW_INFO": "Mostrar informação da faixa ao lado da barra de volume do Windows 10", + "LABEL_NOTIFICATION_LIKED": "Você gostou desta música", + "LABEL_NOTIFICATION_DISLIKED": "Você não gostou desta música" } diff --git a/src/locales/scaffold.json b/src/locales/scaffold.json index 89726966b..f08f9a4a4 100644 --- a/src/locales/scaffold.json +++ b/src/locales/scaffold.json @@ -73,5 +73,7 @@ "MEDIA_CONTROL_VOLUME_DOWN": "Decrease volume", "MEDIA_CONTROL_VOLUME_UP": "Increase volume", "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE": "Enable Windows 10 media service", - "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE_SHOW_INFO": "Show track information next to the Windows 10 volume bar" + "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE_SHOW_INFO": "Show track information next to the Windows 10 volume bar", + "LABEL_NOTIFICATION_LIKED": "You liked this song", + "LABEL_NOTIFICATION_DISLIKED": "You disliked this song" } diff --git a/src/pages/settings/settings.html b/src/pages/settings/settings.html index 75f49ee2d..b60479a75 100644 --- a/src/pages/settings/settings.html +++ b/src/pages/settings/settings.html @@ -767,29 +767,33 @@ > - play_arrow/pause - or  +  or  + + play_arrow/pause + @@ -799,26 +803,30 @@ > - skip_next - or  +  or  + + skip_next + @@ -828,26 +836,30 @@ > - skip_previous - or  +  or  + + skip_previous + @@ -860,13 +872,13 @@ @@ -882,13 +894,13 @@ @@ -904,13 +916,13 @@ @@ -926,13 +938,13 @@ @@ -945,15 +957,18 @@ > - 2x play_arrow/pause + 2x + play_arrow/pause +
{ if (!canConnect(socket)) { diff --git a/src/providers/templateProvider.js b/src/providers/templateProvider.js index a83b7f3e7..859f8b58c 100644 --- a/src/providers/templateProvider.js +++ b/src/providers/templateProvider.js @@ -221,7 +221,7 @@ const popUpMenu = ( { label: 'YouTube Music Desktop', type: 'normal', - click: function() { + click: function () { doBehavior(saved_mainWindow) }, }, @@ -231,7 +231,7 @@ const popUpMenu = ( { label: __.trans('MEDIA_CONTROL_PLAY_PAUSE'), type: 'normal', - click: function() { + click: function () { mediaControl.playPauseTrack(saved_mainWindow.getBrowserView()) }, }, @@ -239,7 +239,7 @@ const popUpMenu = ( { label: __.trans('MEDIA_CONTROL_PREVIOUS'), type: 'normal', - click: function() { + click: function () { mediaControl.previousTrack(saved_mainWindow.getBrowserView()) }, }, @@ -247,7 +247,7 @@ const popUpMenu = ( { label: __.trans('MEDIA_CONTROL_NEXT'), type: 'normal', - click: function() { + click: function () { mediaControl.nextTrack(saved_mainWindow.getBrowserView()) }, }, @@ -257,7 +257,7 @@ const popUpMenu = ( { label: __.trans('MEDIA_CONTROL_THUMBS_UP'), type: 'normal', - click: function() { + click: function () { mediaControl.upVote(saved_mainWindow.getBrowserView()) }, }, @@ -265,7 +265,7 @@ const popUpMenu = ( { label: __.trans('MEDIA_CONTROL_THUMBS_DOWN'), type: 'normal', - click: function() { + click: function () { mediaControl.downVote(saved_mainWindow.getBrowserView()) }, }, @@ -275,7 +275,7 @@ const popUpMenu = ( { label: __.trans('LABEL_MINIPLAYER'), type: 'normal', - click: function() { + click: function () { ipcMain.emit('window', { command: 'show-miniplayer' }) }, }, @@ -283,15 +283,26 @@ const popUpMenu = ( { label: __.trans('LABEL_LYRICS'), type: 'normal', - click: function() { + click: function () { ipcMain.emit('window', { command: 'show-lyrics' }) }, }, + { + label: 'audio', + type: 'submenu', + submenu: [ + { label: 'Item1', type: 'radio' }, + { label: 'Item2', type: 'radio' }, + { label: 'Item3', type: 'radio', checked: true }, + { label: 'Item4', type: 'radio' }, + ], + }, + { label: __.trans('LABEL_SETTINGS'), type: 'normal', - click: function() { + click: function () { ipcMain.emit('window', { command: 'show-settings' }) }, }, @@ -311,7 +322,7 @@ const popUpMenu = ( { label: __.trans('LABEL_EXIT'), type: 'normal', - click: function() { + click: function () { app.exit() }, }, diff --git a/src/providers/trayProvider.js b/src/providers/trayProvider.js index cea6083d2..e2e7636ec 100644 --- a/src/providers/trayProvider.js +++ b/src/providers/trayProvider.js @@ -4,7 +4,6 @@ const mediaControl = require('./mediaProvider') const nativeImage = require('electron').nativeImage const settingsProvider = require('./settingsProvider') const __ = require('./translateProvider') -const Notification = require('electron-native-notification') const { doBehavior } = require('../utils/window') const systemInfo = require('../utils/systemInfo') const imageToBase64 = require('image-to-base64') @@ -100,21 +99,27 @@ function balloon(title, content, cover, icon) { } } -function _doNotification(title, content, image) { +function balloonEvents(data) { + _doNotification(data.title, data.content, data.icon) +} + +function _doNotification(title, content, icon) { try { if (title && content) { if (systemInfo.isWindows()) { tray.displayBalloon({ - icon: image, + icon: icon, title: title, content: content, noSound: true, }) } else { + let Notification = require('electron-native-notification') + new Notification(title, { body: content, silent: true, - icon: image, + icon: icon, }) } } @@ -180,6 +185,7 @@ module.exports = { setTooltip: setTooltip, createTray: createTray, balloon: balloon, + balloonEvents: balloonEvents, quit: quit, setShinyTray: setShinyTray, updateImage: updateImage, diff --git a/src/utils/window.js b/src/utils/window.js index 4265a143b..21edd05f8 100644 --- a/src/utils/window.js +++ b/src/utils/window.js @@ -7,8 +7,6 @@ function create() { function checkWindowPosition(windowPosition) { return new Promise((resolve, reject) => { try { - //const { } = require('electron') - let displays = screen.getAllDisplays() let externalDisplay = displays.find((display) => { return display.bounds.x !== 0 || display.bounds.y !== 0 From bdcea4465ef981d4fb8684bb799cc87a71cbe694 Mon Sep 17 00:00:00 2001 From: Adler Luiz Date: Fri, 14 Aug 2020 21:34:57 -0300 Subject: [PATCH 12/36] :sparkles: Add audio output select on tray --- main.js | 51 +++++++++++++++++-- src/assets/css/styles.css | 13 +++-- src/locales/en.json | 3 +- src/locales/pt.json | 3 +- src/locales/scaffold.json | 3 +- src/pages/home/home.html | 6 ++- src/pages/home/home.js | 31 ++++++----- src/pages/settings/settings.js | 19 +++---- .../shared/window-buttons/window-buttons.html | 2 +- src/providers/templateProvider.js | 26 +++------- src/providers/trayProvider.js | 17 ++++++- src/utils/injectControls.js | 12 +++++ 12 files changed, 126 insertions(+), 60 deletions(-) diff --git a/main.js b/main.js index ff850cdb7..4023dbbe0 100644 --- a/main.js +++ b/main.js @@ -52,7 +52,8 @@ let mainWindow, doublePressPlayPause, updateTrackInfoTimeout, activityLikeStatus, - windowsMediaProvider + windowsMediaProvider, + audioDevices let isFirstTime = false @@ -1420,8 +1421,8 @@ function createWindow() { ) }) - ipcMain.on('change-audio-output', (event, data) => { - setAudioOutput(data) + ipcMain.on('change-audio-output', (dataMain, dataRenderer) => { + setAudioOutput(dataRenderer !== undefined ? dataRenderer : dataMain) }) function setAudioOutput(audioLabel) { @@ -1440,7 +1441,10 @@ function createWindow() { }); ` ) - .then((_) => {}) + .then((_) => { + settingsProvider.set('settings-app-audio-output', audioLabel) + updateTrayAudioOutputs(audioDevices) + }) .catch((_) => writeLog({ type: 'warn', data: 'error setAudioOutput' }) ) @@ -1772,6 +1776,35 @@ function registerGlobalShortcut(value, fn) { } } +function updateTrayAudioOutputs(data) { + let audioOutputs = JSON.parse(data) + let selectedAudio = settingsProvider.get('settings-app-audio-output') + let result = [ + { + label: __.trans( + 'LABEL_SETTINGS_TAB_GENERAL_AUDIO_NO_DEVICES_FOUND' + ), + enabled: false, + }, + ] + + if (audioOutputs.length) { + audioOutputs.forEach((value, index) => { + audioOutputs[index] = { + label: value.label, + type: 'radio', + checked: value.label == selectedAudio ? true : false, + click: function () { + ipcMain.emit('change-audio-output', value.label) + }, + } + }) + result = audioOutputs + } + + tray.updateTray({ type: 'audioOutputs', data: result }) +} + function writeLog(log) { switch (log.type) { case 'info': @@ -1804,13 +1837,21 @@ if (settingsProvider.get('settings-discord-rich-presence')) { discordRPC.start() } +ipcMain.on('set-audio-output-list', (_, data) => { + updateTrayAudioOutputs(data) + audioDevices = data +}) + +ipcMain.handle('get-audio-output-list', (event, someArgument) => { + return audioDevices +}) + // In this file you can include the rest of your app's specific main process // code. You can also put them in separate files and require them here. const mediaControl = require('./src/providers/mediaProvider') const tray = require('./src/providers/trayProvider') const updater = require('./src/providers/updateProvider') const analytics = require('./src/providers/analyticsProvider') -const { player } = require('./src/providers/mprisProvider') analytics.setEvent('main', 'start', 'v' + app.getVersion(), app.getVersion()) analytics.setEvent('main', 'os', process.platform, process.platform) diff --git a/src/assets/css/styles.css b/src/assets/css/styles.css index 4d7413262..aac38ef68 100644 --- a/src/assets/css/styles.css +++ b/src/assets/css/styles.css @@ -83,16 +83,21 @@ html, body { font-size: 20px; } +.div-center { + width: 100%; + position: absolute; + left: 50%; + top: 48%; + transform: translate(-50%, -50%); +} + .is-offline { width: 100%; + min-height: 10%; text-align: center; color: #EEE; } -.content { - /*margin-top: 29px;*/ -} - /* width */ ::-webkit-scrollbar { width: 9px; diff --git a/src/locales/en.json b/src/locales/en.json index c1998127b..54e4b7931 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -79,5 +79,6 @@ "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE": "Enable Windows 10 media service", "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE_SHOW_INFO": "Show track information next to the Windows 10 volume bar", "LABEL_NOTIFICATION_LIKED": "You liked this song", - "LABEL_NOTIFICATION_DISLIKED": "You disliked this song" + "LABEL_NOTIFICATION_DISLIKED": "You disliked this song", + "LABEL_AUDIO": "Audio" } diff --git a/src/locales/pt.json b/src/locales/pt.json index 8aa5cac26..c001007c5 100644 --- a/src/locales/pt.json +++ b/src/locales/pt.json @@ -75,5 +75,6 @@ "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE": "Habilitar serviço de mídia do Windows 10", "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE_SHOW_INFO": "Mostrar informação da faixa ao lado da barra de volume do Windows 10", "LABEL_NOTIFICATION_LIKED": "Você gostou desta música", - "LABEL_NOTIFICATION_DISLIKED": "Você não gostou desta música" + "LABEL_NOTIFICATION_DISLIKED": "Você não gostou desta música", + "LABEL_AUDIO": "Áudio" } diff --git a/src/locales/scaffold.json b/src/locales/scaffold.json index f08f9a4a4..789baaee8 100644 --- a/src/locales/scaffold.json +++ b/src/locales/scaffold.json @@ -75,5 +75,6 @@ "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE": "Enable Windows 10 media service", "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE_SHOW_INFO": "Show track information next to the Windows 10 volume bar", "LABEL_NOTIFICATION_LIKED": "You liked this song", - "LABEL_NOTIFICATION_DISLIKED": "You disliked this song" + "LABEL_NOTIFICATION_DISLIKED": "You disliked this song", + "LABEL_AUDIO": "Audio" } diff --git a/src/pages/home/home.html b/src/pages/home/home.html index 1233d809a..7af939d3a 100644 --- a/src/pages/home/home.html +++ b/src/pages/home/home.html @@ -22,7 +22,7 @@ -
+
-
+
signal_wifi_off +
diff --git a/src/pages/home/home.js b/src/pages/home/home.js index 8a99aaeb2..a0125f616 100644 --- a/src/pages/home/home.js +++ b/src/pages/home/home.js @@ -6,22 +6,12 @@ const icons = require('../../icons_for_shiny_tray') let icon_set = icons.bright -ipc.on('is-online', function(_, isOnline) { - if (isOnline) { - document.getElementById('is-offline').classList.add('hide') - document.getElementById('center-loading').classList.remove('hide') - } else { - document.getElementById('is-offline').classList.remove('hide') - document.getElementById('center-loading').classList.add('hide') - } -}) - const canvas = document.createElement('canvas') canvas.height = 32 canvas.width = 150 const ctx = canvas.getContext('2d') -ipc.on('update-status-bar', function(event, arg) { +ipc.on('update-status-bar', function (event, arg) { ctx.clearRect(0, 0, canvas.width, canvas.height) ctx.font = '14px Arial' if (store.get('settings-shiny-tray-dark', false)) { @@ -45,7 +35,7 @@ ipc.on('update-status-bar', function(event, arg) { ipc.send('register-renderer') -ipc.on('is-dev', function(event, args) { +ipc.on('is-dev', function (event, args) { if (args) { document.title = document.title + ' DEV' } @@ -88,3 +78,20 @@ function getStrLength(str) { } return realLength } + +document.addEventListener('DOMContentLoaded', () => { + let isOnline = navigator.onLine + + if (isOnline) { + document.querySelector('#is-offline').classList.add('hide') + document.querySelector('#center-loading').classList.remove('hide') + } else { + document.querySelector('#is-offline').classList.remove('hide') + document.querySelector('#center-loading').classList.add('hide') + } +}) + +/*document.querySelector('#btn-reload') + .addEventListener('click', () => { + window.location.reload() + })*/ diff --git a/src/pages/settings/settings.js b/src/pages/settings/settings.js index 3ee75aae3..852d01fd0 100644 --- a/src/pages/settings/settings.js +++ b/src/pages/settings/settings.js @@ -30,17 +30,13 @@ const audioOutputSelect = document.querySelector('#settings-app-audio-output') let settingsAccelerators = settingsProvider.get('settings-accelerators') -let audioDevices, typeAcceleratorSelected, keyBindings +let typeAcceleratorSelected, keyBindings -function loadAudioOutputList() { - return navigator.mediaDevices.enumerateDevices() -} - -loadAudioOutputList().then((devices) => { - audioDevices = devices.filter((device) => device.kind === 'audiooutput') +ipc.invoke('get-audio-output-list').then((devices) => { + devices = JSON.parse(devices) - if (audioDevices.length) { - audioDevices.forEach((deviceInfo) => { + if (devices.length) { + devices.forEach((deviceInfo) => { let option = document.createElement('option') option.text = deviceInfo.label || `speaker ${audioOutputSelect.length + 1}` @@ -52,7 +48,7 @@ loadAudioOutputList().then((devices) => { ipc.send('change-audio-output', audioOutputSelect.value) }) - const defaultOuput = audioDevices.find( + const defaultOuput = devices.find( (audio) => audio.deviceId == 'default' ) if (!audioOutputSelect.value.length) { @@ -65,8 +61,7 @@ loadAudioOutputList().then((devices) => { ) option.value = 0 audioOutputSelect.appendChild(option) - - document.getElementById('settings-app-audio-output').disabled = true + audioOutputSelect.disabled = true } mInit() diff --git a/src/pages/shared/window-buttons/window-buttons.html b/src/pages/shared/window-buttons/window-buttons.html index aa1c804dc..990aeff0f 100644 --- a/src/pages/shared/window-buttons/window-buttons.html +++ b/src/pages/shared/window-buttons/window-buttons.html @@ -84,7 +84,7 @@
- - + diff --git a/src/pages/settings/discord_settings.js b/src/pages/settings/sub/discord/discord_settings.js similarity index 83% rename from src/pages/settings/discord_settings.js rename to src/pages/settings/sub/discord/discord_settings.js index 8cc3b883e..d0474851f 100644 --- a/src/pages/settings/discord_settings.js +++ b/src/pages/settings/sub/discord/discord_settings.js @@ -1,10 +1,8 @@ -const { remote, ipcRenderer: ipc, shell } = require('electron') -const settingsProvider = require('../../providers/settingsProvider') -const __ = require('../../providers/translateProvider') +const settingsProvider = require('../../../../providers/settingsProvider') +const __ = require('../../../../providers/translateProvider') //var, because we have to re-assign the variable var discordSettings = null -let buttonSave = document.getElementById('btn-save') __.loadi18n() diff --git a/src/pages/settings/last-fm-login.html b/src/pages/settings/sub/last-fm/last-fm-login.html similarity index 82% rename from src/pages/settings/last-fm-login.html rename to src/pages/settings/sub/last-fm/last-fm-login.html index ca2220c28..adb1c59c2 100644 --- a/src/pages/settings/last-fm-login.html +++ b/src/pages/settings/sub/last-fm/last-fm-login.html @@ -3,17 +3,17 @@ @@ -44,7 +44,7 @@ - +