From 7e67dcceb9ae6da47b8b0865a2dee0d85bb6a1a4 Mon Sep 17 00:00:00 2001 From: Gio Date: Wed, 25 Oct 2023 21:55:18 -0500 Subject: [PATCH] [Bluesky] Use native auth --- gallery_dl/extractor/bluesky.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gallery_dl/extractor/bluesky.py b/gallery_dl/extractor/bluesky.py index 62dee524de..fff95accec 100755 --- a/gallery_dl/extractor/bluesky.py +++ b/gallery_dl/extractor/bluesky.py @@ -11,7 +11,6 @@ import json import dataclasses -import netrc import posixpath import chitose @@ -31,10 +30,9 @@ def __init__(self, extractor, instance="bsky.social"): # BSKY_USER = extractor.config("username"), # BSKY_PASSWD = extractor.config("password") - rc = netrc.netrc() - (BSKY_USER, _, BSKY_PASSWD) = rc.authenticators(instance) + username, password = extractor._get_auth_info() - self.agent.login(BSKY_USER, BSKY_PASSWD) + self.agent.login(username, password) def bskyGetDid(self, user_id: str) -> str: return json.loads(self.agent.get_profile(actor=user_id))['did'] @@ -60,7 +58,7 @@ def getSkeetJson(self, post_reference): class _BlueskyPostExtractor(Extractor): """Extractor for bluesky posts""" - category = "bluesky" + category = "bsky.social" subcategory = "post" directory_fmt = ("{category}", "{user_id}") filename_fmt = "{post_id} {filename}.{extension}" @@ -72,9 +70,10 @@ class _BlueskyPostExtractor(Extractor): def __init__(self, match): Extractor.__init__(self, match) self.user_id, self.post_id = match.groups() + self.api = BlueskyAPI(self) - self.json_obj = self.api.getSkeetJson(PostReference(self.user_id, self.post_id)) + self.json_obj = self.api.getSkeetJson(PostReference(self.user_id, self.post_id)) self.metadata = self.json_obj self.metadata.update(match.groupdict())