Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-10-01 17:16:31 +02:00
Code Issues Projects Releases Wiki Activity

Time: Add support for omitting space in @seconds

Browse Source
This commit is contained in:
Valentin Lorentz 2022-08-02 12:59:27 +02:00
parent cd0f9f2628
commit 8f837a676d
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/Time/plugin.py
View File

@ -72,10 +72,13 @@ try:
except ImportError: except ImportError:
tzlocal = None tzlocal = None
_SECONDS_SPLIT_RE = re.compile('(?<=[a-z]) ?')
class Time(callbacks.Plugin): class Time(callbacks.Plugin):
"""This plugin allows you to use different time-related functions.""" """This plugin allows you to use different time-related functions."""
@internationalizeDocstring @internationalizeDocstring
def seconds(self, irc, msg, args): def seconds(self, irc, msg, args, text):
"""[<years>y] [<weeks>w] [<days>d] [<hours>h] [<minutes>m] [<seconds>s] """[<years>y] [<weeks>w] [<days>d] [<hours>h] [<minutes>m] [<seconds>s]
Returns the number of seconds in the number of <years>, <weeks>, Returns the number of seconds in the number of <years>, <weeks>,
@ -84,11 +87,13 @@ class Time(callbacks.Plugin):
Useful for scheduling events at a given number of seconds in the Useful for scheduling events at a given number of seconds in the
future. future.
""" """
if not args:
raise callbacks.ArgumentError
seconds = 0 seconds = 0
for arg in args: if not text:
if not arg or arg[-1] not in 'ywdhms': raise callbacks.ArgumentError
for arg in _SECONDS_SPLIT_RE.split(text):
if not arg:
continue
if arg[-1] not in 'ywdhms':
raise callbacks.ArgumentError raise callbacks.ArgumentError
(s, kind) = arg[:-1], arg[-1] (s, kind) = arg[:-1], arg[-1]
try: try:
@ -108,6 +113,7 @@ class Time(callbacks.Plugin):
elif kind == 's': elif kind == 's':
seconds += i seconds += i
irc.reply(str(seconds)) irc.reply(str(seconds))
seconds = wrap(seconds, ['text'])
@internationalizeDocstring @internationalizeDocstring
def at(self, irc, msg, args, s=None): def at(self, irc, msg, args, s=None):

6
plugins/Time/test.py
View File

@ -77,16 +77,22 @@ class TimeTestCase(PluginTestCase):
self.assertResponse('seconds 10s', '10') self.assertResponse('seconds 10s', '10')
self.assertResponse('seconds 1m', '60') self.assertResponse('seconds 1m', '60')
self.assertResponse('seconds 1m 1s', '61') self.assertResponse('seconds 1m 1s', '61')
self.assertResponse('seconds 1m1s', '61')
self.assertResponse('seconds 1h', '3600') self.assertResponse('seconds 1h', '3600')
self.assertResponse('seconds 1h 1s', '3601') self.assertResponse('seconds 1h 1s', '3601')
self.assertResponse('seconds 1h1s', '3601')
self.assertResponse('seconds 1d', '86400') self.assertResponse('seconds 1d', '86400')
self.assertResponse('seconds 1d 1s', '86401') self.assertResponse('seconds 1d 1s', '86401')
self.assertResponse('seconds 1d1s', '86401')
self.assertResponse('seconds 2s', '2') self.assertResponse('seconds 2s', '2')
self.assertResponse('seconds 2m', '120') self.assertResponse('seconds 2m', '120')
self.assertResponse('seconds 2d 2h 2m 2s', '180122') self.assertResponse('seconds 2d 2h 2m 2s', '180122')
self.assertResponse('seconds 2d2h2m2s', '180122')
self.assertResponse('seconds 1s', '1') self.assertResponse('seconds 1s', '1')
self.assertResponse('seconds 1y 1s', '31536001') self.assertResponse('seconds 1y 1s', '31536001')
self.assertResponse('seconds 1y1s', '31536001')
self.assertResponse('seconds 1w 1s', '604801') self.assertResponse('seconds 1w 1s', '604801')
self.assertResponse('seconds 1w1s', '604801')
def testNoErrors(self): def testNoErrors(self):
self.assertNotError('ctime') self.assertNotError('ctime')