Geeknasty
9a830cd836
This update enhances the `DirectoryFileCounter` and `TextFileLineCounter` classes by expanding environment variables in file paths using `os.path.expandvars()`. This change allows these classes to correctly handle paths that include environment variables, improving their flexibility and usability in various environments. - **DirectoryFileCounter**: The `execute_file_counter` method now expands environment variables in the `directory_path` before performing directory operations. - **TextFileLineCounter**: The `execute_line_counter` method now expands environment variables in the `file_path` before reading the file. This fix ensures that paths containing variables such as `%userprofile%` are properly resolved, enabling more dynamic and environment-aware file handling.
75 lines
2.1 KiB
Python
75 lines
2.1 KiB
Python
import os
|
|
class DirectoryFileCounter():
|
|
def __init__(self):
|
|
pass
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(s):
|
|
return {
|
|
"required": {
|
|
"directory_path": ("STRING", {"default":""}),
|
|
},
|
|
}
|
|
|
|
RETURN_TYPES = ("INT","FLOAT","STRING",)
|
|
|
|
FUNCTION = "execute_file_counter"
|
|
|
|
CATEGORY = "CCTech/Files"
|
|
|
|
def execute_file_counter(self, directory_path: str) -> dict:
|
|
# Expand environment variables in the directory path
|
|
directory_path = os.path.expandvars(directory_path)
|
|
|
|
if not os.path.isdir(directory_path):
|
|
raise FileNotFoundError(f"The path '{directory_path}' does not exist.")
|
|
|
|
file_count = 0
|
|
|
|
# Walk the directory tree
|
|
for root, dirs, files in os.walk(directory_path):
|
|
file_count += len(files) # Count files in each directory
|
|
|
|
count = file_count - 1
|
|
return (count, float(count), str(count))
|
|
|
|
class TextFileLineCounter():
|
|
def __init__(self):
|
|
pass
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(s):
|
|
return {
|
|
"required": {
|
|
"file_path": ("STRING", {"default":""}),
|
|
},
|
|
}
|
|
|
|
RETURN_TYPES = ("INT","FLOAT","STRING",)
|
|
|
|
FUNCTION = "execute_line_counter"
|
|
|
|
CATEGORY = "CCTech/Files"
|
|
|
|
def execute_line_counter(self, file_path: str) -> dict:
|
|
# Expand environment variables in the file path
|
|
file_path = os.path.expandvars(file_path)
|
|
|
|
if not os.path.isfile(file_path):
|
|
raise FileNotFoundError(f"The file at path '{file_path}' does not exist.")
|
|
with open(file_path, 'r', encoding='utf-8') as file:
|
|
lines = file.readlines()
|
|
line_count = len([line for line in lines if line.strip() != ""]) - 1
|
|
return (line_count, float(line_count), str(line_count))
|
|
|
|
|
|
NODE_CLASS_MAPPINGS = {
|
|
"TextFileLineCounter": TextFileLineCounter,
|
|
"DirectoryFileCounter": DirectoryFileCounter
|
|
}
|
|
|
|
NODE_DISPLAY_NAME_MAPPINGS = {
|
|
"TextFileLineCounter": "🎯 Text File Line Counter",
|
|
"DirectoryFileCounter": "🎯 Directory File Counter",
|
|
}
|