@jellybrick/mpris-service 2.1.3 → 2.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/constants.js.map +1 -1
- package/dist/index.js +30 -40
- package/dist/index.js.map +1 -1
- package/dist/interfaces/mpris-interface.js +6 -14
- package/dist/interfaces/mpris-interface.js.map +1 -1
- package/dist/interfaces/player.js +38 -41
- package/dist/interfaces/player.js.map +1 -1
- package/dist/interfaces/playlists.js +23 -27
- package/dist/interfaces/playlists.js.map +1 -1
- package/dist/interfaces/root.js +29 -34
- package/dist/interfaces/root.js.map +1 -1
- package/dist/interfaces/tracklist.js +22 -26
- package/dist/interfaces/tracklist.js.map +1 -1
- package/dist/interfaces/types.js +2 -2
- package/dist/interfaces/types.js.map +1 -1
- package/dist/logging.js +1 -1
- package/dist/logging.js.map +1 -1
- package/package.json +11 -11
- package/src/index.js +7 -7
- package/src/interfaces/mpris-interface.js +5 -9
- package/src/interfaces/player.js +8 -5
- package/src/interfaces/playlists.js +10 -8
- package/src/interfaces/root.js +7 -6
- package/src/interfaces/tracklist.js +8 -7
- package/src/interfaces/types.js +2 -2
- package/src/logging.js +1 -1
- package/.idea/discord.xml +0 -7
- package/.idea/jsLibraryMappings.xml +0 -6
- package/.idea/modules.xml +0 -8
- package/.idea/mpris-service.iml +0 -12
- package/.idea/vcs.xml +0 -6
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
const dbus = require('dbus-next');
|
|
2
|
-
const Variant = dbus.Variant;
|
|
1
|
+
const dbus = require('@jellybrick/dbus-next');
|
|
3
2
|
const types = require('./types');
|
|
4
3
|
const deepEqual = require('deep-equal');
|
|
5
4
|
const constants = require('../constants');
|
|
6
5
|
const logging = require('../logging');
|
|
7
6
|
|
|
8
|
-
|
|
9
|
-
Interface, property, method, signal, DBusError,
|
|
10
|
-
ACCESS_READ, ACCESS_WRITE, ACCESS_READWRITE
|
|
11
|
-
} = dbus.interface;
|
|
7
|
+
const { Interface } = dbus.interface;
|
|
12
8
|
|
|
13
9
|
class MprisInterface extends Interface {
|
|
14
10
|
constructor(name, player) {
|
|
@@ -18,7 +14,7 @@ class MprisInterface extends Interface {
|
|
|
18
14
|
|
|
19
15
|
_setPropertyInternal(property, valueDbus) {
|
|
20
16
|
// nothing is currently settable internally that needs conversion to plain
|
|
21
|
-
this.player.emit(property[0].toLowerCase() + property.
|
|
17
|
+
this.player.emit(property[0].toLowerCase() + property.substring(1), valueDbus);
|
|
22
18
|
}
|
|
23
19
|
|
|
24
20
|
setProperty(property, valuePlain) {
|
|
@@ -41,9 +37,9 @@ class MprisInterface extends Interface {
|
|
|
41
37
|
if (!deepEqual(this[`_${property}`], valueDbus)) {
|
|
42
38
|
this[`_${property}`] = valueDbus;
|
|
43
39
|
|
|
44
|
-
if (property
|
|
40
|
+
if (property === 'LoopStatus' && !constants.isLoopStatusValid(valuePlain)) {
|
|
45
41
|
logging.warn(`setting player loop status to an invalid value: ${valuePlain}`);
|
|
46
|
-
} else if (property
|
|
42
|
+
} else if (property === 'PlaybackStatus' && !constants.isPlaybackStatusValid(valuePlain)) {
|
|
47
43
|
logging.warn(`setting player playback status to an invalid value: ${valuePlain}`);
|
|
48
44
|
} else {
|
|
49
45
|
let changedProperties = {};
|
package/src/interfaces/player.js
CHANGED
|
@@ -1,12 +1,15 @@
|
|
|
1
|
-
const dbus = require('dbus-next');
|
|
1
|
+
const dbus = require('@jellybrick/dbus-next');
|
|
2
2
|
const MprisInterface = require('./mpris-interface');
|
|
3
|
-
|
|
3
|
+
|
|
4
4
|
const constants = require('../constants');
|
|
5
5
|
|
|
6
|
-
|
|
7
|
-
property,
|
|
8
|
-
|
|
6
|
+
const {
|
|
7
|
+
property,
|
|
8
|
+
method,
|
|
9
|
+
signal,
|
|
10
|
+
ACCESS_READ
|
|
9
11
|
} = dbus.interface;
|
|
12
|
+
const DBusError = dbus.DBusError;
|
|
10
13
|
|
|
11
14
|
class PlayerInterface extends MprisInterface {
|
|
12
15
|
constructor(player) {
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
// TODO proper import
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
property,
|
|
9
|
-
|
|
2
|
+
const MprisInterface = require('./mpris-interface');
|
|
3
|
+
const dbus = require('@jellybrick/dbus-next');
|
|
4
|
+
|
|
5
|
+
const types = require('./types');
|
|
6
|
+
|
|
7
|
+
const {
|
|
8
|
+
property,
|
|
9
|
+
method,
|
|
10
|
+
signal,
|
|
11
|
+
ACCESS_READ
|
|
10
12
|
} = dbus.interface;
|
|
11
13
|
|
|
12
14
|
class PlaylistsInterface extends MprisInterface {
|
package/src/interfaces/root.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
let Variant = dbus.Variant;
|
|
1
|
+
const MprisInterface = require('./mpris-interface');
|
|
2
|
+
const dbus = require('@jellybrick/dbus-next');
|
|
4
3
|
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
4
|
+
|
|
5
|
+
const {
|
|
6
|
+
property,
|
|
7
|
+
method,
|
|
8
|
+
ACCESS_READ
|
|
8
9
|
} = dbus.interface;
|
|
9
10
|
|
|
10
11
|
class RootInterface extends MprisInterface {
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
let types = require('./types');
|
|
1
|
+
const MprisInterface = require('./mpris-interface');
|
|
2
|
+
const dbus = require('@jellybrick/dbus-next');
|
|
3
|
+
const types = require('./types');
|
|
5
4
|
|
|
6
|
-
|
|
7
|
-
property,
|
|
8
|
-
|
|
5
|
+
const {
|
|
6
|
+
property,
|
|
7
|
+
method,
|
|
8
|
+
signal,
|
|
9
|
+
ACCESS_READ
|
|
9
10
|
} = dbus.interface;
|
|
10
11
|
|
|
11
12
|
class TracklistInterface extends MprisInterface {
|
package/src/interfaces/types.js
CHANGED
package/src/logging.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
const loggingEnabled = (process.env.MPRIS_SERVICE_DEBUG !== undefined && process.env.MPRIS_SERVICE_DEBUG !== '0');
|
|
2
2
|
|
|
3
3
|
module.exports.debug = function(message) {
|
|
4
4
|
if (loggingEnabled) {
|
package/.idea/discord.xml
DELETED
package/.idea/modules.xml
DELETED
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
-
<project version="4">
|
|
3
|
-
<component name="ProjectModuleManager">
|
|
4
|
-
<modules>
|
|
5
|
-
<module fileurl="file://$PROJECT_DIR$/.idea/mpris-service.iml" filepath="$PROJECT_DIR$/.idea/mpris-service.iml" />
|
|
6
|
-
</modules>
|
|
7
|
-
</component>
|
|
8
|
-
</project>
|
package/.idea/mpris-service.iml
DELETED
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
-
<module type="WEB_MODULE" version="4">
|
|
3
|
-
<component name="NewModuleRootManager">
|
|
4
|
-
<content url="file://$MODULE_DIR$">
|
|
5
|
-
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
|
|
6
|
-
<excludeFolder url="file://$MODULE_DIR$/temp" />
|
|
7
|
-
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
|
8
|
-
</content>
|
|
9
|
-
<orderEntry type="inheritedJdk" />
|
|
10
|
-
<orderEntry type="sourceFolder" forTests="false" />
|
|
11
|
-
</component>
|
|
12
|
-
</module>
|