Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ authors = [
{ name = "Hugo Haas" },
]
classifiers = [
"Development Status :: 3 - Alpha",
"Development Status :: 4 - Beta",
"Environment :: Console",
"Environment :: Web Environment",
"Intended Audience :: End Users/Desktop",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3.12",
"Topic :: Home Automation",
Expand Down
22 changes: 9 additions & 13 deletions src/pyatv_http/atv.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,39 +26,35 @@ class DeviceUnreachableError(Exception):
"""Raised when the Apple TV cannot be found on the network."""


def _protocol_settings(
device: DeviceConfig,
) -> dict[
str, AirPlaySettings | CompanionSettings | DmapSettings | MrpSettings | RaopSettings
]:
def _protocol_settings(device: DeviceConfig) -> ProtocolSettings:
empty = ProtocolCredential()
airplay = device.protocols.get("airplay", empty)
companion = device.protocols.get("companion", empty)
dmap = device.protocols.get("dmap", empty)
mrp = device.protocols.get("mrp", empty)
raop = device.protocols.get("raop", empty)

return {
"airplay": AirPlaySettings(
return ProtocolSettings(
airplay=AirPlaySettings(
identifier=airplay.identifier,
credentials=airplay.credentials,
password=airplay.password,
),
"companion": CompanionSettings(
companion=CompanionSettings(
identifier=companion.identifier, credentials=companion.credentials
),
"dmap": DmapSettings(identifier=dmap.identifier, credentials=dmap.credentials),
"mrp": MrpSettings(identifier=mrp.identifier, credentials=mrp.credentials),
"raop": RaopSettings(
dmap=DmapSettings(identifier=dmap.identifier, credentials=dmap.credentials),
mrp=MrpSettings(identifier=mrp.identifier, credentials=mrp.credentials),
raop=RaopSettings(
identifier=raop.identifier,
credentials=raop.credentials,
password=raop.password,
),
}
)


def _build_storage(device: DeviceConfig) -> MemoryStorage:
settings = Settings(protocols=ProtocolSettings(**_protocol_settings(device)))
settings = Settings(protocols=_protocol_settings(device))
storage = MemoryStorage()
storage.storage_model = StorageModel(version=MODEL_VERSION, devices=[settings])
return storage
Expand Down
Loading