Conform to PEP8 style

This commit is contained in:
Vasilis Gerakaris
2018-10-09 11:42:56 +03:00
parent 95a4468fa3
commit e83c738a04
7 changed files with 87 additions and 57 deletions

View File

@@ -1,11 +1,11 @@
# Info about the module
__version__ = '0.6.0'
__author__ = 'Juanjo Salvador'
__email__ = 'juanjosalvador@netc.eu'
__url__ = 'http://juanjosalvador.me'
__version__ = '0.6.0'
__author__ = 'Juanjo Salvador'
__email__ = 'juanjosalvador@netc.eu'
__url__ = 'http://juanjosalvador.me'
__copyright__ = '2017 Juanjo Salvador'
__license__ = 'MIT license'
__license__ = 'MIT license'
from NyaaPy.nyaa import Nyaa
from NyaaPy.pantsu import Pantsu
from NyaaPy.sukebei import SukebeiNyaa, SukebeiPantsu
from NyaaPy.sukebei import SukebeiNyaa, SukebeiPantsu

View File

@@ -5,8 +5,9 @@ from NyaaPy.utils import Utils
utils = Utils()
class Nyaa:
def __init__(self):
self.URI = "http://nyaa.si"
@@ -23,9 +24,12 @@ class Nyaa:
user_uri = ""
if page > 0:
r = requests.get("{}/{}?f={}&c={}_{}&q={}&p={}".format(self.URI, user_uri, filters, category, subcategory, keyword, page))
r = requests.get("{}/{}?f={}&c={}_{}&q={}&p={}".format(
self.URI, user_uri, filters, category, subcategory, keyword,
page))
else:
r = requests.get("{}/{}?f={}&c={}_{}&q={}".format(self.URI, user_uri, filters, category, subcategory, keyword))
r = requests.get("{}/{}?f={}&c={}_{}&q={}".format(
self.URI, user_uri, filters, category, subcategory, keyword))
soup = BeautifulSoup(r.text, 'html.parser')
rows = soup.select('table tr')
@@ -35,8 +39,8 @@ class Nyaa:
def get(self, id):
r = requests.get("{}/view/{}".format(self.URI, id))
soup = BeautifulSoup(r.text, 'html.parser')
content = soup.findAll("div", { "class": "panel", "id": None})
content = soup.findAll("div", {"class": "panel", "id": None})
return utils.parse_single(content)
def get_user(self, username):
@@ -50,4 +54,4 @@ class Nyaa:
soup = BeautifulSoup(r.text, 'html.parser')
rows = soup.select('table tr')
return utils.parse_nyaa(rows, limit=number_of_results + 1)
return utils.parse_nyaa(rows, limit=number_of_results + 1)

View File

@@ -3,14 +3,16 @@ from NyaaPy.utils import Utils
utils = Utils()
class Pantsu:
def __init__(self):
self.BASE_URL = "https://nyaa.pantsu.cat/api"
# Torrents - GET
def search(self, keyword, **kwargs):
request = requests.get("{}/search{}".format(self.BASE_URL, utils.query_builder(keyword, kwargs)))
def search(self, keyword, **kwargs):
request = requests.get("{}/search{}".format(
self.BASE_URL, utils.query_builder(keyword, kwargs)))
return request.json()
def view(self, item_id):
@@ -29,11 +31,13 @@ class Pantsu:
# Users
def login(self, username, password):
login = requests.post("{}/login/".format(self.BASE_URL), data={'username': username, 'password': password})
login = requests.post("{}/login/".format(
self.BASE_URL), data={'username': username, 'password': password})
return login.json()
def profile(self, user_id):
profile = requests.post("{}/profile/".format(self.BASE_URL), data={'id': user_id})
profile = requests.post("{}/profile/".format(
self.BASE_URL), data={'id': user_id})
return profile.json()
return profile.json()

View File

@@ -2,6 +2,7 @@ import requests
from bs4 import BeautifulSoup
from NyaaPy.utils import Utils as utils
class SukebeiNyaa:
def search(self, keyword, **kwargs):
category = kwargs.get('category', 0)
@@ -10,9 +11,13 @@ class SukebeiNyaa:
page = kwargs.get('page', 0)
if page > 0:
r = requests.get("{}/?f={}&c={}_{}&q={}&p={}".format("http://sukebei.nyaa.si", filters, category, subcategory, keyword, page))
r = requests.get("{}/?f={}&c={}_{}&q={}&p={}".format(
"http://sukebei.nyaa.si", filters, category, subcategory,
keyword, page))
else:
r = requests.get("{}/?f={}&c={}_{}&q={}".format("http://sukebei.nyaa.si", filters, category, subcategory, keyword))
r = requests.get("{}/?f={}&c={}_{}&q={}".format(
"http://sukebei.nyaa.si", filters, category, subcategory,
keyword))
soup = BeautifulSoup(r.text, 'html.parser')
rows = soup.select('table tr')
@@ -22,8 +27,8 @@ class SukebeiNyaa:
def get(self, id):
r = requests.get("http://sukebei.nyaa.si/view/{}".format(id))
soup = BeautifulSoup(r.text, 'html.parser')
content = soup.findAll("div", { "class": "panel", "id": None})
content = soup.findAll("div", {"class": "panel", "id": None})
return utils.parse_single(content)
def get_user(self, username):
@@ -39,17 +44,20 @@ class SukebeiNyaa:
return utils.parse_sukebei(rows, limit=number_of_results + 1)
class SukebeiPantsu:
BASE_URL = "https://sukebei.pantsu.cat/api"
# Torrents - GET
def search(self, keyword, **kwargs):
request = requests.get("{}/search{}".format(SukebeiPantsu.BASE_URL, utils.query_builder(keyword, kwargs)))
request = requests.get("{}/search{}".format(
SukebeiPantsu.BASE_URL, utils.query_builder(keyword, kwargs)))
return request.json()
def view(self, item_id):
request = requests.get("{}/view/{}".format(SukebeiPantsu.BASE_URL, item_id))
request = requests.get("{}/view/{}".format(
SukebeiPantsu.BASE_URL, item_id))
return request.json()
@@ -64,11 +72,14 @@ class SukebeiPantsu:
# Users
def login(self, username, password):
login = requests.post("{}/login/".format(SukebeiPantsu.BASE_URL), data={'username': username, 'password': password})
login = requests.post("{}/login/".format(
SukebeiPantsu.BASE_URL), data={'username': username,
'password': password})
return login.json()
def profile(self, user_id):
profile = requests.post("{}/profile/".format(SukebeiPantsu.BASE_URL), data={'id': user_id})
profile = requests.post("{}/profile/".format(
SukebeiPantsu.BASE_URL), data={'id': user_id})
return profile.json()
return profile.json()

View File

@@ -4,6 +4,7 @@
import re
class Utils:
def nyaa_categories(self, b):
c = b.replace('/?c=', '')
@@ -37,7 +38,7 @@ class Utils:
"3": "Raw"
}
},
"4": {
"4": {
"name": "Live Action",
"subcats": {
"1": "English-translated",
@@ -46,14 +47,14 @@ class Utils:
"4": "Raw"
}
},
"5": {
"5": {
"name": "Pictures",
"subcats": {
"1": "Graphics",
"2": "Photos"
}
},
"6": {
"6": {
"name": "Software",
"subcats": {
"1": "Applications",
@@ -61,10 +62,11 @@ class Utils:
}
}
}
try:
category_name = "{} - {}".format(categories[cat]['name'], categories[cat]['subcats'][subcat])
except:
category_name = "{} - {}".format(
categories[cat]['name'], categories[cat]['subcats'][subcat])
except Exception:
pass
return category_name
@@ -107,7 +109,7 @@ class Utils:
torrents.append(torrent)
except IndexError as ie:
pass
return torrents
def parse_single(self, content):
@@ -119,13 +121,14 @@ class Utils:
for div in row.find_all('div', {'class': 'col-md-5'}):
data.append(div.text.replace("\n", ""))
files = content[2].find('div', {'class', 'torrent-file-list'}).find_all('li')
files = content[2].find('div',
{'class', 'torrent-file-list'}).find_all('li')
for file in files:
torrent_files.append(file.text)
torrent['title'] = re.sub('\n|\r|\t', '', content[0].find('h3', {"class": "panel-title"}).text.replace("\n", ""))
torrent['title'] = re.sub('\n|\r|\t', '', content[0].find('h3', {
"class": "panel-title"}).text.replace("\n", ""))
torrent['category'] = data[0]
torrent['uploader'] = data[2]
torrent['uploader_profile'] = "https://nyaa.si/user/{}".format(data[2])
@@ -136,7 +139,8 @@ class Utils:
torrent['leechers'] = data[5]
torrent['completed'] = data[7]
torrent['hash'] = data[8]
torrent['description'] = re.sub('\t', '', content[1].find('div', {'id': 'torrent-description'}).text)
torrent['description'] = re.sub('\t', '', content[1].find('div', {
'id': 'torrent-description'}).text)
torrent['files'] = torrent_files
return torrent
@@ -158,14 +162,15 @@ class Utils:
if td.text.rstrip():
block.append(td.text.rstrip())
try:
torrent = {
'id': block[1].replace("/view/", ""),
'category': Utils.sukebei_categories(self, block[0]),
'url': "http://sukebei.nyaa.si{}".format(block[1]),
'name': block[2],
'download_url': "http://sukebei.nyaa.si{}".format(block[4]),
'download_url': "http://sukebei.nyaa.si{}".format(
block[4]),
'magnet': block[5],
'size': block[6],
'date': block[7],
@@ -173,9 +178,9 @@ class Utils:
'leechers': block[9],
'completed_downloads': block[10],
}
torrents.append(torrent)
return torrents
def sukebei_categories(self, b):
@@ -204,32 +209,36 @@ class Utils:
}
}
}
try:
category_name = "{} - {}".format(categories[cat]['name'], categories[cat]['subcats'][subcat])
except:
category_name = "{} - {}".format(
categories[cat]['name'], categories[cat]['subcats'][subcat])
except Exception:
pass
return category_name
# Pantsu Utils
def query_builder(self, q, params):
available_params = ["category", "page", "limit", "userID", "fromID", "status", "maxage", "toDate", "fromDate",\
"dateType", "minSize", "maxSize", "sizeType", "sort", "order", "lang"]
available_params = ["category", "page", "limit", "userID", "fromID",
"status", "maxage", "toDate", "fromDate",
"dateType", "minSize", "maxSize", "sizeType",
"sort", "order", "lang"]
query = "?q={}".format(q.replace(" ", "+"))
for param, value in params.items():
if param in available_params:
if param != "category" and param != "status" and param != "lang":
if (param != "category" and param != "status" and
param != "lang"):
query += "&{}={}".format(param, value)
elif param == "category":
query += "&c={}_{}".format(value[0], value[1])
elif param == "status":
query += "&s={}".format(value)
elif param == "lang":
for lang in value:
query += "&lang={}".format(lang)
return query