From 04c66bad524c573a0a417439f1cd3b9bc29a3601 Mon Sep 17 00:00:00 2001 From: dece Date: Fri, 18 Jun 2021 01:44:17 +0200 Subject: [PATCH] gemini: make it clear that empty CN is OK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Will it be OK for all servers though? We might never know… --- bebop/browser/browser.py | 11 +++++++++-- bebop/browser/gemini.py | 5 +++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/bebop/browser/browser.py b/bebop/browser/browser.py index cfd64e7..4ee24eb 100644 --- a/bebop/browser/browser.py +++ b/bebop/browser/browser.py @@ -388,11 +388,18 @@ class Browser: elif command == "set-render-mode": self.set_render_mode(words[1]) - def get_user_text_input(self, status_text, char, prefix="", strip=False): + def get_user_text_input(self, status_text, char, prefix="", strip=False, + escape_to_none=False): """Get user input from the command-line.""" self.set_status(status_text) - result = self.command_line.focus(char, prefix=prefix) + result = self.command_line.focus( + char, + prefix=prefix, + escape_to_none=escape_to_none + ) self.reset_status() + if result is None: + return None if strip: result = result.strip() return result diff --git a/bebop/browser/gemini.py b/bebop/browser/gemini.py index 3c7f9dd..6a86069 100644 --- a/bebop/browser/gemini.py +++ b/bebop/browser/gemini.py @@ -332,11 +332,12 @@ def create_identity(browser: Browser, url: str, reason: Optional[str] =None): return None common_name = browser.get_user_text_input( - "Name? The server will see this, you can leave it empty.", + "Name? The server may use it as your username.", CommandLine.CHAR_TEXT, strip=True, + escape_to_none=True ) - if not common_name: + if common_name is None: browser.reset_status() return None