From 855538c9219be9f9e2a428d1482404f987e82e2d Mon Sep 17 00:00:00 2001 From: Dmytro Meleshko Date: Mon, 12 Apr 2021 00:53:51 +0300 Subject: [PATCH] [scripts] fix a bug in run_chooser when no search results are found --- scripts/copy-crosscode-emoji-url | 35 ++++++++++++++++---------------- scripts/query-bookmarks | 13 ++++++------ 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/scripts/copy-crosscode-emoji-url b/scripts/copy-crosscode-emoji-url index 2189e10..c955100 100755 --- a/scripts/copy-crosscode-emoji-url +++ b/scripts/copy-crosscode-emoji-url @@ -61,26 +61,27 @@ def emote_downloader_and_iterator(): chosen_index = common_script_utils.run_chooser( emote_downloader_and_iterator(), prompt="emote", async_read=True ) -chosen_emote = emotes[chosen_index] +if chosen_index >= 0: + chosen_emote = emotes[chosen_index] -emote_url = urllib.parse.urlparse(chosen_emote["url"]) -emote_url_query = urllib.parse.parse_qs(emote_url.query) + emote_url = urllib.parse.urlparse(chosen_emote["url"]) + emote_url_query = urllib.parse.parse_qs(emote_url.query) -if config.getboolean("default", "add_emote_name_to_url", fallback=False): - emote_url_query["name"] = [chosen_emote["name"]] + if config.getboolean("default", "add_emote_name_to_url", fallback=False): + emote_url_query["name"] = [chosen_emote["name"]] -default_emote_image_size = config.getint( - "default", "default_emote_image_size", fallback=None -) -if default_emote_image_size is not None: - emote_url_query["size"] = [str(default_emote_image_size)] + default_emote_image_size = config.getint( + "default", "default_emote_image_size", fallback=None + ) + if default_emote_image_size is not None: + emote_url_query["size"] = [str(default_emote_image_size)] -emote_url_query = urllib.parse.urlencode(emote_url_query, doseq=True) -emote_url = urllib.parse.urlunparse(emote_url._replace(query=emote_url_query)) + emote_url_query = urllib.parse.urlencode(emote_url_query, doseq=True) + emote_url = urllib.parse.urlunparse(emote_url._replace(query=emote_url_query)) -common_script_utils.set_clipboard(emote_url) + common_script_utils.set_clipboard(emote_url) -common_script_utils.send_notification( - os.path.basename(__file__), - "copied URL of {} to clipboard!".format(chosen_emote["ref"]), -) + common_script_utils.send_notification( + os.path.basename(__file__), + "copied URL of {} to clipboard!".format(chosen_emote["ref"]), + ) diff --git a/scripts/query-bookmarks b/scripts/query-bookmarks index 5b7023c..7388700 100755 --- a/scripts/query-bookmarks +++ b/scripts/query-bookmarks @@ -110,10 +110,11 @@ chosen_index = common_script_utils.run_chooser( chooser_entries_iter(), prompt="bookmark" ) -_title, url, _folder_path_str = chooser_entries[chosen_index] -print(url) +if chosen_index >= 0: + _title, url, _folder_path_str = chooser_entries[chosen_index] + print(url) -common_script_utils.set_clipboard(url) -common_script_utils.send_notification( - os.path.basename(__file__), "bookmark URL copied to clipboard!", url -) + common_script_utils.set_clipboard(url) + common_script_utils.send_notification( + os.path.basename(__file__), "bookmark URL copied to clipboard!", url + )