From 90807f555ab5de24981950dbec9f81d71ecff36b Mon Sep 17 00:00:00 2001
From: wataru <wataru@fdev.local.com>
Date: Sat, 14 Jan 2023 09:40:08 +0900
Subject: [PATCH] WIP: pyinstaller

---
 server/MMVCServerSIO.py | 44 ++++++++++++++++++++---------------------
 server/const.py         |  4 ++--
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/server/MMVCServerSIO.py b/server/MMVCServerSIO.py
index cd2fb841..1e1d50e7 100755
--- a/server/MMVCServerSIO.py
+++ b/server/MMVCServerSIO.py
@@ -47,37 +47,35 @@ def printMessage(message, level=0):
     else:
         print(f"\033[47m    {message}\033[0m")
 
-
-
-global app_socketio
-global app_fastapi
+# global app_socketio
+# global app_fastapi
 
 parser = setupArgParser()
 args = parser.parse_args()
 
-printMessage(f"Phase name:{__name__}", level=2)
-thisFilename = os.path.basename(__file__)[:-3]
+# printMessage(f"Phase name:{__name__}", level=2)
+# thisFilename = os.path.basename(__file__)[:-3]
 
-if __name__ == thisFilename or args.colab == True:
-    printMessage(f"PHASE3:{__name__}", level=2)
-    TYPE = args.t
-    PORT = args.p
-    CONFIG = args.c
-    MODEL = args.m if args.m != None else None
-    ONNX_MODEL = args.o if args.o != None else None
+# if __name__ == thisFilename or args.colab == True:
+    # printMessage(f"PHASE3:{__name__}", level=2)
+TYPE = args.t
+PORT = args.p
+CONFIG = args.c
+MODEL = args.m if args.m != None else None
+ONNX_MODEL = args.o if args.o != None else None
 
 
-    if args.colab == True:
-        os.environ["colab"] = "True"
-    # if os.getenv("EX_TB_PORT"):
-    #     EX_TB_PORT = os.environ["EX_TB_PORT"]
-    #     exApplitionInfo.external_tensorboard_port = int(EX_TB_PORT)
+if args.colab == True:
+    os.environ["colab"] = "True"
+# if os.getenv("EX_TB_PORT"):
+#     EX_TB_PORT = os.environ["EX_TB_PORT"]
+#     exApplitionInfo.external_tensorboard_port = int(EX_TB_PORT)
 
-    voiceChangerManager = VoiceChangerManager.get_instance()    
-    if CONFIG and (MODEL or ONNX_MODEL):
-        voiceChangerManager.loadModel(CONFIG, MODEL, ONNX_MODEL)
-    app_fastapi = MMVC_Rest.get_instance(voiceChangerManager)
-    app_socketio = MMVC_SocketIOApp.get_instance(app_fastapi, voiceChangerManager)
+voiceChangerManager = VoiceChangerManager.get_instance()    
+if CONFIG and (MODEL or ONNX_MODEL):
+    voiceChangerManager.loadModel(CONFIG, MODEL, ONNX_MODEL)
+app_fastapi = MMVC_Rest.get_instance(voiceChangerManager)
+app_socketio = MMVC_SocketIOApp.get_instance(app_fastapi, voiceChangerManager)
 
 
 if __name__ == '__mp_main__':
diff --git a/server/const.py b/server/const.py
index 35fca3a1..48137fe4 100644
--- a/server/const.py
+++ b/server/const.py
@@ -1,6 +1,6 @@
-frontend_path = "../client/demo/dist"
-
+import os, sys 
 
+frontend_path = os.path.join(sys._MEIPASS, "dist") if hasattr(sys, "_MEIPASS") else "../client/demo/dist"
 ERROR_NO_ONNX_SESSION = "ERROR_NO_ONNX_SESSION"