Merge commit '4945fc99624afc661aae2d3c5c5d73a32ba21897'

# Conflicts:
#	fooocus_version.py
#	language/en.json
#	launch.py
#	modules/async_worker.py
#	modules/config.py
#	modules/flags.py
#	modules/meta_parser.py
#	modules/util.py
#	webui.py

modules/meta_parser.py

@@ -11,8 +11,8 @@ import fooocus_version
 import modules.config
 import modules.sdxl_styles
 from modules.flags import MetadataScheme, Performance, Steps
-from modules.flags import lora_count, SAMPLERS, CIVITAI_NO_KARRAS
-from modules.util import quote, unquote, extract_styles_from_prompt, is_json, calculate_sha256
+from modules.flags import SAMPLERS, CIVITAI_NO_KARRAS
+from modules.util import quote, unquote, extract_styles_from_prompt, is_json, get_file_from_folder_list, calculate_sha256
 
 re_param_code = r'\s*(\w[\w \-/]+):\s*("(?:\\.|[^\\"])+"|[^,]*)(?:,|$)'
 re_param = re.compile(re_param_code)
@@ -57,7 +57,7 @@ def load_parameter_button_click(raw_metadata: dict | str, is_generating: bool):
 
     get_freeu('freeu', 'FreeU', loaded_parameter_dict, results)
 
-    for i in range(lora_count):
+    for i in range(modules.config.default_max_lora_number):
         get_lora(f'lora_combined_{i + 1}', f'LoRA {i + 1}', loaded_parameter_dict, results)
 
     return results
@@ -171,9 +171,11 @@ def get_lora(key: str, fallback: str | None, source_dict: dict, results: list):
     try:
         n, w = source_dict.get(key, source_dict.get(fallback)).split(' : ')
         w = float(w)
+        results.append(True)
         results.append(n)
         results.append(w)
     except:
+        results.append(True)
         results.append('None')
         results.append(1)
 
@@ -209,7 +211,7 @@ def parse_meta_from_preset(preset_content):
             preset_prepared[meta_key] = (width, height)
         else:
             preset_prepared[meta_key] = items[settings_key] if settings_key in items and items[settings_key] is not None else getattr(modules.config, settings_key)
-        
+
         if settings_key == "default_styles" or settings_key == "default_aspect_ratio":
             preset_prepared[meta_key] = str(preset_prepared[meta_key])
 
@@ -241,7 +243,8 @@ class MetadataParser(ABC):
     def parse_string(self, metadata: dict) -> str:
         raise NotImplementedError
 
-    def set_data(self, raw_prompt, full_prompt, raw_negative_prompt, full_negative_prompt, steps, base_model_name, refiner_model_name, loras):
+    def set_data(self, raw_prompt, full_prompt, raw_negative_prompt, full_negative_prompt, steps, base_model_name,
+                 refiner_model_name, loras):
         self.raw_prompt = raw_prompt
         self.full_prompt = full_prompt
         self.raw_negative_prompt = raw_negative_prompt
@@ -249,18 +252,18 @@ class MetadataParser(ABC):
         self.steps = steps
         self.base_model_name = Path(base_model_name).stem
 
-        base_model_path = os.path.join(modules.config.path_checkpoints, base_model_name)
+        base_model_path = get_file_from_folder_list(base_model_name, modules.config.paths_checkpoints)
         self.base_model_hash = get_sha256(base_model_path)
 
         if refiner_model_name not in ['', 'None']:
             self.refiner_model_name = Path(refiner_model_name).stem
-            refiner_model_path = os.path.join(modules.config.path_checkpoints, refiner_model_name)
+            refiner_model_path = get_file_from_folder_list(refiner_model_name, modules.config.paths_checkpoints)
             self.refiner_model_hash = get_sha256(refiner_model_path)
 
         self.loras = []
         for (lora_name, lora_weight) in loras:
             if lora_name != 'None':
-                lora_path = os.path.join(modules.config.path_loras, lora_name)
+                lora_path = get_file_from_folder_list(lora_name, modules.config.paths_loras)
                 lora_hash = get_sha256(lora_path)
                 self.loras.append((Path(lora_name).stem, lora_weight, lora_hash))
 
@@ -327,7 +330,7 @@ class A1111MetadataParser(MetadataParser):
 
         for k, v in re_param.findall(lastline):
             try:
-                if v[0] == '"' and v[-1] == '"':
+                if v != '' and v[0] == '"' and v[-1] == '"':
                     v = unquote(v)
 
                 m = re_imagesize.match(v)
@@ -375,7 +378,8 @@ class A1111MetadataParser(MetadataParser):
 
         if 'lora_hashes' in data:
             lora_filenames = modules.config.lora_filenames.copy()
-            lora_filenames.remove(modules.config.downloading_sdxl_lcm_lora())
+            if modules.config.sdxl_lcm_lora in lora_filenames:
+                lora_filenames.remove(modules.config.sdxl_lcm_lora)
             for li, lora in enumerate(data['lora_hashes'].split(', ')):
                 lora_name, lora_hash, lora_weight = lora.split(': ')
                 for filename in lora_filenames:
@@ -456,7 +460,8 @@ class FooocusMetadataParser(MetadataParser):
     def parse_json(self, metadata: dict) -> dict:
         model_filenames = modules.config.model_filenames.copy()
         lora_filenames = modules.config.lora_filenames.copy()
-        lora_filenames.remove(modules.config.downloading_sdxl_lcm_lora())
+        if modules.config.sdxl_lcm_lora in lora_filenames:
+            lora_filenames.remove(modules.config.sdxl_lcm_lora)
 
         for key, value in metadata.items():
             if value in ['', 'None']: