From 2aa71a6df9f2d70dd2410053239f30f94c122ad7 Mon Sep 17 00:00:00 2001
From: Goldmojo <goldmojo@home>
Date: Sun, 25 Jun 2023 19:36:42 +0200
Subject: [PATCH] Merge branch 'Add-LyCORIS-parsing' of
 https://github.com/goldmojo/Stable-Diffusion-Webui-Civitai-Helper into
 Add-LyCORIS-parsing

---
 scripts/ch_lib/civitai.py | 2 +-
 scripts/ch_lib/model.py   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/ch_lib/civitai.py b/scripts/ch_lib/civitai.py
index 2a15ae7..9002dcd 100644
--- a/scripts/ch_lib/civitai.py
+++ b/scripts/ch_lib/civitai.py
@@ -23,7 +23,7 @@ model_type_dict = {
     "TextualInversion": "ti",
     "Hypernetwork": "hyper",
     "LORA": "lora",
-    "LoCon": "lora",
+    "LoCon": "lycoris",
 }
 
 
diff --git a/scripts/ch_lib/model.py b/scripts/ch_lib/model.py
index e1f3ae9..2d65f78 100644
--- a/scripts/ch_lib/model.py
+++ b/scripts/ch_lib/model.py
@@ -17,7 +17,7 @@ folders = {
     "hyper": os.path.join(root_path, "models", "hypernetworks"),
     "ckp": os.path.join(root_path, "models", "Stable-diffusion"),
     "lora": os.path.join(root_path, "models", "Lora"),
-	"lycoris": os.path.join(root_path, "models", "LyCORIS"),
+    "lycoris": os.path.join(root_path, "models", "LyCORIS"),
 }
 
 exts = (".bin", ".pt", ".safetensors", ".ckpt")
@@ -43,8 +43,8 @@ def get_custom_model_folder():
     if shared.cmd_opts.lora_dir and os.path.isdir(shared.cmd_opts.lora_dir):
         folders["lora"] = shared.cmd_opts.lora_dir
 
-
-
+    if shared.cmd_opts.lyco_dir and os.path.isdir(shared.cmd_opts.lyco_dir):
+        folders["lycoris"] = shared.cmd_opts.lyco_dir
 
 
 # write model info to file