From 1bb21f35102326da28e1360750a879386c015716 Mon Sep 17 00:00:00 2001
From: bluelovers <codelovers@users.sourceforge.net>
Date: Tue, 29 Aug 2023 06:25:16 +0800
Subject: feat: display file metadata path

https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/12289
---
 modules/ui_extra_networks_user_metadata.py | 20 ++++++++++++++++++++
 1 file changed, 20 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..877d0285 100644
--- a/modules/ui_extra_networks_user_metadata.py
+++ b/modules/ui_extra_networks_user_metadata.py
@@ -2,10 +2,29 @@ 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 windows_to_unix_style(path):
+    return Path(path).as_posix()
+
+
+def exclude_root_path(root_path, path_to_exclude):
+    try:
+        relative_path = os.path.relpath(path_to_exclude, root_path)
+        # 如果路径已经在 root_path 之外，relpath 会返回绝对路径
+        # 所以需要检查路径是否在 root_path 之内
+        if not relative_path.startswith('..'):
+            return windows_to_unix_style(relative_path)
+    except ValueError:
+        pass
+    # 如果路径无法相对化，或者位于 root_path 之外，则返回原始路径
+    return windows_to_unix_style(path_to_exclude)
 
 
 class UserMetadataEditor:
@@ -98,6 +117,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.3


From f564d8ed2c5c5644101c5670d2cec15b03ccb51b Mon Sep 17 00:00:00 2001
From: bluelovers <codelovers@users.sourceforge.net>
Date: Tue, 29 Aug 2023 22:11:18 +0800
Subject: refactor: refactor function

---
 modules/ui_extra_networks_user_metadata.py | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 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 877d0285..588f84c7 100644
--- a/modules/ui_extra_networks_user_metadata.py
+++ b/modules/ui_extra_networks_user_metadata.py
@@ -10,21 +10,12 @@ from modules import generation_parameters_copypaste, images, sysinfo, errors
 from modules.paths_internal import models_path
 
 
-def windows_to_unix_style(path):
-    return Path(path).as_posix()
-
-
-def exclude_root_path(root_path, path_to_exclude):
-    try:
-        relative_path = os.path.relpath(path_to_exclude, root_path)
-        # 如果路径已经在 root_path 之外，relpath 会返回绝对路径
-        # 所以需要检查路径是否在 root_path 之内
-        if not relative_path.startswith('..'):
-            return windows_to_unix_style(relative_path)
-    except ValueError:
-        pass
-    # 如果路径无法相对化，或者位于 root_path 之外，则返回原始路径
-    return windows_to_unix_style(path_to_exclude)
+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:
-- 
cgit v1.2.3


From edf3ad5aed9435e2ff3cc0f98895be6056f1f950 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.3


From 67cd4ec0aabb69d1133dfb18543ab080be855323 Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Wed, 30 Aug 2023 15:37:13 +0900
Subject: lint

---
 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.3


From a15dd151ffb4d11556028b34561058bc44930427 Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Sun, 26 Nov 2023 21:55:50 +0900
Subject: json.dump(ensure_ascii=False)

improve json readability
---
 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 bfec140c..36a807fc 100644
--- a/modules/ui_extra_networks_user_metadata.py
+++ b/modules/ui_extra_networks_user_metadata.py
@@ -134,7 +134,7 @@ class UserMetadataEditor:
         basename, ext = os.path.splitext(filename)
 
         with open(basename + '.json', "w", encoding="utf8") as file:
-            json.dump(metadata, file, indent=4)
+            json.dump(metadata, file, indent=4, ensure_ascii=False)
 
     def save_user_metadata(self, name, desc, notes):
         user_metadata = self.get_user_metadata(name)
-- 
cgit v1.2.3