From 613799f536666d9bcebedabc12241a9d2c7ffb8a Mon Sep 17 00:00:00 2001
From: Caleb Fontenot <foley2431@gmail.com>
Date: Wed, 3 Jun 2020 20:19:43 -0500
Subject: [PATCH] Data is transfered, but client no longer updates...

---
 Client.py |  4 +--
 Server.py | 96 +++++++++++++++++++++++++++++--------------------------
 2 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/Client.py b/Client.py
index 0761a36..20fb835 100644
--- a/Client.py
+++ b/Client.py
@@ -12,9 +12,9 @@ MyVirtual = pyxinput.vController()
 # Connect to Server
 client = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 client.connect((ip, port))
-from_server = client.makefile(mode='rb')
+file = client.makefile(mode='rb')
 #Decode Sever message
-unpickler = pickle.Unpickler(from_server)
+unpickler = pickle.Unpickler(file)
 while True:
     decodedServerData = unpickler.load()
     print("Raw Data:", decodedServerData)
diff --git a/Server.py b/Server.py
index 496796d..98c36e5 100644
--- a/Server.py
+++ b/Server.py
@@ -6,6 +6,7 @@ import threading
 import socket
 from termcolor import colored
 import pickle
+import re
 # Define ip/port to use
 ip = "192.168.122.1"
 port = 2222
@@ -20,54 +21,59 @@ controllerDataDict = {'AxisLx': 0, 'AxisLy': 0, 'AxisRx': 0, 'AxisRy': 0, 'BtnBa
 lookup_table = {'ABS_X': 'AxisLx', 'ABS_Y': 'AxisLy', 'ABS_RX': 'AxisRx', 'ABS_RY': 'AxisRy', 'BTN_SELECT': 'BtnBack', 'BTN_START': 'BtnStart', 'BTN_SOUTH': 'BtnA', 'BTN_EAST': 'BtnB', 'BTN_NORTH': 'BtnX', 'BTN_WEST': 'BtnY', 'BTN_THUMBL': 'BtnThumbL', 'BTN_THUMBR': 'BtnThumbR', 'BTN_TL': 'BtnShoulderL', 'BTN_TR': 'BtnShoulderR', 'ABS_Z': 'TriggerL', 'ABS_RZ': 'TriggerR'}
 def sendData():
     #Pickle for transmittion
-    file.flush()
     pickler.dump(controllerDataDict)
+    file.flush()
 #Create Socket
 socket = socket.create_server((ip, port))
-#Create pickler :D
-file = socket.makefile(mode='wb')
-pickler = pickle.Pickler(file)
 #Wait for connections before continuing
 print("Waiting for connection...")
-socket.accept()
-#print(colored('Connected by', 'red'), addr)
+connection, _ = socket.accept()
+#Create pickler :D
+file = connection.makefile(mode='wb')
+pickler = pickle.Pickler(file)
+file.flush()
+print(connection)
+print(type(connection))
+#Immutiple socket? I don't think so...
+iwantThatRaddr = re.findall(r"'(?<=raddr=\(')\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}'", str(connection))
+print(iwantThatRaddr)
+print(colored('Connected by', 'red'), iwantThatRaddr[0])
 print(controllerDataDict)
-with socket:
-    while True:
-            events = get_gamepad()
-            for event in events:
-                #controllerDataTuple = event.ev_type, event.code, event.state
-                controllerDataTuple = event.code, event.state
-                controllerData = controllerDataTuple
-                #print("controllerData is a", type(controllerData))
-                print(controllerData)
-                print(controllerDataDict)
-                #If event.code is SYN_REPORT, ignore it
-            if event.code == "SYN_REPORT":
-                continue
-            if event.code == "BTN_MODE":
-                print(colored('The home button is unimplemented on PYXinput, ignoring', 'red'))
-                continue
-            #Ugh, PYXinput and inputs handle the Dpad in the most annoying way possible
-            elif event.code == "ABS_HAT0X":
-                #if ABS_HAT0X is 0, then there is no input on the dpad
-                if event.state == 0:
-                    controllerDataDict['Dpad'] = 0  #No input
-                if event.state == 1:
-                    controllerDataDict['Dpad'] = 8  #Right
-                if event.state == -1:
-                    controllerDataDict['Dpad'] = 4  #Left
-                sendData()
-            elif event.code == "ABS_HAT0Y":
-                #if ABS_HAT0Y is 0, then there is no input on the dpad
-                if event.state == 0:
-                    controllerDataDict['Dpad'] = 0  #No input
-                if event.state == 1:
-                    controllerDataDict['Dpad'] = 2  #Down
-                if event.state == -1:
-                    controllerDataDict['Dpad'] = 1  #Up
-                sendData()
-            else:
-                # Add values to controllerDataDict
-                controllerDataDict[lookup_table[str(event.code)]] = event.state
-                sendData()
+while True:
+        events = get_gamepad()
+        for event in events:
+            #controllerDataTuple = event.ev_type, event.code, event.state
+            controllerDataTuple = event.code, event.state
+            controllerData = controllerDataTuple
+            #print("controllerData is a", type(controllerData))
+            print(controllerData)
+            print(controllerDataDict)
+            #If event.code is SYN_REPORT, ignore it
+        if event.code == "SYN_REPORT":
+            continue
+        if event.code == "BTN_MODE":
+            print(colored('The home button is unimplemented on PYXinput, ignoring', 'red'))
+            continue
+        #Ugh, PYXinput and inputs handle the Dpad in the most annoying way possible
+        elif event.code == "ABS_HAT0X":
+            #if ABS_HAT0X is 0, then there is no input on the dpad
+            if event.state == 0:
+                controllerDataDict['Dpad'] = 0  #No input
+            if event.state == 1:
+                controllerDataDict['Dpad'] = 8  #Right
+            if event.state == -1:
+                controllerDataDict['Dpad'] = 4  #Left
+            sendData()
+        elif event.code == "ABS_HAT0Y":
+            #if ABS_HAT0Y is 0, then there is no input on the dpad
+            if event.state == 0:
+                controllerDataDict['Dpad'] = 0  #No input
+            if event.state == 1:
+                controllerDataDict['Dpad'] = 2  #Down
+            if event.state == -1:
+                controllerDataDict['Dpad'] = 1  #Up
+            sendData()
+        else:
+            # Add values to controllerDataDict
+            controllerDataDict[lookup_table[str(event.code)]] = event.state
+            sendData()