services/logging.js

@@ -1,12 +1,4 @@
 const pino = require("pino");
 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;

services/poll.js

@@ -21,13 +21,25 @@ async function poll() {
     const previous = lastPlaying[current.sessionKey];
     lastPlaying[current.sessionKey] = current;
     if (previous == null) {
-      logger.info(current, "A new session has started.");
       continue;
     }
 
-    if (checkIfCanScrobble(current, previous, now)) {
-      logger.info(previous, "Scrobble");
-      lastScrobbleTimes[previous.mediaKey] = now;
+    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)) {
+        logger.info(previous, "Scrobble");
+        lastScrobbleTimes[previous.mediaKey] = now;
+      }
     }
   }
 
@@ -65,29 +77,20 @@ function applyFilter(track, filters) {
   return false;
 }
 
-function checkIfCanScrobble(current, previous, now) {
-  if (!previous)
+function checkIfCanScrobble(current, last, now) {
+  if (!last)
     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 scrobblePercent = isInt(config.scrobble.minimum.percent) ? Number(config.scrobble.minimum.percent) : 30;
 
-  if (previous) {
-    const newPlayback = current == null || current.playtime < previous.playtime;
-    const canBeScrobbled = previous.playtime > scrobbleDuration * 1000 || previous.playtime / previous.duration > scrobblePercent;
+  if (last) {
+    const newPlayback = current == null || current.playtime < last.playtime;
+    const canBeScrobbled = last.playtime > scrobbleDuration * 1000 || last.playtime / last.duration > scrobblePercent;
 
     if (newPlayback && canBeScrobbled) {
-      const sameSong = current != null && current.mediaKey == previous.mediaKey;
-      const lastTime = lastScrobbleTimes[previous.mediaKey];
+      const sameSong = current != null && current.mediaKey == last.mediaKey;
+      const lastTime = lastScrobbleTimes[last.mediaKey];
       return !sameSong || !lastTime || now - lastTime > scrobbleDuration;
     }
   }