From fe7a623e6b7e04bab2cfc96e8fd6cf49b48daee1 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sun, 22 Jan 2023 00:02:41 +0300
Subject: add a slider for default value of added extra networks

---
 modules/ui_extra_networks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/ui_extra_networks.py')

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index e2e060c8..4c88193f 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -54,7 +54,7 @@ class ExtraNetworksPage:
 
         args = {
             "preview_html": "style='background-image: url(" + json.dumps(preview) + ")'" if preview else '',
-            "prompt": json.dumps(item["prompt"]),
+            "prompt": item["prompt"],
             "tabname": json.dumps(tabname),
             "local_preview": json.dumps(item["local_preview"]),
             "name": item["name"],
-- 
cgit v1.2.3


From 35419b274614984e2b511a6ad34f37e41481c809 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sun, 22 Jan 2023 11:00:05 +0300
Subject: add an option to reorder tabs for extra networks

---
 modules/ui_extra_networks.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'modules/ui_extra_networks.py')

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index 4c88193f..285c8ffe 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -79,6 +79,22 @@ class ExtraNetworksUi:
         self.tabname = None
 
 
+def pages_in_preferred_order(pages):
+    tab_order = [x.lower().strip() for x in shared.opts.ui_extra_networks_tab_reorder.split(",")]
+
+    def tab_name_score(name):
+        name = name.lower()
+        for i, possible_match in enumerate(tab_order):
+            if possible_match in name:
+                return i
+
+        return len(pages)
+
+    tab_scores = {page.name: (tab_name_score(page.name), original_index) for original_index, page in enumerate(pages)}
+
+    return sorted(pages, key=lambda x: tab_scores[x.name])
+
+
 def create_ui(container, button, tabname):
     ui = ExtraNetworksUi()
     ui.pages = []
@@ -86,7 +102,7 @@ def create_ui(container, button, tabname):
     ui.tabname = tabname
 
     with gr.Tabs(elem_id=tabname+"_extra_tabs") as tabs:
-        for page in ui.stored_extra_pages:
+        for page in pages_in_preferred_order(ui.stored_extra_pages):
             with gr.Tab(page.title):
                 page_elem = gr.HTML(page.create_html(ui.tabname))
                 ui.pages.append(page_elem)
-- 
cgit v1.2.3


From c98cb0f8ecc904666f47684e238dd022039ca16f Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sun, 22 Jan 2023 11:04:02 +0300
Subject: amend previous commit to work in a proper fashion when saving
 previews

---
 modules/ui_extra_networks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/ui_extra_networks.py')

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index 285c8ffe..af2b8071 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -98,11 +98,11 @@ def pages_in_preferred_order(pages):
 def create_ui(container, button, tabname):
     ui = ExtraNetworksUi()
     ui.pages = []
-    ui.stored_extra_pages = extra_pages.copy()
+    ui.stored_extra_pages = pages_in_preferred_order(extra_pages.copy())
     ui.tabname = tabname
 
     with gr.Tabs(elem_id=tabname+"_extra_tabs") as tabs:
-        for page in pages_in_preferred_order(ui.stored_extra_pages):
+        for page in ui.stored_extra_pages:
             with gr.Tab(page.title):
                 page_elem = gr.HTML(page.create_html(ui.tabname))
                 ui.pages.append(page_elem)
-- 
cgit v1.2.3


From 985c0b8e9abdd67734d638badefb6ea806b1f28b Mon Sep 17 00:00:00 2001
From: Guillermo Moreno <gmq@guillermomoreno.cl>
Date: Sat, 21 Jan 2023 17:45:36 -0300
Subject: feat(extra-networks): add thumbs view style

---
 modules/ui_extra_networks.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'modules/ui_extra_networks.py')

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index af2b8071..ce4801b5 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -25,7 +25,7 @@ class ExtraNetworksPage:
     def refresh(self):
         pass
 
-    def create_html(self, tabname):
+    def create_html(self, tabname, view = 'cards'):
         items_html = ''
 
         for item in self.list_items():
@@ -36,7 +36,7 @@ class ExtraNetworksPage:
             items_html = shared.html("extra-networks-no-cards.html").format(dirs=dirs)
 
         res = f"""
-<div id='{tabname}_{self.name}_cards' class='extra-network-cards'>
+<div id='{tabname}_{self.name}_cards' class='extra-network-{view}'>
 {items_html}
 </div>
 """
@@ -75,6 +75,7 @@ class ExtraNetworksUi:
 
         self.button_save_preview = None
         self.preview_target_filename = None
+        self.view_dropdown = None
 
         self.tabname = None
 
@@ -110,6 +111,7 @@ def create_ui(container, button, tabname):
     filter = gr.Textbox('', show_label=False, elem_id=tabname+"_extra_search", placeholder="Search...", visible=False)
     button_refresh = gr.Button('Refresh', elem_id=tabname+"_extra_refresh")
     button_close = gr.Button('Close', elem_id=tabname+"_extra_close")
+    ui.view_dropdown = gr.Dropdown(['cards', 'thumbs'], elem_id=tabname+"_extra_view", label="View as", value='cards')
 
     ui.button_save_preview = gr.Button('Save preview', elem_id=tabname+"_save_preview", visible=False)
     ui.preview_target_filename = gr.Textbox('Preview save filename', elem_id=tabname+"_preview_filename", visible=False)
@@ -117,16 +119,17 @@ def create_ui(container, button, tabname):
     button.click(fn=lambda: gr.update(visible=True), inputs=[], outputs=[container])
     button_close.click(fn=lambda: gr.update(visible=False), inputs=[], outputs=[container])
 
-    def refresh():
+    def refresh(view='cards'):
         res = []
 
         for pg in ui.stored_extra_pages:
             pg.refresh()
-            res.append(pg.create_html(ui.tabname))
+            res.append(pg.create_html(ui.tabname, view))
 
         return res
 
-    button_refresh.click(fn=refresh, inputs=[], outputs=ui.pages)
+    ui.view_dropdown.change(fn=refresh, inputs=[ui.view_dropdown], outputs=ui.pages)
+    button_refresh.click(fn=refresh, inputs=[ui.view_dropdown], outputs=ui.pages)
 
     return ui
 
@@ -139,7 +142,7 @@ def path_is_parent(parent_path, child_path):
 
 
 def setup_ui(ui, gallery):
-    def save_preview(index, images, filename):
+    def save_preview(index, images, filename, view='cards'):
         if len(images) == 0:
             print("There is no image in gallery to save as a preview.")
             return [page.create_html(ui.tabname) for page in ui.stored_extra_pages]
@@ -161,11 +164,11 @@ def setup_ui(ui, gallery):
 
         image.save(filename)
 
-        return [page.create_html(ui.tabname) for page in ui.stored_extra_pages]
+        return [page.create_html(ui.tabname, view) for page in ui.stored_extra_pages]
 
     ui.button_save_preview.click(
         fn=save_preview,
-        _js="function(x, y, z){console.log(x, y, z); return [selected_gallery_index(), y, z]}",
-        inputs=[ui.preview_target_filename, gallery, ui.preview_target_filename],
+        _js="function(x, y, z, a){console.log(x, y, z, a); return [selected_gallery_index(), y, z, a]}",
+        inputs=[ui.preview_target_filename, gallery, ui.preview_target_filename, ui.view_dropdown],
         outputs=[*ui.pages]
     )
-- 
cgit v1.2.3


From 66eef11ce7f3db108225668c573cb4a763a43fb3 Mon Sep 17 00:00:00 2001
From: Guillermo Moreno <gmq@guillermomoreno.cl>
Date: Sat, 21 Jan 2023 18:27:57 -0300
Subject: feat(extra-networks): add default view setting

---
 modules/ui_extra_networks.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/ui_extra_networks.py')

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index ce4801b5..179ba47a 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -25,7 +25,7 @@ class ExtraNetworksPage:
     def refresh(self):
         pass
 
-    def create_html(self, tabname, view = 'cards'):
+    def create_html(self, tabname, view=shared.opts.extra_networks_default_view):
         items_html = ''
 
         for item in self.list_items():
@@ -111,7 +111,7 @@ def create_ui(container, button, tabname):
     filter = gr.Textbox('', show_label=False, elem_id=tabname+"_extra_search", placeholder="Search...", visible=False)
     button_refresh = gr.Button('Refresh', elem_id=tabname+"_extra_refresh")
     button_close = gr.Button('Close', elem_id=tabname+"_extra_close")
-    ui.view_dropdown = gr.Dropdown(['cards', 'thumbs'], elem_id=tabname+"_extra_view", label="View as", value='cards')
+    ui.view_dropdown = gr.Dropdown(['cards', 'thumbs'], elem_id=tabname+"_extra_view", label="View as", value=lambda: shared.opts.extra_networks_default_view)
 
     ui.button_save_preview = gr.Button('Save preview', elem_id=tabname+"_save_preview", visible=False)
     ui.preview_target_filename = gr.Textbox('Preview save filename', elem_id=tabname+"_preview_filename", visible=False)
@@ -119,7 +119,7 @@ def create_ui(container, button, tabname):
     button.click(fn=lambda: gr.update(visible=True), inputs=[], outputs=[container])
     button_close.click(fn=lambda: gr.update(visible=False), inputs=[], outputs=[container])
 
-    def refresh(view='cards'):
+    def refresh(view):
         res = []
 
         for pg in ui.stored_extra_pages:
@@ -142,7 +142,7 @@ def path_is_parent(parent_path, child_path):
 
 
 def setup_ui(ui, gallery):
-    def save_preview(index, images, filename, view='cards'):
+    def save_preview(index, images, filename, view):
         if len(images) == 0:
             print("There is no image in gallery to save as a preview.")
             return [page.create_html(ui.tabname) for page in ui.stored_extra_pages]
-- 
cgit v1.2.3


From f80ff3c1e444926879c284be9384a26ca38d4955 Mon Sep 17 00:00:00 2001
From: Guillermo Moreno <gmq@guillermomoreno.cl>
Date: Sun, 22 Jan 2023 22:01:24 -0300
Subject: feat(extra-networks): remove view dropdown

---
 modules/ui_extra_networks.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'modules/ui_extra_networks.py')

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index 179ba47a..2ddac3d8 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -25,7 +25,8 @@ class ExtraNetworksPage:
     def refresh(self):
         pass
 
-    def create_html(self, tabname, view=shared.opts.extra_networks_default_view):
+    def create_html(self, tabname):
+        view = shared.opts.extra_networks_default_view
         items_html = ''
 
         for item in self.list_items():
@@ -75,7 +76,6 @@ class ExtraNetworksUi:
 
         self.button_save_preview = None
         self.preview_target_filename = None
-        self.view_dropdown = None
 
         self.tabname = None
 
@@ -111,7 +111,6 @@ def create_ui(container, button, tabname):
     filter = gr.Textbox('', show_label=False, elem_id=tabname+"_extra_search", placeholder="Search...", visible=False)
     button_refresh = gr.Button('Refresh', elem_id=tabname+"_extra_refresh")
     button_close = gr.Button('Close', elem_id=tabname+"_extra_close")
-    ui.view_dropdown = gr.Dropdown(['cards', 'thumbs'], elem_id=tabname+"_extra_view", label="View as", value=lambda: shared.opts.extra_networks_default_view)
 
     ui.button_save_preview = gr.Button('Save preview', elem_id=tabname+"_save_preview", visible=False)
     ui.preview_target_filename = gr.Textbox('Preview save filename', elem_id=tabname+"_preview_filename", visible=False)
@@ -119,17 +118,16 @@ def create_ui(container, button, tabname):
     button.click(fn=lambda: gr.update(visible=True), inputs=[], outputs=[container])
     button_close.click(fn=lambda: gr.update(visible=False), inputs=[], outputs=[container])
 
-    def refresh(view):
+    def refresh():
         res = []
 
         for pg in ui.stored_extra_pages:
             pg.refresh()
-            res.append(pg.create_html(ui.tabname, view))
+            res.append(pg.create_html(ui.tabname))
 
         return res
 
-    ui.view_dropdown.change(fn=refresh, inputs=[ui.view_dropdown], outputs=ui.pages)
-    button_refresh.click(fn=refresh, inputs=[ui.view_dropdown], outputs=ui.pages)
+    button_refresh.click(fn=refresh, inputs=[], outputs=ui.pages)
 
     return ui
 
@@ -142,7 +140,7 @@ def path_is_parent(parent_path, child_path):
 
 
 def setup_ui(ui, gallery):
-    def save_preview(index, images, filename, view):
+    def save_preview(index, images, filename):
         if len(images) == 0:
             print("There is no image in gallery to save as a preview.")
             return [page.create_html(ui.tabname) for page in ui.stored_extra_pages]
@@ -164,11 +162,11 @@ def setup_ui(ui, gallery):
 
         image.save(filename)
 
-        return [page.create_html(ui.tabname, view) for page in ui.stored_extra_pages]
+        return [page.create_html(ui.tabname) for page in ui.stored_extra_pages]
 
     ui.button_save_preview.click(
         fn=save_preview,
-        _js="function(x, y, z, a){console.log(x, y, z, a); return [selected_gallery_index(), y, z, a]}",
-        inputs=[ui.preview_target_filename, gallery, ui.preview_target_filename, ui.view_dropdown],
+        _js="function(x, y, z){console.log(x, y, z); return [selected_gallery_index(), y, z]}",
+        inputs=[ui.preview_target_filename, gallery, ui.preview_target_filename],
         outputs=[*ui.pages]
     )
-- 
cgit v1.2.3


From 7b1c7ba87b14da9960d0347269421233f4cb5838 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Mon, 23 Jan 2023 23:11:34 +0300
Subject: add support for apostrophe in extra network names

---
 modules/ui_extra_networks.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'modules/ui_extra_networks.py')

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index 2ddac3d8..8b4f97f8 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -3,6 +3,7 @@ import os.path
 from modules import shared
 import gradio as gr
 import json
+import html
 
 from modules.generation_parameters_copypaste import image_from_url_text
 
@@ -54,12 +55,13 @@ class ExtraNetworksPage:
         preview = item.get("preview", None)
 
         args = {
-            "preview_html": "style='background-image: url(" + json.dumps(preview) + ")'" if preview else '',
+            "preview_html": "style='background-image: url(\"" + html.escape(preview) + "\")'" if preview else '',
             "prompt": item["prompt"],
             "tabname": json.dumps(tabname),
             "local_preview": json.dumps(item["local_preview"]),
             "name": item["name"],
-            "allow_negative_prompt": "true" if self.allow_negative_prompt else "false",
+            "card_clicked": '"' + html.escape(f"""return cardClicked({json.dumps(tabname)}, {item["prompt"]}, {"true" if self.allow_negative_prompt else "false"})""") + '"',
+            "save_card_preview": '"' + html.escape(f"""return saveCardPreview(event, {json.dumps(tabname)}, {json.dumps(item["local_preview"])})""") + '"',
         }
 
         return self.card_page.format(**args)
-- 
cgit v1.2.3