From 2860c3be3e29d7f0a7d8e1ada6594078aee3aebb Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 1 Aug 2023 07:10:42 +0300
Subject: add filename to to the table in user metadata editor
---
modules/ui_extra_networks_user_metadata.py | 1 +
1 file changed, 1 insertion(+)
(limited to 'modules/ui_extra_networks_user_metadata.py')
diff --git a/modules/ui_extra_networks_user_metadata.py b/modules/ui_extra_networks_user_metadata.py
index 63d4b503..1cb9eb6f 100644
--- a/modules/ui_extra_networks_user_metadata.py
+++ b/modules/ui_extra_networks_user_metadata.py
@@ -96,6 +96,7 @@ class UserMetadataEditor:
stats = os.stat(filename)
params = [
+ ('Filename: ', os.path.basename(filename)),
('File size: ', sysinfo.pretty_bytes(stats.st_size)),
('Modified: ', datetime.datetime.fromtimestamp(stats.st_mtime).strftime('%Y-%m-%d %H:%M')),
]
--
cgit v1.2.1
From c1027806936f4460cd01dcdcc93f11ea30390382 Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Wed, 9 Aug 2023 13:38:53 +0900
Subject: extra network metadata inherit old description
---
modules/ui_extra_networks_user_metadata.py | 2 ++
1 file changed, 2 insertions(+)
(limited to 'modules/ui_extra_networks_user_metadata.py')
diff --git a/modules/ui_extra_networks_user_metadata.py b/modules/ui_extra_networks_user_metadata.py
index 1cb9eb6f..ea7e1ab2 100644
--- a/modules/ui_extra_networks_user_metadata.py
+++ b/modules/ui_extra_networks_user_metadata.py
@@ -40,6 +40,8 @@ class UserMetadataEditor:
user_metadata = {}
item['user_metadata'] = user_metadata
+ if len(user_metadata) == 0:
+ user_metadata = {'description': item.get('description', '')}
return user_metadata
def create_extra_default_items_in_left_column(self):
--
cgit v1.2.1
From 0cac6ab6153dc376b55c9b7f61c01024515ae73a Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Wed, 9 Aug 2023 20:32:36 +0900
Subject: extra network metadata inherit old description
---
modules/ui_extra_networks_user_metadata.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
(limited to 'modules/ui_extra_networks_user_metadata.py')
diff --git a/modules/ui_extra_networks_user_metadata.py b/modules/ui_extra_networks_user_metadata.py
index ea7e1ab2..a5423fd8 100644
--- a/modules/ui_extra_networks_user_metadata.py
+++ b/modules/ui_extra_networks_user_metadata.py
@@ -36,12 +36,10 @@ class UserMetadataEditor:
item = self.page.items.get(name, {})
user_metadata = item.get('user_metadata', None)
- if user_metadata is None:
- user_metadata = {}
+ if not user_metadata:
+ user_metadata = {'description': item.get('description', '')}
item['user_metadata'] = user_metadata
- if len(user_metadata) == 0:
- user_metadata = {'description': item.get('description', '')}
return user_metadata
def create_extra_default_items_in_left_column(self):
--
cgit v1.2.1
From 0a0a9d4fe92b97bdaf827532bc6a132e8ca41987 Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Thu, 10 Aug 2023 18:05:17 +0900
Subject: extra networks metadata indent
---
modules/ui_extra_networks_user_metadata.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'modules/ui_extra_networks_user_metadata.py')
diff --git a/modules/ui_extra_networks_user_metadata.py b/modules/ui_extra_networks_user_metadata.py
index a5423fd8..cda471e4 100644
--- a/modules/ui_extra_networks_user_metadata.py
+++ b/modules/ui_extra_networks_user_metadata.py
@@ -125,7 +125,7 @@ class UserMetadataEditor:
basename, ext = os.path.splitext(filename)
with open(basename + '.json', "w", encoding="utf8") as file:
- json.dump(metadata, file)
+ json.dump(metadata, file, indent=4)
def save_user_metadata(self, name, desc, notes):
user_metadata = self.get_user_metadata(name)
--
cgit v1.2.1
From 7fa5ee54b15904bef6598800df76ba1291d44ec6 Mon Sep 17 00:00:00 2001
From: catboxanon <122327233+catboxanon@users.noreply.github.com>
Date: Sun, 13 Aug 2023 02:32:54 -0400
Subject: Support search and display of hashes for all extra network items
---
modules/ui_extra_networks_user_metadata.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'modules/ui_extra_networks_user_metadata.py')
diff --git a/modules/ui_extra_networks_user_metadata.py b/modules/ui_extra_networks_user_metadata.py
index cda471e4..b11622a1 100644
--- a/modules/ui_extra_networks_user_metadata.py
+++ b/modules/ui_extra_networks_user_metadata.py
@@ -93,11 +93,13 @@ class UserMetadataEditor:
item = self.page.items.get(name, {})
try:
filename = item["filename"]
+ shorthash = item.get("shorthash", None)
stats = os.stat(filename)
params = [
('Filename: ', os.path.basename(filename)),
('File size: ', sysinfo.pretty_bytes(stats.st_size)),
+ ('Hash: ', shorthash),
('Modified: ', datetime.datetime.fromtimestamp(stats.st_mtime).strftime('%Y-%m-%d %H:%M')),
]
@@ -115,7 +117,7 @@ class UserMetadataEditor:
errors.display(e, f"reading metadata info for {name}")
params = []
- table = ''
+ table = ''
return html.escape(name), user_metadata.get('description', ''), table, self.get_card_html(name), user_metadata.get('notes', '')
--
cgit v1.2.1
From 3989d7e88bf82d50f5a72d759346070df1bc2097 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 08:07:15 +0300
Subject: Merge pull request #12838 from bluelovers/pr/file-metadata-path-001
display file metadata `path` , `ss_output_name`
---
modules/ui_extra_networks_user_metadata.py | 11 +++++++++++
1 file changed, 11 insertions(+)
(limited to 'modules/ui_extra_networks_user_metadata.py')
diff --git a/modules/ui_extra_networks_user_metadata.py b/modules/ui_extra_networks_user_metadata.py
index b11622a1..588f84c7 100644
--- a/modules/ui_extra_networks_user_metadata.py
+++ b/modules/ui_extra_networks_user_metadata.py
@@ -2,10 +2,20 @@ import datetime
import html
import json
import os.path
+from pathlib import Path
import gradio as gr
from modules import generation_parameters_copypaste, images, sysinfo, errors
+from modules.paths_internal import models_path
+
+
+def exclude_root_path(root_path, path):
+ path_object = Path(path)
+ if path_object.is_relative_to(root_path):
+ path_object = path_object.relative_to(root_path)
+
+ return path_object.as_posix()
class UserMetadataEditor:
@@ -98,6 +108,7 @@ class UserMetadataEditor:
stats = os.stat(filename)
params = [
('Filename: ', os.path.basename(filename)),
+ ('Path: ', exclude_root_path(models_path, filename)),
('File size: ', sysinfo.pretty_bytes(stats.st_size)),
('Hash: ', shorthash),
('Modified: ', datetime.datetime.fromtimestamp(stats.st_mtime).strftime('%Y-%m-%d %H:%M')),
--
cgit v1.2.1
From 338d0b610344354f6323d6d5877546696578a13f Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 08:22:06 +0300
Subject: go back to single path for filenames in extra networks metadata
dialog
---
modules/ui_extra_networks_user_metadata.py | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
(limited to 'modules/ui_extra_networks_user_metadata.py')
diff --git a/modules/ui_extra_networks_user_metadata.py b/modules/ui_extra_networks_user_metadata.py
index 588f84c7..ae972fbb 100644
--- a/modules/ui_extra_networks_user_metadata.py
+++ b/modules/ui_extra_networks_user_metadata.py
@@ -2,22 +2,13 @@ import datetime
import html
import json
import os.path
-from pathlib import Path
import gradio as gr
-from modules import generation_parameters_copypaste, images, sysinfo, errors
+from modules import generation_parameters_copypaste, images, sysinfo, errors, ui_extra_networks
from modules.paths_internal import models_path
-def exclude_root_path(root_path, path):
- path_object = Path(path)
- if path_object.is_relative_to(root_path):
- path_object = path_object.relative_to(root_path)
-
- return path_object.as_posix()
-
-
class UserMetadataEditor:
def __init__(self, ui, tabname, page):
@@ -99,6 +90,13 @@ class UserMetadataEditor:
return preview
+ def relative_path(self, path):
+ for parent_path in self.page.allowed_directories_for_previews():
+ if ui_extra_networks.path_is_parent(parent_path, path):
+ return os.path.relpath(path, parent_path)
+
+ return os.path.basename(path)
+
def get_metadata_table(self, name):
item = self.page.items.get(name, {})
try:
@@ -107,8 +105,7 @@ class UserMetadataEditor:
stats = os.stat(filename)
params = [
- ('Filename: ', os.path.basename(filename)),
- ('Path: ', exclude_root_path(models_path, filename)),
+ ('Filename: ', self.relative_path(filename)),
('File size: ', sysinfo.pretty_bytes(stats.st_size)),
('Hash: ', shorthash),
('Modified: ', datetime.datetime.fromtimestamp(stats.st_mtime).strftime('%Y-%m-%d %H:%M')),
--
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_extra_networks_user_metadata.py | 1 -
1 file changed, 1 deletion(-)
(limited to 'modules/ui_extra_networks_user_metadata.py')
diff --git a/modules/ui_extra_networks_user_metadata.py b/modules/ui_extra_networks_user_metadata.py
index ae972fbb..bfec140c 100644
--- a/modules/ui_extra_networks_user_metadata.py
+++ b/modules/ui_extra_networks_user_metadata.py
@@ -6,7 +6,6 @@ import os.path
import gradio as gr
from modules import generation_parameters_copypaste, images, sysinfo, errors, ui_extra_networks
-from modules.paths_internal import models_path
class UserMetadataEditor:
--
cgit v1.2.1