Skip to content

Add a supported version range instead of a single version #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 28, 2024
Merged

Add a supported version range instead of a single version #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e899e76
Specify a supported version range
edenhaus Oct 28, 2024
6f045f7
rename
edenhaus Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions go2rtc_client/rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from aiohttp import ClientError, ClientResponse, ClientSession
from aiohttp.client import _RequestOptions
from awesomeversion import AwesomeVersion
from awesomeversion import AwesomeVersion, AwesomeVersionException
from mashumaro.codecs.basic import BasicDecoder
from mashumaro.mixins.dict import DataClassDictMixin
from yarl import URL
Expand All @@ -21,7 +21,8 @@
_LOGGER = logging.getLogger(__name__)

_API_PREFIX = "/api"
_SUPPORTED_VERSION: Final = AwesomeVersion("1.9.4")
_MIN_VERSION_SUPPORTED: Final = AwesomeVersion("1.9.4")
_MIN_VERSION_UNSUPPORTED: Final = AwesomeVersion("2.0.0")


class _BaseClient:
Expand Down Expand Up @@ -145,4 +146,14 @@ def __init__(self, websession: ClientSession, server_url: str) -> None:
async def validate_server_version(self) -> bool:
"""Validate the server version is compatible."""
application_info = await self.application.get_info()
return application_info.version == _SUPPORTED_VERSION
try:
return (
_MIN_VERSION_SUPPORTED
<= application_info.version
< _MIN_VERSION_UNSUPPORTED
)
except AwesomeVersionException:
_LOGGER.exception(
"Invalid version received from server: %s", application_info.version
)
return False
2 changes: 1 addition & 1 deletion tests/test_rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ async def test_streams_add(
("0.0.0", False),
("1.9.3", False),
("1.9.4", True),
("1.9.5", False),
("1.9.5", True),
("2.0.0", False),
("BLAH", False),
],
Expand Down