Merge pull request #8839 from pieresimakp/master
Add search textbox to filter available extensions by name/description
This commit is contained in:
commit
b2c428a095
@ -164,12 +164,12 @@ def install_extension_from_url(dirname, url):
|
|||||||
shutil.rmtree(tmpdir, True)
|
shutil.rmtree(tmpdir, True)
|
||||||
|
|
||||||
|
|
||||||
def install_extension_from_index(url, hide_tags, sort_column):
|
def install_extension_from_index(url, hide_tags, sort_column, filter_text):
|
||||||
ext_table, message = install_extension_from_url(None, url)
|
ext_table, message = install_extension_from_url(None, url)
|
||||||
|
|
||||||
code, _ = refresh_available_extensions_from_data(hide_tags, sort_column)
|
code, _ = refresh_available_extensions_from_data(hide_tags, sort_column, filter_text)
|
||||||
|
|
||||||
return code, ext_table, message
|
return code, ext_table, message, ''
|
||||||
|
|
||||||
|
|
||||||
def refresh_available_extensions(url, hide_tags, sort_column):
|
def refresh_available_extensions(url, hide_tags, sort_column):
|
||||||
@ -183,11 +183,17 @@ def refresh_available_extensions(url, hide_tags, sort_column):
|
|||||||
|
|
||||||
code, tags = refresh_available_extensions_from_data(hide_tags, sort_column)
|
code, tags = refresh_available_extensions_from_data(hide_tags, sort_column)
|
||||||
|
|
||||||
return url, code, gr.CheckboxGroup.update(choices=tags), ''
|
return url, code, gr.CheckboxGroup.update(choices=tags), '', ''
|
||||||
|
|
||||||
|
|
||||||
def refresh_available_extensions_for_tags(hide_tags, sort_column):
|
def refresh_available_extensions_for_tags(hide_tags, sort_column, filter_text):
|
||||||
code, _ = refresh_available_extensions_from_data(hide_tags, sort_column)
|
code, _ = refresh_available_extensions_from_data(hide_tags, sort_column, filter_text)
|
||||||
|
|
||||||
|
return code, ''
|
||||||
|
|
||||||
|
|
||||||
|
def search_extensions(filter_text, hide_tags, sort_column):
|
||||||
|
code, _ = refresh_available_extensions_from_data(hide_tags, sort_column, filter_text)
|
||||||
|
|
||||||
return code, ''
|
return code, ''
|
||||||
|
|
||||||
@ -202,7 +208,7 @@ sort_ordering = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
def refresh_available_extensions_from_data(hide_tags, sort_column):
|
def refresh_available_extensions_from_data(hide_tags, sort_column, filter_text=""):
|
||||||
extlist = available_extensions["extensions"]
|
extlist = available_extensions["extensions"]
|
||||||
installed_extension_urls = {normalize_git_url(extension.remote): extension.name for extension in extensions.extensions}
|
installed_extension_urls = {normalize_git_url(extension.remote): extension.name for extension in extensions.extensions}
|
||||||
|
|
||||||
@ -241,6 +247,11 @@ def refresh_available_extensions_from_data(hide_tags, sort_column):
|
|||||||
hidden += 1
|
hidden += 1
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
if filter_text and filter_text.strip():
|
||||||
|
if filter_text.lower() not in html.escape(name).lower() and filter_text.lower() not in html.escape(description).lower():
|
||||||
|
hidden += 1
|
||||||
|
continue
|
||||||
|
|
||||||
install_code = f"""<button onclick="install_extension_from_index(this, '{html.escape(url)}')" {"disabled=disabled" if existing else ""} class="lg secondary gradio-button custom-button">{"Install" if not existing else "Installed"}</button>"""
|
install_code = f"""<button onclick="install_extension_from_index(this, '{html.escape(url)}')" {"disabled=disabled" if existing else ""} class="lg secondary gradio-button custom-button">{"Install" if not existing else "Installed"}</button>"""
|
||||||
|
|
||||||
tags_text = ", ".join([f"<span class='extension-tag' title='{tags.get(x, '')}'>{x}</span>" for x in extension_tags])
|
tags_text = ", ".join([f"<span class='extension-tag' title='{tags.get(x, '')}'>{x}</span>" for x in extension_tags])
|
||||||
@ -309,30 +320,39 @@ def create_ui():
|
|||||||
hide_tags = gr.CheckboxGroup(value=["ads", "localization", "installed"], label="Hide extensions with tags", choices=["script", "ads", "localization", "installed"])
|
hide_tags = gr.CheckboxGroup(value=["ads", "localization", "installed"], label="Hide extensions with tags", choices=["script", "ads", "localization", "installed"])
|
||||||
sort_column = gr.Radio(value="newest first", label="Order", choices=["newest first", "oldest first", "a-z", "z-a", "internal order", ], type="index")
|
sort_column = gr.Radio(value="newest first", label="Order", choices=["newest first", "oldest first", "a-z", "z-a", "internal order", ], type="index")
|
||||||
|
|
||||||
|
with gr.Row():
|
||||||
|
search_extensions_text = gr.Text(label="Search").style(container=False)
|
||||||
|
|
||||||
install_result = gr.HTML()
|
install_result = gr.HTML()
|
||||||
available_extensions_table = gr.HTML()
|
available_extensions_table = gr.HTML()
|
||||||
|
|
||||||
refresh_available_extensions_button.click(
|
refresh_available_extensions_button.click(
|
||||||
fn=modules.ui.wrap_gradio_call(refresh_available_extensions, extra_outputs=[gr.update(), gr.update(), gr.update()]),
|
fn=modules.ui.wrap_gradio_call(refresh_available_extensions, extra_outputs=[gr.update(), gr.update(), gr.update()]),
|
||||||
inputs=[available_extensions_index, hide_tags, sort_column],
|
inputs=[available_extensions_index, hide_tags, sort_column],
|
||||||
outputs=[available_extensions_index, available_extensions_table, hide_tags, install_result],
|
outputs=[available_extensions_index, available_extensions_table, hide_tags, install_result, search_extensions_text],
|
||||||
)
|
)
|
||||||
|
|
||||||
install_extension_button.click(
|
install_extension_button.click(
|
||||||
fn=modules.ui.wrap_gradio_call(install_extension_from_index, extra_outputs=[gr.update(), gr.update()]),
|
fn=modules.ui.wrap_gradio_call(install_extension_from_index, extra_outputs=[gr.update(), gr.update()]),
|
||||||
inputs=[extension_to_install, hide_tags, sort_column],
|
inputs=[extension_to_install, hide_tags, sort_column, search_extensions_text],
|
||||||
outputs=[available_extensions_table, extensions_table, install_result],
|
outputs=[available_extensions_table, extensions_table, install_result],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
search_extensions_text.change(
|
||||||
|
fn=modules.ui.wrap_gradio_call(search_extensions, extra_outputs=[gr.update()]),
|
||||||
|
inputs=[search_extensions_text, hide_tags, sort_column],
|
||||||
|
outputs=[available_extensions_table, install_result],
|
||||||
|
)
|
||||||
|
|
||||||
hide_tags.change(
|
hide_tags.change(
|
||||||
fn=modules.ui.wrap_gradio_call(refresh_available_extensions_for_tags, extra_outputs=[gr.update()]),
|
fn=modules.ui.wrap_gradio_call(refresh_available_extensions_for_tags, extra_outputs=[gr.update()]),
|
||||||
inputs=[hide_tags, sort_column],
|
inputs=[hide_tags, sort_column, search_extensions_text],
|
||||||
outputs=[available_extensions_table, install_result]
|
outputs=[available_extensions_table, install_result]
|
||||||
)
|
)
|
||||||
|
|
||||||
sort_column.change(
|
sort_column.change(
|
||||||
fn=modules.ui.wrap_gradio_call(refresh_available_extensions_for_tags, extra_outputs=[gr.update()]),
|
fn=modules.ui.wrap_gradio_call(refresh_available_extensions_for_tags, extra_outputs=[gr.update()]),
|
||||||
inputs=[hide_tags, sort_column],
|
inputs=[hide_tags, sort_column, search_extensions_text],
|
||||||
outputs=[available_extensions_table, install_result]
|
outputs=[available_extensions_table, install_result]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user