aboutsummaryrefslogtreecommitdiff
path: root/modules/modelloader.py
diff options
context:
space:
mode:
authorAUTOMATIC <16777216c@gmail.com>2023-05-19 09:09:00 +0300
committerAUTOMATIC <16777216c@gmail.com>2023-05-19 09:09:18 +0300
commitdf6fffb054f8d3444baa887151a4874506a68be1 (patch)
tree6b2ab174215a1525a62d1fdd9fd46f7c61302e1d /modules/modelloader.py
parent379fd6204dfc27e16acc03f705ecd9ff23c2d1c0 (diff)
change upscalers to download models into user-specified directory (from commandline args) rather than the default models/<...>
Diffstat (limited to 'modules/modelloader.py')
-rw-r--r--modules/modelloader.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/modelloader.py b/modules/modelloader.py
index 2a479bcb..be23071a 100644
--- a/modules/modelloader.py
+++ b/modules/modelloader.py
@@ -47,7 +47,7 @@ def load_models(model_path: str, model_url: str = None, command_path: str = None
if model_url is not None and len(output) == 0:
if download_name is not None:
from basicsr.utils.download_util import load_file_from_url
- dl = load_file_from_url(model_url, model_path, True, download_name)
+ dl = load_file_from_url(model_url, places[0], True, download_name)
output.append(dl)
else:
output.append(model_url)
@@ -144,7 +144,10 @@ def load_upscalers():
for cls in reversed(used_classes.values()):
name = cls.__name__
cmd_name = f"{name.lower().replace('upscaler', '')}_models_path"
- scaler = cls(commandline_options.get(cmd_name, None))
+ commandline_model_path = commandline_options.get(cmd_name, None)
+ scaler = cls(commandline_model_path)
+ scaler.user_path = commandline_model_path
+ scaler.model_download_path = commandline_model_path or scaler.model_path
datas += scaler.scalers
shared.sd_upscalers = sorted(