merge fixes

NyaaPy/nyaa.py

@@ -1,54 +1,54 @@
-import requests
-import urllib.parse
-from bs4 import BeautifulSoup
-from NyaaPy import utils
-
-class Nyaa:
-
-    def __init__(self):
-        self.URI = "http://nyaa.si"
-
-    def search(self, keyword, **kwargs):
-        user = kwargs.get('user', None)
-        category = kwargs.get('category', 0)
-        subcategory = kwargs.get('subcategory', 0)
-        filters = kwargs.get('filters', 0)
-        page = kwargs.get('page', 0)
-
-        if user:
-            user_uri = "user/{}".format(user)
-        else:
-            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')
-        rows = soup.select('table tr')
-
-        return utils.parse_nyaa(rows, limit=None)
-
-    def get(self, id):
-        r = requests.get("{}/view/{}".format(self.URI, id))
-        soup = BeautifulSoup(r.text, 'html.parser')
-        content = soup.findAll("div", {"class": "panel", "id": None})
-
-        return utils.parse_single(content)
-
-    def get_user(self, username):
-        r = requests.get("{}/user/{}".format(self.URI, username))
-        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)
+import requests
+import urllib.parse
+from bs4 import BeautifulSoup
+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)
+        subcategory = kwargs.get('subcategory', 0)
+        filters = kwargs.get('filters', 0)
+        page = kwargs.get('page', 0)
+
+        if user:
+            user_uri = "user/{}".format(user)
+        else:
+            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')
+        rows = soup.select('table tr')
+
+        return utils.parse_nyaa(rows, limit=None)
+
+    def get(self, id):
+        r = requests.get("{}/view/{}".format(self.URI, id))
+        soup = BeautifulSoup(r.text, 'html.parser')
+        content = soup.findAll("div", {"class": "panel", "id": None})
+
+        return utils.parse_single(content)
+
+    def get_user(self, username):
+        r = requests.get("{}/user/{}".format(self.URI, username))
+        soup = BeautifulSoup(r.text, 'html.parser')
+
+        return utils.parse_nyaa(soup.select('table tr'), limit=None)

NyaaPy/pantsu.py

@@ -1,40 +1,48 @@
-import requests
-from NyaaPy import utils
-
-class Pantsu:
-
-    def __init__(self):
-        self.BASE_URL = "https://nyaa.pantsu.cat/api"
-
-    # Torrents - GET
-    def search(self, keyword, **kwargs):
-        request = requests.get("{}/search{}".format(
-            self.BASE_URL, utils.query_builder(keyword, kwargs)))
-        return request.json()
-
-    def view(self, item_id):
-        request = requests.get("{}/view/{}".format(self.BASE_URL, item_id))
-
-        return request.json()
-
-    # Torrents - POST
-
-    def upload(self):
-        return "Work in progress!"
-
-    def update(self):
-        return "Work in progress!"
-
-    # Users
-
-    def login(self, username, password):
-        login = requests.post("{}/login/".format(
-            self.BASE_URL), data={'username': username, 'password': password})
-
-        return login.json()
-
-    def profile(self, user_id):
-        profile = requests.post("{}/profile/".format(
-            self.BASE_URL), data={'id': user_id})
-
-        return profile.json()
+import requests
+from NyaaPy import utils
+
+class Pantsu:
+
+    def __init__(self):
+        self.BASE_URL = "https://nyaa.pantsu.cat/api"
+    
+    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(rows, limit=number_of_results + 1)
+
+
+    # Torrents - GET
+    def search(self, keyword, **kwargs):
+        request = requests.get("{}/search{}".format(
+            self.BASE_URL, utils.query_builder(keyword, kwargs)))
+        return request.json()
+
+    def view(self, item_id):
+        request = requests.get("{}/view/{}".format(self.BASE_URL, item_id))
+
+        return request.json()
+
+    # Torrents - POST
+
+    def upload(self):
+        return "Work in progress!"
+
+    def update(self):
+        return "Work in progress!"
+
+    # Users
+
+    def login(self, username, password):
+        login = requests.post("{}/login/".format(
+            self.BASE_URL), data={'username': username, 'password': password})
+
+        return login.json()
+
+    def profile(self, user_id):
+        profile = requests.post("{}/profile/".format(
+            self.BASE_URL), data={'id': user_id})
+
+        return profile.json()

NyaaPy/sukebei.py

@@ -1,84 +1,84 @@
-import requests
-from bs4 import BeautifulSoup
-from NyaaPy import utils
-
-class SukebeiNyaa:
-    def search(self, keyword, **kwargs):
-        category = kwargs.get('category', 0)
-        subcategory = kwargs.get('subcategory', 0)
-        filters = kwargs.get('filters', 0)
-        page = kwargs.get('page', 0)
-
-        if page > 0:
-            r = requests.get("{}/?f={}&c={}_{}&q={}&p={}".format(
-                "http://sukebei.nyaa.si", filters, category, subcategory,
-                keyword, page))
-        else:
-            r = requests.get("{}/?f={}&c={}_{}&q={}".format(
-                "http://sukebei.nyaa.si", filters, category, subcategory,
-                keyword))
-
-        soup = BeautifulSoup(r.text, 'html.parser')
-        rows = soup.select('table tr')
-
-        return utils.parse_nyaa(rows, limit=None)
-
-    def get(self, id):
-        r = requests.get("http://sukebei.nyaa.si/view/{}".format(id))
-        soup = BeautifulSoup(r.text, 'html.parser')
-        content = soup.findAll("div", {"class": "panel", "id": None})
-
-        return utils.parse_single(content)
-
-    def get_user(self, username):
-        r = requests.get("http://sukebei.nyaa.si/user/{}".format(username))
-        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("http://sukebei.nyaa.si/")
-        soup = BeautifulSoup(r.text, 'html.parser')
-        rows = soup.select('table tr')
-
-        return utils.parse_sukebei(rows, limit=number_of_results + 1)
-
-
-class SukebeiPantsu:
-    BASE_URL = "https://sukebei.pantsu.cat/api"
-
-    # Torrents - GET
-    def search(self, keyword, **kwargs):
-        request = requests.get("{}/search{}".format(
-            SukebeiPantsu.BASE_URL, utils.query_builder(keyword, kwargs)))
-
-        return request.json()
-
-    def view(self, item_id):
-        request = requests.get("{}/view/{}".format(
-            SukebeiPantsu.BASE_URL, item_id))
-
-        return request.json()
-
-    # Torrents - POST
-
-    def upload(self):
-        return "Work in progress!"
-
-    def update(self):
-        return "Work in progress!"
-
-    # Users
-
-    def login(self, username, password):
-        login = requests.post("{}/login/".format(
-            SukebeiPantsu.BASE_URL), data={'username': username,
-                                           'password': password})
-
-        return login.json()
-
-    def profile(self, user_id):
-        profile = requests.post("{}/profile/".format(
-            SukebeiPantsu.BASE_URL), data={'id': user_id})
-
-        return profile.json()
+import requests
+from bs4 import BeautifulSoup
+from NyaaPy import utils
+
+class SukebeiNyaa:
+    def search(self, keyword, **kwargs):
+        category = kwargs.get('category', 0)
+        subcategory = kwargs.get('subcategory', 0)
+        filters = kwargs.get('filters', 0)
+        page = kwargs.get('page', 0)
+
+        if page > 0:
+            r = requests.get("{}/?f={}&c={}_{}&q={}&p={}".format(
+                "http://sukebei.nyaa.si", filters, category, subcategory,
+                keyword, page))
+        else:
+            r = requests.get("{}/?f={}&c={}_{}&q={}".format(
+                "http://sukebei.nyaa.si", filters, category, subcategory,
+                keyword))
+
+        soup = BeautifulSoup(r.text, 'html.parser')
+        rows = soup.select('table tr')
+
+        return utils.parse_nyaa(rows, limit=None)
+
+    def get(self, id):
+        r = requests.get("http://sukebei.nyaa.si/view/{}".format(id))
+        soup = BeautifulSoup(r.text, 'html.parser')
+        content = soup.findAll("div", {"class": "panel", "id": None})
+
+        return utils.parse_single(content)
+
+    def get_user(self, username):
+        r = requests.get("http://sukebei.nyaa.si/user/{}".format(username))
+        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("http://sukebei.nyaa.si/")
+        soup = BeautifulSoup(r.text, 'html.parser')
+        rows = soup.select('table tr')
+
+        return utils.parse_sukebei(rows, limit=number_of_results + 1)
+
+
+class SukebeiPantsu:
+    BASE_URL = "https://sukebei.pantsu.cat/api"
+
+    # Torrents - GET
+    def search(self, keyword, **kwargs):
+        request = requests.get("{}/search{}".format(
+            SukebeiPantsu.BASE_URL, utils.query_builder(keyword, kwargs)))
+
+        return request.json()
+
+    def view(self, item_id):
+        request = requests.get("{}/view/{}".format(
+            SukebeiPantsu.BASE_URL, item_id))
+
+        return request.json()
+
+    # Torrents - POST
+
+    def upload(self):
+        return "Work in progress!"
+
+    def update(self):
+        return "Work in progress!"
+
+    # Users
+
+    def login(self, username, password):
+        login = requests.post("{}/login/".format(
+            SukebeiPantsu.BASE_URL), data={'username': username,
+                                           'password': password})
+
+        return login.json()
+
+    def profile(self, user_id):
+        profile = requests.post("{}/profile/".format(
+            SukebeiPantsu.BASE_URL), data={'id': user_id})
+
+        return profile.json()