Parcourir la source

Remove copy of modelverse.xml and http_client.xml

Yentl Van Tendeloo il y a 7 ans
Parent
commit
49457566dc
3 fichiers modifiés avec 3 ajouts et 2318 suppressions
  1. 0 180
      classes/modelverse/http_client.xml
  2. 0 2136
      classes/modelverse/modelverse.xml
  3. 3 2
      frontend.xml

+ 0 - 180
classes/modelverse/http_client.xml

@@ -1,180 +0,0 @@
-<class name="HTTPClient">
-    <constructor>
-        <body>
-            <![CDATA[
-            self.socket = None
-            self.received_data = ""
-            self.send_data = ""
-            self.queue = []
-            self.IDs = []
-            ]]>
-        </body>
-    </constructor>
-
-    <scxml initial="init">
-        <state id="init">
-            <onentry>
-                <script>
-                    self.ID = str(uuid.uuid4())
-                </script>
-                <raise scope="output" event="create_socket" port="socket_out">
-                    <parameter expr="self.ID"/>
-                </raise>
-            </onentry>
-
-            <transition port="socket_in" event="created_socket" cond="self.ID == ID" target="../waiting">
-                <parameter name="socket"/>
-                <parameter name="ID"/>
-                <script>
-                    self.socket = socket
-                </script>
-            </transition>
-        </state>
-
-        <state id="waiting">
-            <onentry>
-                <raise scope="broad" event="http_client_initialized"/>
-            </onentry>
-
-            <transition event="connect" target="../connecting">
-                <parameter name="address"/>
-                <parameter name="timeout"/>
-
-                <script>
-                    self.address = address
-                    self.timeout = timeout
-                </script>
-            </transition>
-        </state>
-
-        <state id="connecting" initial="connecting">
-            <state id="connecting">
-                <onentry>
-                    <raise scope="output" event="connect_socket" port="socket_out">
-                        <parameter expr="self.socket"/>
-                        <parameter expr="self.address"/>
-                    </raise>
-                </onentry>
-
-                <transition port="socket_in" event="error_socket" target="../cooldown"/>
-
-                <transition port="socket_in" event="connected_socket" cond="self.socket == socket" target="../../connected">
-                    <parameter name="socket"/>
-                    <raise scope="broad" event="http_client_ready"/>
-                </transition>
-            </state>
-
-            <state id="cooldown">
-                <transition after="0.1" target="../connecting"/>
-            </state>
-
-            <transition after="self.timeout" target="../waiting">
-                <raise scope="broad" event="http_client_timeout"/>
-                <script>
-                    print("Raise timeout after %ss" % self.timeout)
-                </script>
-            </transition>
-        </state>
-
-        <parallel id="connected">
-            <state id="listening" initial="listen">
-                <state id="listen">
-                    <onentry>
-                        <raise scope="output" port="socket_out" event="recv_socket">
-                            <parameter expr="self.socket"/>
-                        </raise>
-                    </onentry>
-                    <transition event="received_socket" port="socket_in" cond="(self.socket == socket) and (len(data) > 0)" target=".">
-                        <parameter name="socket"/>
-                        <parameter name="data"/>
-                        <script>
-                            self.received_data += data
-                        </script>
-                    </transition>
-                    <transition event="received_socket" port="socket_in" cond="(self.socket == socket) and (len(data) == 0)" target="../close">
-                        <parameter name="socket"/>
-                        <parameter name="data"/>
-                    </transition>
-                </state>
-                <state id="close">
-                </state>
-            </state>
-
-            <state id="sending" initial="waiting_for_data">
-                <state id="waiting_for_data">
-                    <transition cond="len(self.send_data) > 0" target="../transferring">
-                        <raise scope="output" port="socket_out" event="send_socket">
-                            <parameter expr="self.socket"/>
-                            <parameter expr="self.send_data"/>
-                        </raise>
-                    </transition>
-                </state>
-                <state id="transferring">
-                    <transition event="sent_socket" port="socket_in" cond="self.socket == socket" target="../waiting_for_data">
-                        <parameter name="socket"/>
-                        <parameter name="sent_bytes"/>
-                        <script>
-                            self.send_data = self.send_data[sent_bytes:]
-                        </script>
-                    </transition>
-                </state>
-            </state>
-
-            <state id="queueing">
-                <state id="queueing">
-                    <onentry>
-                    </onentry>
-                    <transition event="HTTP_input" target=".">
-                        <parameter name="data"/>
-                        <parameter name="ID"/>
-                        <script>
-                            self.send_data += "POST / HTTP/1.0\r\n"
-                            self.send_data += "Content-Length: %i\r\n" % len(str(data))
-                            self.send_data += "\r\n"
-                            self.send_data += data
-                            self.IDs.append(ID)
-                        </script>
-                    </transition>
-                </state>
-            </state>
-
-            <state id="parsing" initial="wait_for_header">
-                <state id="wait_for_header">
-                    <transition cond="'\r\n\r\n' in self.received_data" target="../wait_for_payload">
-                        <script>
-                            header, self.received_data = self.received_data.split("\r\n\r\n", 1)
-                            header = header.lower()
-                            if "content-length" in header:
-                                _, after = header.split("content-length:", 1)
-                                after, _ = after.split("\r\n", 1)
-                                after = after.strip()
-                                self.length = int(after)
-                            else:
-                                self.length = float('inf')
-                        </script>
-                    </transition>
-                </state>
-                <state id="wait_for_payload">
-                    <transition cond="len(self.received_data) >= self.length and self.IDs[0] is not None" target="../wait_for_header">
-                        <script>
-                            data = self.received_data[:self.length]
-                            self.received_data = self.received_data[self.length:]
-                        </script>
-                        <raise event="HTTP_output" scope="broad">
-                            <parameter expr="data"/>
-                            <parameter expr="self.IDs.pop(0)"/>
-                        </raise>
-                    </transition>
-
-                    <transition cond="len(self.received_data) >= self.length and self.IDs[0] is None" target="../wait_for_header">
-                        <script>
-                            # Drop data
-                            self.received_data = self.received_data[self.length:]
-                            self.IDs.pop(0)
-                        </script>
-                    </transition>
-                </state>
-            </state>
-        </parallel>
-    </scxml>
-</class>

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2136
classes/modelverse/modelverse.xml


+ 3 - 2
frontend.xml

@@ -23,8 +23,8 @@
     <outport name="socket_out"/>
 
     <class src="classes/main_app.xml" default="true" />
-    <class src="classes/modelverse/modelverse.xml"/>
-    <class src="classes/modelverse/http_client.xml"/>
+    <class src="../modelverse/wrappers/classes/modelverse.xml"/>
+    <class src="../modelverse/wrappers/classes/http_client.xml"/>
     <class src="classes/window/attribute_editor.xml"/>
     <class src="classes/window/prompt_window.xml"/>
     <class src="classes/window/main_window.xml"/>
@@ -35,6 +35,7 @@
     <class src="classes/window/activity.xml"/>
     <class src="classes/window/process_enact.xml"/>
     <class src="classes/window/create_activity.xml"/>
+    <class src="classes/window/chatwindow.xml"/>
     <class src="classes/toolbar/toolbar.xml"/>
     <class src="classes/toolbar/generic_toolbar.xml"/>
     <class src="classes/toolbar/dsl_toolbar.xml"/>