Commit 5eee2ac3 authored by Max Audron's avatar Max Audron
Browse files

add data-dir flag and set all user data directories based on it

parent 9beb794e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ import git
from modules import paths, shared

extensions = []
extensions_dir = os.path.join(paths.script_path, "extensions")
extensions_dir = os.path.join(paths.data_path, "extensions")
extensions_builtin_dir = os.path.join(paths.script_path, "extensions-builtin")


+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ import re
from pathlib import Path

import gradio as gr
from modules.shared import script_path
from modules.paths import data_path, script_path
from modules import shared, ui_tempdir, script_callbacks
import tempfile
from PIL import Image
@@ -289,7 +289,7 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
def connect_paste(button, paste_fields, input_comp, jsfunc=None):
    def paste_func(prompt):
        if not prompt and not shared.cmd_opts.hide_ui_dir_config:
            filename = os.path.join(script_path, "params.txt")
            filename = os.path.join(data_path, "params.txt")
            if os.path.exists(filename):
                with open(filename, "r", encoding="utf8") as file:
                    prompt = file.read()
+2 −3
Original line number Diff line number Diff line
@@ -6,12 +6,11 @@ import facexlib
import gfpgan

import modules.face_restoration
from modules import shared, devices, modelloader
from modules.paths import models_path
from modules import paths, shared, devices, modelloader

model_dir = "GFPGAN"
user_path = None
model_path = os.path.join(models_path, model_dir)
model_path = os.path.join(paths.models_path, model_dir)
model_url = "https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.4.pth"
have_gfpgan = False
loaded_gfpgan_model = None
+3 −1
Original line number Diff line number Diff line
@@ -4,8 +4,10 @@ import os.path

import filelock

from modules.paths import data_path

cache_filename = "cache.json"

cache_filename = os.path.join(data_path, "cache.json")
cache_data = None


+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ from torchvision import transforms
from torchvision.transforms.functional import InterpolationMode

import modules.shared as shared
from modules import devices, paths, lowvram, modelloader, errors
from modules import devices, paths, shared, lowvram, modelloader, errors

blip_image_eval_size = 384
clip_model_name = 'ViT-L/14'
Loading