diff --git a/NyaaPy/nyaa.py b/NyaaPy/nyaa.py index 550985f..d916e06 100644 --- a/NyaaPy/nyaa.py +++ b/NyaaPy/nyaa.py @@ -1,13 +1,20 @@ import requests import urllib.parse from bs4 import BeautifulSoup -from NyaaPy.utils import utils +from NyaaPy import utils class Nyaa: def __init__(self): self.URI = "http://nyaa.si" + def last_uploads(self, number_of_results): + r = requests.get(self.URI) + soup = BeautifulSoup(r.text, 'html.parser') + rows = soup.select('table tr') + + return utils.parse_nyaa(table_rows=rows, limit=number_of_results + 1) + def search(self, keyword, **kwargs): user = kwargs.get('user', None) category = kwargs.get('category', 0) @@ -45,10 +52,3 @@ class Nyaa: soup = BeautifulSoup(r.text, 'html.parser') return utils.parse_nyaa(soup.select('table tr'), limit=None) - - def news(self, number_of_results): - r = requests.get(self.URI) - soup = BeautifulSoup(r.text, 'html.parser') - rows = soup.select('table tr') - - return utils.parse_nyaa(rows, limit=number_of_results + 1) diff --git a/NyaaPy/pantsu.py b/NyaaPy/pantsu.py index 3caf98a..d982f86 100644 --- a/NyaaPy/pantsu.py +++ b/NyaaPy/pantsu.py @@ -1,5 +1,5 @@ import requests -from NyaaPy.utils import utils +from NyaaPy import utils class Pantsu: diff --git a/NyaaPy/sukebei.py b/NyaaPy/sukebei.py index 7f03b45..d0223c2 100644 --- a/NyaaPy/sukebei.py +++ b/NyaaPy/sukebei.py @@ -1,6 +1,6 @@ import requests from bs4 import BeautifulSoup -from NyaaPy.utils import utils +from NyaaPy import utils class SukebeiNyaa: def search(self, keyword, **kwargs): diff --git a/NyaaPy/utils.py b/NyaaPy/utils.py index 348878d..c0dd89d 100644 --- a/NyaaPy/utils.py +++ b/NyaaPy/utils.py @@ -4,7 +4,7 @@ import re -def nyaa_categories(self, b): +def nyaa_categories(b): c = b.replace('/?c=', '') cats = c.split('_') @@ -69,7 +69,7 @@ def nyaa_categories(self, b): return category_name -def parse_nyaa(self, table_rows, limit): +def parse_nyaa(table_rows, limit): if limit == 0: limit = len(table_rows) @@ -92,7 +92,7 @@ def parse_nyaa(self, table_rows, limit): try: torrent = { 'id': block[1].replace("/view/", ""), - 'category': nyaa_categories(self, block[0]), + 'category': nyaa_categories(block[0]), 'url': "http://nyaa.si{}".format(block[1]), 'name': block[2], 'download_url': "http://nyaa.si{}".format(block[4]), @@ -110,7 +110,7 @@ def parse_nyaa(self, table_rows, limit): return torrents -def parse_single(self, content): +def parse_single(content): torrent = {} data = [] torrent_files = [] @@ -143,45 +143,45 @@ def parse_single(self, content): return torrent -def parse_sukebei(self, table_rows, limit): - if limit == 0: - limit = len(table_rows) +# def parse_sukebei(table_rows, limit): +# if limit == 0: +# limit = len(table_rows) - torrents = [] +# torrents = [] - for row in table_rows[:limit]: - block = [] +# for row in table_rows[:limit]: +# block = [] - for td in row.find_all('td'): - for link in td.find_all('a'): - if link.get('href')[-9:] != '#comments': - block.append(link.get('href')) - block.append(link.text.rstrip()) +# for td in row.find_all('td'): +# for link in td.find_all('a'): +# if link.get('href')[-9:] != '#comments': +# block.append(link.get('href')) +# block.append(link.text.rstrip()) - if td.text.rstrip(): - block.append(td.text.rstrip()) +# if td.text.rstrip(): +# block.append(td.text.rstrip()) - try: - torrent = { - 'id': block[1].replace("/view/", ""), - 'category': 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]), - 'magnet': block[5], - 'size': block[6], - 'date': block[7], - 'seeders': block[8], - 'leechers': block[9], - 'completed_downloads': block[10], - } +# try: +# torrent = { +# 'id': block[1].replace("/view/", ""), +# 'category': sukebei_categories(block[0]), +# 'url': "http://sukebei.nyaa.si{}".format(block[1]), +# 'name': block[2], +# 'download_url': "http://sukebei.nyaa.si{}".format( +# block[4]), +# 'magnet': block[5], +# 'size': block[6], +# 'date': block[7], +# 'seeders': block[8], +# 'leechers': block[9], +# 'completed_downloads': block[10], +# } - torrents.append(torrent) +# torrents.append(torrent) - return torrents +# return torrents -def sukebei_categories(self, b): +def sukebei_categories(b): c = b.replace('/?c=', '') cats = c.split('_') @@ -217,7 +217,7 @@ def sukebei_categories(self, b): return category_name # Pantsu Utils -def query_builder(self, q, params): +def query_builder(q, params): available_params = ["category", "page", "limit", "userID", "fromID", "status", "maxage", "toDate", "fromDate", "dateType", "minSize", "maxSize", "sizeType",