Fix #36
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
import requests
|
import requests
|
||||||
|
import urllib.parse
|
||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
from NyaaPy.utils import Utils
|
from NyaaPy.utils import Utils
|
||||||
|
|
||||||
@@ -10,15 +11,21 @@ class Nyaa:
|
|||||||
self.URI = "http://nyaa.si"
|
self.URI = "http://nyaa.si"
|
||||||
|
|
||||||
def search(self, keyword, **kwargs):
|
def search(self, keyword, **kwargs):
|
||||||
|
user = kwargs.get('user', None)
|
||||||
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 user:
|
||||||
r = requests.get("{}/?f={}&c={}_{}&q={}&p={}".format(self.URI, filters, category, subcategory, keyword, page))
|
user_uri = "user/{}".format(user)
|
||||||
else:
|
else:
|
||||||
r = requests.get("{}/?f={}&c={}_{}&q={}".format(self.URI, filters, category, subcategory, keyword))
|
user_uri = ""
|
||||||
|
|
||||||
|
if page > 0:
|
||||||
|
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))
|
||||||
|
|
||||||
soup = BeautifulSoup(r.text, 'html.parser')
|
soup = BeautifulSoup(r.text, 'html.parser')
|
||||||
rows = soup.select('table tr')
|
rows = soup.select('table tr')
|
||||||
|
|||||||
6
setup.py
6
setup.py
@@ -1,13 +1,13 @@
|
|||||||
from setuptools import setup, find_packages
|
from setuptools import setup, find_packages
|
||||||
|
|
||||||
setup(name='nyaapy',
|
setup(name='nyaapy',
|
||||||
version='0.6.1',
|
version='0.6.2',
|
||||||
install_requires = [
|
install_requires = [
|
||||||
"requests",
|
"requests",
|
||||||
"bs4",
|
"beautifulsoup4",
|
||||||
],
|
],
|
||||||
url='https://github.com/juanjosalvador/nyaapy',
|
url='https://github.com/juanjosalvador/nyaapy',
|
||||||
download_url = 'https://github.com/juanjosalvador/nyaapy/archive/0.6.1.tar.gz',
|
download_url = 'https://github.com/juanjosalvador/nyaapy/archive/0.6.2.tar.gz',
|
||||||
license='MIT',
|
license='MIT',
|
||||||
author='Juanjo Salvador',
|
author='Juanjo Salvador',
|
||||||
author_email='juanjosalvador@netc.eu',
|
author_email='juanjosalvador@netc.eu',
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
from NyaaPy import Pantsu
|
from NyaaPy import Pantsu, Nyaa
|
||||||
|
|
||||||
pantsu = Pantsu()
|
pantsu = Pantsu()
|
||||||
|
nyaa = Nyaa()
|
||||||
|
|
||||||
print(pantsu.search(keyword='koe no katachi', lang=["es", "ja"], category=[1, 3]))
|
#print(pantsu.search(keyword='koe no katachi', lang=["es", "ja"], category=[1, 3]))
|
||||||
|
print(nyaa.search(keyword='yuru camp'))
|
||||||
Reference in New Issue
Block a user