Update README, define xcloud-client script entry-point

Author: tuxuser

README.md

@@ -1,5 +1,9 @@
 # XCloud, XHome and SmartGlass
 
+## Status
+
+Work-in-progress research codebase
+
 ## Preparation
 
 As usual, create a python venv
@@ -13,14 +17,15 @@ And install the dependencies
 
 ```sh
 pip install -r requirements.txt
+pip install .
 ```
 
 ## Usage
 
 You can invoke 3 different parts of the script
 
 ```sh
-python -m main smartglass
-python -m main xhome
-python -m main xcloud
+xcloud-client smartglass
+xcloud-client xhome
+xcloud-client xcloud
 ```

setup.py

@@ -10,7 +10,12 @@
     author_email='noreply@openxbox.org',
     url='https://github.com/OpenXbox/xcloud-python',
     packages=find_packages(),
-    entry_points={'console_scripts': ['xcloud-pcap-reader=xcloud.scripts.pcap_reader:main']},
+    entry_points={
+        'console_scripts': [
+            'xcloud-pcap-reader=xcloud.scripts.pcap_reader:main',
+            'xcloud-client=xcloud.scripts.client:main'
+        ]
+    },
     install_requires=[
         "ecdsa",
         "ms_cv",

xcloud/main.py xcloud/scripts/client.pyxcloud/main.py renamed to xcloud/scripts/client.py

@@ -4,16 +4,16 @@
 import time
 import asyncio
 
-from .common import AppConfiguration
+from ..common import AppConfiguration
 
-from .auth.constants import IOS_XBOXBETA_APP_PARAMS, ANDROID_GAMEPASS_BETA_PARAMS
-from .auth.models import XalClientParameters, XSTSResponse
-from .auth.xal_auth import XalAuthenticator
-from .auth.request_signer import RequestSigner
+from ..auth.constants import IOS_XBOXBETA_APP_PARAMS, ANDROID_GAMEPASS_BETA_PARAMS
+from ..auth.models import XalClientParameters, XSTSResponse
+from ..auth.xal_auth import XalAuthenticator
+from ..auth.request_signer import RequestSigner
 
-from .smartglass_api import SmartglassApi
-from .xcloud_api import XCloudApi
-from .xhomestreaming_api import XHomeStreamingApi
+from ..smartglass_api import SmartglassApi
+from ..xcloud_api import XCloudApi
+from ..xhomestreaming_api import XHomeStreamingApi
 
 APP_CONFIG_XBOXBETA_FILE = "appconfig.xboxbeta.json"
 APP_CONFIG_XBOXGAMEPASS_FILE = "appconfig.xboxgamepass.json"
@@ -96,7 +96,7 @@ async def test_xcloud_streaming(
     await xhome_api.session.aclose()
 
 
-async def main(command: str):
+async def async_main(command: str):
     """
     Prepare needed values
     """
@@ -165,8 +165,7 @@ async def main(command: str):
     elif command == 'xcloud':
         await test_xcloud_streaming(config)
 
-
-if __name__ == '__main__':
+def main():
     if len(sys.argv) < 2:
         print(':: Please provide a command! Choices: smartglass, xhome, xcloud')
         sys.exit(1)
@@ -176,4 +175,7 @@ async def main(command: str):
         print(':: You provided an invalid command!')
         sys.exit(2)
 
-    asyncio.run(main(command))
+    asyncio.run(async_main(command))
+
+if __name__ == '__main__':
+    main()