Merge branch 'dev' into patch-1

1 files changed, 7 insertions, 4 deletions

diff --git a/modules/ui_extra_networks_user_metadata.py b/modules/ui_extra_networks_user_metadata.py
index 63d4b503..b11622a1 100644
--- a/modules/ui_extra_networks_user_metadata.py
+++ b/modules/ui_extra_networks_user_metadata.py
@@ -36,8 +36,8 @@ 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

 

         return user_metadata

@@ -93,10 +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')),

             ]

 

@@ -114,7 +117,7 @@ class UserMetadataEditor:
             errors.display(e, f"reading metadata info for {name}")

             params = []

 

-        table = '<table class="file-metadata">' + "".join(f"<tr><th>{name}</th><td>{value}</td></tr>" for name, value in params) + '</table>'

+        table = '<table class="file-metadata">' + "".join(f"<tr><th>{name}</th><td>{value}</td></tr>" for name, value in params if value is not None) + '</table>'

 

         return html.escape(name), user_metadata.get('description', ''), table, self.get_card_html(name), user_metadata.get('notes', '')

 

@@ -124,7 +127,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)