From 2dd89995e15da1d451900077f9a7d0b8bebfe92a Mon Sep 17 00:00:00 2001 From: Anon Date: Sun, 9 Oct 2022 22:14:27 -0700 Subject: [PATCH] Removed hardcoded url --- src/danbooru_backend.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/danbooru_backend.py b/src/danbooru_backend.py index 5078a70..5882dcc 100644 --- a/src/danbooru_backend.py +++ b/src/danbooru_backend.py @@ -76,14 +76,16 @@ class downloader: password = None max_size = None tmp = None - # Limit for posts.json is 200 - limit=100 + url = "" + api_endpoint = "posts.json?random=true&limit=100" + api_tags = "&tags={}" def __init__(self, backend_credentials): self.username = backend_credentials["username"] self.password = backend_credentials["password"] self.max_size = backend_credentials["max_size"] self.tmp = backend_credentials["tmp_dir"] + self.url = backend_credentials["url"] def download_post(self, post): @@ -105,11 +107,11 @@ class downloader: def fetch_post(self, profile): # Search ratings: s=safe, e=nsfw # base_url = "https://danbooru.donmai.us/posts.json?random=true&tags={}&rating=e&limit=1" + search_url = "/".join((self.url, self.api_endpoint)) tags = profile["tags"] - search_url = "https://danbooru.donmai.us/posts.json?random=true&limit={}".format(self.limit) if tags and not random_tag(*tags): search_tags = "+".join(tags) - search_url = "{}&tags={}".format(search_url, search_tags) + search_url += self.api_tags.format(search_tags) search_request = None if self.username and self.password: @@ -118,12 +120,12 @@ class downloader: ) else: search_request = requests.get(search_url) - + if search_request.status_code != 200: print(search_url) print("Search request returned:", search_request.status_code) return None - + selected = select_from_response(search_request.json(), profile, self.max_size) if selected is None: