Merge branch 'model' into UI_2.0

config.py

@@ -399,15 +399,6 @@ class Config:
             self._STARTUP_OSC_ENABLED_CHECK = value
             saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
 
-    @property
-    def IS_VALID_OSC(self):
-        return self._IS_VALID_OSC
-
-    @IS_VALID_OSC.setter
-    def IS_VALID_OSC(self, value):
-        if type(value) is bool:
-            self._IS_VALID_OSC = value
-
     @property
     def UPDATE_FLAG(self):
         return self._UPDATE_FLAG
@@ -528,7 +519,6 @@ class Config:
         self._ENABLE_NOTICE_XSOVERLAY = False
         self._ENABLE_SEND_MESSAGE_TO_VRC = True
         self._STARTUP_OSC_ENABLED_CHECK = True
-        self._IS_VALID_OSC = False
         self._UPDATE_FLAG = False
         self._GITHUB_URL = "https://api.github.com/repos/misyaguziya/VRCT/releases/latest"
         # self._BREAK_KEYSYM_LIST = [

main.py

@@ -191,9 +191,6 @@ def callbackSelectedLanguagePresetTab(selected_tab_no):
 def callbackSetAuthKeys(keys):
     config.AUTH_KEYS = keys
 
-def callbackChangeStatusIsValidOSC(value):
-    config.IS_VALID_OSC = value
-
 def callbackChangeStatusSoftwareUpdated(value):
     config.UPDATE_FLAG = value
 
@@ -548,11 +545,8 @@ if model.authenticationTranslator(callbackSetAuthKeys) is False:
 model.addKeywords()
 
 # check OSC started
-if config.STARTUP_OSC_ENABLED_CHECK is True:
-    model.checkOSCStarted(callbackChangeStatusIsValidOSC)
-    sleep(2)
-    if config.IS_VALID_OSC is False:
-        view.printToTextbox_OSCError()
+if config.STARTUP_OSC_ENABLED_CHECK is True and config.ENABLE_SEND_MESSAGE_TO_VRC is True:
+    model.checkOSCStarted(view.printToTextbox_OSCError)
 
 # check Software Updated
 model.checkSoftwareUpdated(callbackChangeStatusSoftwareUpdated)

model.py

@@ -180,21 +180,26 @@ class Model:
     def oscSendMessage(message):
         sendMessage(message, config.OSC_IP_ADDRESS, config.OSC_PORT)
 
-    @staticmethod
-    def checkOSCStarted(fnc):
+    def checkOSCStarted(self, fnc):
+        self.is_valid_osc = False
         def checkOscReceive(address, osc_arguments):
-            if config.IS_VALID_OSC is False and config.STARTUP_OSC_ENABLED_CHECK is True:
-                try:
-                    fnc(True)
-                except:
-                    pass
+            if self.is_valid_osc is False:
+                self.is_valid_osc = True
+
+        self.listening_server = receiveOscParameters(checkOscReceive)
+        def oscListener():
+            self.listening_server.serve_forever()
 
         def sendTestActionLoop():
-            while config.IS_VALID_OSC is False and config.STARTUP_OSC_ENABLED_CHECK is True:
+            for _ in range(10):
                 sendTestAction()
+                if self.is_valid_osc is True:
+                    break
+                sleep(0.1)
+            self.listening_server.shutdown()
 
         # start receive osc
-        th_receive_osc_parameters = Thread(target=receiveOscParameters, args=(checkOscReceive,))
+        th_receive_osc_parameters = Thread(target=oscListener)
         th_receive_osc_parameters.daemon = True
         th_receive_osc_parameters.start()
 
@@ -203,6 +208,12 @@ class Model:
         th_send_osc_test_action.daemon = True
         th_send_osc_test_action.start()
 
+        th_receive_osc_parameters.join()
+        th_send_osc_test_action.join()
+
+        if self.is_valid_osc is False:
+            fnc()
+
     @staticmethod
     def checkSoftwareUpdated(fnc):
         # check update

models/osc/osc_tools.py

@@ -50,7 +50,7 @@ def receiveOscParameters(target, filter="/*", ip_address="127.0.0.1", port=9001)
     _dispatcher = dispatcher.Dispatcher()
     _dispatcher.map(filter, target)
     server = osc_server.ThreadingOSCUDPServer((ip_address, port), _dispatcher)
-    server.serve_forever()
+    return server
 
 if __name__ == "__main__":
     sendChangeVoice()