From e143acf41772128b59e884be601824a4a43e0d31 Mon Sep 17 00:00:00 2001 From: Evert Prants Date: Sun, 4 Oct 2020 11:01:16 +0300 Subject: [PATCH] export fixes --- src/common/async.js | 2 +- src/common/download.js | 2 +- src/dbpopulate.js | 4 ++-- src/download.js | 4 ++-- src/external.js | 6 +++--- src/lastfm.js | 4 +--- src/playlist.js | 2 +- src/server.js | 8 ++++---- 8 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/common/async.js b/src/common/async.js index c04dc09..7287f6f 100644 --- a/src/common/async.js +++ b/src/common/async.js @@ -171,7 +171,7 @@ async function setMetadata (file, meta, source, cleanup = false) { return { file, dbq } } -export default { +export { getFiles, promiseExec, askAsync, diff --git a/src/common/download.js b/src/common/download.js index 583c452..25be658 100644 --- a/src/common/download.js +++ b/src/common/download.js @@ -92,4 +92,4 @@ function fetchVideo (data) { }) } -export default { parseTitle, getVideoInfo, fetchVideo } +export { parseTitle, getVideoInfo, fetchVideo } diff --git a/src/dbpopulate.js b/src/dbpopulate.js index 7412d9e..06fcea4 100644 --- a/src/dbpopulate.js +++ b/src/dbpopulate.js @@ -1,8 +1,8 @@ import path from 'path' import readline from 'readline' -import asn from './common/async' -import dl from './common/download' +import * as asn from './common/async' +import * as dl from './common/download' import { dbPromise } from './database' const values = require(path.join(process.cwd(), 'values.json')) diff --git a/src/download.js b/src/download.js index 025ccb9..f7ccd9f 100644 --- a/src/download.js +++ b/src/download.js @@ -4,8 +4,8 @@ import readline from 'readline' import path from 'path' import sanitize from 'sanitize-filename' -import asn from './common/async' -import dl from './common/download' +import * as asn from './common/async' +import * as dl from './common/download' import { dbPromise } from './database' const values = require(path.join(process.cwd(), 'values.json')) diff --git a/src/external.js b/src/external.js index 38acb39..0675199 100644 --- a/src/external.js +++ b/src/external.js @@ -1,7 +1,7 @@ import path from 'path' import sanitize from 'sanitize-filename' -import asn from './common/async' -import dl from './common/download' +import * as asn from './common/async' +import * as dl from './common/download' import { dbPromise } from './database' import { URL } from 'url' @@ -134,7 +134,7 @@ async function searchURL (url) { return [] } -export default { +export { downloadLocally, invokeDownload, addListExternal, diff --git a/src/lastfm.js b/src/lastfm.js index 6ad7201..c019d28 100644 --- a/src/lastfm.js +++ b/src/lastfm.js @@ -115,13 +115,11 @@ async function scrobbleTrack (userId, trackData) { mbid: trackData.mbid, timestamp: Math.floor(Date.now() / 1000) }) - // let res = await rp.post('http://ws.audioscrobbler.com/2.0/', { form: scrobbleSig }) - // let rep = await parseStringPromise(res) return true } -export default { +export { search, getAPISig, getAuthURL, diff --git a/src/playlist.js b/src/playlist.js index f64e450..9fcae43 100644 --- a/src/playlist.js +++ b/src/playlist.js @@ -98,4 +98,4 @@ async function moveTrack (userId, playlistId, trackId, position) { return true } -export default { getPlaylist, getPlaylists, createPlaylist, deletePlaylist, addTrack, removeTrack, moveTrack } +export { getPlaylist, getPlaylists, createPlaylist, deletePlaylist, addTrack, removeTrack, moveTrack } diff --git a/src/server.js b/src/server.js index b594d2f..1f8a34a 100644 --- a/src/server.js +++ b/src/server.js @@ -9,11 +9,11 @@ import ffmpeg from 'fluent-ffmpeg' import { user, userMiddleware } from './user' import { dbPromise } from './database' -import asn from './common/async' +import * as asn from './common/async' -import playlist from './playlist' -import lastfm from './lastfm' -import external from './external.js' +import * as playlist from './playlist' +import * as lastfm from './lastfm' +import * as external from './external.js' require('express-async-errors')