"
-
- remote = f"""{html.escape(webui_remote or '')}"""
- commit_link = make_commit_link(webui_commit_hash, webui_remote)
- date_link = make_commit_link(webui_commit_hash, webui_remote, webui_commit_date)
-
- current_webui = config_states.get_webui_config()
-
- style_remote = ""
- style_branch = ""
- style_commit = ""
- if current_webui["remote"] != webui_remote:
- style_remote = STYLE_PRIMARY
- if current_webui["branch"] != webui_branch:
- style_branch = STYLE_PRIMARY
- if current_webui["commit_hash"] != webui_commit_hash:
- style_commit = STYLE_PRIMARY
-
- code += f"""Config Backup: {config_name}
- Filepath: {filepath}
- Created at: {created_date}
"""
-
- code += f"""WebUI State
-
-
-
- | URL |
- Branch |
- Commit |
- Date |
-
-
-
-
- | {remote} |
- {webui_branch} |
- {commit_link} |
- {date_link} |
-
-
-
- """
-
- code += """Extension State
-
- """
+ if current_webui["remote"] != webui_remote:
+ style_remote = STYLE_PRIMARY
+ if current_webui["branch"] != webui_branch:
+ style_branch = STYLE_PRIMARY
+ if current_webui["commit_hash"] != webui_commit_hash:
+ style_commit = STYLE_PRIMARY
+
+ code = f"""
+Config Backup: {config_name}
+Filepath: {filepath}
+Created at: {created_date}
+WebUI State
+
+
+
+ | URL |
+ Branch |
+ Commit |
+ Date |
+
+
+
+
+ |
+ {remote}
+ |
+
+ {webui_branch}
+ |
+
+ {commit_link}
+ |
+
+ {date_link}
+ |
+
+
+
+Extension State
+"""
+
+ except Exception as e:
+ print(f"[ERROR]: Config states {filepath}, {e}")
+ code = f"""
+Config Backup: {config_name}
+Filepath: {filepath}
+Created at: {created_date}
+This file is corrupted
"""
return code
--
cgit v1.2.1
From afea99a72b48fd88b101b1b2cea45fd527c3bc6f Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 08:05:18 +0300
Subject: get progressbar to display correctly in extensions tab
---
modules/ui_extensions.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
(limited to 'modules/ui_extensions.py')
diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index e0138267..67a243c3 100644
--- a/modules/ui_extensions.py
+++ b/modules/ui_extensions.py
@@ -557,8 +557,12 @@ def create_ui():
msg = '"--disable-extra-extensions" was used, remove it to load all extensions again'
html = f'{msg}'
- info = gr.HTML(html)
- extensions_table = gr.HTML('Loading...')
+ with gr.Row():
+ info = gr.HTML(html)
+
+ with gr.Row(elem_classes="progress-container"):
+ extensions_table = gr.HTML('Loading...', elem_id="extensions_installed_html")
+
ui.load(fn=extension_table, inputs=[], outputs=[extensions_table])
apply.click(
--
cgit v1.2.1
From 06bc1f4f67f9c01808cafd034b8f9761740982f4 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 08:23:11 +0300
Subject: Merge pull request #12851 from bluelovers/pr/extension-time-001
chore: change extension time format
---
modules/ui_extensions.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'modules/ui_extensions.py')
diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index 67a243c3..83557d7a 100644
--- a/modules/ui_extensions.py
+++ b/modules/ui_extensions.py
@@ -177,7 +177,7 @@ def extension_table():
{remote} |
{ext.branch} |
{version_link} |
- {time.asctime(time.gmtime(ext.commit_date))} |
+ {time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime(ext.commit_date))} |
{ext_status}
"""
--
cgit v1.2.1
From 87a083d1b23ed0a777432907752980249421783f Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 09:45:12 +0300
Subject: Merge pull request #12864 from
AUTOMATIC1111/extension-time-format-time-zone
patch Extension time format in systme time zone
---
modules/ui_extensions.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'modules/ui_extensions.py')
diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index 83557d7a..fa831f57 100644
--- a/modules/ui_extensions.py
+++ b/modules/ui_extensions.py
@@ -177,7 +177,7 @@ def extension_table():
{remote} |
{ext.branch} |
{version_link} |
- {time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime(ext.commit_date))} |
+ {datetime.fromtimestamp(ext.commit_date) if ext.commit_date else ""} |
{ext_status}
"""
--
cgit v1.2.1
From 1ac11b3dae49568fc0b3ae6afe6627196a0a001e Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 11:00:29 +0300
Subject: Merge pull request #12865 from
AUTOMATIC1111/another-convert-to-system-time-zone
extension update time, convert to system time zone
---
modules/ui_extensions.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'modules/ui_extensions.py')
diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index fa831f57..2e8c1d6d 100644
--- a/modules/ui_extensions.py
+++ b/modules/ui_extensions.py
@@ -2,7 +2,7 @@ import json
import os
import threading
import time
-from datetime import datetime
+from datetime import datetime, timezone
import git
@@ -442,7 +442,7 @@ sort_ordering = [
def get_date(info: dict, key):
try:
- return datetime.strptime(info.get(key), "%Y-%m-%dT%H:%M:%SZ").strftime("%Y-%m-%d")
+ return datetime.strptime(info.get(key), "%Y-%m-%dT%H:%M:%SZ").replace(tzinfo=timezone.utc).astimezone().strftime("%Y-%m-%d")
except (ValueError, TypeError):
return ''
--
cgit v1.2.1