From 88c7768ddb2323588024d186c761ac985e0716cc Mon Sep 17 00:00:00 2001
From: wataru <wataru@fdev.local.com>
Date: Sat, 12 Nov 2022 11:23:01 +0900
Subject: [PATCH] update

---
 demo/MMVCServerSIO.py      | 4 ++--
 demo/setup.sh              | 4 ++--
 demo/trainer_mods/files.py | 7 ++++++-
 docker/Dockerfile          | 2 +-
 start2.sh                  | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/demo/MMVCServerSIO.py b/demo/MMVCServerSIO.py
index ed224f02..800a90cf 100755
--- a/demo/MMVCServerSIO.py
+++ b/demo/MMVCServerSIO.py
@@ -429,8 +429,8 @@ if __name__ == '__main__':
 
         if os.getenv("EX_TB_PORT"):
             EX_TB_PORT = os.environ["EX_TB_PORT"]
-            exApplitionInfo = int(EX_TB_PORT)
-            printMessage(f"External_TeonsorBord_Port:{EX_PORT}", level=1)
+            exApplitionInfo.external_tensorboard_port = int(EX_TB_PORT)
+            printMessage(f"External_TeonsorBord_Port:{EX_TB_PORT}", level=1)
 
         if os.getenv("EX_IP"):
             EX_IP = os.environ["EX_IP"]
diff --git a/demo/setup.sh b/demo/setup.sh
index 87188aec..0ad02684 100755
--- a/demo/setup.sh
+++ b/demo/setup.sh
@@ -39,8 +39,8 @@ python3 MMVCServerSIO.py "$@"
 ### 
 # 起動パラメータ
 # (1) トレーニングの場合
-# python3 MMVCServerSIO.py <type> 
-# 環境変数: 
+# python3 MMVCServerSIO.py -t <type> [--https on|off, --httpsKey <key>, --httpsCert <key>, --httpsSelfSigned on|off]
+# 環境変数: EX_PORT, EX_TB_PORT, EX_IP (EX_IPはEX_IP="`hostname -I`"で自動取得)
 # ※ Colabの場合：python3 MMVCServerSIO.py -t Train -p {PORT} --colab True
 # (2) VCの場合
 
diff --git a/demo/trainer_mods/files.py b/demo/trainer_mods/files.py
index 6610b7cd..2aa1c147 100755
--- a/demo/trainer_mods/files.py
+++ b/demo/trainer_mods/files.py
@@ -13,7 +13,12 @@ def get_file_list(top_dir):
 
 
 def get_dir_list(top_dir):
-    return os.listdir(top_dir)
+    dirlist = []
+    files = os.listdir(top_dir)
+    for filename in files:
+        if os.path.isdir(os.path.join(top_dir, filename)):
+            dirlist.append(filename)
+    return dirlist
 
 def get_file_list(top_dir):
     return glob.glob(top_dir)
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 85b2a63f..1d93d949 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM dannadori/voice-changer-internal:20221112_105408 as front
+FROM dannadori/voice-changer-internal:20221112_111947 as front
 FROM debian:bullseye-slim as base
 
 ARG DEBIAN_FRONTEND=noninteractive
diff --git a/start2.sh b/start2.sh
index 97920164..b5b4e7fa 100644
--- a/start2.sh
+++ b/start2.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eu
 
-DOCKER_IMAGE=dannadori/voice-changer:20221112_105616
+DOCKER_IMAGE=dannadori/voice-changer:20221112_112216
 # DOCKER_IMAGE=voice-changer
 
 if [ $# = 0 ]; then