Move port and path constants

tobiipro · Aug 26, 2022 · 64df172 · 64df172
1 parent 1af9935
commit 64df172
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/g3pylib/__init__.py b/src/g3pylib/__init__.py
@@ -34,14 +34,16 @@
 from g3pylib.recordings import Recordings
 from g3pylib.rudimentary import Rudimentary
 from g3pylib.settings import Settings
-from g3pylib.streams import DEFAULT_RTPS_LIVE_PATH, DEFAULT_RTSP_PORT, Streams
+from g3pylib.streams import Streams
 from g3pylib.system import System
 from g3pylib.websocket import G3WebSocketClientProtocol
 from g3pylib.zeroconf import DEFAULT_WEBSOCKET_PATH, G3Service, G3ServiceDiscovery
 
 __version__ = "0.2.0-alpha"
 
-DEFAULT_HTTP_PORT = "80"
+DEFAULT_RTSP_LIVE_PATH = "/live/all"
+DEFAULT_RTSP_PORT = 8554
+DEFAULT_HTTP_PORT = 80
 
 _logger = logging.getLogger(__name__)
 
@@ -231,7 +233,7 @@ async def _urls_from_hostname(
         if not using_zeroconf:
             return (
                 f"ws://{hostname}{DEFAULT_WEBSOCKET_PATH}",
-                f"rtsp://{hostname}:{DEFAULT_RTSP_PORT}{DEFAULT_RTPS_LIVE_PATH}",
+                f"rtsp://{hostname}:{DEFAULT_RTSP_PORT}{DEFAULT_RTSP_LIVE_PATH}",
                 f"http://{hostname}:{DEFAULT_HTTP_PORT}",
             )
         else:

diff --git a/src/g3pylib/streams.py b/src/g3pylib/streams.py
@@ -33,8 +33,6 @@
 from g3pylib import _utils
 from g3pylib.g3typing import JSONObject
 
-DEFAULT_RTPS_LIVE_PATH = "/live/all"
-DEFAULT_RTSP_PORT = 8554
 TIMESTAMP_GRANULARITY = 90000
 FRAME_QUEUE_SIZE = 10
 DATA_QUEUE_SIZE = 100

diff --git a/tests/test_connect_to_glasses.py b/tests/test_connect_to_glasses.py
@@ -2,8 +2,12 @@
 
 import pytest
 
-from g3pylib import DEFAULT_HTTP_PORT, connect_to_glasses
-from g3pylib.streams import DEFAULT_RTPS_LIVE_PATH, DEFAULT_RTSP_PORT
+from g3pylib import (
+    DEFAULT_HTTP_PORT,
+    DEFAULT_RTSP_LIVE_PATH,
+    DEFAULT_RTSP_PORT,
+    connect_to_glasses,
+)
 from g3pylib.zeroconf import DEFAULT_WEBSOCKET_PATH, G3ServiceDiscovery
 
 
@@ -53,7 +57,7 @@ async def test_connect_with_hostname_no_zeroconf(g3_hostname: str):
 async def test_connect_with_urls(g3_hostname: str):
     async with connect_to_glasses.with_url(
         f"ws://{g3_hostname}{DEFAULT_WEBSOCKET_PATH}",
-        f"rtsp://{g3_hostname}:{DEFAULT_RTSP_PORT}{DEFAULT_RTPS_LIVE_PATH}",
+        f"rtsp://{g3_hostname}:{DEFAULT_RTSP_PORT}{DEFAULT_RTSP_LIVE_PATH}",
         f"http://{g3_hostname}:{DEFAULT_HTTP_PORT}",
     ) as g3:
         serial = await g3.system.get_recording_unit_serial()