Déplacement du dossier Server dans la racine

Blender/PositionController.py

@@ -3,18 +3,21 @@
 import socket
 import os
 import select
-from Server import ConnectedPipe
 import bpy
+import sys
+sys.path += ['..']
+
+from Server import ClientHandler
 
 # Shared memory
 relPosition = mathutils.Vector((0, 1, 0))
 lockPosition = threading.Lock()
 
 # Sample trajectory to test the module
 import math
-class server(ConnectedPipe):
+class server(ClientHandler):
     def __init__(self, addr):
-        ConnectedPipe.__init__(self, addr)
+        ClientHandler.__init__(self, addr)
 
     def _parseRecv(self, data_raw):
         global lockPosition

Blender/TestServer.py

@@ -1,14 +1,16 @@
 #!/bin/env python3
 
 import time
-#from Server import ClientServer
-from Server import Pipe
+import argparse
+import sys
+sys.path += ['..']
+from Server import Handler
 from Server import Listener
 
 def PositionServer(path):
-    class _PositionServer(Pipe):
+    class _PositionServer(Handler):
         def __init__(self, client):
-            Pipe.__init__(self, client)
+            Handler.__init__(self, client)
             self._time = 0
             self._dt = 0.01
 
@@ -31,7 +33,12 @@ def dummyPath(t):
     return (10 * math.cos(t), 10 * math.sin(t), 0)
 
 if __name__ == '__main__':
-    addr = '/tmp/togetic-blender'
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--output', required=True, metavar='output', type=str,
+            help='Filename of the socket to write in')
+    parsed_args = parser.parse_args()
+    addr = parsed_args.output
+
     listener = Listener(addr, PositionServer(dummyPath))
     try:
         listener.start()

Blender/runBlender.py

@@ -1,13 +1,12 @@
 #!/usr/bin/env python
+
 import subprocess
 import argparse
 
-# TODO use argparse to set these variables
-# script params
 parser = argparse.ArgumentParser()
-parser.add_argument('input', metavar='input', type=str,
-        help='Filename of the socket to read')
-parser.add_argument('blender', metavar='blender', type=str,
+parser.add_argument('--input', required=True, metavar='input', type=str,
+        help='Filename of the socket to read in')
+parser.add_argument('--blender', required=True, metavar='blender', type=str,
         help='Filename of the blender file to use')
 parsed_args = parser.parse_args()
 

Server/ClientHandler.py

@@ -0,0 +1,14 @@
+import socket
+
+from Server.Handler import Handler
+
+class ClientHandler(Handler):
+    def __init__(self, addr):
+        # Connect to the socket as a client
+        sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        try:
+            sock.connect(addr)
+        except (FileNotFoundError, ConnectionRefusedError):
+            raise
+        Handler.__init__(self, (sock, addr))
+

Blender/Server/Pipe.py → Server/Handler.py

@@ -1,9 +1,8 @@
 import select
-import socket
 
 from Server.AbstractServer import AbstractServer
 
-class Pipe(AbstractServer):
+class Handler(AbstractServer):
     def __init__(self, client):
         """
         \brief  Initialise the server and stock the socket and address of the
@@ -61,13 +60,3 @@ def _run(self):
         is non-blocking.
         """
         raise Exception('Not implemented yet')
-
-class ConnectedPipe(Pipe):
-    def __init__(self, addr):
-        # Connect to the socket as a client
-        sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-        try:
-            sock.connect(addr)
-        except (FileNotFoundError, ConnectionRefusedError):
-            raise
-        Pipe.__init__(self, (sock, addr))

Server/__init__.py

@@ -0,0 +1,3 @@
+from Server.Listener import Listener
+from Server.Handler import Handler
+from Server.ClientHandler import ClientHandler