correct webpath when webui_dir is not work_dir

k1nos · Sep 13, 2023 · 5b761b4 · 5b761b4
1 parent 6fb2194
commit 5b761b4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/modules/paths.py b/modules/paths.py
@@ -1,6 +1,6 @@
 import os
 import sys
-from modules.paths_internal import models_path, script_path, data_path, extensions_dir, extensions_builtin_dir  # noqa: F401
+from modules.paths_internal import models_path, script_path, data_path, extensions_dir, extensions_builtin_dir, cwd  # noqa: F401
 
 import modules.safe  # noqa: F401
 

diff --git a/modules/paths_internal.py b/modules/paths_internal.py
@@ -8,6 +8,7 @@
 commandline_args = os.environ.get('COMMANDLINE_ARGS', "")
 sys.argv += shlex.split(commandline_args)
 
+cwd = os.getcwd()
 modules_path = os.path.dirname(os.path.realpath(__file__))
 script_path = os.path.dirname(modules_path)
 

diff --git a/modules/ui_gradio_extensions.py b/modules/ui_gradio_extensions.py
@@ -2,12 +2,12 @@
 import gradio as gr
 
 from modules import localization, shared, scripts
-from modules.paths import script_path, data_path
+from modules.paths import script_path, data_path, cwd
 
 
 def webpath(fn):
-    if fn.startswith(script_path):
-        web_path = os.path.relpath(fn, script_path).replace('\\', '/')
+    if fn.startswith(cwd):
+        web_path = os.path.relpath(fn, cwd)
     else:
         web_path = os.path.abspath(fn)