From 5b5414a189035bb905a161d3cd33550ce830b8c9 Mon Sep 17 00:00:00 2001
From: Evert Prants <imsonotsleepy@gmail.com>
Date: Mon, 16 Dec 2019 21:24:44 +0200
Subject: [PATCH] Update babel

---
 .babelrc        | 13 +------------
 package.json    | 16 +++++++++-------
 public/index.js |  3 +--
 src/server.js   |  1 +
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/.babelrc b/.babelrc
index b89b7c3..1320b9a 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,14 +1,3 @@
 {
-  "presets": [
-    "env",
-    "stage-0"
-  ],
-  "plugins": [
-    "transform-class-properties",
-    "transform-decorators",
-    ["transform-runtime", {
-      "polyfill": false,
-      "regenerator": true
-    }]
-  ]
+  "presets": ["@babel/preset-env"]
 }
diff --git a/package.json b/package.json
index 7aa66b7..fe506d8 100644
--- a/package.json
+++ b/package.json
@@ -1,18 +1,18 @@
 {
   "name": "btrtracks",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "server.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "babel src -d dist",
+    "build": "babel --plugins @babel/plugin-transform-runtime src -d dist",
     "start": "node dist/server.js",
     "download": "node dist/download.js",
     "populate": "node dist/dbpopulate.js"
   },
   "private": true,
   "dependencies": {
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "bcrypt": "^3.0.6",
+    "@babel/runtime": "^7.7.6",
+    "bcrypt": "^3.0.7",
     "bluebird": "^3.5.2",
     "connect-redis": "^3.4.1",
     "express": "^4.16.3",
@@ -23,11 +23,13 @@
     "oauth-libre": "^0.9.17",
     "socket.io": "^2.1.1",
     "sqlite": "^3.0.2",
-    "sqlite3": "^4.0.6"
+    "sqlite3": "^4.1.1"
   },
   "devDependencies": {
-    "babel-core": "^6.26.3",
-    "babel-env": "^2.4.1",
+    "@babel/cli": "^7.7.5",
+    "@babel/core": "^7.7.5",
+    "@babel/plugin-transform-runtime": "^7.7.6",
+    "@babel/preset-env": "^7.7.6",
     "morgan": "^1.9.1"
   }
 }
diff --git a/public/index.js b/public/index.js
index dd577cc..d1a21a4 100644
--- a/public/index.js
+++ b/public/index.js
@@ -367,8 +367,7 @@
       clear.style.display = 'none'
     }
 
-    if (page > pages) return
-    if (page < 1) return
+    if (page > pages) page = pages
     updatePaging()
 
     if (playlist === 0) {
diff --git a/src/server.js b/src/server.js
index daf3ebf..8f903b0 100644
--- a/src/server.js
+++ b/src/server.js
@@ -215,6 +215,7 @@ router.get('/serve/by-id/:id', userMiddleware, async (req, res, next) => {
       lastfm.invokeDownload(id)
       return res.end('<p>OK</p><script>window.close();</script>')
     }
+    dev && console.log("Remote", track.file)
     return ffmpeg(track.file)
       .audioCodec('libmp3lame')
       .format('mp3')