KomSuite/KomSuite-NyaaPy
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

Merge pull request #70 from sALTaccount/master

Browse Source 
uri referenced before assignment
This commit is contained in:
Juanjo Salvador
2023-11-09 16:30:17 +01:00
committed by GitHub
parent 6995bbc67c ba4d951d9c
commit 02e814a002
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
NyaaPy/nyaa.py
View File

@@ -23,34 +23,30 @@ class Nyaa:
return torrent.json_to_class(json_data) return torrent.json_to_class(json_data)
def search(self, keyword, **kwargs): def search(self, keyword, **kwargs):
url = self.URL base_url = self.URL
user = kwargs.get('user', None) 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)
sorting = kwargs.get('sort', 'id') # Sorting by id = sorting by date, this is the default. sorting = kwargs.get('sort', 'id') # Sorting by id = sorting by date, this is the default.
order = kwargs.get('order', 'desc') order = kwargs.get('order', 'desc')
if user: user_uri = f"user/{user}" if user else ""
user_uri = f"user/{user}"
else:
user_uri = ""
if page > 0: if page > 0:
r = requests.get("{}/{}?f={}&c={}_{}&q={}&p={}&s={}&o={}".format( search_uri = "{}/{}?f={}&c={}_{}&q={}&p={}&s={}&o={}".format(
url, user_uri, filters, category, subcategory, keyword, base_url, user_uri, filters, category, subcategory, keyword,
page, sorting, order)) page, sorting, order)
else: else:
r = requests.get("{}/{}?f={}&c={}_{}&q={}&s={}&o={}".format( search_uri = "{}/{}?f={}&c={}_{}&q={}&s={}&o={}".format(
url, user_uri, filters, category, subcategory, keyword, sorting, order)) base_url, user_uri, filters, category, subcategory, keyword, sorting, order)
if not user: if not user:
uri += "&page=rss" search_uri += "&page=rss"
http_response = requests.get(uri)
http_response = requests.get(search_uri)
http_response.raise_for_status() http_response.raise_for_status()
if user: if user:
@@ -66,6 +62,7 @@ class Nyaa:
site=self.SITE site=self.SITE
) )
# Convert JSON data to a class object
return torrent.json_to_class(json_data) return torrent.json_to_class(json_data)
def get(self, view_id): def get(self, view_id):