From f375edf33a2bdc7fd197e49424d1b296ecaf1430 Mon Sep 17 00:00:00 2001 From: Edesem <93417266+Edesem@users.noreply.github.com> Date: Mon, 3 Jan 2022 12:28:06 +1100 Subject: [PATCH 01/14] Update notflix --- notflix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/notflix b/notflix index c30a7cd..e17008a 100755 --- a/notflix +++ b/notflix @@ -25,7 +25,7 @@ grep -o ' Date: Mon, 3 Jan 2022 12:30:10 +1100 Subject: [PATCH 02/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a90fa4c..caa8378 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

NOTFLIX

-

f@#k netflix use notflix a tool which search magnet links and stream it with webtorrent

+

Removed the emojis from the script as its kinda cringe imo

##

From 8e10082beade33834008f4aa5d523f0cdd975769 Mon Sep 17 00:00:00 2001 From: Edesem <93417266+Edesem@users.noreply.github.com> Date: Mon, 3 Jan 2022 12:58:56 +1100 Subject: [PATCH 03/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index caa8378..47403bf 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

NOTFLIX

-

Removed the emojis from the script as its kinda cringe imo

+

Removed the emojis from the script as its kinda cringe imo and made it less able to search porn, by only searching movies and not everything in general. Although it is still possible although, just it wont be as likely to come up

##

From d9cf2d0afd79fa5589c2529001d3d53cd38b99c0 Mon Sep 17 00:00:00 2001 From: Edesem <93417266+Edesem@users.noreply.github.com> Date: Mon, 3 Jan 2022 13:00:22 +1100 Subject: [PATCH 04/14] Update notflix --- notflix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notflix b/notflix index e17008a..12ea9f7 100755 --- a/notflix +++ b/notflix @@ -17,7 +17,7 @@ fi query="$(echo $query | sed 's/ /+/g')" #curl -s https://1337x.to/category-search/$query/Movies/1/ > $cachedir/tmp.html -curl -s $baseurl/search/$query/1/ > $cachedir/tmp.html +curl -s $baseurl/search/$query/Movies/1/ > $cachedir/tmp.html # Get Titles grep -o ' $cachedir/tmp.html -curl -s $baseurl/search/$query/Movies/1/ > $cachedir/tmp.html +curl -s https://1337x.to/category-search/$query/Movies/1/ > $cachedir/tmp.html +#curl -s $baseurl/search/$query/Movies/1/ > $cachedir/tmp.html # Get Titles grep -o 'NOTFLIX -

Removed the emojis from the script as its kinda cringe imo and made it less able to search porn, by only searching movies and not everything in general. Although it is still possible although, just it wont be as likely to come up

+

Removed the emojis from the script as its kinda cringe imo and made it less able to search porn, by only searching movies and not everything in general. It makes it a lot harder to search and probably almost impossible so yeah. STOP DEGENERACY

##

From 09d8c32462b0ea6c332eb1d1076cae52919c4bb0 Mon Sep 17 00:00:00 2001 From: Edesem <93417266+Edesem@users.noreply.github.com> Date: Mon, 3 Jan 2022 18:25:06 +1100 Subject: [PATCH 07/14] Can select between different forms of media Definitely not the best solution and inefficient, im a noob with shell scripting and couldnt get elif statements to work so theres this. Its ehh but it works perfectly fine --- notflix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/notflix b/notflix index fb90c6b..4cdb093 100755 --- a/notflix +++ b/notflix @@ -4,10 +4,29 @@ mkdir -p $HOME/.cache/notflix +menu="fzf" menu="dmenu -i -l 25" baseurl="https://1337x.wtf" cachedir="$HOME/.cache/notflix" +category=$(dmenu -p "Movies? TV? Documentaries? Anime? (1,2,3,4) [NO INPUT = MOVIES]: " <&-) + +if [ "$category" == "1" ] || [ "$category" == "" ]; then # If no input, then it defaults to Movies category + category="Movies" +fi + +if [ "$category" == "2" ]; then + category="TV" +fi + +if [ "$category" == "3" ]; then + category="Documentaries" +fi + +if [ "$category" == "4" ]; then + category="Anime" +fi + if [ -z $1 ]; then query=$(dmenu -p "Search Torrent: " <&-) else From 9066ccc2f7b0fbc1cb99f90c6a8d1d32aac18def Mon Sep 17 00:00:00 2001 From: Edesem <93417266+Edesem@users.noreply.github.com> Date: Mon, 3 Jan 2022 18:34:42 +1100 Subject: [PATCH 08/14] Updated curl link and readme --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 59a41ae..a03fbfb 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,14 @@

NOTFLIX

-

Removed the emojis from the script as its kinda cringe imo and made it less able to search porn, by only searching movies and not everything in general. It makes it a lot harder to search and probably almost impossible so yeah. STOP DEGENERACY

+

STOP DEGENERACY

+ +Removed the emojis from the script as its kinda cringe imo and made it less able to search porn, by only searching movies and not everything in general. It makes it a lot harder to search and probably almost impossible so yeah. The major difference between this fork and the original is that you select the form of media you want (movie, tv, documentary, anime), this is because I just don't how to do it in a better way, where you can view all content simulatanousely on 1337x without accessing the degenerate content then besides the way I decided to implement it ##

Video Preview

-> Watch my video on this - [bugswriter's notflix](https://youtu.be/RFJCL9C46Mc) +> Watch BugsWriters video on it - [bugswriter's notflix](https://youtu.be/RFJCL9C46Mc) ### How does this work? @@ -24,7 +26,7 @@ For scraping, the script uses simple gnu utils like sed, awk, paste, cut. cURL **notflix** to your **$PATH** and give execute permissions. ```sh -$ sudo curl -sL "https://raw.githubusercontent.com/Bugswriter/notflix/master/notflix" -o /usr/local/bin/notflix +$ sudo curl -sL "https://raw.githubusercontent.com/Edesem/no-emoji-and-porn-notflix/master/notflix" -o /usr/local/bin/notflix $ sudo chmod +x /usr/local/bin/notflix ``` - To update, just do `curl` again, no need to `chmod` anymore. From 3e748236e06e9765098a4412eb82ebb8ff6c89b2 Mon Sep 17 00:00:00 2001 From: Edesem <93417266+Edesem@users.noreply.github.com> Date: Tue, 4 Jan 2022 23:03:48 +1100 Subject: [PATCH 09/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a03fbfb..71e22f5 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ For scraping, the script uses simple gnu utils like sed, awk, paste, cut. ## Requirements -* [webtorrent](https://webtorrent.io/) - A tool to stream torrent. `npm install webtorrent-cli -g` +* [webtorrent](https://webtorrent.io/) - A tool to stream torrent. `npm install webtorrent-cli -g` or `yay -S webtorrent-cli` for Arch Users ## Installation From 72cd5cc8cd597556f50cc3faf713e5581df9b9c0 Mon Sep 17 00:00:00 2001 From: Edesem <93417266+Edesem@users.noreply.github.com> Date: Wed, 5 Jan 2022 16:02:26 +1100 Subject: [PATCH 10/14] Replaced if then statements with case statements --- notflix | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/notflix b/notflix index 4cdb093..edcf29c 100755 --- a/notflix +++ b/notflix @@ -11,21 +11,13 @@ cachedir="$HOME/.cache/notflix" category=$(dmenu -p "Movies? TV? Documentaries? Anime? (1,2,3,4) [NO INPUT = MOVIES]: " <&-) -if [ "$category" == "1" ] || [ "$category" == "" ]; then # If no input, then it defaults to Movies category - category="Movies" -fi - -if [ "$category" == "2" ]; then - category="TV" -fi - -if [ "$category" == "3" ]; then - category="Documentaries" -fi - -if [ "$category" == "4" ]; then - category="Anime" -fi +case $category in + "1") category="Movies";; + "2") category="TV";; + "3") category="Documentaries";; + "4") category="Anime";; + *) category="Movies";; +esac if [ -z $1 ]; then query=$(dmenu -p "Search Torrent: " <&-) From 47b8a65b164f5c4ccfaa32dc8eb556d218f31a08 Mon Sep 17 00:00:00 2001 From: Edesem <93417266+Edesem@users.noreply.github.com> Date: Thu, 6 Jan 2022 22:24:41 +1100 Subject: [PATCH 11/14] Update notflix --- notflix | 1 - 1 file changed, 1 deletion(-) diff --git a/notflix b/notflix index edcf29c..741da79 100755 --- a/notflix +++ b/notflix @@ -4,7 +4,6 @@ mkdir -p $HOME/.cache/notflix -menu="fzf" menu="dmenu -i -l 25" baseurl="https://1337x.wtf" cachedir="$HOME/.cache/notflix" From 03e19b397b264a752ed1ab1f0d4eaaf53406eb4d Mon Sep 17 00:00:00 2001 From: Edesem <93417266+Edesem@users.noreply.github.com> Date: Thu, 6 Jan 2022 23:11:00 +1100 Subject: [PATCH 12/14] Reverting commits for PR --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 71e22f5..c25b308 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,12 @@

NOTFLIX

-

STOP DEGENERACY

- -Removed the emojis from the script as its kinda cringe imo and made it less able to search porn, by only searching movies and not everything in general. It makes it a lot harder to search and probably almost impossible so yeah. The major difference between this fork and the original is that you select the form of media you want (movie, tv, documentary, anime), this is because I just don't how to do it in a better way, where you can view all content simulatanousely on 1337x without accessing the degenerate content then besides the way I decided to implement it +

f@#k netflix use notflix a tool which search magnet links and stream it with webtorrent

##

Video Preview

-> Watch BugsWriters video on it - [bugswriter's notflix](https://youtu.be/RFJCL9C46Mc) +> Watch my video on this - [bugswriter's notflix](https://youtu.be/RFJCL9C46Mc) ### How does this work? @@ -18,7 +16,7 @@ For scraping, the script uses simple gnu utils like sed, awk, paste, cut. ## Requirements -* [webtorrent](https://webtorrent.io/) - A tool to stream torrent. `npm install webtorrent-cli -g` or `yay -S webtorrent-cli` for Arch Users +* [webtorrent](https://webtorrent.io/) - A tool to stream torrent. `npm install webtorrent-cli -g` ## Installation From 04ad767f41d8ff2be47f5c5bc671733276a7be60 Mon Sep 17 00:00:00 2001 From: Edesem <93417266+Edesem@users.noreply.github.com> Date: Thu, 6 Jan 2022 23:24:10 +1100 Subject: [PATCH 13/14] Reverting commits for PR and added XXX Flag --- notflix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/notflix b/notflix index 741da79..56c8f8a 100755 --- a/notflix +++ b/notflix @@ -9,12 +9,14 @@ baseurl="https://1337x.wtf" cachedir="$HOME/.cache/notflix" category=$(dmenu -p "Movies? TV? Documentaries? Anime? (1,2,3,4) [NO INPUT = MOVIES]: " <&-) +#category=$(dmenu -p "Movies? TV? Documentaries? Anime? XXX? (1,2,3,4,5) [NO INPUT = MOVIES]: " <&-) # XXX Flag case $category in "1") category="Movies";; "2") category="TV";; "3") category="Documentaries";; "4") category="Anime";; +# "5") category="XXX";; # XXX Flag *) category="Movies";; esac @@ -26,7 +28,7 @@ fi query="$(echo $query | sed 's/ /+/g')" -curl -s https://1337x.to/category-search/$query/Movies/1/ > $cachedir/tmp.html +curl -s https://1337x.to/category-search/$query/$category/1/ > $cachedir/tmp.html #curl -s $baseurl/search/$query/Movies/1/ > $cachedir/tmp.html # Get Titles @@ -35,7 +37,7 @@ grep -o ' Date: Thu, 6 Jan 2022 23:41:46 +1100 Subject: [PATCH 14/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c25b308..a90fa4c 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ For scraping, the script uses simple gnu utils like sed, awk, paste, cut. cURL **notflix** to your **$PATH** and give execute permissions. ```sh -$ sudo curl -sL "https://raw.githubusercontent.com/Edesem/no-emoji-and-porn-notflix/master/notflix" -o /usr/local/bin/notflix +$ sudo curl -sL "https://raw.githubusercontent.com/Bugswriter/notflix/master/notflix" -o /usr/local/bin/notflix $ sudo chmod +x /usr/local/bin/notflix ``` - To update, just do `curl` again, no need to `chmod` anymore.