diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-12-02 09:59:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-02 09:59:29 +0300 |
| commit | 0bb6e00ba3c6775b17b3449c454c6efabb1bdad1 (patch) | |
| tree | 4a92fb361793b90578e8b2c465a08cbb3df5d57f /modules | |
| parent | 87d973e389b5a0415430fecc1046415cd575f1d4 (diff) | |
| parent | 314ae1535ea172fcdb0f5b3b2eecc5d4ce9112b5 (diff) | |
Merge pull request #13957 from h43lb1t0/extra_network_subdirs
dir buttons start with / so only the correct dir will be shown and no…
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/shared_options.py | 1 | ||||
| -rw-r--r-- | modules/ui_extra_networks.py | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/modules/shared_options.py b/modules/shared_options.py index 1390152d..d8a27180 100644 --- a/modules/shared_options.py +++ b/modules/shared_options.py @@ -235,6 +235,7 @@ options_templates.update(options_section(('interrogate', "Interrogate"), { options_templates.update(options_section(('extra_networks', "Extra Networks", "sd"), {
"extra_networks_show_hidden_directories": OptionInfo(True, "Show hidden directories").info("directory is hidden if its name starts with \".\"."),
+ "extra_networks_dir_button_function": OptionInfo(False, "Add a '/' to the beginning of directory buttons").info("Buttons will display the contents of the selected directory without acting as a search filter."),
"extra_networks_hidden_models": OptionInfo("When searched", "Show cards for models in hidden directories", gr.Radio, {"choices": ["Always", "When searched", "Never"]}).info('"When searched" option will only show the item when the search string has 4 characters or more'),
"extra_networks_default_multiplier": OptionInfo(1.0, "Default multiplier for extra networks", gr.Slider, {"minimum": 0.0, "maximum": 2.0, "step": 0.01}),
"extra_networks_card_width": OptionInfo(0, "Card width for Extra Networks").info("in pixels"),
diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py index f3b23cc9..fe5d3ba3 100644 --- a/modules/ui_extra_networks.py +++ b/modules/ui_extra_networks.py @@ -151,8 +151,13 @@ class ExtraNetworksPage: continue
subdir = os.path.abspath(x)[len(parentdir):].replace("\\", "/")
- while subdir.startswith("/"):
- subdir = subdir[1:]
+
+ if shared.opts.extra_networks_dir_button_function:
+ if not subdir.startswith("/"):
+ subdir = "/" + subdir
+ else:
+ while subdir.startswith("/"):
+ subdir = subdir[1:]
is_empty = len(os.listdir(x)) == 0
if not is_empty and not subdir.endswith("/"):
|