Cleanup and remove nodejs dep
This commit is contained in:
parent
289f938eb6
commit
1bf903b1f9
@ -4,9 +4,9 @@ ENV DEBIAN_FRONTEND noninteractive
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get -y upgrade && \
|
||||
apt-get -y install python3 python3-pip locales nodejs \
|
||||
apt-get -y install python3 python3-pip locales \
|
||||
python3-flask python3-flask-sqlalchemy python3-flask-httpauth python3-flaskext.wtf \
|
||||
python3-pymysql python3-requests python3-bs4 python3-dotenv && \
|
||||
pip3 install cfscrape && \
|
||||
python3-pymysql python3-requests python3-requests-toolbelt python3-bs4 python3-dotenv && \
|
||||
pip3 install cloudscraper && \
|
||||
printf "en_US.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\n" > /etc/locale.gen && \
|
||||
locale-gen && rm -rf /var/lib/apt/lists/*
|
||||
|
@ -8,11 +8,13 @@ from logging import getLogger
|
||||
from urllib.parse import quote
|
||||
|
||||
from bs4 import BeautifulSoup
|
||||
from cfscrape import create_scraper
|
||||
from cloudscraper import create_scraper
|
||||
|
||||
from config import IS_DEBUG, CACHE_TIMEOUT, BLACKLIST_WORDS
|
||||
from models import AnimeLink
|
||||
|
||||
scraper = create_scraper()
|
||||
|
||||
|
||||
class ConnectorReturn(Enum):
|
||||
SEARCH = 1
|
||||
@ -102,11 +104,6 @@ class Connector(ABC):
|
||||
def is_light(self):
|
||||
pass
|
||||
|
||||
@property
|
||||
@abstractmethod
|
||||
def is_behind_cloudflare(self):
|
||||
pass
|
||||
|
||||
def __init__(self, query, page=1, return_type=ConnectorReturn.SEARCH):
|
||||
self.query = query
|
||||
self.data = []
|
||||
@ -136,8 +133,6 @@ class Connector(ABC):
|
||||
return self
|
||||
|
||||
def curl_content(self, url, params=None, ajax=False):
|
||||
scraper = create_scraper()
|
||||
|
||||
if ajax:
|
||||
headers = {'X-Requested-With': 'XMLHttpRequest'}
|
||||
else:
|
||||
@ -193,7 +188,6 @@ class Nyaa(Connector):
|
||||
favicon = 'nyaa.png'
|
||||
base_url = 'https://nyaa.si'
|
||||
is_light = False
|
||||
is_behind_cloudflare = False
|
||||
|
||||
def get_full_search_url(self):
|
||||
sort_type = 'size'
|
||||
@ -266,7 +260,6 @@ class Pantsu(Connector):
|
||||
favicon = 'pantsu.png'
|
||||
base_url = 'https://nyaa.net'
|
||||
is_light = False
|
||||
is_behind_cloudflare = False
|
||||
|
||||
def get_full_search_url(self):
|
||||
sort_type = 4
|
||||
@ -349,7 +342,6 @@ class YggTorrent(Connector):
|
||||
favicon = 'yggtorrent.png'
|
||||
base_url = 'https://www2.yggtorrent.se'
|
||||
is_light = False
|
||||
is_behind_cloudflare = True
|
||||
category = 2179
|
||||
|
||||
def get_full_search_url(self):
|
||||
@ -425,7 +417,6 @@ class AnimeUltime(Connector):
|
||||
favicon = 'animeultime.png'
|
||||
base_url = 'http://www.anime-ultime.net'
|
||||
is_light = True
|
||||
is_behind_cloudflare = False
|
||||
|
||||
def get_full_search_url(self):
|
||||
from_date = ''
|
||||
@ -530,7 +521,6 @@ class Other(Connector):
|
||||
favicon = 'blank.png'
|
||||
base_url = ''
|
||||
is_light = True
|
||||
is_behind_cloudflare = False
|
||||
|
||||
def get_full_search_url(self):
|
||||
pass
|
||||
|
@ -8,4 +8,5 @@ requests==2.21.0
|
||||
beautifulsoup4==4.7.1
|
||||
python-dotenv==0.9.1
|
||||
Werkzeug==0.14.1
|
||||
cfscrape
|
||||
requests-toolbelt
|
||||
cloudscraper
|
||||
|
Reference in New Issue
Block a user