From 202b984b87ca69f6d71ccf408d27360af9efcf62 Mon Sep 17 00:00:00 2001 From: "Aaron C. de Bruyn" Date: Sat, 20 Jan 2024 09:37:07 -0800 Subject: [PATCH 1/3] Make Dark Combiner useless by integrating combining into Dark Prompt --- __init__.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/__init__.py b/__init__.py index 6abaed8..79b3f87 100644 --- a/__init__.py +++ b/__init__.py @@ -127,6 +127,11 @@ class DarkPrompt(object): "prefix": ("STRING", {"default": None}), "suffix": ("STRING", {"default": None}), "text": ("STRING", {"default": None, "multiline": True}), + "combine_with": ( + "STRING", + {"default": None, "multiline": True, "forceInput": True}, + ), + "combine_with_delimiter": ("STRING", {"default": "\n"}), }, } @@ -145,6 +150,8 @@ class DarkPrompt(object): text=None, prefix=None, suffix=None, + combine_with=None, + combine_with_delimiter="\n", ): logger.info("DarkPrompt called with filename %s" % (filename)) @@ -182,6 +189,17 @@ class DarkPrompt(object): if suffix: ret = ret + suffix + if combine_with and not combine_with == "undefined": + print("Combine with: %s" % (combine_with)) + if combine_with_delimiter: + if combine_with_delimiter == "\\n": + combine_with_delimiter = "\n" + print("Combine with delimiter: %s" % (combine_with_delimiter)) + ret = combine_with + combine_with_delimiter + ret + else: + ret = combine_with + ret + + print(ret) return (ret,) From 226472a450599f5e7d291b8b634ced941b6aa39a Mon Sep 17 00:00:00 2001 From: "Aaron C. de Bruyn" Date: Sat, 20 Jan 2024 09:39:04 -0800 Subject: [PATCH 2/3] Bump version for release --- __init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__init__.py b/__init__.py index 79b3f87..be59c77 100644 --- a/__init__.py +++ b/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.0.1" +__version__ = "0.0.3" import logging import random From 8f814ca6147b54c6498467b9036edb0dd4716b53 Mon Sep 17 00:00:00 2001 From: "Aaron C. de Bruyn" Date: Sat, 20 Jan 2024 09:39:16 -0800 Subject: [PATCH 3/3] Update changelog for release --- History.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/History.md b/History.md index 8978c8f..7bead81 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,10 @@ +v0.0.3 / 2024-01-20 +================== + + * Bump version for release + * Make Dark Combiner useless by integrating combining into Dark Prompt + v0.0.2 / 2024-01-19 ==================