jkhsjdhjs/nxy
1
0
Fork 0
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Migrated timer to pgsql

Browse Source
This commit is contained in:
mrhanky 2017-06-29 23:26:07 +02:00
parent 4a0a24e38a
commit bfd438e8fa
No known key found for this signature in database
GPG Key ID: 67D772C481CB41B8
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
nxy/plugins/timer.py
View File

@ -19,16 +19,16 @@ class Timer(DatabasePlugin):
def __init__(self, bot: irc3.IrcBot): def __init__(self, bot: irc3.IrcBot):
super().__init__(bot) super().__init__(bot)
# Restore timers from database # Restore timers from database
self.cur.execute('select id, mask, channel, message, delay, until ' self.cur.execute('select id, nick, channel, message, delay, ends_at '
'from timers') 'from timers')
for res in self.cur.fetchall(): for res in self.cur.fetchall():
delta = res['until'] - datetime.utcnow() delta = res['ends_at'] - datetime.now()
args = (IrcString(res['mask']), res['channel'], delta, args = (IrcString(res['nick']), res['channel'], delta,
res['message'], res['delay'], res['id']) res['message'], res['delay'], res['id'])
asyncio.ensure_future(self._timer(*args)) asyncio.ensure_future(self._timer(*args))
@command @command
def timer(self, mask: IrcString, channel: IrcString, args: DocOptDict): def timer(self, mask: IrcString, target: IrcString, args: DocOptDict):
"""Sets a timer, delay can be: s, m, h, w, mon, y( """Sets a timer, delay can be: s, m, h, w, mon, y(
%%timer <delay> <message>... %%timer <delay> <message>...
@ -37,29 +37,40 @@ class Timer(DatabasePlugin):
delta = time_delta(delay) delta = time_delta(delay)
if delta: if delta:
message = ' '.join(args['<message>']) message = ' '.join(args['<message>'])
self.cur.execute('insert into timers (mask, channel, message, ' # Insert into database
'delay, until) values (?, ?, ?, ?, ?)', self.cur.execute('insert into timers (nick, channel, message, '
[mask.nick, channel.lower(), message, delay, 'delay, ends_at) values (%s, %s, %s, %s, %s)',
datetime.utcnow() + delta]) [mask.nick, target.lower(), message, delay,
datetime.now() + delta])
self.con.commit() self.con.commit()
asyncio.ensure_future(self._timer(mask, channel, delta, message,
delay, self.cur.lastrowid)) # Get id from inserted and start timer
self.cur.execute('select lastval()')
lastid = self.cur.fetchone()['lastval']
asyncio.ensure_future(self._timer(mask, target, delta, message,
delay, lastid))
# Send notice to user
self.bot.notice(mask.nick, 'Timer in {delay} set: {message}' self.bot.notice(mask.nick, 'Timer in {delay} set: {message}'
.format(delay=delay, message=message)) .format(delay=delay, message=message))
else: else:
self.bot.privmsg(channel, 'Invalid timer delay') self.bot.privmsg(target, 'Invalid timer delay')
async def _timer(self, mask: IrcString, channel: IrcString, async def _timer(self, mask: IrcString, target: IrcString, delta: timedelta,
delta: timedelta, message: str, delay: str, row_id: int): message: str, delay: str, row_id: int):
"""Async function, sleeps for `delay` seconds and sends notification""" """Async function, sleeps for `delay` seconds and sends notification"""
seconds = delta.total_seconds() seconds = delta.total_seconds()
# Sleep if necessary until timed
if seconds > 0: if seconds > 0:
await asyncio.sleep(seconds) await asyncio.sleep(seconds)
text = '\x02[Timer]\x0F {nick}: {message} ({delay})'.format(
message=message, # Send reminder
delay=delay, self.bot.privmsg(target, '\x02[Timer]\x0F {nick}: {message} ({delay})'
nick=mask.nick, .format(message=message,
) nick=mask.nick,
self.bot.privmsg(channel, text) delay=delay))
self.cur.execute('delete from timers where id = ?', [row_id])
# Delete timer from database
self.cur.execute('delete from timers where id = %s', [row_id])
self.con.commit() self.con.commit()