Only When Focused
- Show any notification but only when you're not using the player window Show any enabled notification but only when you're not using the player window
@@ -160,7 +158,7 @@ Show Tray Icon
Close To Tray
- Allows you to keep the window hidden whilst playing music and use the tray menu or application menu to quit.The window will minimise if the tray icon is disabled.
+ Allows you to keep the window hidden whilst playing music and use the tray menu or application menu to quit.The window will minimise if the tray icon is disabled
@@ -168,6 +166,28 @@ Close To Tray
+
+
+ Close To Controller
+ Allows you to keep the window hidden without an indicator or application icon taking up spaceHint: MPRIS controllers have to raise Spotify Web Player for it to become unhidden
+
+
+
+
+
+
+
+
+ Show Application Menu
+ Whether Spotify Web Player should hide the application menuWarning! Without a tray icon, you may not be able to get into the preferences window
+
+
+
+
+
+
Start on Login
@@ -181,8 +201,8 @@ Start on Login
- Start hidden
- Sometimes waiting is ok, Spotify Web Player is never gonna give you up
+ Start Hidden
+ Starts Spotify Web Player minimized
@@ -195,11 +215,7 @@ Start hidden
Navbar
-
-
-
+
diff --git a/js/backend/Preferences/preload.js b/js/backend/Preferences/preload.js
index c145100..e42e0fe 100755
--- a/js/backend/Preferences/preload.js
+++ b/js/backend/Preferences/preload.js
@@ -2,7 +2,9 @@ global.remote = require('electron').remote;
let props = remote.getGlobal('props');
var AutoLaunch = require('auto-launch');
let autolaunch = new AutoLaunch({
- name: 'Spotify Web Player for Linux'
+ name: 'Spotify Web Player for Linux',
+ //A 10 second sleep allows the desktop to load, otherwise no dice... :(
+ path: '/bin/bash -c "sleep 10 && . ' + props.process.cwd() + '/spotifywebplayer"'
});
global.props = props;
global.windowHook = true;
@@ -38,11 +40,14 @@ document.onreadystatechange = function(){
recursivelySetupSettings(props.appSettings, ['Theme']);
$('input[name=\'StartOnLogin\']').change(function(){
- console.log(props.process.cwd());
- if($(this).prop('checked')){
- autolaunch.enable();
+ if (props.process.platform == 'linux'){
+ if($(this).prop('checked')){
+ autolaunch.enable();
+ } else {
+ autolaunch.disable();
+ }
} else {
- autolaunch.disable();
+ app.setLoginItemSettings({openAtLogin: $(this).prop('checked')});
}
});
@@ -51,6 +56,11 @@ document.onreadystatechange = function(){
props.appSettings.save();
props.mainWindow.webContents.executeJavaScript('tray.toggleTray(' + props.appSettings.ShowTray + ')');
});
+ $('input[name*="ShowApplicationMenu"]').change(function(){
+ props.appSettings.ShowApplicationMenu = $(this).prop('checked');
+ props.appSettings.save();
+ props.mainWindow.webContents.executeJavaScript('appMenu.toggleMenu(' + props.appSettings.ShowApplicationMenu + ')');
+ });
$('input[name*=\'NavBar\'], select').change(() => {
props.mainWindow.webContents.executeJavaScript('interface.load();interface.clean()');
diff --git a/js/backend/dbus_implementation.js b/js/backend/dbus_implementation.js
index 38f450e..749c485 100755
--- a/js/backend/dbus_implementation.js
+++ b/js/backend/dbus_implementation.js
@@ -1,39 +1,57 @@
/*
* @author Matthew James
- * D-Bus MPRIS Messaging implementer
+ * D-Bus MPRIS, Notifications and Media Keys Messaging Implementer
*/
var child_process = require('child_process');
var spawn = child_process.spawn;
var lib_node = process.cwd() + '/libs/node/bin/node';
const interpreter = require('./dbus_interpreter');
-let dbus = spawnDBus();
+let MPRISAndNotifications = spawnMPRISAndNotificationService();
+let MediaKeys = spawnMediaKeyService();
-function spawnDBus(){
- var spawned = spawn(lib_node, [__dirname + '/dbus_service.js']);
+function spawnMPRISAndNotificationService(){
+ var spawned = spawn(lib_node, [__dirname + '/MPRISAndNotifications_service.js']);
spawned.stderr.on('data', (data) => {
- console.log('D-Bus Error: ' + data.toString())
+ console.log('MPRIS & Notification Error: ' + data.toString())
});
spawned.stdout.on('data', (data) => {
- console.log('D-Bus/MPRIS says: \n' + data.toString());
+ console.log('MPRIS & Notification service: \n' + data.toString());
});
spawned.on('exit', () => {
- console.log('D-Bus has unexpectedly disconnected.');
+ console.log('MPRIS & Notification service quit!');
+ });
+ return spawned;
+}
+function spawnMediaKeyService(){
+ var spawned = spawn(lib_node, [__dirname + '/MediaKeys_service.js']);
+ spawned.stderr.on('data', (data)=>{
+ console.log('Media Key Error: ' + data.toString());
+ });
+ spawned.stdout.on('data', (data) => {
+ console.log('Media Keys service: ' + data.toString());
+ });
+ spawned.on('exit', () => {
+ console.log('Media Keys quit!');
});
return spawned;
}
module.exports = {
- instance: dbus,
+ instances: {
+ MPRISAndNotifications: MPRISAndNotifications,
+ MediaKeys: MediaKeys
+ },
interpreter: interpreter,
reload: () => {
- dbus = spawnDBus();
+ MPRISAndNotifications = spawnMPRISAndNotificationService();
+ MediaKeys = spawnMediaKeyService();
},
quit: () => {
try {
- process.kill(dbus.pid);
- dbus = null;
- } catch (e){
- //D-Bus quitted early
- }
+ process.kill(MPRISAndNotifications.pid);
+ process.kill(MediaKeys.pid);
+ MPRISAndNotifications = null;
+ MediaKeys = null;
+ } catch (e){}
}
};
diff --git a/js/backend/dbus_interpreter.js b/js/backend/dbus_interpreter.js
index 1395da9..6fb3f97 100755
--- a/js/backend/dbus_interpreter.js
+++ b/js/backend/dbus_interpreter.js
@@ -17,6 +17,7 @@
* The JSON string has a standard format of
* {"command": "doSomething", args: {"key":"test"}}
*/
+ let events = {};
const interpreter = {
/*
* Encapsulate an event object into a sendable string for decapsulation
@@ -41,10 +42,20 @@ const interpreter = {
handle: (std, handlers) => {
std.on('data', function(data){
var message = interpreter.decapsulate(data.toString());
+ events = handlers;
//Try processing the command/event
- if(message && message.command && handlers.hasOwnProperty(message.command)) handlers[message.command](message.args);
+ if(message && message.command && events.hasOwnProperty(message.command)) {
+ try{
+ events[message.command](message.args);
+ } catch (e) {
+ console.log('Handles have not been released! - ' + e);
+ }
+ }
});
},
+ clearHandles: function(){
+ events = {};
+ },
/*
* Send a message to a process
* MUST PASS A STDIN/STDOUT object!
diff --git a/js/backend/properties.js b/js/backend/properties.js
index 6e859fe..82806e7 100755
--- a/js/backend/properties.js
+++ b/js/backend/properties.js
@@ -4,8 +4,39 @@ module.exports = function(electron){
const os = require('os');
const fs = require('fs');
var home = process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'];
+ var appSettings = require('./app-settings')(
+ home + '/.spotifywebplayer/preferences.json',
+ {
+ CloseToTray: true,
+ CloseToController: false,
+ ShowApplicationMenu: true,
+ ShowTray: true,
+ Notifications: {
+ ShowTrackChange: true,
+ ShowPlaybackPlaying: true,
+ ShowPlaybackPaused: true,
+ ShowPlaybackStopped: true,
+ OnlyWhenFocused: true,
+ },
+ NavBar: {
+ Follow: true,
+ User: true,
+ Radio: true,
+ YourMusic: true,
+ Browse: true,
+ Settings: true,
+ Search: true,
+ Sing: true
+ },
+ Theme: 'dark',
+ StartOnLogin: false,
+ StartHidden: false,
+ ShowDevTools: false,
+ lastURL: null
+ }
+ );
//Global properties that may be required by the web application
- return {
+ const props = {
PROC_NAME: 'spotifywebplayer',
NAME: 'Spotify Web Player',
fs: fs,
@@ -19,35 +50,7 @@ module.exports = function(electron){
APP_ICON: __dirname + '/../../icons/spotify-web-player.png',
APP_ICON_SMALL: __dirname + '/../../icons/spotify-ico-small.png',
userhome: home,
- appSettings: require('./app-settings')(
- home + '/.spotifywebplayer/preferences.json',
- {
- CloseToTray: true,
- ShowTray: true,
- Notifications: {
- ShowTrackChange: true,
- ShowPlaybackPlaying: true,
- ShowPlaybackPaused: true,
- ShowPlaybackStopped: true,
- OnlyWhenFocused: true
- },
- NavBar: {
- Follow: true,
- User: true,
- Radio: true,
- YourMusic: true,
- Browse: true,
- Settings: true,
- Search: true,
- Sing: true
- },
- Theme: 'dark',
- StartOnLogin: false,
- StartHidden: false,
- ShowDevTools: false,
- lastURL: null
- }
- ),
+ appSettings: appSettings,
globalShortcut: electron.globalShortcut,
APP_DIR: home + '/.spotifywebplayer',
HOST: 'https://play.spotify.com',
@@ -96,6 +99,7 @@ module.exports = function(electron){
minHeight: height,
maxWidth: width,
maxHeight: height,
+ resizable: false,
show: false,
webPreferences: {preload: __dirname + '/About/preload.js'}
});
@@ -115,6 +119,7 @@ module.exports = function(electron){
minHeight: height,
maxWidth: width,
maxHeight: height,
+ resizable: false,
show: false,
webPreferences: {preload: __dirname + '/Preferences/preload.js'}
});
@@ -127,7 +132,7 @@ module.exports = function(electron){
icon: global.props.APP_ICON,
width: 1200,
height: 700,
- show: !props.appSettings.StartHidden,
+ show: false,
backgroundColor: "#121314",
minWidth: 800,
minHeight: 600,
@@ -135,26 +140,19 @@ module.exports = function(electron){
nodeIntegration: false,
preload: __dirname + "/../preloaded/main.js",
plugins: true,
+ webSecurity: false,
allowDisplayingInsecureContent: true,
- allowRunningInsecureContent: true
+ allowRunningInsecureContent: true,
}
});
- if(props.appSettings.StartHidden){
- mainWindow.webContents.once('did-finish-load', function(){
- //mainWindow.show();
- mainWindow.minimize();
+ appSettings.open((err, data) => {
+ mainWindow.webContents.once('dom-ready', () => {
+ mainWindow.show();
+ if(appSettings.StartHidden) mainWindow.minimize();
});
- }
- mainWindow.webContents.on('plugin-crashed', () => {
- console.log('Plugin crashed and cannot continue.');
- electron.app.quit();
+ mainWindow.loadURL((appSettings.lastURL && appSettings.lastURL.indexOf('play.spotify.com') > -1 ? appSettings.lastURL : props.HOST));
+ if (appSettings.ShowDevTools) mainWindow.openDevTools();
});
- //Setup a new window
- mainWindow.loadURL((
- props.appSettings.lastURL && props.appSettings.lastURL.indexOf('play.spotify.com') > -1 ?
- props.appSettings.lastURL :
- global.props.HOST
- ));
mainWindow.on('page-title-updated', function(event){
event.preventDefault();
});
@@ -167,4 +165,5 @@ module.exports = function(electron){
return mainWindow;
}
};
+ return props;
};
diff --git a/js/preloaded/Sing!/sing.js b/js/preloaded/Sing!/sing.js
index cf37267..8715bda 100755
--- a/js/preloaded/Sing!/sing.js
+++ b/js/preloaded/Sing!/sing.js
@@ -1,13 +1,5 @@
//Elements
let ui, navButton, timeButton, timer;
-//Make lyrics cache if it doesn't exist
-props.fs.access(props.lyricCache, props.fs.F_OK, (err) => {
- if (err){
- props.fs.mkdir(props.lyricCache, (err) => {
- if (err) console.log(err);
- });
- }
-});
//Load UI Element first
props.fs.readFile(__dirname + '/ui.html', function(err, data){
if(err) console.log(err);
@@ -52,6 +44,9 @@ props.fs.readFile(__dirname + '/ui.html', function(err, data){
singFuncs.load(controller.getTrackUri(), controller.getTrackName(), controller.getArtist());
}
});
+ $('a[id*=\'nav-\']').not('#nav-sing').click(function(){
+ if(singFuncs.isOpen()) singFuncs.toggleUI(false);
+ });
});
});
function toggleLyricScroller(toggle){
@@ -67,7 +62,14 @@ function toggleLyricScroller(toggle){
}
const singFuncs = {
load: (trackURI, trackName, trackArtist) => {
- //alert('TrackURI: ' + trackURI + ' \nName: ' + trackName + '\nArtist: ' + trackArtist);
+ //Make lyrics cache if it doesn't exist
+ props.fs.access(props.lyricCache, props.fs.F_OK, (err) => {
+ if (err){
+ props.fs.mkdir(props.lyricCache, (err) => {
+ if (err) console.log(err);
+ });
+ }
+ });
if (singFuncs.isOpen() && props.appSettings.NavBar.Sing && $('#sing-ui').attr('data-ref') != trackURI && trackURI && trackName && trackArtist){
singFuncs.showLoader();
var filepath = props.lyricCache + '/' + trackArtist.split(',')[0] + '-' + trackName.match(/(\w+)/g).join('-') + '.html';
@@ -79,9 +81,9 @@ const singFuncs = {
singFuncs.hideLoader();
if (err){
console.log(err);
- $('#sing-ui #sing-container').html("
Sorry, I couldn't find the lyrics to this song.
Sorry, I couldn't find the lyrics to this song. (" + err + ") " + result.title + " " + result.artist + " " + result.lyrics.replace(/\n/g, '
Lyrics from MusixMatch, using node-unofficialmxm
" + result.title + " " + result.artists.join(', ') + " " + result.lyrics.replace(/\n/g, '
Lyrics from MusixMatch, using node-unofficialmxm
Sorry, I couldn't get the lyrics to this song.
Sorry, I couldn't get the lyrics to this song. (" + error + ")