Skip to content

Commit b36fef0

Browse files
committed
make things work
1 parent 460b1df commit b36fef0

File tree

6 files changed

+43
-59
lines changed

6 files changed

+43
-59
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.idea/
2+
*.build/
23

34
config.toml

Diff for: Pipfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ aioredis = "*"
1111
autobahn = "*"
1212
konfi = "*"
1313
click = "*"
14-
uvloop = {markers="sys_platform != 'win32'"}
14+
uvloop = {markers = "sys_platform != 'win32'"}
15+
cbor = "*"
1516

1617
[requires]
1718
python_version = "3.7"

Diff for: Pipfile.lock

+28-31
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: README.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
# Ari Player
22

33
Giesela's player service
4+
5+
6+
## Required Components
7+
8+
- [Wampus](https://github.com/gieseladev/wampus) `io.giesela.wampus`
9+
- [Elakshi](https://github.com/gieseladev/elakshi) `io.giesela.elakshi`

Diff for: ari/component.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ async def create_ari_server(config: ari.Config, *, loop: asyncio.AbstractEventLo
171171
user_id=config.andesite.user_id,
172172
loop=loop)
173173
server = AriServer(redis, config.redis.namespace, andesite_ws)
174-
andesite_ws.state = andesite.AndesiteState[Any](state_factory=server.get_player)
174+
andesite_ws.state = andesite.AndesiteState(state_factory=server.get_player)
175175

176176
return server
177177

@@ -180,15 +180,15 @@ def create_component(server: AriServer, config: ari.Config) -> Component:
180180
"""Create the WAMP component."""
181181
component = Component(
182182
realm=config.realm,
183-
transports=config.get_transports(),
183+
transports=config.transports,
184184
)
185185

186186
@component.on_join
187187
async def joined(session: ISession, details: SessionDetails) -> None:
188-
log.info("joined session %s: %s", session, details)
188+
log.info("joined session (realm: %s)", details.realm)
189189
server._session = session
190190

191-
await session.register(server, preifx=f"io.giesela.ari.")
191+
await session.register(server, prefix=f"io.giesela.ari.")
192192
await session.subscribe(server)
193193

194194
return component

Diff for: ari/config.py

+2-23
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Dict, Iterable, List, Optional, Tuple, Union
1+
from typing import Iterable, List, Optional, Tuple, Union
22

33
import konfi
44

@@ -35,35 +35,14 @@ def get_node_tuples(self) -> Iterable[Tuple[str, str]]:
3535
return (node.as_tuple() for node in self.nodes)
3636

3737

38-
@konfi.template()
39-
class Transport:
40-
"""Transport configuration."""
41-
type: str = "websocket"
42-
url: str
43-
44-
def as_dict(self) -> Dict[str, str]:
45-
return {
46-
"type": self.type,
47-
"url": self.url,
48-
}
49-
50-
5138
@konfi.template()
5239
class Config:
5340
"""Ari configuration"""
5441
redis: Redis
5542
andesite: Andesite
5643

5744
realm: str
58-
transports: Union[List[Transport], str]
59-
60-
def get_transports(self) -> Union[List[Dict[str, str]], str]:
61-
"""Get the transports configuration in the format required by
62-
the component constructor."""
63-
if isinstance(self.transports, str):
64-
return self.transports
65-
else:
66-
return [transport.as_dict() for transport in self.transports]
45+
transports: Union[List[dict], str]
6746

6847

6948
def load_config(config_file: str) -> Config:

0 commit comments

Comments
 (0)