python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2025-12-11 01:54:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some improvements v2

Browse source
This commit is contained in:
Arslan 'Ars2014' Sakhapov 2018-01-11 01:03:05 +05:00
parent df74cecdef
commit 539e67d394
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
aiogram/contrib/fsm_storage/rethinkdb.py
View file

@ -94,10 +94,10 @@ class RethinkDBStorage(BaseStorage):
state: typing.Optional[typing.AnyStr] = None): state: typing.Optional[typing.AnyStr] = None):
chat, user = map(str, self.check_address(chat=chat, user=user)) chat, user = map(str, self.check_address(chat=chat, user=user))
conn = await self.connection() conn = await self.connection()
# https://stackoverflow.com/questions/24306933/how-to-make-a-rethinkdb-atomic-update-if-document-exists-insert-otherwise if await r.table(self._table).get(chat).run(conn):
await r.table(self._table).insert( await r.table(self._table).get(chat).update({user: {'state': state}}).run(conn)
{'id': chat, user: {'state': state}}, else:
conflict='update').run(conn) await r.table(self._table).insert({'id': chat, user: {'state': state}}).run(conn)
async def set_data(self, *, chat: typing.Union[str, int, None] = None, user: typing.Union[str, int, None] = None, data: typing.Dict = None): async def set_data(self, *, chat: typing.Union[str, int, None] = None, user: typing.Union[str, int, None] = None, data: typing.Dict = None):
chat, user = map(str, self.check_address(chat=chat, user=user)) chat, user = map(str, self.check_address(chat=chat, user=user))
@ -111,9 +111,10 @@ class RethinkDBStorage(BaseStorage):
**kwargs): **kwargs):
chat, user = map(str, self.check_address(chat=chat, user=user)) chat, user = map(str, self.check_address(chat=chat, user=user))
conn = await self.connection() conn = await self.connection()
await r.table(self._table).insert( if await r.table(self._table).get(chat).run(conn):
{'id': chat, user: {'data': data}}, await r.table(self._table).get(chat).update({user: {'data': data}}).run(conn)
conflict='update').run(conn) else:
await r.table(self._table).insert({'id': chat, user: {'data': data}}).run(conn)
def has_bucket(self): def has_bucket(self):
return True return True
@ -136,9 +137,10 @@ class RethinkDBStorage(BaseStorage):
**kwargs): **kwargs):
chat, user = map(str, self.check_address(chat=chat, user=user)) chat, user = map(str, self.check_address(chat=chat, user=user))
conn = await self.connection() conn = await self.connection()
await r.table(self._table).insert( if await r.table(self._table).get(chat).run(conn):
{'id': chat, user: {'bucket': bucket}}, await r.table(self._table).get(chat).update({user: {'bucket': bucket}}).run(conn)
conflict='update').run(conn) else:
await r.table(self._table).insert({'id': chat, user: {'bucket': bucket}}).run(conn)
async def get_states_list(self) -> typing.List[typing.Tuple[int]]: async def get_states_list(self) -> typing.List[typing.Tuple[int]]:
""" """