xinyun/ComfyUI-KJNodes
1
0
Fork 0
mirror of https://git.datalinker.icu/kijai/ComfyUI-KJNodes.git synced 2025-12-10 21:34:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #451 from stuttlepress/handle-base-directory-paths

Browse Source 
Add relative path handling for --base-directory
This commit is contained in:
Jukka Seppänen 2025-12-04 09:52:42 +02:00 committed by GitHub
commit 712851c53e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nodes/image_nodes.py
View File

@ -2963,6 +2963,8 @@ class LoadImagesFromFolderKJ:
@classmethod @classmethod
def IS_CHANGED(cls, folder, **kwargs): def IS_CHANGED(cls, folder, **kwargs):
if not os.path.isabs(folder) and args.base_directory:
folder = os.path.join(args.base_directory, folder)
if not os.path.isdir(folder): if not os.path.isdir(folder):
return float("NaN") return float("NaN")
@ -3032,6 +3034,8 @@ class LoadImagesFromFolderKJ:
DESCRIPTION = """Loads images from a folder into a batch, images are resized and loaded into a batch.""" DESCRIPTION = """Loads images from a folder into a batch, images are resized and loaded into a batch."""
def load_images(self, folder, width, height, image_load_cap, start_index, keep_aspect_ratio, include_subfolders=False): def load_images(self, folder, width, height, image_load_cap, start_index, keep_aspect_ratio, include_subfolders=False):
if not os.path.isabs(folder) and args.base_directory:
folder = os.path.join(args.base_directory, folder)
if not os.path.isdir(folder): if not os.path.isdir(folder):
raise FileNotFoundError(f"Folder '{folder} cannot be found.'") raise FileNotFoundError(f"Folder '{folder} cannot be found.'")
@ -3335,6 +3339,8 @@ class SaveStringKJ:
filename_prefix += self.prefix_append filename_prefix += self.prefix_append
full_output_folder, filename, counter, subfolder, filename_prefix = folder_paths.get_save_image_path(filename_prefix, self.output_dir) full_output_folder, filename, counter, subfolder, filename_prefix = folder_paths.get_save_image_path(filename_prefix, self.output_dir)
if not os.path.isabs(output_folder) and args.base_directory:
output_folder = os.path.join(args.base_directory, output_folder)
if output_folder != "output": if output_folder != "output":
if not os.path.exists(output_folder): if not os.path.exists(output_folder):
os.makedirs(output_folder, exist_ok=True) os.makedirs(output_folder, exist_ok=True)
@ -3960,6 +3966,9 @@ class LoadVideosFromFolder:
FUNCTION = "load_video" FUNCTION = "load_video"
def load_video(self, output_type, grid_max_columns, add_label=False, **kwargs): def load_video(self, output_type, grid_max_columns, add_label=False, **kwargs):
if not os.path.isabs(kwargs['video']) and args.base_directory:
kwargs['video'] = os.path.join(args.base_directory, kwargs['video'])
if self.vhs_nodes is None: if self.vhs_nodes is None:
raise ImportError("This node requires ComfyUI-VideoHelperSuite to be installed.") raise ImportError("This node requires ComfyUI-VideoHelperSuite to be installed.")
videos_list = [] videos_list = []