From 98a3f3ad04e55ff11827d725647a8c9bc0f741b4 Mon Sep 17 00:00:00 2001 From: uihp Date: Sun, 9 Feb 2025 02:37:18 +0800 Subject: [PATCH] mod: removed reverse option --- StringChain.py | 11 +++++------ StringConcat.py | 8 ++------ StringToggle.py | 8 ++------ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/StringChain.py b/StringChain.py index aff8302..04aefde 100644 --- a/StringChain.py +++ b/StringChain.py @@ -2,14 +2,13 @@ class StringChain: @classmethod def INPUT_TYPES(cls) -> dict: return { - 'optional': { 'previous': ('STRING', {'forceInput': True, 'default': '', 'multiline': True}) }, - 'required': { - 'separator': ('STRING', {'default': ', '}), - 'string': ('STRING', {'default': '', 'multiline': True}), + 'optional': { + 'previous': ('STRING', {'forceInput': True, 'default': '', 'multiline': True}), + 'string': ('STRING', {'default': '', 'multiline': True}) } } RETURN_TYPES = ('STRING',) FUNCTION = 'combine' CATEGORY = 'utils' - def combine(self, string: str, separator: str, previous: str = '') -> tuple[str]: - return (f'{previous}{separator}{string}',) if previous and string else (previous or string,) + def combine(self, previous: str = '', string: str = '') -> tuple[str]: + return (f'{previous}, {string}',) if previous and string else (previous or string,) diff --git a/StringConcat.py b/StringConcat.py index d3b1905..13b4717 100644 --- a/StringConcat.py +++ b/StringConcat.py @@ -6,14 +6,10 @@ class StringConcat: 'previous': ('STRING', {'forceInput': True, 'default': '', 'multiline': True}), 'string': ('STRING', {'default': '', 'multiline': True}) }, - 'required': { - 'separator': ('STRING', {'default': ', '}), - 'reverse': ('BOOLEAN', {'default': False}) - } + 'required': { 'separator': ('STRING', { 'default': '' }) } } RETURN_TYPES = ('STRING',) FUNCTION = 'concat' CATEGORY = 'utils' - def concat(self, separator: str, reverse: bool, previous: str = '', string: str = '') -> tuple[str]: - if reverse: previous, string = string, previous + def concat(self, separator: str, previous: str = '', string: str = '') -> tuple[str]: return (f'{previous}{separator}{string}',) if previous and string else (previous or string,) diff --git a/StringToggle.py b/StringToggle.py index 846af01..ecd025f 100644 --- a/StringToggle.py +++ b/StringToggle.py @@ -9,19 +9,15 @@ class StringToggle: @classmethod def INPUT_TYPES(cls) -> dict: return { - 'required': { - 'separator': ('STRING', {'default': ', '}), - 'reverse': ('BOOLEAN', {'default': False}) - }, + 'required': { 'separator': ('STRING', {'default': ', '}) }, 'optional': optional } RETURN_TYPES = ('STRING',) FUNCTION = 'join' CATEGORY = 'utils' - def join(self, separator: str, reverse: bool, previous: str = '', **kwargs) -> tuple[str]: + def join(self, separator: str, previous: str = '', **kwargs) -> tuple[str]: arguments = {} for (argtype, unique), value in [(k.split('_'),v) for k,v in kwargs.items() if '_' in k]: arguments.setdefault(argtype, {})[unique] = value strings = ([previous] if previous else []) + [text for unique, text in arguments['text'].items() if arguments['append'][unique]] - if reverse: strings = strings[::-1] return (separator.join(strings),)