From 3702a2a78aacaf50548f564356271a1673216b0c Mon Sep 17 00:00:00 2001 From: Juanjo Salvador Date: Wed, 17 Jul 2024 21:18:12 +0000 Subject: [PATCH 1/2] fix(sukebei): refactor Sukebei module and fix number of results --- NyaaPy/sukebei.py | 47 +++-------------------------------------------- 1 file changed, 3 insertions(+), 44 deletions(-) diff --git a/NyaaPy/sukebei.py b/NyaaPy/sukebei.py index 55a657c..e828582 100644 --- a/NyaaPy/sukebei.py +++ b/NyaaPy/sukebei.py @@ -1,49 +1,8 @@ -import requests +from NyaaPy.nyaa import Nyaa from NyaaPy import utils - -class SukebeiNyaa: +class SukebeiNyaa(Nyaa): def __init__(self): self.SITE = utils.TorrentSite.SUKEBEINYAASI - - def search(self, keyword, **kwargs): - uri = self.SITE.value - 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( - uri, filters, category, subcategory, - keyword, page)) - else: - r = requests.get("{}/?f={}&c={}_{}&q={}".format( - uri, filters, category, subcategory, - keyword)) - - r.raise_for_status() - return utils.parse_nyaa(r.text, limit=None, site=self.SITE) - - def get(self, id): - r = requests.get("{}/view/{}".format(self.SITE.value, id)) - r.raise_for_status() - - return utils.parse_single(r.text, self.SITE) - - def get_user(self, username): - r = requests.get("{}/user/{}".format(self.SITE.value, username)) - r.raise_for_status() - - return utils.parse_nyaa(r.text, limit=None, site=self.SITE) - - def last_uploads(self, number_of_results): - r = requests.get(self.SITE.value) - r.raise_for_status() - - return utils.parse_nyaa( - r.text, - limit=number_of_results + 1, - site=self.SITE - ) + self.URL = utils.TorrentSite.SUKEBEINYAASI.value From 735a251ccead14bb55fe26aa814c2f4a29156df4 Mon Sep 17 00:00:00 2001 From: Juanjo Salvador Date: Wed, 17 Jul 2024 23:37:50 +0200 Subject: [PATCH 2/2] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6ae6b3b..020c6bc 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@

-![](https://img.shields.io/badge/Python-3.5-green.svg) +![](https://img.shields.io/badge/Python-3.10-green.svg) ![](https://img.shields.io/badge/Nyaa.si-supported-green.svg) -![](https://img.shields.io/badge/NyaaPantsu-supported-green.svg) +![](https://img.shields.io/badge/NyaaPantsu-no%20longer%20supported-red.svg) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/JuanjoSalvador/NyaaPy/master/LICENSE.txt) Unofficial Python module for Nyaa.si (WebScraping) and Nyaa.pantsu.cat (API wrapper) @@ -23,7 +23,7 @@ Install it using pip. ## License -Copyright 2017 Juanjo Salvador +Copyright 2024 Juanjo Salvador Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: