-
<%= source.display %> - <%= source.name %>
--
-
- Status: <%= source.status %> -
- Tracks Discovered (since app started): <%= source.tracksDiscovered %> - <% if (source.canPoll === true) { %> -
- Click href="recent?name=<%= source.name %>&type=<%= source.type %>" <% } else { %>class="disabled"<% } %>>to see recently played tracks returned by API - <% if (source.hasAuth) { %> -
- Click to (re)authenticate and (re)start polling - <% } %> -
- Click href="poll?name=<%= source.name %>&type=<%= source.type %>" <% } else { %>class="disabled"<% } %>>to restart polling - <% } %> -
+
- <% }) %>
-
-Clients
-
- <% clients.forEach(function (client){ %>
-
Date: Sat, 27 Feb 2021 14:30:39 +1100
Subject: [PATCH 2/4] feat: added styles, dark mode to frontend
---
index.js | 7 +++-
views/recent.ejs | 75 ++++++++++++++++++++++++++++++-----------
views/status.ejs | 86 +++++++++++++++++++++++++++++++-----------------
3 files changed, 117 insertions(+), 51 deletions(-)
diff --git a/index.js b/index.js
index 605ea901..49ca846d 100644
--- a/index.js
+++ b/index.js
@@ -35,7 +35,12 @@ const {transports} = winston;
let output = []
const stream = new Writable()
stream._write = (chunk, encoding, next) => {
- output.unshift(chunk.toString().replace('\n', ''));
+ let formatString = chunk.toString().replace('\n', '
') + .replace(/(debug)/gi, '$1') + .replace(/(warn)/gi, '$1') + .replace(/(info)/gi, '$1') + .replace(/(error)/gi, '$1') + output.unshift(formatString); output = output.slice(0, 101); next() } diff --git a/views/recent.ejs b/views/recent.ejs index 490c0750..49ad58f7 100644 --- a/views/recent.ejs +++ b/views/recent.ejs @@ -1,26 +1,61 @@ - + + + + +Multi Scrobbler - Status
- Multi Scrobbler
+
-
-
- <%= client.display %> - <%= client.name %>
--
-
- Status: <%= client.status %> -
- Tracks Scrobbled (since app started): <%= client.tracksDiscovered %> - <% if (client.hasAuth) { %> -
- Click to (re)authenticate or initialize - <% } %> -
+
+ <% sources.forEach(function (source){ %>
+
+
+
+ <% }) %>
+
+
+ <%= source.display %> - <%= source.name %>
+
+ Status: <%= source.status %>
+ Tracks Discovered (since app started): <%= source.tracksDiscovered %>
+ <% if (source.canPoll === true) { %>
+ Click href="recent?name=<%= source.name %>&type=<%= source.type %>" <% } else { %>class="disabled"<% } %>>to see recently played tracks returned by API
+ <% if (source.hasAuth) { %>
+ Click to (re)authenticate and (re)start polling
+ <% } %>
+ Click href="poll?name=<%= source.name %>&type=<%= source.type %>" <% } else { %>class="disabled"<% } %>>to restart polling
+ <% } %>
+
+
+ <% clients.forEach(function (client){ %>
+
- <% }) %>
+
+
+ <% }) %>
+
+ <%= client.display %> - <%= client.name %>
+
+
+ -
+
- Status: <%= client.status %> +
- Tracks Scrobbled (since app started): <%= client.tracksDiscovered %> + <% if (client.hasAuth) { %> +
- Click to (re)authenticate or initialize + <% } %> +
+
+
+
+
+
+ Log (Most Recent)
+
+
+
+ -
+
- Level : <%- logs.level %> +
- Sort : <%- logs.sort %> +
- Limit : <%- logs.limit %> +
Log (Most Recent)
--
-
- Level : <%- logs.level %> -
- Sort : <%- logs.sort %> -
- Limit : <%- logs.limit %> -
-<% logs.output.forEach(function (logEntry){ %>
-<%=logEntry%><% }) %>
-
--
2.51.2
From 49fadd8c9a010b96e00ee8b5d67ced126845af83 Mon Sep 17 00:00:00 2001
From: Chris Newton ') + .replace(/(debug)/gi, '$1') + .replace(/(warn)/gi, '$1') + .replace(/(info)/gi, '$1') + .replace(/(error)/gi, '$1') + output.unshift(formatString); output = output.slice(0, 101); next() } diff --git a/views/recent.ejs b/views/recent.ejs index 490c0750..49ad58f7 100644 --- a/views/recent.ejs +++ b/views/recent.ejs @@ -1,26 +1,61 @@ - + + + + +
Recently Played (<%= name %>)
- <% if (sourceType === 'spotify') { %> - This list was returned from the Spotify Api now. Sometimes Spotify "backlogs" user activity so your recent tracks may not show up for minutes (or hours). ¯\_(ツ)_/¯ - <% } %> --
- <% plays.forEach(function (play){ %>
-
<%-play%>
- <% }) %>
-
+
+
diff --git a/views/status.ejs b/views/status.ejs
index 1f9abd81..f9d1906a 100644
--- a/views/status.ejs
+++ b/views/status.ejs
@@ -2,36 +2,48 @@
+
+
+
+
+
+
+
+ 
+
+ Multi Scrobbler
+
+
+
+
+
+ Multi Scrobbler
+
+
+
+ Dark mode
+
+
+
+
+
+
+
+
+ Recently Played (<%= name %>)
+
+ <% if (sourceType === 'spotify') { %>
+ This list was returned from the Spotify Api now. Sometimes Spotify "backlogs" user activity so your recent tracks may not show up for minutes (or hours). ¯\_(ツ)_/¯
+ <% } %>
+
+ -
+ <% plays.forEach(function (play){ %>
+
- <%-play%> + <% }) %> +
-
-
-
- Multi Scrobbler
-
-
+
-
- Multi Scrobbler
-
-
+
+
+
+
+ Multi Scrobbler
+
+
+
+
+ Multi Scrobbler
+
+
+
+ Dark mode
+
<% sources.forEach(function (source){ %>
-
+
-
<%= source.display %> - <%= source.name %>
- Status: <%= source.status %>
- Tracks Discovered (since app started): <%= source.tracksDiscovered %>
+
@@ -40,15 +52,15 @@
+ Click href="recent?name=<%= source.name %>&type=<%= source.type %>" <% } else { %>class="disabled"<% } %>>to see recently played tracks returned by API
+
<% if (source.hasAuth) { %>
- Click to (re)authenticate and (re)start polling
+
<% } %>
- Click href="poll?name=<%= source.name %>&type=<%= source.type %>" <% } else { %>class="disabled"<% } %>>to restart polling
+
<% } %>
Status: <%= source.status %>
+ Tracks Discovered (since app started): <%= source.tracksDiscovered %>
<% if (source.canPoll === true) { %>
-
<% clients.forEach(function (client){ %>
-
+
-
Date: Sat, 27 Feb 2021 14:31:41 +1100
Subject: [PATCH 3/4] feat: fixed typo in readme for docker
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 585a86d8..8d713ab2 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ npm install
### [Docker](https://hub.docker.com/r/foxxmd/multi-scrobbler)
```
-foxxmd/spotify-scrobbler:latest
+foxxmd/multi-scrobbler:latest
```
## Setup
@@ -61,7 +61,7 @@ SPOTIFY_CLIENT_ID=yourId SPOTIFY_CLIENT_SECRET=yourSecret MALOJA_URL=http://doma
#### Docker
```bash
-docker run -e "SPOTIFY_CLIENT_ID=yourId" -e "SPOTIFY_CLIENT_SECRET=yourSecret" -e "MALOJA_URL=http://domain.tld" -e "MALOJA_API_KEY=1234" -v /path/on/host/config:/home/node/app/config foxxmd/spotify-scrobbler
+docker run -e "SPOTIFY_CLIENT_ID=yourId" -e "SPOTIFY_CLIENT_SECRET=yourSecret" -e "MALOJA_URL=http://domain.tld" -e "MALOJA_API_KEY=1234" -v /path/on/host/config:/home/node/app/config foxxmd/multi-scrobbler
```
**But I want to use json for configuration?**
--
2.51.2
From 31cd72cd159e41868bbe3041922e90ea896401b6 Mon Sep 17 00:00:00 2001
From: Chris Newton
Date: Tue, 2 Mar 2021 08:24:32 +1100
Subject: [PATCH 4/4] feat: fixed typo in debug output, added active state for
links
---
index.js | 8 ++++----
views/recent.ejs | 8 ++++++--
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/index.js b/index.js
index 49ca846d..bbff6622 100644
--- a/index.js
+++ b/index.js
@@ -36,7 +36,7 @@ let output = []
const stream = new Writable()
stream._write = (chunk, encoding, next) => {
let formatString = chunk.toString().replace('\n', '
') - .replace(/(debug)/gi, '$1') + .replace(/(debug)/gi, '$1') .replace(/(warn)/gi, '$1') .replace(/(info)/gi, '$1') .replace(/(error)/gi, '$1') @@ -203,9 +203,9 @@ app.use(bodyParser.json()); clients: clientData, logs: { output: slicedLog, - limit: [10, 20, 50, 100].map(x => `${x}`).join(' | '), - sort: ['ascending', 'descending'].map(x => `${x}`).join(' | '), - level: availableLevels.map(x => `${x}`).join(' | ') + limit: [10, 20, 50, 100].map(x => `${x}`).join(' | '), + sort: ['ascending', 'descending'].map(x => `${x}`).join(' | '), + level: availableLevels.map(x => `${x}`).join(' | ') } }); }) diff --git a/views/recent.ejs b/views/recent.ejs index 49ad58f7..667c21e3 100644 --- a/views/recent.ejs +++ b/views/recent.ejs @@ -51,10 +51,14 @@ let toggleSwitch = document.querySelector('#toggle-switch'); toggleSwitch.addEventListener('change', (event) => { document.body.classList.toggle('dark') + toggleSwitch.checked ? localStorage.setItem('ms-dark', 'yes') : localStorage.setItem('ms-dark', 'no') }); if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) { - document.body.classList.add('dark') - toggleSwitch.checked = true + if (localStorage.getItem('ms-dark') === 'yes') { + document.body.classList.add('dark') + toggleSwitch.checked = true + localStorage.setItem('ms-dark', 'yes') + } }
<%= client.display %> - <%= client.name %>
+
@@ -57,25 +69,39 @@
-
-
- Status: <%= client.status %> -
- Tracks Scrobbled (since app started): <%= client.tracksDiscovered %> +
- Click to (re)authenticate or initialize + <% } %>
Status: <%= client.status %>
+ Tracks Scrobbled (since app started): <%= client.tracksDiscovered %>
<% if (client.hasAuth) { %>
-
-
+
--
2.51.2
From 55afe876e0b2647d34a3e790979e0b2d966c0e7f Mon Sep 17 00:00:00 2001
From: Chris Newton
+
-
Log (Most Recent)
-
-
-
- Level : <%- logs.level %> -
- Sort : <%- logs.sort %> -
- Limit : <%- logs.limit %> -
+
+ <% logs.output.forEach(function (logEntry){ %> + <%-logEntry%> + <% }) %>
-
Level : <%- logs.level %>
+ Sort : <%- logs.sort %>
+ Limit : <%- logs.limit %>
+ + <% logs.output.forEach(function (logEntry){ %> + <%-logEntry%> + <% }) %>
') - .replace(/(debug)/gi, '$1') + .replace(/(debug)/gi, '$1') .replace(/(warn)/gi, '$1') .replace(/(info)/gi, '$1') .replace(/(error)/gi, '$1') @@ -203,9 +203,9 @@ app.use(bodyParser.json()); clients: clientData, logs: { output: slicedLog, - limit: [10, 20, 50, 100].map(x => `${x}`).join(' | '), - sort: ['ascending', 'descending'].map(x => `${x}`).join(' | '), - level: availableLevels.map(x => `${x}`).join(' | ') + limit: [10, 20, 50, 100].map(x => `${x}`).join(' | '), + sort: ['ascending', 'descending'].map(x => `${x}`).join(' | '), + level: availableLevels.map(x => `${x}`).join(' | ') } }); }) diff --git a/views/recent.ejs b/views/recent.ejs index 49ad58f7..667c21e3 100644 --- a/views/recent.ejs +++ b/views/recent.ejs @@ -51,10 +51,14 @@ let toggleSwitch = document.querySelector('#toggle-switch'); toggleSwitch.addEventListener('change', (event) => { document.body.classList.toggle('dark') + toggleSwitch.checked ? localStorage.setItem('ms-dark', 'yes') : localStorage.setItem('ms-dark', 'no') }); if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) { - document.body.classList.add('dark') - toggleSwitch.checked = true + if (localStorage.getItem('ms-dark') === 'yes') { + document.body.classList.add('dark') + toggleSwitch.checked = true + localStorage.setItem('ms-dark', 'yes') + } }