From 96815b01c0846a76167d5d605a7bca5f89559d19 Mon Sep 17 00:00:00 2001 From: Nguyen Marc Date: Sat, 20 Feb 2021 01:58:35 +0100 Subject: [PATCH] up --- Pipfile | 2 +- Pipfile.lock | 64 +- build.bat | 1 + .../debug/payload_viewer_thread.py | 2 +- csgo_gsi_arduino_lcd/ui/csgo_window.py | 8 +- out.txt | 579 ------------------ requirements.txt | Bin 126 -> 122 bytes run.sh | 2 + setup.py | 2 +- 9 files changed, 38 insertions(+), 622 deletions(-) create mode 100644 build.bat delete mode 100644 out.txt create mode 100644 run.sh diff --git a/Pipfile b/Pipfile index db8cc43..25cacba 100644 --- a/Pipfile +++ b/Pipfile @@ -6,7 +6,7 @@ name = "pypi" [packages] pyserial = "*" qtpy = "*" -pyqt5 = "*" +pyside2 = "*" [dev-packages] pylama = "*" diff --git a/Pipfile.lock b/Pipfile.lock index ebbc93e..c2f41dc 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "7ad20ccde186722410df54cd28183a5a91a321e7489f22ecdb3aa8c11becde1d" + "sha256": "4d128255dc7da00974d097c68525536c1cb701fe3b123bf464acb4a1998ed50c" }, "pipfile-spec": 6, "requires": { @@ -16,44 +16,6 @@ ] }, "default": { - "pyqt5": { - "hashes": [ - "sha256:29889845688a54d62820585ad5b2e0200a36b304ff3d7a555e95599f110ba4ce", - "sha256:372b08dc9321d1201e4690182697c5e7ffb2e0770e6b4a45519025134b12e4fc", - "sha256:894ca4ae767a8d6cf5903784b71f755073c78cb8c167eecf6e4ed6b3b055ac6a", - "sha256:ea24f24b7679bf393dd2e4f53fe0ce65021be18304c1ff7a226c2fc5c356d0da", - "sha256:faaecb76ec65e12673a968e7f5bc02495957e6996f0a3fa0d98895f9e4113746" - ], - "index": "pypi", - "version": "==5.15.2" - }, - "pyqt5-sip": { - "hashes": [ - "sha256:0304ca9114b9817a270f67f421355075b78ff9fc25ac58ffd72c2601109d2194", - "sha256:0cd969be528c27bbd4755bd323dff4a79a8fdda28215364e6ce3e069cb56c2a9", - "sha256:2f35e82fd7ec1e1f6716e9154721c7594956a4f5bd4f826d8c6a6453833cc2f0", - "sha256:30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd", - "sha256:34dcd29be47553d5f016ff86e89e24cbc5eebae92eb2f96fb32d2d7ba028c43c", - "sha256:5a011aeff89660622a6d5c3388d55a9d76932f3b82c95e82fc31abd8b1d2990d", - "sha256:6c1ebee60f1d2b3c70aff866b7933d8d8d7646011f7c32f9321ee88c290aa4f9", - "sha256:7b81382ce188d63890a0e35abe0f9bb946cabc873a31873b73583b0fc84ac115", - "sha256:832fd60a264de4134c2824d393320838f3ab648180c9c357ec58a74524d24507", - "sha256:84ba7746762bd223bed22428e8561aa267a229c28344c2d28c5d5d3f8970cffb", - "sha256:9312ec47cac4e33c11503bc1cbeeb0bdae619620472f38e2078c5a51020a930f", - "sha256:a1b8ef013086e224b8e86c93f880f776d01b59195bdfa2a8e0b23f0480678fec", - "sha256:a29e2ac399429d3b7738f73e9081e50783e61ac5d29344e0802d0dcd6056c5a2", - "sha256:b6d42250baec52a5f77de64e2951d001c5501c3a2df2179f625b241cbaec3369", - "sha256:bb5a87b66fc1445915104ee97f7a20a69decb42f52803e3b0795fa17ff88226c", - "sha256:c317ab1263e6417c498b81f5c970a9b1af7acefab1f80b4cc0f2f8e661f29fc5", - "sha256:c9800729badcb247765e4ffe2241549d02da1fa435b9db224845bc37c3e99cb0", - "sha256:c9d6d448c29dc6606bb7974696608f81f4316c8234f7c7216396ed110075e777", - "sha256:da9c9f1e65b9d09e73bd75befc82961b6b61b5a3b9d0a7c832168e1415f163c6", - "sha256:ed897c58acf4a3cdca61469daa31fe6e44c33c6c06a37c3f21fab31780b3b86a", - "sha256:f168f0a7f32b81bfeffdf003c36f25d81c97dee5eb67072a5183e761fe250f13" - ], - "markers": "python_version >= '3.5'", - "version": "==12.8.1" - }, "pyserial": { "hashes": [ "sha256:3c77e014170dfffbd816e6ffc205e9842efb10be9f58ec16d3e8675b4925cddb", @@ -62,6 +24,18 @@ "index": "pypi", "version": "==3.5" }, + "pyside2": { + "hashes": [ + "sha256:0558ced3bcd7f9da638fa8b7709dba5dae82a38728e481aac8b9058ea22fcdd9", + "sha256:081d8c8a6c65fb1392856a547814c0c014e25ac04b38b987d9a3483e879e9634", + "sha256:087a0b719bb967405ea85fd202757c761f1fc73d0e2397bc3a6a15376782ee75", + "sha256:1316aa22dd330df096daf7b0defe9c00297a66e0b4907f057aaa3e88c53d1aff", + "sha256:4f17a0161995678110447711d685fcd7b15b762810e8f00f6dc239bffb70a32e", + "sha256:976cacf01ef3b397a680f9228af7d3d6273b9254457ad4204731507c1f9e6c3c" + ], + "index": "pypi", + "version": "==5.15.2" + }, "qtpy": { "hashes": [ "sha256:2db72c44b55d0fe1407be8fba35c838ad0d6d3bb81f23007886dc1fc0f459c8d", @@ -69,6 +43,18 @@ ], "index": "pypi", "version": "==1.9.0" + }, + "shiboken2": { + "hashes": [ + "sha256:03f41b0693b91c7f89627f1085a4ecbe8591c03f904118a034854d935e0e766c", + "sha256:14a33169cf1bd919e4c4c4408fffbcd424c919a3f702df412b8d72b694e4c1d5", + "sha256:4aee1b91e339578f9831e824ce2a1ec3ba3a463f41fda8946b4547c7eb3cba86", + "sha256:89c157a0e2271909330e1655892e7039249f7b79a64a443d52c512337065cde0", + "sha256:ae8ca41274cfa057106268b6249674ca669c5b21009ec49b16d77665ab9619ed", + "sha256:edc12a4df2b5be7ca1e762ab94e331ba9e2fbfe3932c20378d8aa3f73f90e0af" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '3.10'", + "version": "==5.15.2" } }, "develop": { diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..8e866c9 --- /dev/null +++ b/build.bat @@ -0,0 +1 @@ +pyinstaller -F .\main.spec \ No newline at end of file diff --git a/csgo_gsi_arduino_lcd/debug/payload_viewer_thread.py b/csgo_gsi_arduino_lcd/debug/payload_viewer_thread.py index 16ee969..129bebc 100644 --- a/csgo_gsi_arduino_lcd/debug/payload_viewer_thread.py +++ b/csgo_gsi_arduino_lcd/debug/payload_viewer_thread.py @@ -49,7 +49,7 @@ def run(self): while self.running: if not self.__pause: if self.refreshable: - logging.debug(json.dumps(self.payload, indent=4)) + logging.debug(json.dumps(self.payload, indent=2)) self.refreshable = False def shutdown(self): diff --git a/csgo_gsi_arduino_lcd/ui/csgo_window.py b/csgo_gsi_arduino_lcd/ui/csgo_window.py index 982de37..bbb8450 100644 --- a/csgo_gsi_arduino_lcd/ui/csgo_window.py +++ b/csgo_gsi_arduino_lcd/ui/csgo_window.py @@ -6,6 +6,7 @@ """ import os import sys +from typing import Optional from csgo_gsi_arduino_lcd.data.server_thread import ServerThread from qtpy.QtCore import QSize, Qt, Slot @@ -29,6 +30,12 @@ def resource_path(relative_path: str): class CsgoWindow(QWidget): """App UI.""" + server_thread: Optional[ServerThread] = None + connect_btn: QPushButton + refresh_btn: QPushButton + payload_viewer_btn: QPushButton + comcb: QComboBox + def __init__(self): """Init UI.""" super(CsgoWindow, self).__init__() @@ -38,7 +45,6 @@ def __init__(self): ) # Widgets - self.server_thread = None self.connect_btn = QPushButton("Connect") self.comcb = QComboBox() diff --git a/out.txt b/out.txt deleted file mode 100644 index db593aa..0000000 --- a/out.txt +++ /dev/null @@ -1,579 +0,0 @@ -Listening at http://127.0.0.1:3000 -Handling POST request... -POST payload: { - "provider": { - "name": "Counter-Strike: Global Offensive", - "appid": 730, - "version": 13563, - "steamid": "76561198113122507", - "timestamp": 1482322811 - }, - "map": { - "mode": "competitive", - "name": "de_dust2", - "phase": "live", - "round": 4, - "team_ct": { - "score": 4, - "name": "SnappleT" - }, - "team_t": { - "score": 0 - } - }, - "round": { - "phase": "live", - "bomb": "planted" - }, - "player": { - "steamid": "76561198113122507", - "clan": "SnappT", - "name": "Darketek", - "team": "CT", - "activity": "menu", - "state": { - "health": 100, - "armor": 100, - "helmet": true, - "defusekit": true, - "flashed": 0, - "smoked": 0, - "burning": 0, - "money": 3200, - "round_kills": 0, - "round_killhs": 0 - }, - "weapons": { - "weapon_0": { - "name": "weapon_knife", - "paintkit": "default", - "type": "Knife", - "state": "holstered" - }, - "weapon_1": { - "name": "weapon_fiveseven", - "paintkit": "cu_fiveseven_urban_hazard", - "type": "Pistol", - "ammo_clip": 20, - "ammo_clip_max": 20, - "ammo_reserve": 100, - "state": "holstered" - }, - "weapon_2": { - "name": "weapon_awp", - "paintkit": "hy_snakeskin", - "type": "SniperRifle", - "ammo_clip": 10, - "ammo_clip_max": 10, - "ammo_reserve": 24, - "state": "active" - }, - "weapon_3": { - "name": "weapon_decoy", - "paintkit": "default", - "type": "Grenade", - "ammo_reserve": 1, - "state": "holstered" - }, - "weapon_4": { - "name": "weapon_hegrenade", - "paintkit": "default", - "type": "Grenade", - "ammo_reserve": 1, - "state": "holstered" - } - }, - "match_stats": { - "kills": 14, - "assists": 0, - "deaths": 0, - "mvps": 4, - "score": 32 - } - } -} -Handling POST request... -POST payload: { - "provider": { - "name": "Counter-Strike: Global Offensive", - "appid": 730, - "version": 13563, - "steamid": "76561198113122507", - "timestamp": 1482322843 - }, - "map": { - "mode": "competitive", - "name": "de_dust2", - "phase": "live", - "round": 4, - "team_ct": { - "score": 4, - "name": "SnappleT" - }, - "team_t": { - "score": 0 - } - }, - "round": { - "phase": "live", - "bomb": "planted" - }, - "player": { - "steamid": "76561198113122507", - "clan": "SnappT", - "name": "Darketek", - "team": "CT", - "activity": "textinput", - "state": { - "health": 0, - "armor": 0, - "helmet": false, - "flashed": 0, - "smoked": 0, - "burning": 0, - "money": 3200, - "round_kills": 0, - "round_killhs": 0 - }, - "weapons": { - - }, - "match_stats": { - "kills": 13, - "assists": 0, - "deaths": 1, - "mvps": 4, - "score": 30 - } - }, - "previously": { - "player": { - "activity": "menu", - "state": { - "health": 100, - "armor": 100, - "helmet": true, - "defusekit": true - }, - "weapons": { - "weapon_0": { - "name": "weapon_knife", - "paintkit": "default", - "type": "Knife", - "state": "holstered" - }, - "weapon_1": { - "name": "weapon_fiveseven", - "paintkit": "cu_fiveseven_urban_hazard", - "type": "Pistol", - "ammo_clip": 20, - "ammo_clip_max": 20, - "ammo_reserve": 100, - "state": "holstered" - }, - "weapon_2": { - "name": "weapon_awp", - "paintkit": "hy_snakeskin", - "type": "SniperRifle", - "ammo_clip": 10, - "ammo_clip_max": 10, - "ammo_reserve": 24, - "state": "active" - }, - "weapon_3": { - "name": "weapon_decoy", - "paintkit": "default", - "type": "Grenade", - "ammo_reserve": 1, - "state": "holstered" - }, - "weapon_4": { - "name": "weapon_hegrenade", - "paintkit": "default", - "type": "Grenade", - "ammo_reserve": 1, - "state": "holstered" - } - }, - "match_stats": { - "kills": 14, - "deaths": 0, - "score": 32 - } - } - } -} -Handling POST request... -POST payload: { - "provider": { - "name": "Counter-Strike: Global Offensive", - "appid": 730, - "version": 13563, - "steamid": "76561198113122507", - "timestamp": 1482322845 - }, - "map": { - "mode": "competitive", - "name": "de_dust2", - "phase": "live", - "round": 5, - "team_ct": { - "score": 4, - "name": "SnappleT" - }, - "team_t": { - "score": 0 - } - }, - "round": { - "phase": "over", - "win_team": "T", - "bomb": "exploded" - }, - "player": { - "steamid": "76561198113122507", - "clan": "SnappT", - "name": "Darketek", - "team": "CT", - "activity": "playing", - "state": { - "health": 0, - "armor": 0, - "helmet": false, - "flashed": 0, - "smoked": 0, - "burning": 0, - "money": 4600, - "round_kills": 0, - "round_killhs": 0 - }, - "weapons": { - - }, - "match_stats": { - "kills": 13, - "assists": 0, - "deaths": 1, - "mvps": 4, - "score": 30 - } - }, - "previously": { - "map": { - "round": 4 - }, - "round": { - "phase": "live", - "bomb": "planted" - }, - "player": { - "activity": "textinput", - "state": { - "money": 3200 - } - } - }, - "added": { - "round": { - "win_team": true - } - } -} -Handling POST request... -POST payload: { - "provider": { - "name": "Counter-Strike: Global Offensive", - "appid": 730, - "version": 13563, - "steamid": "76561198113122507", - "timestamp": 1482322845 - }, - "map": { - "mode": "competitive", - "name": "de_dust2", - "phase": "live", - "round": 5, - "team_ct": { - "score": 4, - "name": "SnappleT" - }, - "team_t": { - "score": 1 - } - }, - "round": { - "phase": "over", - "win_team": "T", - "bomb": "exploded" - }, - "player": { - "steamid": "76561198113122507", - "clan": "SnappT", - "name": "Darketek", - "team": "CT", - "activity": "playing", - "state": { - "health": 0, - "armor": 0, - "helmet": false, - "flashed": 0, - "smoked": 0, - "burning": 0, - "money": 4600, - "round_kills": 0, - "round_killhs": 0 - }, - "weapons": { - - }, - "match_stats": { - "kills": 13, - "assists": 0, - "deaths": 1, - "mvps": 4, - "score": 30 - } - }, - "previously": { - "map": { - "team_t": { - "score": 0 - } - } - } -} -Handling POST request... -POST payload: { - "provider": { - "name": "Counter-Strike: Global Offensive", - "appid": 730, - "version": 13563, - "steamid": "76561198113122507", - "timestamp": 1482322847 - }, - "map": { - "mode": "competitive", - "name": "de_dust2", - "phase": "live", - "round": 5, - "team_ct": { - "score": 4, - "name": "SnappleT" - }, - "team_t": { - "score": 1 - } - }, - "round": { - "phase": "over", - "win_team": "T", - "bomb": "exploded" - }, - "player": { - "steamid": "76561197960265735", - "name": "Wesley", - "team": "CT", - "activity": "playing", - "state": { - "health": 96, - "armor": 97, - "helmet": true, - "flashed": 0, - "smoked": 0, - "burning": 0, - "money": 9600, - "round_kills": 0, - "round_killhs": 0 - }, - "weapons": { - "weapon_0": { - "name": "weapon_knife", - "paintkit": "default", - "type": "Knife", - "state": "active" - }, - "weapon_1": { - "name": "weapon_p250", - "paintkit": "default", - "type": "Pistol", - "ammo_clip": 13, - "ammo_clip_max": 13, - "ammo_reserve": 26, - "state": "holstered" - }, - "weapon_2": { - "name": "weapon_xm1014", - "paintkit": "default", - "type": "Shotgun", - "ammo_clip": 7, - "ammo_clip_max": 7, - "ammo_reserve": 32, - "state": "holstered" - }, - "weapon_3": { - "name": "weapon_smokegrenade", - "paintkit": "default", - "type": "Grenade", - "ammo_reserve": 1, - "state": "holstered" - } - }, - "match_stats": { - "kills": -1, - "assists": 0, - "deaths": 1, - "mvps": 0, - "score": 1 - } - }, - "previously": { - "player": { - "steamid": "76561198113122507", - "clan": "SnappT", - "name": "Darketek", - "state": { - "health": 0, - "armor": 0, - "helmet": false, - "money": 4600 - }, - "match_stats": { - "kills": 13, - "mvps": 4, - "score": 30 - } - } - }, - "added": { - "player": { - "weapons": { - "weapon_0": true, - "weapon_1": true, - "weapon_2": true, - "weapon_3": true - } - } - } -} -Handling POST request... -POST payload: { - "provider": { - "name": "Counter-Strike: Global Offensive", - "appid": 730, - "version": 13563, - "steamid": "76561198113122507", - "timestamp": 1482322852 - }, - "map": { - "mode": "competitive", - "name": "de_dust2", - "phase": "live", - "round": 5, - "team_ct": { - "score": 4, - "name": "SnappleT" - }, - "team_t": { - "score": 1 - } - }, - "round": { - "phase": "freezetime" - }, - "player": { - "steamid": "76561198113122507", - "clan": "SnappT", - "name": "Darketek", - "team": "CT", - "activity": "playing", - "state": { - "health": 100, - "armor": 0, - "helmet": false, - "flashed": 0, - "smoked": 0, - "burning": 0, - "money": 4600, - "round_kills": 0, - "round_killhs": 0 - }, - "weapons": { - "weapon_0": { - "name": "weapon_knife", - "paintkit": "default", - "type": "Knife", - "state": "holstered" - }, - "weapon_1": { - "name": "weapon_hkp2000", - "paintkit": "cu_p2000_pulse", - "type": "Pistol", - "ammo_clip": 13, - "ammo_clip_max": 13, - "ammo_reserve": 52, - "state": "active" - } - }, - "match_stats": { - "kills": 13, - "assists": 0, - "deaths": 1, - "mvps": 4, - "score": 30 - } - }, - "previously": { - "round": { - "phase": "over", - "win_team": "T", - "bomb": "exploded" - }, - "player": { - "steamid": "76561197960265735", - "name": "Wesley", - "state": { - "health": 96, - "armor": 97, - "helmet": true, - "money": 9600 - }, - "weapons": { - "weapon_0": { - "state": "active" - }, - "weapon_1": { - "name": "weapon_p250", - "paintkit": "default", - "ammo_reserve": 26, - "state": "holstered" - }, - "weapon_2": { - "name": "weapon_xm1014", - "paintkit": "default", - "type": "Shotgun", - "ammo_clip": 7, - "ammo_clip_max": 7, - "ammo_reserve": 32, - "state": "holstered" - }, - "weapon_3": { - "name": "weapon_smokegrenade", - "paintkit": "default", - "type": "Grenade", - "ammo_reserve": 1, - "state": "holstered" - } - }, - "match_stats": { - "kills": -1, - "mvps": 0, - "score": 1 - } - } - }, - "added": { - "player": { - "clan": true - } - } -} diff --git a/requirements.txt b/requirements.txt index 51f8930797447534c1ba94ea79f69e48eaa56756..77e22327ec941cadb1716da3e61a1bcc81fc3b38 100644 GIT binary patch literal 122 zcmX}k!3sb?6ouh`t-OgQGmKJr2J!@og|ZMfULI#=VRz3tU-x}>ZcY{sRwgz&S_%xF mjD}KIPD(;AH_FViE-J6h${FQgtKSY>(T87FZ5@|j+;2YT>=4cX literal 126 zcmYL>F$#b{3DZ*bSFtVUtul(BNS(~Bl=Slv3-5BiSU&dCQD{}L4d diff --git a/run.sh b/run.sh new file mode 100644 index 0000000..0b198bd --- /dev/null +++ b/run.sh @@ -0,0 +1,2 @@ +#!/bin/sh +python -m csgo_gsi_arduino_lcd \ No newline at end of file diff --git a/setup.py b/setup.py index 8e1456d..c4866a1 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ scripts=scripts, package_data={"assets": ["*"]}, install_requires=[ - "PyQt5", + "PySide2", "pyserial", "QtPy", ],