Merge pull request #17 from JuanjoSalvador/no-pantsu-branch

No pantsu branch

NyaaPy/__init__.py

@@ -6,5 +6,4 @@ __url__       = 'http://juanjosalvador.me'
 __copyright__ = '2017 Juanjo Salvador'
 __license__   = 'MIT license'
 
-from NyaaPy.nyaa import Nyaa
-from NyaaPy.nyaapantsu import NyaaPantsu
+from NyaaPy.nyaa import Nyaa

NyaaPy/nyaapantsu.py

@@ -1,42 +0,0 @@
-import requests
-from bs4 import BeautifulSoup
-from NyaaPy.utils import Utils as utils
-
-
-class NyaaPantsu():
-    '''
-     Make a query to nyaa.pantsu.cat using keyword as keyword.
-     Returns an array of OrderedDict with every result of the query.
-     Returns an empty array if no results.
-    '''
-    def search(keyword):
-        nyaapantsu_baseurl = "https://nyaa.pantsu.cat/feed?c=_&s=0&max=99999&userID=0&q="
-
-        request  = requests.get(nyaa_baseurl + keyword)
-        response = xmltodict.parse(request.text)
-
-        results = []
-
-        try:
-            if type(response['rss']['channel']['item']) is collections.OrderedDict:
-                results.append(response['rss']['channel']['item'])
-            else:
-                results = response['rss']['channel']['item']
-
-        except KeyError as ex:
-            results = []
-
-        return results
-
-    '''
-     Returns an array of OrderedDict with the n last updates of nyaa.pantsu.cat
-    '''
-    def news(n):
-        nyaa_baseurl = "https://nyaa.pantsu.cat/feed"
-
-        request  = requests.get(nyaa_baseurl)
-        response = xmltodict.parse(request.text)
-
-        results = response['rss']['channel']['item']
-
-        return results[:n]

NyaaPy/utils.py

@@ -4,7 +4,7 @@
 
 class Utils():
 
-    def get_categories(b):
+    def nyaa_categories(b):
         c = b.replace('/?c=', '')
         cats = c.split('_')
 
@@ -88,7 +88,7 @@ class Utils():
 
                 try:
                     torrent = {
-                        'category': Utils.get_categories(block[0]),
+                        'category': Utils.nyaa_categories(block[0]),
                         'url': "http://nyaa.si{}".format(block[1]),
                         'name': block[2],
                         'download_url': "http://nyaa.si{}".format(block[4]),

README.md

@@ -1,6 +1,6 @@
 # NyaaPy
 
-Unofficial Python module to search into Nyaa.si and nyaa.pantsu.cat.
+Unofficial Python module to search into Nyaa.si
 
 Supports Python 3+
 
@@ -23,7 +23,7 @@ Install it using pip.
 ## Example
 
 ```python
-    from NyaaPy import Nyaa, NyaaPantsu
+    from NyaaPy import Nyaa
 
     nyaa_query = Nyaa.search(keyword='koe no katachi 1080', category=1, subcategory=0, filters=0, page=0)
 

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 setup(name='nyaapy',
-      version='0.4.0',
+      version='0.4.1',
       url='https://github.com/juanjosalvador/nyaapy',
       download_url = 'https://github.com/juanjosalvador/nyaapy/archive/0.1.tar.gz',
       license='MIT',

tests/test.py

@@ -2,10 +2,13 @@ from NyaaPy import Nyaa, NyaaPantsu
 
 # Nyaa.si results
 def nyaa_search():
-    nyaa_query = Nyaa.search(keyword='koe no katachi 1080', category=1, subcategory=0, filters=0, page=0)
+    try:
+        nyaa_query = Nyaa.search(keyword='koe no katachi 1080', category=1, subcategory=0, page=0)
 
-    for nyaa in nyaa_query:
-        print(nyaa)
+        for nyaa in nyaa_query:
+            print(nyaa)
+    except TypeError as te:
+        print(te)
 
 def nyaa_news():
     news = Nyaa.news(number_of_results=5)
@@ -15,22 +18,14 @@ def nyaa_news():
 # Nyaa.pantsu.cat results
 def pantsu_search():
     pantsu_query = NyaaPantsu.search('new game!!')
-    if len(pantsu_query) > 0:
-        for result in pantsu_query:
-            print(result['title'])
-    else:
-        print('Nothing here!')
 
 
 def pantsu_news():
-    news = NyaaPantsu.news(5)
-
-    for result in news:
-        print(result['title'])
+    print(NyaaPantsu.news(1))
 
 # Uncomment whatever you want to test
 
 #nyaa_search()
 #pantsu_search()
-nyaa_news()
-#pantsu_news()
+#nyaa_news()
+pantsu_news()