tom/apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: tom:ad624172a612b1e7941055032574916148dcb5e7
Branches Tags
tom:main
..
compare: tom:3112a29bb3ee30d5fe3c3a38b22e45c06c96cdad
Branches Tags
tom:main

No commits in common. "ad624172a612b1e7941055032574916148dcb5e7" and "3112a29bb3ee30d5fe3c3a38b22e45c06c96cdad" have entirely different histories.
ad624172a6 ... 3112a29bb3

2 changed files with 23 additions and 28 deletions
Show Stats Expand all files Collapse all files

8
services/logging.js
View File

@ -1,12 +1,4 @@
const pino = require("pino"); const pino = require("pino");
const logger = pino(pino.destination({ dest: 'logs/.log', sync: false })); const logger = pino(pino.destination({ dest: 'logs/.log', sync: false }));
const environment = process.env.NODE_ENV || 'development';
console.log(process.env.NODE_ENV);
if (environment == "production") {
logger.level = 30
} else {
logger.level = 20
}
module.exports = logger; module.exports = logger;

37
services/poll.js
View File

@ -21,15 +21,27 @@ async function poll() {
const previous = lastPlaying[current.sessionKey]; const previous = lastPlaying[current.sessionKey];
lastPlaying[current.sessionKey] = current; lastPlaying[current.sessionKey] = current;
if (previous == null) { if (previous == null) {
logger.info(current, "A new session has started.");
continue; continue;
} }
let filters = [];
if (previous.source == 'plex')
filters = config.scrobble.plex.filters;
if (!applyFilter(previous, filters)) {
logger.debug(previous, 'No filters got triggered. Ignoring.');
continue;
}
if (!previous) {
logger.info(current, "A new session has started.");
} else {
if (checkIfCanScrobble(current, previous, now)) { if (checkIfCanScrobble(current, previous, now)) {
logger.info(previous, "Scrobble"); logger.info(previous, "Scrobble");
lastScrobbleTimes[previous.mediaKey] = now; lastScrobbleTimes[previous.mediaKey] = now;
} }
} }
}
// Scrobble then remove lingering sessions // Scrobble then remove lingering sessions
for (let key in lastPlaying) { for (let key in lastPlaying) {
@ -65,29 +77,20 @@ function applyFilter(track, filters) {
return false; return false;
} }
function checkIfCanScrobble(current, previous, now) { function checkIfCanScrobble(current, last, now) {
if (!previous) if (!last)
return; return;
let filters = [];
if (previous.source == 'plex')
filters = config.scrobble.plex.filters;
if (!applyFilter(previous, filters)) {
logger.debug(previous, 'No filters got triggered. Ignoring.');
return false;
}
const scrobbleDuration = isInt(config.scrobble.minimum.duration) ? Number(config.scrobble.minimum.duration) : 30; const scrobbleDuration = isInt(config.scrobble.minimum.duration) ? Number(config.scrobble.minimum.duration) : 30;
const scrobblePercent = isInt(config.scrobble.minimum.percent) ? Number(config.scrobble.minimum.percent) : 30; const scrobblePercent = isInt(config.scrobble.minimum.percent) ? Number(config.scrobble.minimum.percent) : 30;
if (previous) { if (last) {
const newPlayback = current == null || current.playtime < previous.playtime; const newPlayback = current == null || current.playtime < last.playtime;
const canBeScrobbled = previous.playtime > scrobbleDuration * 1000 || previous.playtime / previous.duration > scrobblePercent; const canBeScrobbled = last.playtime > scrobbleDuration * 1000 || last.playtime / last.duration > scrobblePercent;
if (newPlayback && canBeScrobbled) { if (newPlayback && canBeScrobbled) {
const sameSong = current != null && current.mediaKey == previous.mediaKey; const sameSong = current != null && current.mediaKey == last.mediaKey;
const lastTime = lastScrobbleTimes[previous.mediaKey]; const lastTime = lastScrobbleTimes[last.mediaKey];
return !sameSong || !lastTime || now - lastTime > scrobbleDuration; return !sameSong || !lastTime || now - lastTime > scrobbleDuration;
} }
} }