Merge branch 'dev' into master

1 files changed, 23 insertions, 6 deletions

diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index c7e0a866..dff522ef 100644
--- a/modules/ui_extensions.py
+++ b/modules/ui_extensions.py
@@ -138,7 +138,10 @@ def extension_table():
     <table id="extensions">

         <thead>

             <tr>

-                <th><abbr title="Use checkbox to enable the extension; it will be enabled or disabled when you click apply button">Extension</abbr></th>

+                <th>

+                    <input class="gr-check-radio gr-checkbox all_extensions_toggle" type="checkbox" {'checked="checked"' if all(ext.enabled for ext in extensions.extensions) else ''} onchange="toggle_all_extensions(event)" />

+                    <abbr title="Use checkbox to enable the extension; it will be enabled or disabled when you click apply button">Extension</abbr>

+                </th>

                 <th>URL</th>

                 <th>Branch</th>

                 <th>Version</th>

@@ -170,7 +173,7 @@ def extension_table():
 

         code += f"""

             <tr>

-                <td><label{style}><input class="gr-check-radio gr-checkbox" name="enable_{html.escape(ext.name)}" type="checkbox" {'checked="checked"' if ext.enabled else ''}>{html.escape(ext.name)}</label></td>

+                <td><label{style}><input class="gr-check-radio gr-checkbox extension_toggle" name="enable_{html.escape(ext.name)}" type="checkbox" {'checked="checked"' if ext.enabled else ''} onchange="toggle_extension(event)" />{html.escape(ext.name)}</label></td>

                 <td>{remote}</td>

                 <td>{ext.branch}</td>

                 <td>{version_link}</td>

@@ -421,9 +424,19 @@ sort_ordering = [
     (False, lambda x: x.get('name', 'z')),

     (True, lambda x: x.get('name', 'z')),

     (False, lambda x: 'z'),

+    (True, lambda x: x.get('commit_time', '')),

+    (True, lambda x: x.get('created_at', '')),

+    (True, lambda x: x.get('stars', 0)),

 ]

 

 

+def get_date(info: dict, key):

+    try:

+        return datetime.strptime(info.get(key), "%Y-%m-%dT%H:%M:%SZ").strftime("%Y-%m-%d")

+    except (ValueError, TypeError):

+        return ''

+

+

 def refresh_available_extensions_from_data(hide_tags, sort_column, filter_text=""):

     extlist = available_extensions["extensions"]

     installed_extension_urls = {normalize_git_url(extension.remote): extension.name for extension in extensions.extensions}

@@ -448,7 +461,10 @@ def refresh_available_extensions_from_data(hide_tags, sort_column, filter_text="
 

     for ext in sorted(extlist, key=sort_function, reverse=sort_reverse):

         name = ext.get("name", "noname")

+        stars = int(ext.get("stars", 0))

         added = ext.get('added', 'unknown')

+        update_time = get_date(ext, 'commit_time')

+        create_time = get_date(ext, 'created_at')

         url = ext.get("url", None)

         description = ext.get("description", "")

         extension_tags = ext.get("tags", [])

@@ -475,7 +491,8 @@ def refresh_available_extensions_from_data(hide_tags, sort_column, filter_text="
         code += f"""

             <tr>

                 <td><a href="{html.escape(url)}" target="_blank">{html.escape(name)}</a><br />{tags_text}</td>

-                <td>{html.escape(description)}<p class="info"><span class="date_added">Added: {html.escape(added)}</span></p></td>

+                <td>{html.escape(description)}<p class="info">

+                <span class="date_added">Update: {html.escape(update_time)}  Added: {html.escape(added)}  Created: {html.escape(create_time)}</span><span class="star_count">stars: <b>{stars}</b></a></p></td>

                 <td>{install_code}</td>

             </tr>

 

@@ -559,7 +576,7 @@ def create_ui():
 

                 with gr.Row():

                     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",'update time', 'create time', "stars"], type="index")

 

                 with gr.Row():

                     search_extensions_text = gr.Text(label="Search").style(container=False)

@@ -568,9 +585,9 @@ def create_ui():
                 available_extensions_table = gr.HTML()

 

                 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(), gr.update()]),

                     inputs=[available_extensions_index, hide_tags, sort_column],

-                    outputs=[available_extensions_index, available_extensions_table, hide_tags, install_result, search_extensions_text],

+                    outputs=[available_extensions_index, available_extensions_table, hide_tags, search_extensions_text, install_result],

                 )

 

                 install_extension_button.click(