Merge branch 'dev' into img2img-save

1 files changed, 4 insertions, 4 deletions

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index a7d3bc79..693cafb6 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -30,8 +30,8 @@ def fetch_file(filename: str = ""):
         raise ValueError(f"File cannot be fetched: {filename}. Must be in one of directories registered by extra pages.")

 

     ext = os.path.splitext(filename)[1].lower()

-    if ext not in (".png", ".jpg", ".jpeg", ".webp"):

-        raise ValueError(f"File cannot be fetched: {filename}. Only png and jpg and webp.")

+    if ext not in (".png", ".jpg", ".jpeg", ".webp", ".gif"):

+        raise ValueError(f"File cannot be fetched: {filename}. Only png, jpg, webp, and gif.")

 

     # would profit from returning 304

     return FileResponse(filename, headers={"Accept-Ranges": "bytes"})

@@ -90,8 +90,8 @@ class ExtraNetworksPage:
 

         subdirs = {}

         for parentdir in [os.path.abspath(x) for x in self.allowed_directories_for_previews()]:

-            for root, dirs, _ in os.walk(parentdir, followlinks=True):

-                for dirname in dirs:

+            for root, dirs, _ in sorted(os.walk(parentdir, followlinks=True), key=lambda x: shared.natural_sort_key(x[0])):

+                for dirname in sorted(dirs, key=shared.natural_sort_key):

                     x = os.path.join(root, dirname)

 

                     if not os.path.isdir(x):