index.js

@@ -2,7 +2,6 @@ const render = require('./render');
 const mpris = require('./mpris');
 
 async function main() {
-  process.title = 'bouncy';
   mpris.init(render.error, render.warning, render.info);
   setInterval(() => {render.render(mpris.getArtist(), mpris.getAlbum(), mpris.getTitle(), mpris.getSongStart(), mpris.getSongEnd(), mpris.getSongPauseSpot(), mpris.getSongPaused())}, render.refreshrate);
 }

readme.md

@@ -11,12 +11,8 @@ bouncy is a tiny script that hooks onto mpris to read your currently listening s
 - a machine running dbus and mpris (typically linux)
 - nodejs >=14
 
-## how-to install
+## how-to
 
 `npm install` and `node index.js`
 
 the music player string defaults to `org.mpris.MediaPlayer2.rhythmbox`, however you can use the `BOUNCY_MUSICPLAYER` environment value to change it to another music player name
-
-## usage
-
-press space to switch between modes

render.js

@@ -1,29 +1,5 @@
 const readline = require('readline');
 
-readline.emitKeypressEvents(process.stdin);
-
-if (process.stdin.isTTY) {
-  process.stdin.setRawMode(true);
-}
-
-const modes = ['classic', 'bottom', 'top'];
-let mode = 0;
-
-let modePopup = 0;
-const modePopupDuration = 2;
-
-process.stdin.on('keypress', (str, key) => {
-  if (key.name === 'space') {
-    mode++;
-    mode = mode % modes.length;
-    modePopup = modePopupDuration;
-  }
-  if (key.sequence === '\x03' || key.sequence === '\x04') process.exit(0); // ctrl+c, ctrl+d
-});
-process.on('exit', () => {
-  process.stdout.write('\x1B[?25h\033[0m'); // show cursor
-})
-
 const plas = [' ', '.', '*', '/', '0'];
 const progressChars = ['▏', '▎', '▍', '▌', '▋', '▊', '▉'];
 //const progressChars = ['0', '1', '2', '3', '4', '5', '6', '7'];
@@ -54,8 +30,9 @@ function plasma(x, y, time, k) {
 let displaytitle = '';
 let displayalbum = '';
 
-// type: 0 = error, 1 = warning, 2 = info
-let popups = [];
+let errorText = '';
+let errorTimer = 0;
+let errorType = 0; // 0 = error, 1 = warning, 2 = info
 
 function transform(old, n) {
   if (old.length < n.length) {
@@ -82,7 +59,7 @@ let time = 0;
 function render(artist, album, title, songStart, songEnd, pauseSpot, paused) {
   let dt = refreshrate / 1000
   time += dt;
-  modePopup -= dt;
+  errorTimer -= dt;
   let w = process.stdout.columns;
   let h = process.stdout.rows;
 
@@ -97,81 +74,35 @@ function render(artist, album, title, songStart, songEnd, pauseSpot, paused) {
   }
 
   // leaving the coordinates as non-integer values is very undefined behavior
-  let texts = [];
-
-  switch (mode) {
-    case 0:
-      texts.push({
+  let texts = [
+    {
       value: ' ' + displaytitle + ' ',
       x: Math.round(w / 2 - displaytitle.length / 2 + Math.sin(time) * 5),
       y: Math.floor(h / 2) - 1,
       color: '\033[7;1m'
-      });
-      texts.push({
+    },
+    {
       value: ' ' + displayalbum + ' ',
       x: Math.round(w / 2 - displayalbum.length / 2 - Math.sin(time) * 5),
       y: Math.floor(h / 2) + 1,
       color: '\033[7m'
-      });
-      break;
-    case 1:
-      texts.push({
-        value: ' ' + displaytitle + ' '.repeat(w),
-        x: 0,
-        y: h - 3,
-        color: '\033[7;1m'
-      });
-      texts.push({
-        value: '  ' + displayalbum + ' '.repeat(w),
-        x: 0,
-        y: h - 2,
-        color: '\033[7m'
-      });
-      break;
-    case 2:
-      texts.push({
-        value: ' ' + displaytitle + ' '.repeat(w),
-        x: 0,
-        y: 0,
-        color: '\033[7;1m'
-      });
-      texts.push({
-        value: '  ' + displayalbum + ' '.repeat(w),
-        x: 0,
-        y: 1,
-        color: '\033[7m'
-      });
-      break;
     }
+  ];
 
-  let i = 0;
-  for (let popup of popups) {
-    popup.timer -= dt;
-    if (popup.timer < 0) {
-      popups.splice(i, 1);
-    } else {
-      let symbol = ['⚠️', '⚠️', 'ℹ'][popup.type];
-      let color = ['\033[41;37m', '\033[43;37m', '\033[44;37m'][popup.type];
-      let text = ` ${symbol} ${popup.text} `;
+  if (errorText && errorTimer > 0) {
+    let symbol = '⚠️';
+    if (errorType === 2) symbol = 'ℹ';
+
+    let color = '\033[41;37m';
+    if (errorType === 1) color = '\033[43;37m';
+    if (errorType === 2) color = '\033[44;37m';
 
     texts.push({
-        value: ' '.repeat(text.length) + text,
-        x: -text.length * 2 + Math.round((text.length + 3) * outCirc(Math.min(popup.timer, 1))),
-        y: 3 + i,
+      value: ` ${symbol} ${errorText} `,
+      x: 4,
+      y: Math.round(3 * outCirc(Math.min(errorTimer, 1))),
       color: color
     });
-
-      i++;
-    }
-  }
-
-  if (modePopup > 0) {
-    texts.push({
-      value: modes[mode],
-      x: Math.floor(w - ((modes[mode].length + 2) * outCirc(Math.min(modePopup, 1)))),
-      y: 0,
-      color: '\033[40;37m'
-    });
   }
 
   let reset = '\033[0m';
@@ -248,9 +179,21 @@ function render(artist, album, title, songStart, songEnd, pauseSpot, paused) {
   }
 }
 
-function error(content) {popups.push({text: content, timer: errorDuration, type: 0});}
-function warning(content) {popups.push({text: content, timer: errorDuration, type: 1});}
-function info(content) {popups.push({text: content, timer: errorDuration, type: 2});}
+function error(content) {
+  errorText = content;
+  errorTimer = errorDuration;
+  errorType = 0;
+}
+function warning(content) {
+  errorText = content;
+  errorTimer = errorDuration;
+  errorType = 1;
+}
+function info(content) {
+  errorText = content;
+  errorTimer = errorDuration;
+  errorType = 2;
+}
 
 module.exports.render = render;
 module.exports.refreshrate = refreshrate;