Merge branch 'master' into api_request

This commit is contained in:
2018-03-19 15:46:07 +01:00
committed by GitHub
5 changed files with 30 additions and 7 deletions

6
.gitmodules vendored
View File

@@ -1,3 +1,3 @@
[submodule "app/torrent_search"] [submodule "torrent_search"]
path = app/torrent_search path = torrent_search
url = https://github.com/kevinmidboe/torrent_search url = git@github.com:KevinMidboe/torrent_search.git

23
ISSUE_TEMPLATE.md Normal file
View File

@@ -0,0 +1,23 @@
## What kind of an issue is this?
- [ ] Bug report
- [ ] Feature request
## Expected behaviour?
## Current behaviour?
*if this is a bug report*
<br/>
## Steps to reproduce behaviour?
*if this is a bug report*
<br/>
## Screenshot? 📷
*A image tells a thousands words*

View File

@@ -21,10 +21,10 @@ async function find(searchterm, callback) {
const options = { const options = {
pythonPath: '/usr/bin/python3', pythonPath: '/usr/bin/python3',
// pythonPath: '/Library/Frameworks/Python.framework/Versions/3.6/bin/python3', // pythonPath: '/Library/Frameworks/Python.framework/Versions/3.6/bin/python3',
args: [searchterm, '-s', 'jackett', '--print'], args: [searchterm, '-s', 'jackett', '-f', '--print'],
}; };
PythonShell.run('../app/torrent_search/torrentSearch/search.py', options, callback); PythonShell.run('../torrent_search/torrentSearch/search.py', options, callback);
// PythonShell does not support return // PythonShell does not support return
} }
@@ -50,7 +50,7 @@ async function SearchPiratebay(query) {
return await new Promise((resolve, reject) => find(query, (err, results) => { return await new Promise((resolve, reject) => find(query, (err, results) => {
if (err) { if (err) {
/* eslint-disable no-console */ /* eslint-disable no-console */
console.log('THERE WAS A FUCKING ERROR!', err); console.log('THERE WAS A FUCKING ERROR!\n', err);
reject(Error('There was a error when searching for torrents')); reject(Error('There was a error when searching for torrents'));
} }
if (results) { if (results) {

1
torrent_search Submodule

Submodule torrent_search added at 4996f20bbc