Changeset 165
- Timestamp:
- 06/26/08 17:00:08 (3 months ago)
- Files:
-
- trunk/antimatter/luke (modified) (1 prop)
- trunk/antimatter/luke/myplugs (modified) (1 prop)
- trunk/antimatter/luke/myplugs/libtracker (modified) (1 prop)
- trunk/antimatter/luke/myplugs/libtracker/auth.py (modified) (1 diff)
- trunk/antimatter/luke/myplugs/libtracker/dateutil (modified) (1 prop)
- trunk/antimatter/luke/myplugs/libtracker/dateutil/zoneinfo (modified) (1 prop)
- trunk/antimatter/luke/myplugs/libtracker/timeparser.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/antimatter/luke
- Property svn:ignore changed from
.hg
.hgignore
.hgsigs
.hgtags
gozerdata
to
.hg*
.svnignore
log
README
runbot
setup.py
gozer*
logs
man
plugtests
tables
tests
backup
bin
doc
files
- Property svn:ignore changed from
trunk/antimatter/luke/myplugs
- Property svn:ignore changed from
*.pyc
to
.svnignore
*.pyc
- Property svn:ignore changed from
trunk/antimatter/luke/myplugs/libtracker
- Property svn:ignore set to
.svnignore
*.pyc
- Property svn:ignore set to
trunk/antimatter/luke/myplugs/libtracker/auth.py
r159 r165 27 27 if (not user == None): 28 28 until = gmtime(config.get('max_auth') - (time() - user.lastauth)) 29 bot.say(ievent.nick,repr(config.get('max_auth')))30 29 bot.say(ievent.nick, "You're still authenticated for " + str(until[3]) + "h:" \ 31 30 + str(until[4]) + "m:" + str(until[5]) + "s") trunk/antimatter/luke/myplugs/libtracker/dateutil
- Property svn:ignore set to
.svnignore
*.pyc
- Property svn:ignore set to
trunk/antimatter/luke/myplugs/libtracker/dateutil/zoneinfo
- Property svn:ignore set to
.svnignore
*.pyc
- Property svn:ignore set to
trunk/antimatter/luke/myplugs/libtracker/timeparser.py
r163 r165 38 38 OUTPUT: TimeAdjustment 39 39 """ 40 #First Type: 5 hours (assumed current day)41 #Second Type: 1 AM to 5 PM42 #Third Type: ON Sunday: 5 hours or so 43 # Fourth Type: ON Sunday: 1 AM to 5 PM44 setdate = re.findall( r"^on (\b\w+\b).?[,:](.*)", ievent.txt, re.I)40 #First part: On $date: 41 first = r"^(?:(?:on )?(\b\w+\b|\b\d{2,2}\b.\b\d{1,2}\b.\b\d{2,4}\b|\b\w+\b.\b\d{1,2}(?:,.\d{2,4})?).?[,:])?" 42 43 #setdate = re.findall(r"^on (\b\w+\b).?[,:](.*)", ievent.txt, re.I) 44 setdate = re.findall(first + r"(.*)", ievent.txt, re.I) 45 45 if (setdate): 46 46 setdate = setdate[0]