Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed the broken soup and deleted outdated source #36

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed the broken soup and deleted outdated source #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 8 additions & 56 deletions proxyscrape/scrapers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
__all__ = ['add_resource', 'add_resource_type', 'get_resources', 'get_resource_types', 'ProxyResource', 'RESOURCE_MAP',
'RESOURCE_TYPE_MAP']


from bs4 import BeautifulSoup
from threading import Lock
import time
Expand All @@ -42,6 +41,7 @@
Proxy,
request_proxy_list
)

_resource_lock = Lock()
_resource_type_lock = Lock()

Expand All @@ -56,6 +56,7 @@ class ProxyResource:
:type func: function
:type refresh_interval: int
"""

def __init__(self, func, refresh_interval):
self._func = func
self._refresh_interval = refresh_interval
Expand Down Expand Up @@ -97,7 +98,7 @@ def get_anonymous_proxies():

try:
soup = BeautifulSoup(response.content, 'html.parser')
table = soup.find('table', {'id': 'proxylisttable'})
table = soup.find('div', class_='table-responsive fpl-list')
proxies = set()

for row in table.find('tbody').find_all('tr'):
Expand All @@ -122,7 +123,7 @@ def get_free_proxy_list_proxies():

try:
soup = BeautifulSoup(response.content, 'html.parser')
table = soup.find('table', {'id': 'proxylisttable'})
table = soup.find('div', class_='table-responsive fpl-list')
proxies = set()

for row in table.find('tbody').find_all('tr'):
Expand All @@ -141,56 +142,13 @@ def get_free_proxy_list_proxies():
raise InvalidHTMLError()


def _get_proxy_daily_proxies_parse_inner(element, type, source):
content = element.contents[0]
rows = content.replace('"', '').replace("'", '').split('\n')

proxies = set()
for row in rows:
row = row.strip()
if len(row) == 0:
continue

params = str(row).split(':')
params.extend([None, None, None, type, source])
proxies.add(Proxy(*params))
return proxies


def get_proxy_daily_data_elements():
url = 'http://www.proxy-daily.com'
response = request_proxy_list(url)

try:
soup = BeautifulSoup(response.content, 'html.parser')
content = soup.find('div', {'id': 'free-proxy-list'})
return content.find_all(class_="freeProxyStyle")
except (AttributeError, KeyError):
raise InvalidHTMLError()


def get_proxy_daily_http_proxies():
http_data_element = get_proxy_daily_data_elements()[0]
return _get_proxy_daily_proxies_parse_inner(http_data_element, 'http', 'proxy-daily-http')


def get_proxy_daily_socks4_proxies():
socks4_data_element = get_proxy_daily_data_elements()[1]
return _get_proxy_daily_proxies_parse_inner(socks4_data_element, 'socks4', 'proxy-daily-socks4')


def get_proxy_daily_socks5_proxies():
socks5_data_element = get_proxy_daily_data_elements()[2]
return _get_proxy_daily_proxies_parse_inner(socks5_data_element, 'socks5', 'proxy-daily-socks5')


def get_socks_proxies():
url = 'https://www.socks-proxy.net'
response = request_proxy_list(url)

try:
soup = BeautifulSoup(response.content, 'html.parser')
table = soup.find('table', {'id': 'proxylisttable'})
table = soup.find('div', class_='table-responsive fpl-list')
proxies = set()

for row in table.find('tbody').find_all('tr'):
Expand All @@ -215,7 +173,7 @@ def get_ssl_proxies():

try:
soup = BeautifulSoup(response.content, 'html.parser')
table = soup.find('table', {'id': 'proxylisttable'})
table = soup.find('div', class_='table-responsive fpl-list')
proxies = set()

for row in table.find('tbody').find_all('tr'):
Expand All @@ -239,7 +197,7 @@ def get_uk_proxies():

try:
soup = BeautifulSoup(response.content, 'html.parser')
table = soup.find('table', {'id': 'proxylisttable'})
table = soup.find('div', class_='table-responsive fpl-list')
proxies = set()

for row in table.find('tbody').find_all('tr'):
Expand All @@ -264,7 +222,7 @@ def get_us_proxies():

try:
soup = BeautifulSoup(response.content, 'html.parser')
table = soup.find('table', {'id': 'proxylisttable'})
table = soup.find('div', class_='table-responsive fpl-list')
proxies = set()

for row in table.find('tbody').find_all('tr'):
Expand Down Expand Up @@ -385,9 +343,6 @@ def get_resources():
RESOURCE_MAP = {
'anonymous-proxy': get_anonymous_proxies,
'free-proxy-list': get_free_proxy_list_proxies,
'proxy-daily-http': get_proxy_daily_http_proxies,
'proxy-daily-socks4': get_proxy_daily_socks4_proxies,
'proxy-daily-socks5': get_proxy_daily_socks5_proxies,
'socks-proxy': get_socks_proxies,
'ssl-proxy': get_ssl_proxies,
'uk-proxy': get_uk_proxies,
Expand All @@ -399,7 +354,6 @@ def get_resources():
'us-proxy',
'uk-proxy',
'free-proxy-list',
'proxy-daily-http',
'anonymous-proxy'
},
'https': {
Expand All @@ -411,10 +365,8 @@ def get_resources():
},
'socks4': {
'socks-proxy',
'proxy-daily-socks4'
},
'socks5': {
'socks-proxy',
'proxy-daily-socks5'
}
}