extern/easydiffusion
1
0
Fork 1
mirror of https://github.com/easydiffusion/easydiffusion.git synced 2025-02-16 18:32:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta' of github.com:cmdr2/stable-diffusion-ui into beta

Browse Source
This commit is contained in:
cmdr2 2023-04-07 15:52:02 +05:30
commit e7c0b9bd76
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/on_env_start.bat
View File

@ -8,6 +8,10 @@ if exist "scripts\config.bat" (
@call scripts\config.bat @call scripts\config.bat
) )
if exist "scripts\user_config.bat" (
@call scripts\user_config.bat
)
if "%update_branch%"=="" ( if "%update_branch%"=="" (
set update_branch=main set update_branch=main
) )

5
scripts/on_env_start.sh
View File

@ -8,6 +8,11 @@ if [ -f "scripts/config.sh" ]; then
source scripts/config.sh source scripts/config.sh
fi fi
if [ -f "scripts/user_config.sh" ]; then
source scripts/user_config.sh
fi
if [ "$update_branch" == "" ]; then if [ "$update_branch" == "" ]; then
export update_branch="main" export update_branch="main"
fi fi

9
ui/easydiffusion/utils/save_utils.py
View File

@ -1,6 +1,5 @@
import os import os
import time import time
import base64
import re import re
from easydiffusion import app from easydiffusion import app
@ -137,7 +136,13 @@ def save_images_to_disk(images: list, filtered_images: list, req: GenerateImageR
file_format=task_data.output_format, file_format=task_data.output_format,
) )
else: else:
make_filter_filename = make_filename_callback(req, task_data, file_number, now=now, suffix="filtered") make_filter_filename = make_filename_callback(
app_config.get("filename_format", "$p_$tsb64"),
req,
task_data,
file_number,
now=now,
suffix="filtered")
save_images( save_images(
images, images,

10
ui/media/css/fonts.css
View File

@ -3,7 +3,7 @@
font-family: 'Work Sans'; font-family: 'Work Sans';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local(''), src: local('Work Sans'),
url('/media/fonts/work-sans-v18-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ url('/media/fonts/work-sans-v18-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('/media/fonts/work-sans-v18-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ url('/media/fonts/work-sans-v18-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
} }
@ -13,7 +13,7 @@
font-family: 'Work Sans'; font-family: 'Work Sans';
font-style: normal; font-style: normal;
font-weight: 600; font-weight: 600;
src: local(''), src: local('Work Sans'),
url('/media/fonts/work-sans-v18-latin-600.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ url('/media/fonts/work-sans-v18-latin-600.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('/media/fonts/work-sans-v18-latin-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ url('/media/fonts/work-sans-v18-latin-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
} }
@ -23,7 +23,7 @@
font-family: 'Work Sans'; font-family: 'Work Sans';
font-style: normal; font-style: normal;
font-weight: 700; font-weight: 700;
src: local(''), src: local('Work Sans'),
url('/media/fonts/work-sans-v18-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ url('/media/fonts/work-sans-v18-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('/media/fonts/work-sans-v18-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ url('/media/fonts/work-sans-v18-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
} }
@ -33,8 +33,8 @@
font-family: 'Work Sans'; font-family: 'Work Sans';
font-style: normal; font-style: normal;
font-weight: 800; font-weight: 800;
src: local(''), src: local('Work Sans'),
url('/media/fonts/work-sans-v18-latin-800.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ url('/media/fonts/work-sans-v18-latin-800.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('/media/fonts/work-sans-v18-latin-800.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ url('/media/fonts/work-sans-v18-latin-800.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
} }