Merge branch 'main' into draft-v4

comfyui_manager/common/git_utils.py

@@ -46,6 +46,8 @@ def git_url(fullpath):
 
     for k, v in config.items():
         if k.startswith('remote ') and 'url' in v:
+            if 'Comfy-Org/ComfyUI-Manager' in v['url']:
+                return "https://github.com/ltdrdata/ComfyUI-Manager"
             return v['url']
 
     return None

comfyui_manager/glob/manager_server.py

@@ -185,7 +185,10 @@ def set_preview_method(method):
     core.get_config()['preview_method'] = method
 
 
-set_preview_method(core.get_config()['preview_method'])
+if args.preview_method == latent_preview.LatentPreviewMethod.NoPreviews:
+    set_preview_method(core.get_config()['preview_method'])
+else:
+    logging.warning("[ComfyUI-Manager] Since --preview-method is set, ComfyUI-Manager's preview method feature will be ignored.")
 
 
 def set_component_policy(mode):

comfyui_manager/prestartup_script.py

@@ -336,7 +336,12 @@ try:
                     log_file.write(message)
                 else:
                     log_file.write(f"[{timestamp}] {message}")
-                log_file.flush()
+
+                try:
+                    log_file.flush()
+                except Exception:
+                    pass
+
                 self.last_char = message if message == '' else message[-1]
 
             if not file_only:
@@ -349,7 +354,10 @@ try:
                         original_stderr.flush()
 
         def flush(self):
-            log_file.flush()
+            try:
+                log_file.flush()
+            except Exception:
+                pass
 
             with std_log_lock:
                 if self.is_stdout: