diff --git a/src/plex/requestRepository.js b/src/plex/requestRepository.js index cd8372f..0cc27dd 100644 --- a/src/plex/requestRepository.js +++ b/src/plex/requestRepository.js @@ -7,23 +7,9 @@ const TMDB = require('src/tmdb/tmdb'); const tmdb = new TMDB(configuration.get('tmdb', 'apiKey')); var Promise = require('bluebird'); var rp = require('request-promise'); -var pythonShell = require('python-shell'); - -const establishedDatabase = require('src/database/database'); class RequestRepository { - constructor(database) { - this.database = database || establishedDatabase; - this.queries = { - // 'read': 'SELECT * FROM stray_eps WHERE id = ?', - // 'readAll': 'SELECT id, name, season, episode, verified FROM stray_eps', - // 'readAllFiltered': 'SELECT id, name, season, episode, verified FROM stray_eps WHERE verified = ', - 'checkRequested': 'SELECT id, title FROM request WHERE id = ?', - 'request': 'UPDATE request SET matched = 1 WHERE id = ?', - }; - } - searchRequest(query, page, type) { return Promise.resolve() .then(() => tmdb.search(query, page, type)) @@ -69,36 +55,6 @@ class RequestRepository { }); } - submitRequest(movieId) { - console.log(movieId); - return Promise.resolve() - .then(() => { - pythonShell.run('moveSeasoned.py', function (err, results) { - // if (err) throw err; - // TODO Add error handling!! StrayRepository.ERROR - // results is an array consisting of messages collected during execution - console.log('results: %j', results); - }) - }) - .catch((error) => { - console.log(error); - return error; - }) - - // return this.database.get(this.queries.checkRequested, movieId).then((row) => { - // // TODO send back the name, not ID - // assert.notEqual(row, undefined, `Stray '${movieId}' already verified.`); - - // var options = { - // args: [movieId] - // } - - - - // return this.database.run(this.queries.verify, movieId); - // }) - } - } module.exports = RequestRepository; \ No newline at end of file diff --git a/src/webserver/app.js b/src/webserver/app.js index 0007e41..3da8ccb 100644 --- a/src/webserver/app.js +++ b/src/webserver/app.js @@ -34,12 +34,9 @@ router.post('/v1/seasoned/verify/:strayId', require('./controllers/seasoned/veri router.get('/v1/plex/search', require('./controllers/plex/searchMedia.js')); router.get('/v1/plex/playing', require('./controllers/plex/plexPlaying.js')); - -// router.get('/v1/plex/request/all', require('./controllers/plex/searchRequest.js')); router.get('/v1/plex/request', require('./controllers/plex/searchRequest.js')); router.get('/v1/plex/request/:mediaId', require('./controllers/plex/readRequest.js')); -router.post('/v1/plex/request/:mediaId', require('./controllers/plex/submitRequest.js')); - +// router.post('/v1/plex/request/:mediaId', require('./controllers/plex/submitRequest.js')); router.get('/v1/plex/hook', require('./controllers/plex/hookDump.js')); router.get('/v1/tmdb/search', require('./controllers/tmdb/searchMedia.js')); diff --git a/src/webserver/controllers/plex/readRequest.js b/src/webserver/controllers/plex/readRequest.js index 32f1b05..0524a2f 100644 --- a/src/webserver/controllers/plex/readRequest.js +++ b/src/webserver/controllers/plex/readRequest.js @@ -8,10 +8,9 @@ const requestRepository = new RequestRepository(); * @returns {Callback} */ function readRequestController(req, res) { - const requestId = req.params.requestId; + const mediaId = req.params.mediaId; const { type } = req.query; - - requestRepository.lookup(requestId, type) + requestRepository.lookup(mediaId, type) .then((movies) => { res.send(movies); }).catch((error) => { diff --git a/src/webserver/controllers/plex/submitRequest.js b/src/webserver/controllers/plex/submitRequest.js deleted file mode 100644 index 0a53446..0000000 --- a/src/webserver/controllers/plex/submitRequest.js +++ /dev/null @@ -1,18 +0,0 @@ -const configuration = require('src/config/configuration').getInstance(); -const RequestRepository = require('src/plex/requestRepository'); -const requestRepository = new RequestRepository(); - -function submitRequestController(req, res) { - const id = req.params.requestId; - - requestRepository.submitRequest(id) - .then(() => { - // Better sendback message. - res.send({ success: true, message: 'Request sent' }); - }) - .catch((error) => { - res.status(500).send({ success: false, error: error.message }); - }); -} - -module.exports = submitRequestController;