From a17186393dc9e778e95a25639a3b708dbb30577a Mon Sep 17 00:00:00 2001 From: JuanjoSalvador Date: Sat, 12 Aug 2017 19:40:34 +0200 Subject: [PATCH] Minor fixes --- NyaaPy/nyaa.py | 12 ++++++++++-- README.md | 18 ++++++++++++------ setup.py | 3 +-- src/nyaa.py | 6 +++++- tests/test.py | 17 +++++++++++------ 5 files changed, 39 insertions(+), 17 deletions(-) diff --git a/NyaaPy/nyaa.py b/NyaaPy/nyaa.py index 05e25f7..ed0de3d 100644 --- a/NyaaPy/nyaa.py +++ b/NyaaPy/nyaa.py @@ -8,7 +8,11 @@ class Nyaa(): request = requests.get(nyaa_baseurl + keyword) response = xmltodict.parse(request.text) - results = response['rss']['channel']['item'] + + try: + results = response['rss']['channel']['item'] + except KeyError as ex: + results = {} return results @@ -18,6 +22,10 @@ class NyaaPantsu(): request = requests.get(nyaapantsu_baseurl + keyword) response = xmltodict.parse(request.text) - results = response['rss']['channel']['item'] + + try: + results = response['rss']['channel']['item'] + except KeyError as ex: + results = {} return results diff --git a/README.md b/README.md index a3e3b9f..4c7d9ed 100644 --- a/README.md +++ b/README.md @@ -41,15 +41,21 @@ At this moment there isn't an official Nyaa.si API, so we only can make requests from NyaaPy.nyaa import NyaaPantsu # Nyaa.si results - nyaa_query = Nyaa.search('new game') - for result in nyaa_query: - print(result['title']) + nyaa_query = Nyaa.search('illo que pasa') + + if len(nyaa_query) > 0: + for result in nyaa_query: + print(result['title']) + else: + print('Nothing here!') # Nyaa.pantsu.cat results pantsu_query = NyaaPantsu.search('new game') - - for result in pantsu_query: - print(result['title']) + if len(pantsu_query) > 0: + for result in pantsu_query: + print(result['title']) + else: + print('Nothing here!') ### License diff --git a/setup.py b/setup.py index 3aecf4c..1ffeb54 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages setup(name='nyaapy', - version='0.1', + version='0.3', url='https://github.com/juanjosalvador/nyaapy', download_url = 'https://github.com/juanjosalvador/nyaapy/archive/0.1.tar.gz', license='MIT', @@ -9,5 +9,4 @@ setup(name='nyaapy', author_email='juanjosalvador@netc.eu', description='Allows you to make requests on Nyaa.si and nyaa.pantsu.cat', packages=find_packages(exclude=['tests']), - long_description=open('README.md').read(), zip_safe=False) diff --git a/src/nyaa.py b/src/nyaa.py index 60afc42..a99782d 100644 --- a/src/nyaa.py +++ b/src/nyaa.py @@ -13,7 +13,11 @@ class Nyaa: request = requests.get(nyaa_baseurl + keyword) response = xmltodict.parse(request.text) - results = response['rss']['channel']['item'] + + try: + results = response['rss']['channel']['item'] + except Exception as ex: + print(ex) return results diff --git a/tests/test.py b/tests/test.py index 58800ce..dbc0dcf 100644 --- a/tests/test.py +++ b/tests/test.py @@ -2,13 +2,18 @@ from NyaaPy.nyaa import Nyaa from NyaaPy.nyaa import NyaaPantsu # Nyaa.si results +nyaa_query = Nyaa.search('illo que pasa') -nyaa_query = Nyaa.search('new game') -for result in nyaa_query: - print(result['title']) +if len(nyaa_query) > 0: + for result in nyaa_query: + print(result['title']) +else: + print('Nothing here!') # Nyaa.pantsu.cat results pantsu_query = NyaaPantsu.search('new game') - -for result in pantsu_query: - print(result['title']) +if len(pantsu_query) > 0: + for result in pantsu_query: + print(result['title']) +else: + print('Nothing here!')