diff --git a/seasoned_api/package.json b/seasoned_api/package.json index 8b2db1b..9f69350 100644 --- a/seasoned_api/package.json +++ b/seasoned_api/package.json @@ -7,8 +7,8 @@ }, "main": "webserver/server.js", "scripts": { - "start": "cross-env SEASONED_CONFIG=conf/development.json PROD=true NODE_PATH=. node src/webserver/server.js", - "test": "cross-env SEASONED_CONFIG=conf/test.json NODE_PATH=. mocha --recursive test/unit test/system", + "start": "cross-env SEASONED_CONFIG=conf/development.json PROD=true NODE_PATH=. babel-node src/webserver/server.js", + "test": "cross-env SEASONED_CONFIG=conf/test.json NODE_PATH=. mocha --require @babel/register --recursive test/unit test/system", "coverage": "cross-env SEASONED_CONFIG=conf/test.json NODE_PATH=. nyc mocha --recursive test && nyc report --reporter=text-lcov | coveralls", "lint": "./node_modules/.bin/eslint src/", "update": "cross-env SEASONED_CONFIG=conf/development.json NODE_PATH=. node src/plex/updateRequestsInPlex.js", @@ -32,6 +32,10 @@ "sqlite3": "^4.0.0" }, "devDependencies": { + "@babel/core": "^7.5.5", + "@babel/node": "^7.5.5", + "@babel/preset-env": "^7.5.5", + "@babel/register": "^7.5.5", "coveralls": "^3.0.0", "documentation": "^12.0.3", "eslint": "^4.9.0", diff --git a/seasoned_api/src/database/sqliteDatabase.js b/seasoned_api/src/database/sqliteDatabase.js index e6b8bf7..aee129a 100644 --- a/seasoned_api/src/database/sqliteDatabase.js +++ b/seasoned_api/src/database/sqliteDatabase.js @@ -25,7 +25,7 @@ class SqliteDatabase { * @param {Array} parameters in the SQL query * @returns {Promise} */ - async run(sql, parameters) { + run(sql, parameters) { return new Promise((resolve, reject) => { this.connection.run(sql, parameters, (error, result) => { if (error) @@ -41,7 +41,7 @@ class SqliteDatabase { * @param {Array} parameters in the SQL query * @returns {Promise} */ - async all(sql, parameters) { + all(sql, parameters) { return new Promise((resolve, reject) => { this.connection.all(sql, parameters, (err, rows) => { if (err) { @@ -58,7 +58,7 @@ class SqliteDatabase { * @param {Array} parameters in the SQL query * @returns {Promise} */ - async get(sql, parameters) { + get(sql, parameters) { return new Promise((resolve, reject) => { this.connection.get(sql, parameters, (err, rows) => { if (err) { @@ -75,7 +75,7 @@ class SqliteDatabase { * @param {Array} parameters in the SQL query * @returns {Promise} */ - async execute(sql) { + execute(sql) { return new Promise(resolve => { this.connection.exec(sql, (err, database) => { if (err) { diff --git a/seasoned_api/src/tmdb/.babelrc b/seasoned_api/src/tmdb/.babelrc new file mode 100644 index 0000000..1320b9a --- /dev/null +++ b/seasoned_api/src/tmdb/.babelrc @@ -0,0 +1,3 @@ +{ + "presets": ["@babel/preset-env"] +} diff --git a/seasoned_api/src/tmdb/convertTmdbToMovie.js b/seasoned_api/src/tmdb/convertTmdbToMovie.js index 9d06ca0..2b54c0f 100644 --- a/seasoned_api/src/tmdb/convertTmdbToMovie.js +++ b/seasoned_api/src/tmdb/convertTmdbToMovie.js @@ -1,4 +1,4 @@ -const Movie = require('src/tmdb/types/movie'); +import { Movie } from './types' const tmdbSwitcher = (tmdbMovie, property) => tmdbMovie[property] diff --git a/seasoned_api/src/tmdb/convertTmdbToPerson.js b/seasoned_api/src/tmdb/convertTmdbToPerson.js index 32e6911..3626ff4 100644 --- a/seasoned_api/src/tmdb/convertTmdbToPerson.js +++ b/seasoned_api/src/tmdb/convertTmdbToPerson.js @@ -1,4 +1,4 @@ -const Person = require('src/tmdb/types/person'); +import { Person } from './types' const convertTmdbToMovie = require('src/tmdb/convertTmdbToMovie'); function convertTmdbToPerson(tmdbPerson, cast=undefined) { diff --git a/seasoned_api/src/tmdb/convertTmdbToSeasoned.js b/seasoned_api/src/tmdb/convertTmdbToSeasoned.js index cd552c2..0ce7886 100644 --- a/seasoned_api/src/tmdb/convertTmdbToSeasoned.js +++ b/seasoned_api/src/tmdb/convertTmdbToSeasoned.js @@ -1,5 +1,4 @@ const TMDB = require('src/media_classes/tmdb'); -const Movie = require('src/types/movie'); function translateYear(tmdbReleaseDate) { return new Date(tmdbReleaseDate).getFullYear(); diff --git a/seasoned_api/src/tmdb/convertTmdbToShow.js b/seasoned_api/src/tmdb/convertTmdbToShow.js index 0bb0481..1a25fe5 100644 --- a/seasoned_api/src/tmdb/convertTmdbToShow.js +++ b/seasoned_api/src/tmdb/convertTmdbToShow.js @@ -1,4 +1,4 @@ -const Show = require('src/tmdb/types/show'); +import { Show } from './types' function convertTmdbToShow(tmdbShow, credits=undefined) { const show = new Show(tmdbShow.id, tmdbShow.name) diff --git a/seasoned_api/src/tmdb/tmdb.js b/seasoned_api/src/tmdb/tmdb.js index 8c16f40..3675dd8 100644 --- a/seasoned_api/src/tmdb/tmdb.js +++ b/seasoned_api/src/tmdb/tmdb.js @@ -2,7 +2,7 @@ const moviedb = require('km-moviedb'); const convertTmdbToMovie = require('src/tmdb/convertTmdbToMovie'); const convertTmdbToShow = require('src/tmdb/convertTmdbToShow'); const convertTmdbToPerson = require('src/tmdb/convertTmdbToPerson'); -const { tmdbInfo } = require('src/tmdb/types') +// const { tmdbInfo } = require('src/tmdb/types') class TMDB { constructor(cache, apiKey, tmdbLibrary) { diff --git a/seasoned_api/src/tmdb/types.js b/seasoned_api/src/tmdb/types.js new file mode 100644 index 0000000..5c8891e --- /dev/null +++ b/seasoned_api/src/tmdb/types.js @@ -0,0 +1,5 @@ +import Movie from './types/movie.js' +import Show from './types/show.js' +import Person from './types/person.js' + +module.exports = { Movie, Show, Person }