mirror of
https://github.com/lllyasviel/Fooocus.git
synced 2026-08-16 13:13:16 +02:00
Merge branch 'feature/use-consistent-file-name-in-gradio' into jpg_config_image_extension
# Conflicts: # modules/async_worker.py # modules/private_logger.py
This commit is contained in:
@@ -6,7 +6,7 @@ import urllib.parse
|
||||
|
||||
from PIL import Image
|
||||
from modules.util import generate_temp_filename
|
||||
|
||||
from tempfile import gettempdir
|
||||
|
||||
log_cache = {}
|
||||
|
||||
@@ -19,14 +19,16 @@ def get_current_html_path(image_extension=None):
|
||||
return html_name
|
||||
|
||||
|
||||
def log(img, dic, image_extension=None):
|
||||
if args_manager.args.disable_image_log:
|
||||
return
|
||||
|
||||
def log(img, dic, image_extension=None) -> str:
|
||||
path_outputs = args_manager.args.temp_path if args_manager.args.disable_image_log else modules.config.path_outputs
|
||||
_image_extension = image_extension if image_extension else modules.config.default_image_extension
|
||||
date_string, local_temp_filename, only_name = generate_temp_filename(folder=modules.config.path_outputs, extension=_image_extension)
|
||||
date_string, local_temp_filename, only_name = generate_temp_filename(folder=path_outputs, extension=_image_extension)
|
||||
os.makedirs(os.path.dirname(local_temp_filename), exist_ok=True)
|
||||
Image.fromarray(img).save(local_temp_filename)
|
||||
|
||||
if args_manager.args.disable_image_log:
|
||||
return local_temp_filename
|
||||
|
||||
html_name = os.path.join(os.path.dirname(local_temp_filename), 'log.html')
|
||||
|
||||
css_styles = (
|
||||
@@ -107,4 +109,4 @@ def log(img, dic, image_extension=None):
|
||||
|
||||
log_cache[html_name] = middle_part
|
||||
|
||||
return
|
||||
return local_temp_filename
|
||||
|
||||
Reference in New Issue
Block a user