From 864f4220d9dfeff687352ddb3c2d97d3e199ef70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Sun, 31 May 2020 15:34:05 +0200
Subject: [PATCH] =?UTF-8?q?update=20output=20of=20'oauth:=E2=80=A6'=20(#61?=
 =?UTF-8?q?6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gallery_dl/extractor/oauth.py | 128 +++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 63 deletions(-)

diff --git a/gallery_dl/extractor/oauth.py b/gallery_dl/extractor/oauth.py
index 076c7707..c07c4b7f 100644
--- a/gallery_dl/extractor/oauth.py
+++ b/gallery_dl/extractor/oauth.py
@@ -87,21 +87,22 @@ class OAuthBase(Extractor):
 
         # exchange the request token for an access token
         data = self.session.get(access_token_url, params=data).text
-
         data = text.parse_query(data)
-        self.send(OAUTH1_MSG_TEMPLATE.format(
-            category=self.subcategory,
-            token=data["oauth_token"],
-            token_secret=data["oauth_token_secret"],
-        ))
+        token = data["oauth_token"]
+        token_secret = data["oauth_token_secret"]
 
         # write to cache
         if self.cache:
             key = (self.subcategory, self.session.auth.consumer_key)
-            tokens = (data["oauth_token"], data["oauth_token_secret"])
-            oauth._token_cache.update(key, tokens)
+            oauth._token_cache.update(key, (token, token_secret))
             self.log.info("Writing tokens to cache")
 
+        # display tokens
+        self.send(self._generate_message(
+            ("access-token", "access-token-secret"),
+            (token, token_secret),
+        ))
+
     def _oauth2_authorization_code_grant(
             self, client_id, client_secret, auth_url, token_url,
             scope="read", key="refresh_token", auth=True,
@@ -156,24 +157,66 @@ class OAuthBase(Extractor):
             self.send(data["error"])
             return
 
-        # display token
-        part = key.partition("_")[0]
-        template = message_template or OAUTH2_MSG_TEMPLATE
-        self.send(template.format(
-            category=self.subcategory,
-            key=part,
-            Key=part.capitalize(),
-            token=data[key],
-            instance=getattr(self, "instance", ""),
-            client_id=client_id,
-            client_secret=client_secret,
-        ))
-
         # write to cache
         if self.cache and cache:
             cache.update("#" + str(client_id), data[key])
             self.log.info("Writing 'refresh-token' to cache")
 
+        # display token
+        if message_template:
+            msg = message_template.format(
+                category=self.subcategory,
+                key=key.partition("_")[0],
+                token=data[key],
+                instance=getattr(self, "instance", ""),
+                client_id=client_id,
+                client_secret=client_secret,
+            )
+        else:
+            msg = self._generate_message(
+                ("refresh-token",),
+                (data[key],),
+            )
+        self.send(msg)
+
+    def _generate_message(self, names, values):
+        if len(names) == 1:
+            _vh = "This value has"
+            _is = "is"
+            _it = "it"
+            _va = "this value"
+        else:
+            _vh = "These values have"
+            _is = "are"
+            _it = "them"
+            _va = "these values"
+
+        msg = "\nYour {} {}\n\n{}\n\n".format(
+            " and ".join("'" + n + "'" for n in names),
+            _is,
+            "\n".join(values),
+        )
+
+        if self.cache:
+            opt = self.oauth_config(names[0])
+            if opt is None or opt == "cache":
+                msg += _vh + " been cached and will automatically be used."
+            else:
+                msg += (
+                    "Set 'extractor.{}.{}' to \"cache\" to use {}.".format(
+                        self.subcategory, names[0], _it,
+                    )
+                )
+        else:
+            msg += "Put " + _va + " into your configuration file as \n"
+            msg += " and\n".join(
+                "'extractor." + self.subcategory + "." + n + "'"
+                for n in names
+            )
+            msg += "."
+
+        return msg
+
 
 class OAuthDeviantart(OAuthBase):
     subcategory = "deviantart"
@@ -326,49 +369,8 @@ class OAuthMastodon(OAuthBase):
         return data
 
 
-OAUTH1_MSG_TEMPLATE = """
-Your Access Token and Access Token Secret are
-
-{token}
-{token_secret}
-
-Put these values into your configuration file as
-'extractor.{category}.access-token' and
-'extractor.{category}.access-token-secret'.
-
-Example:
-{{
-    "extractor": {{
-        "{category}": {{
-            "access-token": "{token}",
-            "access-token-secret": "{token_secret}"
-        }}
-    }}
-}}
-"""
-
-
-OAUTH2_MSG_TEMPLATE = """
-Your {Key} Token is
-
-{token}
-
-Put this value into your configuration file as
-'extractor.{category}.{key}-token'.
-
-Example:
-{{
-    "extractor": {{
-        "{category}": {{
-            "{key}-token": "{token}"
-        }}
-    }}
-}}
-"""
-
-
 MASTODON_MSG_TEMPLATE = """
-Your {Key} Token is
+Your 'access-token' is
 
 {token}