From 40ad60ab0673d928232bc4c54bb789153c1988ec Mon Sep 17 00:00:00 2001
From: lilly <lilly1987@naver.com>
Date: Wed, 12 Apr 2023 21:44:20 +0900
Subject: [PATCH] Update __init__.py

---
 __init__.py | 57 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/__init__.py b/__init__.py
index 3a97fbe..7b81146 100644
--- a/__init__.py
+++ b/__init__.py
@@ -2,12 +2,23 @@ import sys
 import os
 
 
-print(f"__file__ : {__file__}")
 print(f"__name__ : {__name__}")
-if __name__ == os.path.splitext(os.path.basename(__file__))[0] or __name__ =='__main__':
+print(f"__file__ : {__file__}")
+print(f"os.path.basename(__file__) : {os.path.basename(__file__)}")
+print(f"os.path.splitext(os.path.basename(__file__))[0] : {os.path.splitext(os.path.basename(__file__))[0]}")
+#print(f"os.path.basename(__file__) : {os.path.basename('/ComfyUI_windows_portable/ComfyUI/custom_nodes/ComfyUI_node_Lilly/__init__.py')}")
+#print(f"os.path.splitext(os.path.basename(__file__))[0] : {os.path.splitext(os.path.basename('/ComfyUI_windows_portable/ComfyUI/custom_nodes/ComfyUI_node_Lilly/__init__.py'))[0]}")
+
+wd = os.getcwd()
+print("working directory : ", wd)
+
+if __name__ == os.path.splitext(os.path.basename(__file__))[0] or __name__ =='__main__':    
     from ConsoleColor import print, console
+    #md="custom_nodes.ComfyUI_node_Lilly."
 else:
     from .ConsoleColor import print, console
+    #md="custom_nodes.ComfyUI_node_Lilly."
+md="custom_nodes.ComfyUI_node_Lilly."
 #print(__file__)
 #print(os.path.basename(__file__))
 
@@ -25,13 +36,14 @@ else:
 #path, filename = os.path.split(absFilePath)
 #print("Script file path is {}, filename is {}".format(path, filename))
 
-wd = os.getcwd()
-#print("working directory : ", wd)
 
-nm=os.path.abspath(__name__)
+#
+#nm=os.path.abspath(__name__)
+#nm=os.path.abspath(__name__)
 #print("abspath __name__ : ", nm)
-
-md=nm.replace(wd+"\\","")
+#print("abspath __name__ : ", nm)
+#
+#md=nm.replace(wd+"\\","")
 #print("import name", md)
 """ 
 """
@@ -39,32 +51,41 @@ md=nm.replace(wd+"\\","")
 #    print(f"{md!r} already in sys.modules")
 #else:
 #    print(f"{md!r} not in sys.modules")
-        
-if not md.startswith("custom_nodes."):
 
-    import importlib
-    #from custom_nodes.ComfyUI_node_Lilly import eval(f"{name}")
+#import importlib
+#import ComfyUI_node_Lilly
+#from custom_nodes.ComfyUI_node_Lilly import eval(f"{name}")
+#print(dir(ComfyUI_node_Lilly))
+#print(dir(ComfyUI_node_Lilly.ComfyUI_node_Lilly))
 
+#print(__name__ == md)
+#print(__name__ != md)
+#print(__name__ == "ComfyUI_node_Lilly")
+#print(__name__ != "ComfyUI_node_Lilly")
+if __name__ == "ComfyUI_node_Lilly" :
     NODE_CLASS_MAPPINGS = {
     }
 
     def add(name,clist=None):
         #print(f"Load : {name}")
         try:        
-            pkg = importlib.import_module(f"{md}.{name}")
+            #pkg = importlib.import_module(f"{md}{name}")
+            #eval(f"{md}{name}")
+            exec(f"import {md}{name}")
             if clist is None:
-                NODE_CLASS_MAPPINGS[name]=eval(f"pkg.{name}")
+                NODE_CLASS_MAPPINGS[name]=eval(f"{md}{name}.{name}")
             elif type(clist) is str:
-                NODE_CLASS_MAPPINGS[clist]=eval(f"pkg.{clist}")
+                NODE_CLASS_MAPPINGS[clist]=eval(f"{md}{name}.{clist}")
             elif type(clist) is list:
                 for c in clist:
-                    NODE_CLASS_MAPPINGS[c]=eval(f"pkg.{c}")
+                    NODE_CLASS_MAPPINGS[c]=eval(f"{md}{name}.{c}")
+            
             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",["CLIPTextEncodeWildcards","CLIPTextEncodeWildcards2","CLIPTextEncodeWildcards3"])
@@ -76,5 +97,5 @@ if not md.startswith("custom_nodes."):
     add("SaveImageSimple")
     add("TextWildcards")
     #add("test")
-    
+
     console.rule(" init end ", style="bold green")
\ No newline at end of file