Merge branch 'master' into api_request
This commit is contained in:
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -1,3 +1,3 @@
|
||||
[submodule "app/torrent_search"]
|
||||
path = app/torrent_search
|
||||
url = https://github.com/kevinmidboe/torrent_search
|
||||
[submodule "torrent_search"]
|
||||
path = torrent_search
|
||||
url = git@github.com:KevinMidboe/torrent_search.git
|
||||
|
||||
23
ISSUE_TEMPLATE.md
Normal file
23
ISSUE_TEMPLATE.md
Normal 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*
|
||||
Submodule app/torrent_search deleted from bf9ed49a86
@@ -21,10 +21,10 @@ async function find(searchterm, callback) {
|
||||
const options = {
|
||||
pythonPath: '/usr/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
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ async function SearchPiratebay(query) {
|
||||
return await new Promise((resolve, reject) => find(query, (err, results) => {
|
||||
if (err) {
|
||||
/* 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'));
|
||||
}
|
||||
if (results) {
|
||||
|
||||
1
torrent_search
Submodule
1
torrent_search
Submodule
Submodule torrent_search added at 4996f20bbc
Reference in New Issue
Block a user