From c1e70df845e4bfe892f94fb5e64b16a3a22e189a Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Thu, 18 May 2023 07:36:38 -0400 Subject: [PATCH] follow symlinks --- extensions-builtin/Lora/lora.py | 4 +--- javascript/style.css | 6 ++++-- modules/shared.py | 2 +- modules/ui_extra_networks.py | 2 +- modules/ui_extra_networks_textual_inversion.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/extensions-builtin/Lora/lora.py b/extensions-builtin/Lora/lora.py index b5d0c98f9..9d9efd73a 100644 --- a/extensions-builtin/Lora/lora.py +++ b/extensions-builtin/Lora/lora.py @@ -1,9 +1,7 @@ -import glob import os import re -import torch from typing import Union - +import torch from modules import shared, devices, sd_models, errors, scripts metadata_tags_order = {"ss_sd_model_name": 1, "ss_resolution": 2, "ss_clip_skip": 3, "ss_num_train_images": 10, "ss_tag_frequency": 20} diff --git a/javascript/style.css b/javascript/style.css index 76d8fc467..b43cc7728 100644 --- a/javascript/style.css +++ b/javascript/style.css @@ -186,8 +186,10 @@ div#extras_scale_to_tab div.form{ } .extra-network-cards{ - height: 725px; - overflow: scroll; + height: fit-content; + max-height: 50vh; + overflow-y: scroll; + overflow-x: hidden; resize: vertical; } diff --git a/modules/shared.py b/modules/shared.py index 62e12cbf1..b893ad106 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -733,7 +733,7 @@ def walk_files(path, allowed_extensions=None): return if allowed_extensions is not None: allowed_extensions = set(allowed_extensions) - for root, _dirs, files in os.walk(path): + for root, _dirs, files in os.walk(path, followlinks=True): for filename in files: if allowed_extensions is not None: _, ext = os.path.splitext(filename) diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py index c044b23d0..95ed70d78 100644 --- a/modules/ui_extra_networks.py +++ b/modules/ui_extra_networks.py @@ -81,7 +81,7 @@ class ExtraNetworksPage: subdirs = {} allowed_folders = [os.path.abspath(x) for x in self.allowed_directories_for_previews()] for parentdir in [*set(allowed_folders)]: - for root, dirs, _files in os.walk(parentdir): + for root, dirs, _files in os.walk(parentdir, followlinks=True): for dirname in dirs: x = os.path.join(root, dirname) if not os.path.isdir(x): diff --git a/modules/ui_extra_networks_textual_inversion.py b/modules/ui_extra_networks_textual_inversion.py index 1abf39675..47b8cdd5a 100644 --- a/modules/ui_extra_networks_textual_inversion.py +++ b/modules/ui_extra_networks_textual_inversion.py @@ -16,7 +16,7 @@ class ExtraNetworksPageTextualInversion(ui_extra_networks.ExtraNetworksPage): def list_items(self): embeddings = [emb for emb in sd_hijack.model_hijack.embedding_db.word_embeddings.values()] if len(embeddings) == 0: # maybe not loaded yet, so lets just look them up - for root, _dirs, fns in os.walk(shared.opts.embeddings_dir): + for root, _dirs, fns in os.walk(shared.opts.embeddings_dir, followlinks=True): for fn in fns: if fn.lower().endswith(".pt"): embedding = Embedding(0, fn)