From ce464fe70943d0a7f2a50e8f4c0ddd396c365cc0 Mon Sep 17 00:00:00 2001 From: Joel Widmer Date: Sat, 23 Apr 2022 21:58:23 +0200 Subject: [PATCH] Cleanup based on pylint rules --- NyaaPy/nyaa.py | 16 ++++++++++------ NyaaPy/utils.py | 6 ++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/NyaaPy/nyaa.py b/NyaaPy/nyaa.py index d32e672..ee2bbdf 100644 --- a/NyaaPy/nyaa.py +++ b/NyaaPy/nyaa.py @@ -37,22 +37,26 @@ class Nyaa: user_uri = "" if page > 0: - uri = "{}/{}?f={}&c={}_{}&q={}&p={}".format(url, user_uri, filters, category, subcategory, keyword, page) + uri = f"{url}/{user_uri}?f={filters}&c={category}_{subcategory}&q={keyword}&p={page}" else: - uri = "{}/{}?f={}&c={}_{}&q={}".format(url, user_uri, filters, category, subcategory, keyword) + uri = f"{url}/{user_uri}?f={filters}&c={category}_{subcategory}&q={keyword}" if not user: uri += "&page=rss" - r = requests.get(uri) + http_response = requests.get(uri) - r.raise_for_status() + http_response.raise_for_status() if user: - json_data = utils.parse_nyaa(request_text=r.text, limit=None, site=self.SITE) + json_data = utils.parse_nyaa( + request_text=http_response.text, + limit=None, + site=self.SITE + ) else: json_data = utils.parse_nyaa_rss( - request_text=r.text, + request_text=http_response.text, limit=None, site=self.SITE ) diff --git a/NyaaPy/utils.py b/NyaaPy/utils.py index ca0bfe2..dfe344d 100644 --- a/NyaaPy/utils.py +++ b/NyaaPy/utils.py @@ -84,6 +84,9 @@ def nyaa_categories(b): def parse_nyaa_rss(request_text, limit, site): + """ + Extracts torrent information from a given rss response. + """ root = etree.fromstring(request_text) torrents = [] @@ -273,6 +276,9 @@ def sukebei_categories(b): def magnet_builder(info_hash, title): + """ + Generates a magnet link using the info_hash and title of a given file. + """ known_trackers = [ "http://nyaa.tracker.wf:7777/announce", "udp://open.stealth.si:80/announce",