Skip to content

Commit 4fdd346

Browse files
committed
Merge branch 'refs/heads/develop'
2 parents 729250a + 4f26b63 commit 4fdd346

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+2775
-216
lines changed

.github/workflows/packagesDeleteUntagged.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Delete Untagged Packages
22
on:
33
schedule:
4-
- cron: '30 1 * * *'
4+
- cron: '30 1 * * 0'
55
workflow_run:
66
workflows: ["Publish Docker image to Dockerhub"]
77
types:

README.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ A javascript app to scrobble music you listened to, to [Maloja](https://github.c
2020
* [Youtube Music](https://foxxmd.github.io/multi-scrobbler/docs/configuration#youtube-music)
2121
* [Last.fm](https://foxxmd.github.io/multi-scrobbler/docs/configuration#lastfm-source)
2222
* [ListenBrainz](https://foxxmd.github.io/multi-scrobbler/docs/configuration#listenbrainz-source)
23-
* [Deezer](https://foxxmd.github.io/multi-scrobbler/docs/configuration#deezer)
23+
* [~~Deezer~~](https://foxxmd.github.io/multi-scrobbler/docs/configuration#deezer)
2424
* [MPRIS (Linux Desktop)](https://foxxmd.github.io/multi-scrobbler/docs/configuration#mpris)
2525
* [Mopidy](https://foxxmd.github.io/multi-scrobbler/docs/configuration#mopidy)
2626
* [JRiver](https://foxxmd.github.io/multi-scrobbler/docs/configuration#jriver)
2727
* [Kodi](https://foxxmd.github.io/multi-scrobbler/docs/configuration#kodi)
2828
* [Google Cast (Chromecast)](https://foxxmd.github.io/multi-scrobbler/docs/configuration#google-cast-chromecast)
2929
* [Musikcube](https://foxxmd.github.io/multi-scrobbler/docs/configuration#muikcube)
30+
* [MPD (Music Player Daemon)](https://foxxmd.github.io/multi-scrobbler/docs/configuration#mpd-music-player-daemon)
3031
* Supports scrobbling to many **Clients**
3132
* [Maloja](https://foxxmd.github.io/multi-scrobbler/docs/configuration#maloja)
3233
* [Last.fm](https://foxxmd.github.io/multi-scrobbler/docs/configuration#lastfm)
@@ -37,7 +38,8 @@ A javascript app to scrobble music you listened to, to [Maloja](https://github.c
3738
* Graceful network and client failure handling (queued scrobbles that auto-retry)
3839
* Smart handling of credentials (persistent, authorization through app)
3940
* Easy configuration through ENVs or JSON
40-
* Install using [Docker images for x86/ARM](https://foxxmd.github.io/multi-scrobbler/docs/installation#docker#docker), [flatpak](https://foxxmd.github.io/multi-scrobbler/docs/installation#docker#flatpak), or [locally with NodeJS](https://foxxmd.github.io/multi-scrobbler/docs/installation#docker#nodejs)
41+
* Modify data before scrobbling with [regular expression or search patterns](https://foxxmd.github.io/multi-scrobbler/docs/transforms)
42+
* Install using [Docker images for x86/ARM](https://foxxmd.github.io/multi-scrobbler/docs/installation#docker), [flatpak](https://foxxmd.github.io/multi-scrobbler/docs/installationr#flatpak), or [locally with NodeJS](https://foxxmd.github.io/multi-scrobbler/docs/installation#nodejs)
4143

4244
[**Quick Start Guide**](https://foxxmd.github.io/multi-scrobbler/docs/quickstart)
4345

config/mpd.json.example

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[
2+
{
3+
"enable": true,
4+
"name": "MyMPD",
5+
"data": {
6+
"url": "192.168.0.100:6600",
7+
"password": "MY_PASSWORD"
8+
},
9+
"options": {
10+
"disableDiscovery": false
11+
}
12+
}
13+
]

config/musikcube.json.example

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"enable": true,
55
"name": "musikcube",
66
"data": {
7+
"url": "ws://localhost:7905",
78
"password": "MY_PASSWORD"
89
}
910
}

docsite/docs/FAQ.md

+4
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@ If multi-scrobbler is not running on the same machine your browser is on then th
124124

125125
EX `http://localhost:9078/lastfm/callback` -> `http://192.168.0.220:9078/lastfm/callback`
126126

127+
### Deezer is not working
128+
129+
Deezer has discontinued support for their API and the Deezer Source is now [**deprecated.**](configuration/configuration.mdx#deezer) See [this issue for more discussion.](https://github.com/FoxxMD/multi-scrobbler/issues/175#issuecomment-2296776625)
130+
127131
## Configuration Issues
128132

129133
### Config could not be parsed

docsite/docs/configuration/configuration.mdx

+63-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import MalojaConfig from '!!raw-loader!../../../config/maloja.json.example';
2121
import MopidyConfig from '!!raw-loader!../../../config/mopidy.json.example';
2222
import MprisConfig from '!!raw-loader!../../../config/mpris.json.example';
2323
import MusikcubeConfig from '!!raw-loader!../../../config/musikcube.json.example';
24+
import MPDConfig from '!!raw-loader!../../../config/mpd.json.example';
2425
import PlexConfig from '!!raw-loader!../../../config/plex.json.example';
2526
import SpotifyConfig from '!!raw-loader!../../../config/spotify.json.example';
2627
import SubsonicConfig from '!!raw-loader!../../../config/subsonic.json.example';
@@ -146,7 +147,7 @@ These options affect multi-scrobbler's behavior and are not specific to any sour
146147

147148
#### Base URL
148149

149-
Defines the URL that is used to generate default redirect URLs for authentication on [spotify](#spotify), [lastfm](#lastfm), and [deezer](#deezer) -- as well as some logging hints.
150+
Defines the URL that is used to generate default redirect URLs for authentication on [spotify](#spotify) and [lastfm](#lastfm) -- as well as some logging hints.
150151

151152
* Default => `http://localhost:9078`
152153
* Set with [ENV](./configuration?configType=env#configuration-types) `BASE_URL` or `baseUrl` [all-in-one configuration](./configuration?configType=aio#configuration-types)
@@ -491,7 +492,21 @@ On your [profile page](https://listenbrainz.org/profile/) find your **User Token
491492
</TabItem>
492493
</Tabs>
493494

494-
### [Deezer](https://deezer.com/)
495+
### [~~Deezer~~](https://deezer.com/)
496+
497+
:::warning
498+
499+
**This Source is DEPRECATED because Deezer has dropped official API support.** This Source will **not** be removed but no further support or fixes will be given.
500+
501+
Users cannot create new applications on Deezer Developers and there is no guarantee existing applications will continue to work.
502+
503+
As a workaround consider integrating Deezer with last.fm and then using [last.fm as a Source](#lastfm-source).
504+
505+
Users with existing Deezer applications in use with multi-scrobbler should consider this change as well to avoid future breaking issues with the unsupported API.
506+
507+
[See this issue for more discussion.](https://github.com/FoxxMD/multi-scrobbler/issues/175#issuecomment-2296776625)
508+
509+
:::
495510

496511
Create a new application at [Deezer Developers](https://developers.deezer.com/myapps)
497512

@@ -1256,6 +1271,52 @@ If no URL is provided to MS it will try to use `ws://localhost:7905`
12561271
</TabItem>
12571272
</Tabs>
12581273

1274+
### [MPD (Music Player Daemon)](https://www.musicpd.org/)
1275+
1276+
MS communicates with MPD using the [TCP client connection.](https://mpd.readthedocs.io/en/stable/user.html#client-connections)
1277+
1278+
You should uncomment/create the following settings in your mpd config:
1279+
1280+
```
1281+
bind_to_address "any" # or a specific ipv4/v6 address
1282+
port "6600"
1283+
```
1284+
1285+
<!-- MS will also discover MPD servers if [zeroconf support](https://mpd.readthedocs.io/en/stable/user.html#zeroconf) is enabled and MS is set up to utilize mDNS. This can be disabled in file-config options. -->
1286+
1287+
#### Configuration
1288+
1289+
<Tabs groupId="configType" queryString>
1290+
<TabItem value="env" label="ENV">
1291+
| Environmental Variable | Required? | Default | Description |
1292+
|------------------------|-----------|------------------|-------------|
1293+
| `MPD_URL` | No | `localhost:6600` | |
1294+
| `MPD_PASSWORD` | No | | |
1295+
</TabItem>
1296+
<TabItem value="file" label="File">
1297+
<details>
1298+
1299+
<summary>Example</summary>
1300+
1301+
<CodeBlock title="CONFIG_DIR/mpd.json" language="json5">{MPDConfig}</CodeBlock>
1302+
1303+
</details>
1304+
1305+
or <SchemaLink lower objectName="MPDSourceConfig"/>
1306+
</TabItem>
1307+
<TabItem value="aio" label="AIO">
1308+
<details>
1309+
1310+
<summary>Example</summary>
1311+
1312+
<AIOExample data={MPDConfig} name="mpd"/>
1313+
1314+
</details>
1315+
1316+
or <SchemaLink lower objectName="MPDSourceConfig"/>
1317+
</TabItem>
1318+
</Tabs>
1319+
12591320
## Client Configurations
12601321

12611322
### [Maloja](https://github.com/krateng/maloja)

0 commit comments

Comments
 (0)