From 884a20289b0c0af13282d610b55c16ac4ace82aa Mon Sep 17 00:00:00 2001 From: lilly Date: Thu, 23 Mar 2023 17:15:51 +0900 Subject: [PATCH] conson clean --- SaveImageSimple.py | 4 ++-- SimpleSampler.py | 8 ++++---- __init__.py | 8 ++++++-- mypath.py | 19 +++++++++---------- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/SaveImageSimple.py b/SaveImageSimple.py index a76fa8e..55d0089 100644 --- a/SaveImageSimple.py +++ b/SaveImageSimple.py @@ -12,8 +12,8 @@ if __name__ == os.path.splitext(os.path.basename(__file__))[0] : else: from .ConsoleColor import print, console from .mypath import * -print(__file__) -print(os.path.basename(__file__)) +#print(__file__) +#print(os.path.basename(__file__)) class SaveImageSimple: diff --git a/SimpleSampler.py b/SimpleSampler.py index fe188ed..65e46c7 100644 --- a/SimpleSampler.py +++ b/SimpleSampler.py @@ -21,16 +21,16 @@ from PIL import Image from PIL.PngImagePlugin import PngInfo import numpy as np -print(f"SimpleSampler __name__ {__name__}") -print(f"SimpleSampler __file__ {os.path.splitext(os.path.basename(__file__))[0]}") +#print(f"SimpleSampler __name__ {__name__}") +#print(f"SimpleSampler __file__ {os.path.splitext(os.path.basename(__file__))[0]}") import os if __name__ == os.path.splitext(os.path.basename(__file__))[0] : from ConsoleColor import print, console else: from .ConsoleColor import print, console -print(__file__) -print(os.path.basename(__file__)) +#print(__file__) +#print(os.path.basename(__file__)) #---------------------------- # wildcards support check diff --git a/__init__.py b/__init__.py index 5d0b1cb..eae3064 100644 --- a/__init__.py +++ b/__init__.py @@ -52,7 +52,9 @@ if not md.startswith("custom_nodes."): print(f"Load ok : {name}", style="bold green") except Exception: console.print_exception() - + + console.rule(f" init start ", style="bold green") + add("CheckpointLoaderRandom") add("CheckpointLoaderSimpleText") add("CLIPTextEncodeWildcards") @@ -62,4 +64,6 @@ if not md.startswith("custom_nodes."): add("VAELoaderDecode") add("SimpleSampler") add("SaveImageSimple") - #add("test") \ No newline at end of file + #add("test") + + console.rule(" finit end ", style="bold green") \ No newline at end of file diff --git a/mypath.py b/mypath.py index 0fb9cf7..1094217 100644 --- a/mypath.py +++ b/mypath.py @@ -26,28 +26,27 @@ print() """ py_name=os.path.basename(__file__) -print(py_name, style="bold CYAN") +print("os.path.basename(__file__) : ",py_name, style="bold CYAN") absFilePath = os.path.abspath(__file__) -print("abspath : " + absFilePath , style="bold CYAN") +print("os.path.abspath(__file__) : " , absFilePath , style="bold CYAN") realFilePath = os.path.realpath(__file__) -print("realpath : " + realFilePath , style="bold CYAN") +print("os.path.abspath(__file__) : " + realFilePath , style="bold CYAN") normpath=os.path.normpath(__file__) -print("normpath : " + normpath , style="bold CYAN") +print("os.path.normpath(__file__) : " + normpath , style="bold CYAN") subfolder = os.path.dirname(normpath) -print("subfolder : " + subfolder , style="bold CYAN") +print("os.path.dirname(normpath) : " + subfolder , style="bold CYAN") filename = os.path.basename(normpath) -print("filename : " + filename , style="bold CYAN") - -mainFile = os.path.abspath(sys.modules['__main__'].__file__) -print("mainFile : " + mainFile ,style="bold CYAN") +print("os.path.basename(normpath) : " + filename , style="bold CYAN") +mainFile = os.path.abspath(sys.modules['__main__'].__file__) +print("os.path.abspath(sys.modules\['__main__'].__file__) : " + mainFile ,style="bold CYAN") mainfolder = os.path.dirname(mainFile) -print("mainfolder : " + mainfolder , style="bold CYAN") +print("os.path.dirname(mainFile) : " + mainfolder , style="bold CYAN") def jsondic(full,dic):