windows fixes, again

Author: NaviVani-dev

app/readme.txt

@@ -1,4 +1,5 @@
 import vgamepad as vg
+import sys
 
 xbox_buttons = {
   "a": vg.XUSB_BUTTON.XUSB_GAMEPAD_A,
@@ -114,5 +115,8 @@ def input(self,input,value):
     elif input == joystick_index[0]:
       self.gamepad.left_joystick_float(value[0], value[1])
     elif input == joystick_index[1]:
-      self.gamepad.right_joystick_float(value[0], value[1])
+      if sys.platform == "win32":
+        self.gamepad.right_joystick_float(value[0], value[1])
+      else:
+        self.gamepad.right_joystick_float(value[0], -value[1])
     self.gamepad.update()

input.py

@@ -5,11 +5,15 @@
 import argparse
 import qrcode
 import os
+import sys
 from aiohttp import web
 from input import Gamepad
 from plyer import notification
 
-BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+if hasattr(sys, '_MEIPASS'):
+    BASE_DIR = sys._MEIPASS
+else:
+    BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
 async def socket_handler(websocket):
     try:
@@ -53,7 +57,8 @@ async def socket_handler(websocket):
         )
 
 async def http_handler(request):
-    return web.FileResponse("./app/index.html")
+    index_html = os.path.join(BASE_DIR, "app", "index.html")
+    return web.FileResponse(index_html)
 
 async def miniapi_handler(request):
     data = {"port": request.app["socketport"], "ip": request.app["host_ip"]}
@@ -87,10 +92,12 @@ async def main(ip, port, socketport):
     runner = web.AppRunner(app)
     await runner.setup()
     http_site = web.TCPSite(runner, ip, port)
+    await http_site.start()
     print(f"App: http://{host_ip}:{port}")
+    print("\nYou can connect your phone using the QR code below:\n")
     print_qr(f"http://{host_ip}:{port}")
 
-    await asyncio.gather(http_site.start(), asyncio.Future())
+    await asyncio.Future()
 
 
 if __name__ == "__main__":

main.py

@@ -5,8 +5,8 @@ a = Analysis(
     ['main.py'],
     pathex=[],
     binaries=[],
-    datas=[('app', 'app'), ("lib/ViGEmClient.dll", "vgamepad/win/vigem/client/x64")],
-    hiddenimports=[],
+    datas=[('app', 'app'), ('icon.ico', '.'), ("lib/ViGEmClient.dll", "vgamepad/win/vigem/client/x64")],
+    hiddenimports=['plyer.platforms.win.notification','plyer.platforms.linux.notification',],
     hookspath=[],
     hooksconfig={},
     runtime_hooks=[],
@@ -29,7 +29,7 @@ exe = EXE(
     upx=True,
     upx_exclude=[],
     runtime_tmpdir=None,
-    console=False,
+    console=True,
     disable_windowed_traceback=False,
     argv_emulation=False,
     target_arch=None,

main.spec

@@ -14,7 +14,7 @@ export default function JoystickC({
   if (!joystick) return;
 
   const handleMove = (m: IJoystickUpdateEvent) => {
-    sendData({ input: joystick, value: [m.x || 0, (m.y || 0) * -1] });
+    sendData({ input: joystick, value: [m.x || 0, m.y || 0] });
   };
 
   const handleStop = () => {