From 69e694493c32d8be009ffb6ba4260001e7153898 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Wed, 7 Mar 2018 09:58:54 +0100 Subject: [PATCH 1/9] updating submodule to latest --- app/torrent_search | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/torrent_search b/app/torrent_search index bf9ed49..4996f20 160000 --- a/app/torrent_search +++ b/app/torrent_search @@ -1 +1 @@ -Subproject commit bf9ed49a86ff873b3046a442878f3ae3b87878a4 +Subproject commit 4996f20bbc315b2630370b371266b2d26221fe7e From 7801ea5d057b7d187840a68957d9dd3fbb2bd3a7 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 8 Mar 2018 02:26:02 +0100 Subject: [PATCH 2/9] Create ISSUE_TEMPLATE.md --- ISSUE_TEMPLATE.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 ISSUE_TEMPLATE.md diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..025f972 --- /dev/null +++ b/ISSUE_TEMPLATE.md @@ -0,0 +1,17 @@ +## What kind of an issue is this? + +- [ ] Bug report +- [ ] Feature request + +## Expected behaviour? + +## Current behaviour? +*if this is a bug report* +
+ +## Steps to reproduce behaviour? +*if this is a bug report* +
+ +## Screenshot? 📷 +*A image tells a thousands words* From 72847efb933792c9204b00e4ddc43a0f792bd954 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 8 Mar 2018 02:27:17 +0100 Subject: [PATCH 3/9] Update ISSUE_TEMPLATE.md --- ISSUE_TEMPLATE.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 025f972..8e46b3f 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -5,13 +5,19 @@ ## Expected behaviour? + + ## Current behaviour? *if this is a bug report*
+ + ## Steps to reproduce behaviour? *if this is a bug report*
+ + ## Screenshot? 📷 *A image tells a thousands words* From 6c062f5fc12a38c791f4d16fcb5cb5a109af77ab Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Thu, 8 Mar 2018 13:48:52 +0100 Subject: [PATCH 4/9] Changed gitmodules config file and moved the submodule from app to a new directory inculde. Also changed default search site to jackett. --- .gitmodules | 4 ++-- include/.gitignore | 0 seasoned_api/src/pirate/pirateRepository.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 include/.gitignore diff --git a/.gitmodules b/.gitmodules index 54ce5f0..d2b079a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "app/torrent_search"] - path = app/torrent_search +[submodule "torrent_search"] + path = include/torrent_search url = https://github.com/kevinmidboe/torrent_search diff --git a/include/.gitignore b/include/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/seasoned_api/src/pirate/pirateRepository.js b/seasoned_api/src/pirate/pirateRepository.js index 8dce82b..bce8288 100644 --- a/seasoned_api/src/pirate/pirateRepository.js +++ b/seasoned_api/src/pirate/pirateRepository.js @@ -5,10 +5,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', 'piratebay', '--print'], + args: [searchterm, '-s', 'jackett', '-f', '--print'], }; - PythonShell.run('../app/torrent_search/torrentSearch/search.py', options, callback); + PythonShell.run('../include/torrent_search/torrentSearch/search.py', options, callback); // PythonShell does not support return } @@ -27,7 +27,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!'); + console.log('THERE WAS A FUCKING ERROR!\n', err); reject(Error('There was a error when searching for torrents')); } if (results) { From 9140fa37ebeec8e3942209858c86e7a4ab249f58 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Thu, 8 Mar 2018 13:57:06 +0100 Subject: [PATCH 5/9] Deleted gitmodules and include folder. --- .gitmodules | 3 --- include/.gitignore | 0 2 files changed, 3 deletions(-) delete mode 100644 .gitmodules delete mode 100644 include/.gitignore diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index d2b079a..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "torrent_search"] - path = include/torrent_search - url = https://github.com/kevinmidboe/torrent_search diff --git a/include/.gitignore b/include/.gitignore deleted file mode 100644 index e69de29..0000000 From 1806f89e2ba9d5813c7fbcd465aaa5831f6f388d Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Thu, 8 Mar 2018 13:59:43 +0100 Subject: [PATCH 6/9] Imported submodule from scratch again. --- .gitmodules | 3 +++ include/torrent_search | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 include/torrent_search diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..8a8dc18 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "include/torrent_search"] + path = include/torrent_search + url = git@github.com:KevinMidboe/torrent_search.git diff --git a/include/torrent_search b/include/torrent_search new file mode 160000 index 0000000..4996f20 --- /dev/null +++ b/include/torrent_search @@ -0,0 +1 @@ +Subproject commit 4996f20bbc315b2630370b371266b2d26221fe7e From 9e557759ce0987e670a3e05a97ac29b41f5144e1 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Thu, 8 Mar 2018 14:07:57 +0100 Subject: [PATCH 7/9] deleted old submodule app. --- app/torrent_search | 1 - 1 file changed, 1 deletion(-) delete mode 160000 app/torrent_search diff --git a/app/torrent_search b/app/torrent_search deleted file mode 160000 index 4996f20..0000000 --- a/app/torrent_search +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4996f20bbc315b2630370b371266b2d26221fe7e From 50d3135a81e3f9e90da30074ee35bf4e46a1dc69 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Thu, 8 Mar 2018 14:15:25 +0100 Subject: [PATCH 8/9] Moved submodule to parent directory. --- .gitmodules | 3 +++ include/torrent_search => torrent_search | 0 2 files changed, 3 insertions(+) rename include/torrent_search => torrent_search (100%) diff --git a/.gitmodules b/.gitmodules index 8a8dc18..d564de1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "include/torrent_search"] path = include/torrent_search url = git@github.com:KevinMidboe/torrent_search.git +[submodule "torrent_search"] + path = torrent_search + url = git@github.com:KevinMidboe/torrent_search.git diff --git a/include/torrent_search b/torrent_search similarity index 100% rename from include/torrent_search rename to torrent_search From 72a7a7e00d537c44eaf9db42c94a41940fe383c9 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Thu, 8 Mar 2018 14:25:28 +0100 Subject: [PATCH 9/9] Changed path to new submodule location. --- .gitmodules | 3 --- seasoned_api/src/pirate/pirateRepository.js | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index d564de1..2da9723 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "include/torrent_search"] - path = include/torrent_search - url = git@github.com:KevinMidboe/torrent_search.git [submodule "torrent_search"] path = torrent_search url = git@github.com:KevinMidboe/torrent_search.git diff --git a/seasoned_api/src/pirate/pirateRepository.js b/seasoned_api/src/pirate/pirateRepository.js index bce8288..c46fcfc 100644 --- a/seasoned_api/src/pirate/pirateRepository.js +++ b/seasoned_api/src/pirate/pirateRepository.js @@ -8,7 +8,7 @@ async function find(searchterm, callback) { args: [searchterm, '-s', 'jackett', '-f', '--print'], }; - PythonShell.run('../include/torrent_search/torrentSearch/search.py', options, callback); + PythonShell.run('../torrent_search/torrentSearch/search.py', options, callback); // PythonShell does not support return }