OPENGIT/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2025-02-03 12:12:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13210 from AUTOMATIC1111/fetch-version-info-when-webui_dir-is-not-work_dir-

Browse Source 
fix issues when webui_dir is not work_dir
This commit is contained in:
AUTOMATIC1111 2023-09-30 09:23:32 +03:00 committed by GitHub
commit b20cd352d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/launch_utils.py
View File

@ -64,7 +64,7 @@ Use --skip-python-version-check to suppress this warning.
@lru_cache() @lru_cache()
def commit_hash(): def commit_hash():
try: try:
return subprocess.check_output([git, "rev-parse", "HEAD"], shell=False, encoding='utf8').strip() return subprocess.check_output([git, "-C", script_path, "rev-parse", "HEAD"], shell=False, encoding='utf8').strip()
except Exception: except Exception:
return "<none>" return "<none>"
@ -72,7 +72,7 @@ def commit_hash():
@lru_cache() @lru_cache()
def git_tag(): def git_tag():
try: try:
return subprocess.check_output([git, "describe", "--tags"], shell=False, encoding='utf8').strip() return subprocess.check_output([git, "-C", script_path, "describe", "--tags"], shell=False, encoding='utf8').strip()
except Exception: except Exception:
try: try:

2
modules/paths.py
View File

@ -1,6 +1,6 @@
import os import os
import sys 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 import modules.safe # noqa: F401

1
modules/paths_internal.py
View File

@ -8,6 +8,7 @@ import shlex
commandline_args = os.environ.get('COMMANDLINE_ARGS', "") commandline_args = os.environ.get('COMMANDLINE_ARGS', "")
sys.argv += shlex.split(commandline_args) sys.argv += shlex.split(commandline_args)
cwd = os.getcwd()
modules_path = os.path.dirname(os.path.realpath(__file__)) modules_path = os.path.dirname(os.path.realpath(__file__))
script_path = os.path.dirname(modules_path) script_path = os.path.dirname(modules_path)

6
modules/ui_gradio_extensions.py
View File

@ -2,12 +2,12 @@ import os
import gradio as gr import gradio as gr
from modules import localization, shared, scripts 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): def webpath(fn):
if fn.startswith(script_path): if fn.startswith(cwd):
web_path = os.path.relpath(fn, script_path).replace('\\', '/') web_path = os.path.relpath(fn, cwd)
else: else:
web_path = os.path.abspath(fn) web_path = os.path.abspath(fn)