KomSuite/KomSuite-NyaaPy
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

Fix Pylint errors (optimized code)

Browse Source
This commit is contained in:
Juan José Salvador
2018-03-08 23:33:54 +01:00
parent 5691782c8c
commit 1e2ba25882
6 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -2,3 +2,5 @@ build/
dist/ dist/
nyaapy.egg-info nyaapy.egg-info
.vscode .vscode
env/
*.pyc

26
NyaaPy/nyaa.py
View File

@@ -1,41 +1,45 @@
import requests import requests
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
from NyaaPy.utils import Utils as utils from NyaaPy.utils import Utils
utils = Utils()
class Nyaa: class Nyaa:
URI = "http://nyaa.si"
def search(keyword, **kwargs): def __init__(self):
self.URI = "http://nyaa.si"
def search(self, keyword, **kwargs):
category = kwargs.get('category', 0) category = kwargs.get('category', 0)
subcategory = kwargs.get('subcategory', 0) subcategory = kwargs.get('subcategory', 0)
filters = kwargs.get('filters', 0) filters = kwargs.get('filters', 0)
page = kwargs.get('page', 0) page = kwargs.get('page', 0)
if page > 0: if page > 0:
r = requests.get("{}/?f={}&c={}_{}&q={}&p={}".format(Nyaa.URI, filters, category, subcategory, keyword, page)) r = requests.get("{}/?f={}&c={}_{}&q={}&p={}".format(self.URI, filters, category, subcategory, keyword, page))
else: else:
r = requests.get("{}/?f={}&c={}_{}&q={}".format(Nyaa.URI, filters, category, subcategory, keyword)) r = requests.get("{}/?f={}&c={}_{}&q={}".format(self.URI, filters, category, subcategory, keyword))
soup = BeautifulSoup(r.text, 'html.parser') soup = BeautifulSoup(r.text, 'html.parser')
rows = soup.select('table tr') rows = soup.select('table tr')
return utils.parse_nyaa(rows, limit=None) return utils.parse_nyaa(rows, limit=None)
def get(id): def get(self, id):
r = requests.get("{}/view/{}".format(Nyaa.URI, id)) r = requests.get("{}/view/{}".format(self.URI, id))
soup = BeautifulSoup(r.text, 'html.parser') 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) return utils.parse_single(content)
def get_user(username): def get_user(self, username):
r = requests.get("{}/user/{}".format(Nyaa.URI, username)) r = requests.get("{}/user/{}".format(self.URI, username))
soup = BeautifulSoup(r.text, 'html.parser') soup = BeautifulSoup(r.text, 'html.parser')
return utils.parse_nyaa(soup.select('table tr'), limit=None) return utils.parse_nyaa(soup.select('table tr'), limit=None)
def news(number_of_results): def news(self, number_of_results):
r = requests.get(Nyaa.URI) r = requests.get(self.URI)
soup = BeautifulSoup(r.text, 'html.parser') soup = BeautifulSoup(r.text, 'html.parser')
rows = soup.select('table tr') rows = soup.select('table tr')

27
NyaaPy/pantsu.py
View File

@@ -1,36 +1,39 @@
import requests import requests
from NyaaPy.utils import Utils as utils from NyaaPy.utils import Utils
utils = Utils()
class Pantsu: class Pantsu:
BASE_URL = "https://nyaa.pantsu.cat/api" def __init__(self):
self.BASE_URL = "https://nyaa.pantsu.cat/api"
# Torrents - GET # Torrents - GET
def search(keyword, **kwargs): def search(self, keyword, **kwargs):
request = requests.get("{}/search{}".format(Pantsu.BASE_URL, utils.query_builder(keyword, kwargs))) request = requests.get("{}/search{}".format(self.BASE_URL, utils.query_builder(keyword, kwargs)))
return request.json() return request.json()
def view(item_id): def view(self, item_id):
request = requests.get("{}/view/{}".format(Pantsu.BASE_URL, item_id)) request = requests.get("{}/view/{}".format(self.BASE_URL, item_id))
return request.json() return request.json()
# Torrents - POST # Torrents - POST
def upload(): def upload(self):
return "Work in progress!" return "Work in progress!"
def update(): def update(self):
return "Work in progress!" return "Work in progress!"
# Users # Users
def login(username, password): def login(self, username, password):
login = requests.post("{}/login/".format(Pantsu.BASE_URL), data={'username': username, 'password': password}) login = requests.post("{}/login/".format(self.BASE_URL), data={'username': username, 'password': password})
return login.json() return login.json()
def profile(user_id): def profile(self, user_id):
profile = requests.post("{}/profile/".format(Pantsu.BASE_URL), data={'id': user_id}) profile = requests.post("{}/profile/".format(self.BASE_URL), data={'id': user_id})
return profile.json() return profile.json()

20
NyaaPy/sukebei.py
View File

@@ -3,7 +3,7 @@ from bs4 import BeautifulSoup
from NyaaPy.utils import Utils as utils from NyaaPy.utils import Utils as utils
class SukebeiNyaa: class SukebeiNyaa:
def search(keyword, **kwargs): def search(self, keyword, **kwargs):
category = kwargs.get('category', 0) category = kwargs.get('category', 0)
subcategory = kwargs.get('subcategory', 0) subcategory = kwargs.get('subcategory', 0)
filters = kwargs.get('filters', 0) filters = kwargs.get('filters', 0)
@@ -19,20 +19,20 @@ class SukebeiNyaa:
return utils.parse_nyaa(rows, limit=None) return utils.parse_nyaa(rows, limit=None)
def get(id): def get(self, id):
r = requests.get("http://sukebei.nyaa.si/view/{}".format(id)) r = requests.get("http://sukebei.nyaa.si/view/{}".format(id))
soup = BeautifulSoup(r.text, 'html.parser') 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) return utils.parse_single(content)
def get_user(username): def get_user(self, username):
r = requests.get("http://sukebei.nyaa.si/user/{}".format(username)) r = requests.get("http://sukebei.nyaa.si/user/{}".format(username))
soup = BeautifulSoup(r.text, 'html.parser') soup = BeautifulSoup(r.text, 'html.parser')
return utils.parse_nyaa(soup.select('table tr'), limit=None) return utils.parse_nyaa(soup.select('table tr'), limit=None)
def news(number_of_results): def news(self, number_of_results):
r = requests.get("http://sukebei.nyaa.si/") r = requests.get("http://sukebei.nyaa.si/")
soup = BeautifulSoup(r.text, 'html.parser') soup = BeautifulSoup(r.text, 'html.parser')
rows = soup.select('table tr') rows = soup.select('table tr')
@@ -43,32 +43,32 @@ class SukebeiPantsu:
BASE_URL = "https://sukebei.pantsu.cat/api" BASE_URL = "https://sukebei.pantsu.cat/api"
# Torrents - GET # Torrents - GET
def search(keyword, **kwargs): 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() return request.json()
def view(item_id): 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() return request.json()
# Torrents - POST # Torrents - POST
def upload(): def upload(self):
return "Work in progress!" return "Work in progress!"
def update(): def update(self):
return "Work in progress!" return "Work in progress!"
# Users # Users
def login(username, password): 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() return login.json()
def profile(user_id): 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()

17
NyaaPy/utils.py
View File

@@ -5,8 +5,7 @@
import re import re
class Utils: class Utils:
def nyaa_categories(self, b):
def nyaa_categories(b):
c = b.replace('/?c=', '') c = b.replace('/?c=', '')
cats = c.split('_') cats = c.split('_')
@@ -70,7 +69,7 @@ class Utils:
return category_name return category_name
def parse_nyaa(table_rows, limit): def parse_nyaa(self, table_rows, limit):
if limit == 0: if limit == 0:
limit = len(table_rows) limit = len(table_rows)
@@ -93,7 +92,7 @@ class Utils:
try: try:
torrent = { torrent = {
'id': block[1].replace("/view/", ""), 'id': block[1].replace("/view/", ""),
'category': Utils.nyaa_categories(block[0]), 'category': Utils.nyaa_categories(self, block[0]),
'url': "http://nyaa.si{}".format(block[1]), 'url': "http://nyaa.si{}".format(block[1]),
'name': block[2], 'name': block[2],
'download_url': "http://nyaa.si{}".format(block[4]), 'download_url': "http://nyaa.si{}".format(block[4]),
@@ -111,7 +110,7 @@ class Utils:
return torrents return torrents
def parse_single(content): def parse_single(self, content):
torrent = {} torrent = {}
data = [] data = []
torrent_files = [] torrent_files = []
@@ -142,7 +141,7 @@ class Utils:
return torrent return torrent
def parse_sukebei(table_rows, limit): def parse_sukebei(self, table_rows, limit):
if limit == 0: if limit == 0:
limit = len(table_rows) limit = len(table_rows)
@@ -165,7 +164,7 @@ class Utils:
try: try:
torrent = { torrent = {
'id': block[1].replace("/view/", ""), 'id': block[1].replace("/view/", ""),
'category': Utils.sukebei_categories(block[0]), 'category': Utils.sukebei_categories(self, block[0]),
'url': "http://sukebei.nyaa.si{}".format(block[1]), 'url': "http://sukebei.nyaa.si{}".format(block[1]),
'name': block[2], 'name': block[2],
'download_url': "http://sukebei.nyaa.si{}".format(block[4]), 'download_url': "http://sukebei.nyaa.si{}".format(block[4]),
@@ -183,7 +182,7 @@ class Utils:
return torrents return torrents
def sukebei_categories(b): def sukebei_categories(self, b):
c = b.replace('/?c=', '') c = b.replace('/?c=', '')
cats = c.split('_') cats = c.split('_')
@@ -218,7 +217,7 @@ class Utils:
return category_name return category_name
# Pantsu Utils # Pantsu Utils
def query_builder(q, params): def query_builder(self, q, params):
available_params = ["category", "page", "limit", "userID", "fromID", "status", "maxage", "toDate", "fromDate",\ available_params = ["category", "page", "limit", "userID", "fromID", "status", "maxage", "toDate", "fromDate",\
"dateType", "minSize", "maxSize", "sizeType", "sort", "order", "lang"] "dateType", "minSize", "maxSize", "sizeType", "sort", "order", "lang"]
query = "?q={}".format(q.replace(" ", "+")) query = "?q={}".format(q.replace(" ", "+"))

4
tests/test.py
View File

@@ -1,3 +1,5 @@
from NyaaPy import Pantsu from NyaaPy import Pantsu
print(Pantsu.search('koe no katachi', lang=["es", "ja"], category=[1, 3])) pantsu = Pantsu()
print(pantsu.search(keyword='koe no katachi', lang=["es", "ja"], category=[1, 3]))