From 3e6fc0960c152358a6d60860a78d4a7d9125bee8 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Sat, 21 Oct 2017 15:26:29 +0200 Subject: [PATCH] PirateRepo now has a function for calling our add magnet python script with a magnet passed from the controller. --- seasoned_api/src/pirate/pirateRepository.js | 29 ++++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/seasoned_api/src/pirate/pirateRepository.js b/seasoned_api/src/pirate/pirateRepository.js index f8455a7..4b20ad3 100644 --- a/seasoned_api/src/pirate/pirateRepository.js +++ b/seasoned_api/src/pirate/pirateRepository.js @@ -1,13 +1,13 @@ const assert = require('assert'); var PythonShell = require('python-shell'); var async = require('async'); +var PythonShell = require('python-shell'); async function find(searchterm, callback) { - var PythonShell = require('python-shell'); var options = { - // pythonPath: '/usr/bin/python3', - pythonPath: '/Library/Frameworks/Python.framework/Versions/3.6/bin/python3', + pythonPath: '/usr/bin/python3', + // pythonPath: '/Library/Frameworks/Python.framework/Versions/3.6/bin/python3', args: [searchterm] } @@ -15,6 +15,17 @@ async function find(searchterm, callback) { // PythonShell does not support return }; + +async function callPythonAddMagnet(magnet, callback) { + var options = { + pythonPath: '/usr/bin/python3', + // pythonPath: '/Library/Frameworks/Python.framework/Versions/3.6/bin/python3', + args: ['"'+magnet+'"'] + } + + PythonShell.run('../app/magnet.py', options, callback); +} + async function SearchPiratebay(query) { return await new Promise((resolve) => { return find(query, function(err, results) { @@ -23,4 +34,14 @@ async function SearchPiratebay(query) { }) } -module.exports = { SearchPiratebay } \ No newline at end of file +async function AddMagnet(magnet) { + return await new Promise((resolve) => { + return callPythonAddMagnet(magnet, function(err, results) { + resolve( + return { success: true } + ) + }) + }) +} + +module.exports = { SearchPiratebay, AddMagnet } \ No newline at end of file