Merge lp:~marco-gallotta/ibid/uva into lp:~ibid-core/ibid/old-trunk-1.6

[marcog]

[marcog (marco-gallotta)]

Add UVa support to codecontest plugin. UVa run ACM ICPC-style programming contests. I hope to support ACM ICPC-style judges in the future, so I've tried to separate out some of the non-UVa-specific bits for now.

[Max Rabkin (max-rabkin)]

I'm not sure how I feel about setting the current contest via config. Config is for, well, configuration.

I'd prefer "monitor uva <id>" -- and if there's only one running contest (this usually seems to be the case on UVa) then one shouldn't need to specify.

[Keegan Carruthers-Smith (keegan-csmith)]

> I'm not sure how I feel about setting the current contest via config. Config
> is for, well, configuration.
>
> I'd prefer "monitor uva <id>" -- and if there's only one running contest (this
> usually seems to be the case on UVa) then one shouldn't need to specify.

I agree with Max. Config feels dirty. I would enforce only one contest at a time.

[marcog (marco-gallotta)]

> I'm not sure how I feel about setting the current contest via config. Config
> is for, well, configuration.
>
> I'd prefer "monitor uva <id>" -- and if there's only one running contest (this
> usually seems to be the case on UVa) then one shouldn't need to specify.

I originally had it like you suggest, but there were a few issues with that -- maybe we can get past them though. The "uva countdown" feature works before the contest starts -- perhaps it can be made to countdown to the next contest and take an optional <id> arg. The "uva scoreboard" feature only could do the same -- except, it uses the current/previous contest if an <id> is not provided.

Usage would then become

14:37 < mibid> marcog: You can use uva in the following ways:
14:37 < mibid> uva countdown <contest_id>
14:37 < mibid> uva scoreboard <contest_id>
14:37 < mibid> monitor uva <contest_id>
14:37 < mibid> stop monitoring uva

Sound good?

[Keegan Carruthers-Smith (keegan-csmith)]

Maybe add a "uva set contest <contest_id>" then we can use that for
the contest_id default.

[Stefano Rivera (stefanor)]

Serious stuff:
--------------

What's with the modification to identity? I thought we needed to use a string.

Query: create acm team foo
./ibid/plugins/codecontest.py:409: SADeprecationWarning: Use session.add()
  event.session.save_or_update(team)
Response: Created ACM team foo
Query: acm team foo
ERROR:scripts.ibid-plugin:Exception occured in ACMTeamManagement processor of codecontest plugin
Traceback (most recent call last):
  File "scripts/ibid-plugin", line 140, in <module>
    processor.process(event)
  File "./ibid/plugins/__init__.py", line 119, in process
    method(event, *match.groups())
  File "./ibid/plugins/codecontest.py", line 505, in acmteam_info
    u'uva_teams': uva_teams,
  File "./ibid/event.py", line 53, in addresponse
    response = response % params
ValueError: incomplete format
WARNING:plugins.unicode:Found a non-unicode string: exception
Response: I'm not feeling too well

Stylistic section of the review:
--------------------------------

> event.addresponse(u'Done')
All of those kind of things should be replaced with either a more descriptive answer ("OK, Team created"), or simply addresponse(True).

> member = event.session.query(ACMTeamMember) \
> .filter(ACMTeam.name==team_name) \
> .filter_by(name=member_name) \
It'd read better if the two filter lines where the other way around, or you used filter() for both instead of one filter(), one filter_by().

> human_join(sorted([team.name for team in teams])))
You can use a generator expression (i.e. remove the square brackets)

> uva_teams = ', and is known as %s on UVa' % human_join(uva_teams)
> else:
> uva_teams = ''
Unicode

> u'%(team_name)s has member%(plural)s %(team_members)s%(uva_teams)s'
> ...
> u'plural': plural(len(team.members), '', 's')
Bad usage of plural. It should be plural(len(team.members), 'member', 'members'). There's another one further down.

> hours = time_penalty / 3600
> time_penalty -= hours * 3600
> minutes = time_penalty / 60
Use the integer division operator //, it makes intent clearer.

> class ACMProblemScore:
That should probably be a new-style class. Applies to the others, too.
Not that it matters :)

> def __str__(self):
Should probably be __unicode__, as it returns unicode. Also applies to the other class.

> def setup(self):
> super(Uva, self).setup()
Redundant.

> u"Sorry, I'm not monitoring the scoreboard anyway"
That needs to be reworded, it doesn't parse.

review: Needs Fixing

[marcog (marco-gallotta)]

> Maybe add a "uva set contest <contest_id>" then we can use that for
> the contest_id default.

When does the bot decide to drop this default? Moving on when once the contest is over makes sense for countdown, but not necessarily for scoreboard.

[Stefano Rivera (stefanor)]

I agree re contest_id in config.

> 14:37 < mibid> marcog: You can use uva in the following ways:
> 14:37 < mibid> uva countdown <contest_id>
> 14:37 < mibid> uva scoreboard <contest_id>
> 14:37 < mibid> monitor uva <contest_id>
> 14:37 < mibid> stop monitoring uva

Marco: optional parameters need square brackets. i.e. uva countdown [for <contest_id>]

[Keegan Carruthers-Smith (keegan-csmith)]

>> Maybe add a "uva set contest <contest_id>" then we can use that for
>> the contest_id default.
>
> When does the bot decide to drop this default? Moving on when once the contest is over makes sense for countdown, but not necessarily for scoreboard.

The contest_id is optional. So if you want the scoreboard for the
non-current contest you will have to specify it.

Also is countdown the correct name for that function? It implies it
will be doing some... counting down. "time left" is a better name.

[marcog (marco-gallotta)]

> Serious stuff:
> --------------
>
> What's with the modification to identity? I thought we needed to use a string.

Oops, that slipped through the cleanup I did. r885

> Query: create acm team foo
> ./ibid/plugins/codecontest.py:409: SADeprecationWarning: Use session.add()
> event.session.save_or_update(team)
> Response: Created ACM team foo
> Query: acm team foo
> ERROR:scripts.ibid-plugin:Exception occured in ACMTeamManagement processor of
> codecontest plugin
> Traceback (most recent call last):
> File "scripts/ibid-plugin", line 140, in <module>
> processor.process(event)
> File "./ibid/plugins/__init__.py", line 119, in process
> method(event, *match.groups())
> File "./ibid/plugins/codecontest.py", line 505, in acmteam_info
> u'uva_teams': uva_teams,
> File "./ibid/event.py", line 53, in addresponse
> response = response % params
> ValueError: incomplete format
> WARNING:plugins.unicode:Found a non-unicode string: exception
> Response: I'm not feeling too well

r886

> Stylistic section of the review:
> --------------------------------
>
> > event.addresponse(u'Done')
> All of those kind of things should be replaced with either a more descriptive
> answer ("OK, Team created"), or simply addresponse(True).

r887

> > member = event.session.query(ACMTeamMember) \
> > .filter(ACMTeam.name==team_name) \
> > .filter_by(name=member_name) \
> It'd read better if the two filter lines where the other way around, or you
> used filter() for both instead of one filter(), one filter_by().

r888

> > human_join(sorted([team.name for team in teams])))
> You can use a generator expression (i.e. remove the square brackets)

r889

> > uva_teams = ', and is known as %s on UVa' %
> human_join(uva_teams)
> > else:
> > uva_teams = ''
> Unicode

r890

> > u'%(team_name)s has member%(plural)s %(team_members)s%(uva_teams)s'
> > ...
> > u'plural': plural(len(team.members), '', 's')
> Bad usage of plural. It should be plural(len(team.members), 'member',
> 'members'). There's another one further down.

r891

> > hours = time_penalty / 3600
> > time_penalty -= hours * 3600
> > minutes = time_penalty / 60
> Use the integer division operator //, it makes intent clearer.

r892

> > class ACMProblemScore:
> That should probably be a new-style class. Applies to the others, too.
> Not that it matters :)

r893

> > def __str__(self):
> Should probably be __unicode__, as it returns unicode. Also applies to the
> other class.

r984

> > def setup(self):
> > super(Uva, self).setup()
> Redundant.

r895

> > u"Sorry, I'm not monitoring the scoreboard anyway"
> That needs to be reworded, it doesn't parse.

r896 - 'I never even started monitoring the scoreboard' better?

[marcog (marco-gallotta)]

> >> Maybe add a "uva set contest <contest_id>" then we can use that for
> >> the contest_id default.
> >
> > When does the bot decide to drop this default? Moving on when once the
> contest is over makes sense for countdown, but not necessarily for scoreboard.
>
> The contest_id is optional. So if you want the scoreboard for the
> non-current contest you will have to specify it.

We seem to be thinking along different paths. I'm thinking that the bot should determine the default contest_id as the current contest (if one is running), or the next upcoming contest. I thought your "set contest" option would be to temporarily override this default (e.g. if we know we're going to do this contest in 2 weeks time and don't care about the ones before then). My question was: if we do this, when do we discard the "set contest" default provided?

Example:

me: uva countdown
bot: <countdown for contest 42>
me: uva scoreboard
bot: <scoreboard for contest 41>
(contest 42 begins)
me: uva countdown
bot: <countdown for contest 42>
me: uva scoreboard
bot: <scoreboard for contest 42>
(contest 42 ends)
me: uva countdown
bot: <countdown for contest 43>
me: uva scoreboard
bot: <scoreboard for contest 42>

then...

me: uva set contest 45
me: uva countdown
bot: <countdown for contest 45>
me: uva scoreboard
bot: <scoreboard for contest 45 -- error>
(contest 45 begins)
me: uva countdown
bot: <countdown for contest 45>
me: uva scoreboard
bot: <scoreboard for contest 45 -- error>
(contest 45 ends)
me: uva countdown
bot: <countdown for contest 45> <-- this makes no sense!
me: uva scoreboard
bot: <scoreboard for contest 45> <-- but this does

or we could do:
(contest 45 ends)
me: uva countdown
bot: <countdown for contest 45>
me: uva scoreboard
bot: <scoreboard for contest 46> <-- the distinction is unexpected though

> Also is countdown the correct name for that function? It implies it
> will be doing some... counting down. "time left" is a better name.

It has aliases "remaining time" and "time remaining".

[Stefano Rivera (stefanor)]

Query: create acm team foo
./ibid/plugins/codecontest.py:409: SADeprecationWarning: Use session.add()
  event.session.save_or_update(team)
Response: Created ACM team foo
Query: create acm team foo
ERROR:scripts.ibid-plugin:Exception occured in ACMTeamManagement processor of codecontest plugin
Traceback (most recent call last):
  File "scripts/ibid-plugin", line 140, in <module>
    processor.process(event)
  File "./ibid/plugins/__init__.py", line 119, in process
    method(event, *match.groups())
  File "./ibid/plugins/codecontest.py", line 410, in create_acmteam
    event.session.commit()
  File "/usr/lib/pymodules/python2.5/sqlalchemy/orm/session.py", line 671, in commit
    self.transaction.commit()
  File "/usr/lib/pymodules/python2.5/sqlalchemy/orm/session.py", line 378, in commit
    self._prepare_impl()
  File "/usr/lib/pymodules/python2.5/sqlalchemy/orm/session.py", line 362, in _prepare_impl
    self.session.flush()
  File "/usr/lib/pymodules/python2.5/sqlalchemy/orm/session.py", line 1354, in flush
    self._flush(objects)
  File "/usr/lib/pymodules/python2.5/sqlalchemy/orm/session.py", line 1432, in _flush
    flush_context.execute()
  File "/usr/lib/pymodules/python2.5/sqlalchemy/orm/unitofwork.py", line 261, in execute
    UOWExecutor().execute(self, tasks)
  File "/usr/lib/pymodules/python2.5/sqlalchemy/orm/unitofwork.py", line 753, in execute
    self.execute_save_steps(trans, task)
  File "/usr/lib/pymodules/python2.5/sqlalchemy/orm/unitofwork.py", line 768, in execute_save_steps
    self.save_objects(trans, task)
  File "/usr/lib/pymodules/python2.5/sqlalchemy/orm/unitofwork.py", line 759, in save_objects
    task.mapper._save_obj(task.polymorphic_tosave_objects, trans)
  File "/usr/lib/pymodules/python2.5/sqlalchemy/orm/mapper.py", line 1428, in _save_obj
    c = connection.execute(statement.values(value_params), params)
  File "/usr/lib/pymodules/python2.5/sqlalchemy/engine/base.py", line 824, in execute
    return Connection.executors[c](self, object, multiparams, params)
  File "/usr/lib/pymodules/python2.5/sqlalchemy/engine/base.py", line 874, in _execute_clauseelement
    return self.__execute_context(context)
  File "/usr/lib/pymodules/python2.5/sqlalchemy/engine/base.py", line 896, in __execute_context
    self._cursor_execute(context.cursor, context.statement, context.parameters[0], context=context)
  File "/usr/lib/pymodules/python2.5/sqlalchemy/engine/base.py", line 950, in _cursor_execute
    self._handle_dbapi_exception(e, statement, parameters, cursor, context)
  File "/usr/lib/pymodules/python2.5/sqlalchemy/engine/base.py", line 931, in _handle_dbapi_exception
    raise exc.DBAPIError.instance(statement, parameters, e, connection_invalidated=is_disconnect)
IntegrityError: (IntegrityError) column name is not unique u'INSERT INTO acmteams (name) VALUES (?)' [u'foo']
WARNING:plugins.unicode:Found a non-unicode string: exception
Response: That didn't seem to agree with me

And another:

Query: foo is uva team bar
./ibid/plugins/codecontest.py:436: SADeprecationWarning: Use session.add()
  event.session.save_or_update(uva)
Response: Righto
Query: acm team foo
Response: foo has no team members, and is known as bar o...

review: Needs Fixing

[marcog (marco-gallotta)]

> Query: create acm team foo
> ./ibid/plugins/codecontest.py:409: SADeprecationWarning: Use session.add()
> event.session.save_or_update(team)
> Response: Created ACM team foo
> Query: create acm team foo
> ERROR:scripts.ibid-plugin:Exception occured in ACMTeamManagement processor of
> codecontest plugin

r899

> Query: foo is uva team bar
> ./ibid/plugins/codecontest.py:436: SADeprecationWarning: Use session.add()
> event.session.save_or_update(uva)
> Response: Righto
> Query: acm team foo
> Response: foo has no team members, and is known as bar on UVa
> Query: delete acm team foo
> ERROR:scripts.ibid-plugin:Exception occured in ACMTeamManagement processor of
> codecontest plugin

r900

[Stefano Rivera (stefanor)]

Do we want this behaviour?

Query: joe is on acm team foo
./ibid/plugins/codecontest.py:461: SADeprecationWarning: Use session.add()
  event.session.save_or_update(member)
Response: Added joe to team foo
Query: joe is on acm team foo
Response: Added joe to team foo
Query: acm team foo
Response: foo has members joe and joe, and is known as bar and baz on UVa
Query: delete joe from acm team foo
Response: Sorry, I don't know that person
Query: joe is on acm team qux
Response: Added joe to team qux

My unconfigured UVa also does this:

Query: uva countdown
ERROR:scripts.ibid-plugin:Exception occured in Uva processor of codecontest plugin
Traceback (most recent call last):
  File "scripts/ibid-plugin", line 140, in <module>
    processor.process(event)
  File "./ibid/plugins/__init__.py", line 119, in process
    method(event, *match.groups())
  File "./ibid/plugins/codecontest.py", line 654, in get_remaining_time
    time_elapsed = [h for h in etree.findall(u'body/table/tbody/tr/td/div/h1')][0].text.strip()
IndexError: list index out of range
WARNING:plugins.unicode:Found a non-unicode string: exception
Response: That didn't go down very well. Burp.

Query: uva scoreboard
ERROR:scripts.ibid-plugin:Exception occured in Uva processor of codecontest plugin
Traceback (most recent call last):
  File "scripts/ibid-plugin", line 140, in <module>
    processor.process(event)
  File "./ibid/plugins/__init__.py", line 119, in process
    method(event, *match.groups())
  File "./ibid/plugins/codecontest.py", line 665, in get_scoreboard
    problems, scores = self._get_scores(event)
  File "./ibid/plugins/codecontest.py", line 641, in _get_scores
    return (problems, scores)
UnboundLocalError: local variable 'problems' referenced before assignment
WARNING:plugins.unicode:Found a non-unicode string: exception
Response: That didn't go down very well. Burp.

[marcog (marco-gallotta)]

> Do we want this behaviour?
>
> Query: joe is on acm team foo
> ./ibid/plugins/codecontest.py:461: SADeprecationWarning: Use session.add()
> event.session.save_or_update(member)
> Response: Added joe to team foo
> Query: joe is on acm team foo
> Response: Added joe to team foo
> Query: acm team foo
> Response: foo has members joe and joe, and is known as bar and baz on UVa
> Query: delete joe from acm team foo
> Response: Sorry, I don't know that person
> Query: joe is on acm team qux
> Response: Added joe to team qux

r902. It makes sense to have multiple Robert's on the same team, but I've fixed deletion.

> My unconfigured UVa also does this:

Planning to rework this based on Max/Keegan's comments anyway.

[marcog (marco-gallotta)]

Alrighty, the selection of contest id is now handled automatically unless a contest id is specified on a per-command basis. Monitoring checks for the running contest only (I assume no parallel contests -- note that this isn't always true, but very rare). It's still not very robust to poor user commands (e.g. an unknown contest id will result in an unhandled exception).

[Stefano Rivera (stefanor)]

First pass

I'm glad to see you've shortened long lines :)

However, be careful with string types. If you do u'a' 'b', you are concatenating different types of string. That's ok, if ugly, and the result will be unicode, which is what you want. However: r'\a' '\r'. Only the first one is a raw string the second one is a literal CR. I'm talking about diff lines 21x.

== Major ==

62 - autoload = False
63 + #autoload = False

I don't think I need to say anything. And there's more than one.

== Minor ==

44 +from sqlalchemy import Table, Column, ForeignKey
45 +from sqlalchemy.orm import relation
46 +from sqlalchemy.exceptions import InvalidRequestError

I think you can get those from ibid.db

83 + return u'%(user)s (%(usaco_user)s on USACO) %(section)s and ' \
84 + 'last logged in %(days)s ago' % {

Inside brackets (of any kind), you don't need a continuation character (\). There are lots of those.

500 +class Contest:

Newstyle, please.

533 + u'start': self.start.strftime('%d %b %Y %H:%M:%S'),

There's a helper function for formatting times in a bot-wide configurable format.

538 + return mktime(self.start.timetuple()) - mktime(other.start.timetuple())

I think datetimes can be subtracted from each other (giving a timedelta). But obviously this works.

review: Needs Fixing

[marcog (marco-gallotta)]

> However, be careful with string types. If you do u'a' 'b', you are

r910

> 62 - autoload = False
> 63 + #autoload = False

r911

> 44 +from sqlalchemy import Table, Column, ForeignKey
> 45 +from sqlalchemy.orm import relation
> 46 +from sqlalchemy.exceptions import InvalidRequestError
>
> I think you can get those from ibid.db

r912. InvalidRequestError was not there, but I added it. That ok?

> Inside brackets (of any kind), you don't need a continuation character (\).
> There are lots of those.

r913

> 500 +class Contest:
>
> Newstyle, please.

r914

> 533 + u'start': self.start.strftime('%d %b %Y %H:%M:%S'),
>
> There's a helper function for formatting times in a bot-wide configurable
> format.

r915. Nice, it even converts to local tz which I was planning on adding later. :)

> 538 + return mktime(self.start.timetuple()) -
> mktime(other.start.timetuple())
>
> I think datetimes can be subtracted from each other (giving a timedelta). But
> obviously this works.

In [1]: datetime.now() - datetime.now()
Out[1]: datetime.timedelta(-1, 86399, 999985)

I don't see a way to get the sign from that that will always work, besides adding days+hours+minutes+... (which is worse than what I currently have)

[Stefano Rivera (stefanor)]

r'\s+([\*xts\.e0-9 ]+?)'
I don't think * or . must be escaped inside square brackets.

296 + def __repr(self):

It returns unicode, so it should be a __unicode__ (besides the obvious fact that it's currently incorrectly named). There are a few __reper__s.

I'm running out of things to say. Now I just need to test it.

[marcog (marco-gallotta)]

> r'\s+([\*xts\.e0-9 ]+?)'
> I don't think * or . must be escaped inside square brackets.

r917

> It returns unicode, so it should be a __unicode__ (besides the obvious fact

r916

[Stefano Rivera (stefanor)]

Somewhere around line 725, reformat badly formatted times (zero-padding)

[marcog (marco-gallotta)]

> Somewhere around line 725, reformat badly formatted times (zero-padding)

r918

[Stefano Rivera (stefanor)]

Can you rename acmteams to acmteam.

Query: acm teams
Response: ACM teams:

Query: uva contests
/usr/lib/pymodules/python2.6/html5lib/inputstream.py:367: DeprecationWarning: object.__init__() takes no parameters
  str.__init__(self, value)
Response: UVa contests: A Canadian Contest (248) starts 2010-01-09 10:00:00 SAST and lasts 5 hours, CUET Inter-university Programming Contest (247) starts 2010-01-09 17:00:00 SAST and lasts 5 hours, A Bangladeshi Contest (246) starts 2009-12-19 10:00:00 SAST and lasts 5 hours, Alkhawarizmi Programming Contest 2009 (245) starts 2009-12-05 11:00:00 SAST and lasts 5 hours, World Finals Warmup II (244) starts 2010-01-23 16:00:00 SAST and lasts 5 hours, World Finals Warmup I (243) starts 2010-01-16 11:00:00 SAST and lasts 5 hours 15 minutes, Wuhan Regional Semilive (242) starts 2009-11-02 11:00:00 SAST and lasts 5 hours, IIUPC 2009 (241) starts 2009-10-21 11:00:00 SAST and lasts 5 hours, Another Regional Contest (240) starts 2009-11-14 09:00:00 SAST and lasts 5 hours, Nordic Collegiate Programming Contest NCPC 2009 (239) starts 2009-10-03 11:00:00 SAST and lasts 5 hours, Waterloo ACM Programming Contest Fall 2 (238) starts 2009-10-04 19:00:00 SAST and lasts 3 hours, Waterloo ACM Programming Contest Fall 1 (237) starts 2009-09-27 19:00:00 SAST and lasts 3 hours, Dhaka regional Semi-live (236) starts 2009-10-24 13:00:00 SAST and lasts 5 hours, Once Again! A Bangladeshi Contest (235) starts 2009-08-22 11:00:00 SAST and lasts 5 hours 45 minutes, Regional Warmup 1 (234) starts 2009-09-13 15:00:00 SAST and lasts 5 hours, ULM Local Contest (233) starts 2009-07-18 11:00:00 SAST and lasts 5 hours, XXIII Colombian Programming Contest (232) starts 2009-09-05 21:00:00 SAST and lasts 5 hours, Yet another Bangladeshi Contest (231) starts 2009-08-01 11:00:00 SAST and lasts 5 hours, One more ICPC Regional Contest (230) starts 2009-11-07 11:00:00 SAST and lasts 5 hours, ACM ICPC South America Regional Contest (229) starts 2009-10-24 22:00:00 SAST and lasts 5 hours, CUPCAM 2009 (228) starts 2009-10-17 10:00:00 SAST and lasts 5 hours, Brazilian National Contest 2009 (227) starts 2009-09-19 22:00:00 SAST and lasts 5 hours, Waterloo Local Spring 2009 (226) starts 2009-06-13 20:00:00 SAST and lasts 4 hours, The first contest of the new season (225) starts 2009-05-09 11:00:00 SAST and lasts 5 hours, VII Programming Olympiads in Murcia (224) starts 2009-05-23 09:30:00 SAST and lasts 4 hours, Another high quality contest (223) starts 2009-02-21 11:00:00 SAST and lasts 5 hours, Pre-warmup contest (222) starts 2009-02-14 11:00:00 SAST and lasts 3 hours, World Finals Warmup II (221) starts 2009-04-05 10:00:00 SAST and lasts 1 day, World Finals Warmup I (220) starts 2009-03-29 16:00:00 SAST and lasts 1 day and Contest of Newbies V (219) starts 2008-12-27 14:00:00 SAST and lasts 4 hours

That looks a little long for IRC, you may need some paging. But quite honestly I wouldn't worry about it for now.

[marcog (marco-gallotta)]

> Can you rename acmteams to acmteam.

r919

> That looks a little long for IRC, you may need some paging. But quite honestly
> I wouldn't worry about it for now.

It gets truncated and we usually don't care about the ones way in the past.

[Stefano Rivera (stefanor)]

I'd still like something to deal with the null-length acm team list response, but I approve

review: Approve

[marcog (marco-gallotta)]

> I'd still like something to deal with the null-length acm team list response,
> but I approve

Oh, missed that in your last comment. r920

[Stefano Rivera (stefanor)]

review: Approve

[Michael Gorven (mgorven)]

Looks fine. Is authorisation not needed?
 review approve

review: Approve

[Jonathan Hitchcock (vhata)]

review: Abstain

[marcog (marco-gallotta)]

> Is authorisation not needed?

For what?

[Stefano Rivera (stefanor)]

You have two "from ibid.db import" lines. merge em.

review: Needs Fixing

[Max Rabkin (max-rabkin)]

u'UVa team %s is already linke to an ACM team'

<Taejo> tibid: create acm team father
<tibid> Taejo: Created ACM team father
<Taejo> tibid: Taejo is on acm team mother
<tibid> Taejo: Added Taejo to team mother
<Taejo> tibid: delete Taejo from acm team father
<tibid> Taejo: Removed Taejo from team father

Expected: "Taejo is not on team father"

Taejo> tibid: I am on acm team father
<tibid> Taejo: Huh?

Expected: "Added Taejo to team father"; I won't block on this.

The human_ranking function should probably be called utils.ordinal or something like that.

"type += ' '" is clearer than "type = '%s ' % type'" (line 663)

<Taejo> tibid: past uva contests
<tibid> Taejo: Past UVa contests: A Canadian Contest (248) starts 2010-01-09 10:00:00 SAST and lasts 5 hours

Expected "started".

Accept "(?:up)?coming" rather than just "coming".

review: Needs Fixing

[Stefano Rivera (stefanor)]

Sorry, API change means you neeed to update your help-related bits.

review: Needs Fixing

Unmerged revisions

922. By marcog on 2010-02-13

Merge trunk

921. By marcog on 2010-02-13

spelling

920. By marcog on 2010-02-13

Handle case of no acm teams

919. By marcog on 2010-02-13

Rename acmteams to acmteam

918. By marcog on 2010-02-02

Pad countdown times with 0's

917. By marcog on 2010-02-02

Fix usaco results regex (don't escape . and * inside [])

916. By marcog on 2010-02-02

__repr__->__unicode__

915. By marcog on 2010-02-01

Use helper function for time formatting

914. By marcog on 2010-02-01

Newstyle class for Contest

913. By marcog on 2010-02-01

Remvoe unneccessary \ characters

=== modified file 'ibid/db/__init__.py'
--- ibid/db/__init__.py	2010-02-05 15:58:06 +0000
+++ ibid/db/__init__.py	2010-02-13 21:24:14 +0000
@@ -11,7 +11,8 @@
 from sqlalchemy.sql import func
 from sqlalchemy.ext.declarative import declarative_base as _declarative_base
 
-from sqlalchemy.exceptions import IntegrityError, SADeprecationWarning
+from sqlalchemy.exceptions import IntegrityError, SADeprecationWarning, \
+                                  InvalidRequestError
 
 metadata = _MetaData()
 Base = _declarative_base(metadata=metadata)

=== modified file 'ibid/event.py'
--- ibid/event.py	2010-01-17 20:17:23 +0000
+++ ibid/event.py	2010-02-13 21:24:14 +0000
@@ -49,7 +49,7 @@
                 u'difficulties with translation later.',
                 SyntaxWarning, stacklevel=2)
 
-        if isinstance(response, basestring) and params:
+        if isinstance(response, basestring) and (params or params in (u'', '')):
             response = response % params
 
         if isinstance(response, str):

=== modified file 'ibid/plugins/codecontest.py'
--- ibid/plugins/codecontest.py	2010-01-25 18:31:04 +0000
+++ ibid/plugins/codecontest.py	2010-02-13 21:24:14 +0000
@@ -1,20 +1,31 @@
 # Copyright (c) 2010, Marco Gallotta
 # Released under terms of the MIT/X/Expat Licence. See COPYING for details.
 
+from dateutil.relativedelta import relativedelta
 import re
+from time import mktime
 from urllib2 import HTTPError, URLError
 
+from dateutil.parser import parse
 from urllib import urlencode
 
-from ibid.config import Option
-from ibid.db import eagerload
+from ibid.config import Option, IntOption
+from ibid.db import Base, eagerload
 from ibid.db.models import Account, Attribute, Identity
-from ibid.plugins import Processor, match, auth_responses
-from ibid.utils import cacheable_download
+from ibid.db.types import IbidUnicode, Integer
+from ibid.db.versioned_schema import VersionedSchema
+from ibid.plugins import Processor, match, periodic, auth_responses
+from ibid.utils import cacheable_download, plural, human_join, format_date
 from ibid.utils.html import get_html_parse_tree
-
-help = {u'usaco': u'Query USACO sections, divisions and more. Since this info is private, users are required to provide their USACO password when linking their USACO account to their ibid account and only linked accounts can be queried. Your password is used only to confirm that the account is yours and is discarded immediately.'}
-
+from ibid.db import Table, Column, ForeignKey, relation, InvalidRequestError
+
+help = {}
+
+help[u'usaco'] = u'Query USACO sections, divisions and more. Since this info ' \
+        u'is private, users are required to provide their USACO password when ' \
+        u'linking their USACO account to their ibid account and only linked ' \
+        u'accounts can be queried. Your password is used only to confirm ' \
+        u'that the account is yours and is discarded immediately.'
 class UsacoException(Exception):
     def __init__(self, msg):
         self.msg = msg
@@ -37,9 +48,13 @@
     autoload = False
 
     def _login(self, user, password):
-        params = urlencode({'NAME': user.encode('utf-8'), 'PASSWORD': password.encode('utf-8')})
+        params = urlencode({
+            'NAME': user.encode('utf-8'),
+            'PASSWORD': password.encode('utf-8')
+        })
         try:
-            etree = get_html_parse_tree(u'http://ace.delos.com/usacogate', data=params, treetype=u'etree')
+            etree = get_html_parse_tree(u'http://ace.delos.com/usacogate',
+                    data=params, treetype=u'etree')
         except URLError:
             raise UsacoException(u'Sorry, USACO (or my connection?) is down')
         for font in etree.getiterator(u'font'):
@@ -66,7 +81,8 @@
             if tds[5] == u'DONE':
                 section = u'has completed USACO training'
             if tds[0] and tds[0].lower() == usaco_user:
-                return u'%(user)s (%(usaco_user)s on USACO) %(section)s and last logged in %(days)s ago' % {
+                return u'%(user)s (%(usaco_user)s on USACO) %(section)s and ' \
+                        u'last logged in %(days)s ago' % {
                     'user': user,
                     'usaco_user': usaco_user,
                     'days': tds[3],
@@ -119,11 +135,14 @@
                 .filter(Identity.source == event.source) \
                 .first()
             if account is None:
-                raise UsacoException(u'Sorry, %s has not been linked to a USACO account yet' % user)
+                raise UsacoException(u'Sorry, %s has not been linked to a '
+                        u'USACO account yet' % user)
 
-        usaco_account = [attr.value for attr in account.attributes if attr.name == 'usaco_account']
+        usaco_account = [attr.value for attr in account.attributes
+                if attr.name == 'usaco_account']
         if len(usaco_account) == 0:
-            raise UsacoException(u'Sorry, %s has not been linked to a USACO account yet' % user)
+            raise UsacoException(u'Sorry, %s has not been linked to a USACO '
+                    u'account yet' % user)
         return usaco_account[0]
 
     def _get_usaco_users(self, event):
@@ -169,21 +188,26 @@
 
         params = urlencode({'id': usaco_user.encode('utf-8'), 'search': 'SEARCH'})
         try:
-            etree = get_html_parse_tree(u'http://ace.delos.com/showdiv', data=params, treetype=u'etree')
+            etree = get_html_parse_tree(u'http://ace.delos.com/showdiv',
+                    data=params, treetype=u'etree')
         except URLError:
             event.addresponse(u'Sorry, USACO (or my connection?) is down')
-        division = [b.text for b in etree.getiterator(u'b') if b.text and usaco_user in b.text][0]
+        division = [b.text for b in etree.getiterator(u'b')
+                if b.text and usaco_user in b.text][0]
         if division.find(u'would compete') != -1:
-            event.addresponse(u'%(user)s (%(usaco_user)s on USACO) has not competed in a USACO before',
+            event.addresponse(u'%(user)s (%(usaco_user)s on USACO) has not '
+                    u'competed in a USACO before',
                     {u'user': user, u'usaco_user': usaco_user})
         matches = re.search(r'(\w+) Division', division)
         division = matches.group(1).lower()
-        event.addresponse(u'%(user)s (%(usaco_user)s on USACO) is in the %(division)s division',
+        event.addresponse(u'%(user)s (%(usaco_user)s on USACO) is in '
+                u'the %(division)s division',
                 {u'user': user, u'usaco_user': usaco_user, u'division': division})
 
     def _redact(self, event, term):
         for type in ['raw', 'deaddressed', 'clean', 'stripped']:
-            event['message'][type] = re.sub(r'(.*)(%s)' % re.escape(term), r'\1[redacted]', event['message'][type])
+            event['message'][type] = re.sub(r'(.*)(%s)' % re.escape(term),
+                    r'\1[redacted]', event['message'][type])
 
     @match(r'^(\S+)\s+(?:is|am)\s+(\S+)\s+on\s+usaco(?:\s+password\s+(\S+))?$')
     def usaco_account(self, event, user, usaco_user, password):
@@ -191,16 +215,19 @@
             self._redact(event, password)
 
         if event.public and password:
-            event.addresponse(u"Giving your password in public is bad! Please tell me that again in a private message.")
+            event.addresponse(u'Giving your password in public is bad! '
+                    u'Please tell me that again in a private message.')
             return
 
         if not event.account:
-            event.addresponse(u'Sorry, you need to create an account with me first (type "usage accounts" to see how)')
+            event.addresponse(u'Sorry, you need to create an account with '
+                    u'me first (type "usage accounts" to see how)')
             return
         admin = auth_responses(event, u'usacoadmin')
         if user.lower() == 'i':
             if password is None and not admin:
-                event.addresponse(u'Sorry, I need your USACO password to verify your account')
+                event.addresponse(u'Sorry, I need your USACO password to '
+                        u'verify your account')
             if password and not self._check_login(user, password):
                 event.addresponse(u'Sorry, that account is invalid')
                 return
@@ -226,7 +253,8 @@
             event.addresponse(e)
             return
 
-        usaco_account = [attr for attr in account.attributes if attr.name == u'usaco_account']
+        usaco_account = [attr for attr in account.attributes
+                if attr.name == u'usaco_account']
         if usaco_account:
             usaco_account[0].value = usaco_user
         else:
@@ -234,7 +262,7 @@
         event.session.save_or_update(account)
         event.session.commit()
 
-        event.addresponse(u'Done')
+        event.addresponse(True)
 
     @match(r'^usaco\s+(\S+)\s+results(?:\s+for\s+(.+))?$')
     def usaco_results(self, event, contest, user):
@@ -249,18 +277,19 @@
 
         url = u'http://ace.delos.com/%sresults' % contest.upper()
         try:
-            filename = cacheable_download(url, u'usaco/results_%s' % contest.upper(), timeout=30)
+            filename = cacheable_download(url,
+                    u'usaco/results_%s' % contest.upper(), timeout=30)
         except HTTPError:
             event.addresponse(u"Sorry, the results for %s aren't released yet", contest)
         except URLError:
-            event.addresponse(u"Sorry, I couldn't fetch the USACO results. Maybe USACO is down?")
+            event.addresponse(u"Sorry, I couldn't fetch the USACO results. "
+                    u"Maybe USACO is down?")
 
         if user is not None:
             users = {usaco_user: user.lower()}
         else:
             try:
                 users = self._get_usaco_users(event)
-                print users
             except UsacoException, e:
                 event.addresponse(e)
                 return
@@ -275,8 +304,16 @@
                 if d in line.lower():
                     division = index
             # Example results line:
-            #            2010 POL Jakub Pachocki      meret1      ***** ***** 270 ***** ***** * 396 ***** ***** ** 324 1000
-            matches = re.match(r'^\s*(\d{4})\s+([A-Z]{3})\s+(.+?)\s+(\S+\d)\s+([\*xts\.e0-9 ]+?)\s+(\d+)\s*$', line)
+            # 2010 POL Jakub Pachocki      meret1      \
+            # ***** ***** 270 ***** ***** * 396 ***** ***** ** 324 1000
+            matches = re.match(
+                    r'^\s*(\d{4})'           # Year
+                    r'\s+([A-Z]{3})'         # Country code
+                    r'\s+(.+?)'              # Name
+                    r'\s+(\S+\d)'            # Account name
+                    r'\s+([*xts.e0-9 ]+?)'   # Scores
+                    r'\s+(\d+)'              # Total score
+                    r'\s*$', line)
             if matches:
                 year = matches.group(1)
                 country = matches.group(2)
@@ -291,7 +328,8 @@
                     match = True
                     users[usaco_user] = user
                 if match:
-                    results[division].append((year, country, name, usaco_user, scores, total))
+                    results[division].append((year, country, name,
+                            usaco_user, scores, total))
                     count += 1
 
         response = []
@@ -309,7 +347,8 @@
                     division_string = u' in the %s division' % division.title()
                 else:
                     division_string = u''
-                response.append(u'%(user)s scored %(total)s%(division)s (%(scores)s)' % {
+                response.append(u'%(user)s scored %(total)s%(division)s '
+                        u'(%(scores)s)' % {
                     u'user': user_string,
                     u'total': result[5],
                     u'scores': result[4],
@@ -323,9 +362,599 @@
                     u'contest': contest,
                 })
             else:
-                event.addresponse(u"Sorry, I don't know anyone that entered %s", contest)
-            return
-
-        event.addresponse(u'\n'.join(response), conflate=False)
+                event.addresponse(u"Sorry, I don't know anyone "
+                        u"that entered %s", contest)
+            return
+
+        event.addresponse(u'\n'.join(response), conflate=False)
+
+
+class UVATeam(Base):
+    __table__ = Table('uvateams', Base.metadata,
+    Column('id', Integer, primary_key=True),
+    Column('acm_id', Integer, ForeignKey('acmteams.id'), nullable=False),
+    Column('name', IbidUnicode(64, case_insensitive=True), unique=True,
+            nullable=False, index=True),
+    useexisting=True)
+
+    __table__.versioned_schema = VersionedSchema(__table__, 1)
+
+    def __init__(self, acm_id, name):
+        self.acm_id = acm_id
+        self.name = name
+
+    def __unicode__(self):
+        return u'<UVATeam %s is ACMTeam %d>' % (self.name, self.acm_id)
+
+
+class ACMTeamMember(Base):
+    __table__ = Table('acmteammembers', Base.metadata,
+    Column('id', Integer, primary_key=True),
+    Column('team_id', Integer, ForeignKey('acmteams.id'), nullable=False,
+        index=True),
+    Column('name', IbidUnicode(64, case_insensitive=True), nullable=False),
+    useexisting=True)
+
+    __table__.versioned_schema = VersionedSchema(__table__, 1)
+
+    def __init__(self, team_id, name):
+        self.team_id = team_id
+        self.name = name
+
+    def __unicode__(self):
+        return u'<ACMTeamMember %s in %s>' % (self.name, self.team_id)
+
+
+class ACMTeam(Base):
+    __table__ = Table('acmteams', Base.metadata,
+    Column('id', Integer, primary_key=True),
+    Column('name', IbidUnicode(64, case_insensitive=True), unique=True,
+            index=True), useexisting=True)
+
+    __table__.versioned_schema = VersionedSchema(__table__, 1)
+
+    uvateams = relation(UVATeam, backref='team', cascade='all,delete')
+    members = relation(ACMTeamMember, backref='team', cascade='all,delete')
+
+    def __init__(self, name=None):
+        self.name = name
+
+    def __unicode__(self):
+        return u'<ACMTeam %s>' % self.name
+
+
+help[u'acmteam'] = u'Manage ACM teams by and their members and link them ' \
+        u'to accounts on various judge sites (currently only UVa is supported).'
+class ACMTeamManagement(Processor):
+    """create acm team <team_name>
+    delete acm team <team_name>
+    <team_name> is uva team <uva_name>
+    <member_name> is on acm team <team_name>
+    delete <member_name> from acm team <team_name>
+    acm teams
+    acm team <team_name>"""
+
+    feature = 'acmteam'
+    priority = -10 # Alternate syntax 'remove foo' clashes with auth
+    autoload = False
+
+    @match(r'^create\s+acm\s+team\s+(.+)$')
+    def create_acmteam(self, event, name):
+        team = event.session.query(ACMTeam) \
+            .filter_by(name=name) \
+            .first()
+        if team:
+            event.addresponse(u'I already know about a team called %s', name)
+            return
+        team = ACMTeam(name)
+        event.session.save_or_update(team)
+        event.session.commit()
+        event.addresponse(u'Created ACM team %s', name)
+
+    @match('^(?:delete|remove)\s+acm\s+team\s+(.+)$')
+    def delete_acmteam(self, event, name):
+        try:
+            team = event.session.query(ACMTeam) \
+                .filter_by(name=name) \
+                .one()
+        except InvalidRequestError:
+            event.addresponse(u"Sorry, I don't know the team %s", name)
+            return
+        event.session.delete(team)
+        event.session.commit()
+        event.addresponse(True)
+
+    @match(r'^(.+)\s+is\s+uva\s+team\s+(.+)$')
+    def link_uvateam(self, event, team_name, uva_name):
+        try:
+            team = event.session.query(ACMTeam) \
+                .filter_by(name=team_name) \
+                .one()
+        except InvalidRequestError:
+            event.addresponse(u"Sorry, I don't know the team %s", team_name)
+            return
+        uvateam = event.session.query(UVATeam) \
+            .filter_by(name=uva_name) \
+            .first()
+        if uvateam:
+            event.addresponse(u'UVa team %s is already linke to an ACM team',
+                    uva_name)
+            return
+        uva = UVATeam(team.id, uva_name)
+        event.session.save_or_update(uva)
+        event.session.commit()
+        event.addresponse(True)
+
+    @match(r'^(.+)\s+is\s+[io]n\s+acm\s+team\s+(.+)$')
+    def add_acmmember(self, event, member_name, team_name):
+        try:
+            team = event.session.query(ACMTeam) \
+                .filter_by(name=team_name) \
+                .one()
+        except InvalidRequestError:
+            event.addresponse(u"Sorry, I don't know the team %s", team_name)
+            return
+        member = ACMTeamMember(team.id, member_name)
+        event.session.save_or_update(member)
+        event.session.commit()
+        event.addresponse(u'Added %(member)s to team %(team)s', {
+            u'member': member_name,
+            u'team': team_name,
+        })
+
+    @match(r'^(?:delete|remove)\s+(.+)\s+from\s+acm\s+team\s+(.+)$')
+    def remove_acmmember(self, event, member_name, team_name):
+        member = event.session.query(ACMTeamMember) \
+            .filter_by(name=member_name) \
+            .filter(ACMTeam.name==team_name) \
+            .first()
+        if not member:
+            event.addresponse(u"Sorry, I don't know that person")
+            return
+        event.session.delete(member)
+        event.session.commit()
+        event.addresponse(u'Removed %(member)s from team %(team)s', {
+            u'member': member_name,
+            u'team': team_name,
+        })
+
+    @match(r'^(?:list\s+)?acm\s+teams$')
+    def list_acmteams(self, event):
+        teams = event.session.query(ACMTeam).all()
+        if teams:
+            event.addresponse(u'ACM teams: %s',
+                human_join(sorted(team.name for team in teams)))
+        else:
+            event.addresponse(u'No ACM teams registered with me')
+
+    @match(r'^acm\s+team\s+(.+)$')
+    def acmteam_info(self, event, name):
+        try:
+            team = event.session.query(ACMTeam) \
+                .filter_by(name=name) \
+                .one()
+        except InvalidRequestError:
+            event.addresponse(u"Sorry, I don't know the team %s", name)
+            return
+        uva_teams = [t.name for t in team.uvateams]
+        if uva_teams:
+            uva_teams = u', and is known as %s on UVa' % human_join(uva_teams)
+        else:
+            uva_teams = u''
+        members = [m.name for m in team.members]
+        if members:
+            event.addresponse(u'%(team_name)s has %(plural)s '
+                    '%(team_members)s%(uva_teams)s', {
+                u'team_name': name,
+                u'team_members': human_join(sorted(m.name for m in team.members)),
+                u'uva_teams': uva_teams,
+                u'plural': plural(len(team.members), 'member', 'members')
+            })
+        else:
+            event.addresponse(u'%(team_name)s has no team members%(uva_teams)s', {
+                u'team_name': name,
+                u'uva_teams': uva_teams,
+            })
+
+
+def time_penalty_str(time_penalty):
+    hours = time_penalty // 3600
+    time_penalty -= hours * 3600
+    minutes = time_penalty // 60
+    time_penalty -= minutes * 60
+    seconds = time_penalty
+    return u'%02d:%02d:%02d' % (hours, minutes, seconds)
+
+
+class ACMProblemScore(object):
+    def __init__(self, correct, submissions, time):
+        self.correct = correct
+        self.submissions = submissions
+        self.time = time
+
+    def points(self):
+        return int(self.correct)
+
+    def time_penalty(self):
+        if self.correct:
+            return self.time + 20*60*(self.submissions-1)
+        return 0
+
+    def __unicode__(self):
+        if self.correct:
+            time_penalty = time_penalty_str(self.time_penalty())
+        else:
+            time_penalty = u'--'
+        return u'(%(submissions)d) %(time_penalty)s' % {
+            u'submissions': self.submissions,
+            u'time_penalty': time_penalty
+        }
+
+
+class ACMScore(object):
+    def __init__(self, problem_scores):
+        self.problem_scores = problem_scores
+
+    def points(self):
+        return sum(s.points() for s in self.problem_scores.itervalues())
+
+    def time_penalty(self):
+        return sum(s.time_penalty() for s in self.problem_scores.itervalues())
+
+    def __cmp__(self, b):
+        if self.points() != b.points():
+            return -(self.points() - b.points())
+        return self.time_penalty() - b.time_penalty()
+
+    def __unicode__(self):
+        return u'%(problem_scores)s %(points)d %(time_penalty)s' % {
+            u'problem_scores': u' '.join(str(s) for p, s in
+                    sorted(self.problem_scores.iteritems())),
+            u'points': self.points(),
+            u'time_penalty': time_penalty_str(self.time_penalty()),
+        }
+
+
+class Contest(object):
+    def __init__(self, id, name, start, end, dayfirst=False, yearfirst=False):
+        self.id = int(id)
+        self.name = name
+        self.start = parse(start)
+        self.end = parse(end)
+
+    def duration(self):
+        time = relativedelta(self.end, self.start)
+
+        if time.days == 0:
+            days = u''
+        else:
+            days = u'%d %s ' % (time.days, plural(time.days, u'day', u'days'))
+
+        if time.hours == 0:
+            hours = u''
+        else:
+            hours = u'%d %s ' % (time.hours,
+                    plural(time.hours, u'hour', u'hours'))
+
+        if time.minutes == 0:
+            minutes = u''
+        else:
+            minutes = u'%d %s ' % (time.minutes,
+                    plural(time.minutes, u'minute', u'minutes'))
+
+        return (u'%s%s%s' % (days, hours, minutes)).strip()
+
+    def __unicode__(self):
+        return u'%(name)s (%(id)d) starts %(start)s and lasts %(duration)s' % {
+            u'name': self.name,
+            u'id': self.id,
+            u'start': format_date(self.start),
+            u'duration': self.duration(),
+        }
+
+    def __cmp__(self, other):
+        return mktime(self.start.timetuple()) - mktime(other.start.timetuple())
+
+
+def ranking(scores, team):
+    for position, (t, score) in enumerate(sorted(
+            scores.iteritems(), key=lambda (k,v): (v,k))):
+        if t == team:
+            return position + 1
+
+
+def human_ranking(ranking):
+    if ranking % 10 == 1 and ranking % 100 != 11:
+        return u'%dst' % ranking
+    if ranking % 10 == 2 and ranking % 100 != 12:
+        return u'%dnd' % ranking
+    if ranking % 10 == 3 and ranking % 100 != 13:
+        return u'%drd' % ranking
+    return u'%dth' % ranking
+
+
+help[u'uva'] = u'Monitor the scoreboard of an ACM contest hosted on the UVa ' \
+        u'online judge. To add teams to monitor, first use the "acmteam" ' \
+        u'feature to create the teams and link them to UVa accounts. The ' \
+        u'<contest_id> option is the contest=? parameter in the UVa contest ' \
+        u'you would like to monitor.'
+class Uva(Processor):
+    """[past|running|coming|all] uva contests
+    [previous|next] uva contest
+    uva countdown [<contest_id>]
+    uva scoreboard [<contest_id>]
+    monitor uva
+    stop monitoring uva"""
+
+    feature = u'uva'
+    autoload = False
+
+    scores_url = u'http://uva.onlinejudge.org/index2.php?option=' \
+            u'com_onlinejudge&Itemid=13&page=show_contest_standings&contest=%s&fullscreen=1'
+    uva_monitor_period = IntOption(u'uva_monitor_period',
+            u'Delay period between monitor calls', 60)
+
+    teams = {}
+    monitors = []
+
+    def _get_contests(self, type='all'):
+        if type == 'all':
+            contests = []
+            for t in ('past', 'running', 'coming'):
+                contests.extend(self._get_contests(t))
+            return contests
+        elif type == 'past':
+            item_id = 13
+        elif type == 'running':
+            item_id = 12
+        elif type == 'coming':
+            item_id = 11
+        else:
+            raise Exception(u'Unexpected contest type: %s' % type)
+
+        url = u'http://uva.onlinejudge.org/index.php?option=' \
+                u'com_onlinejudge&Itemid=%s' % item_id
+        etree = get_html_parse_tree(url, treetype=u'etree')
+
+        contests = []
+        for tr in etree.findall(u'body/div/div/div/div/div/div/table/tbody/tr'):
+            if tr.get(u'class')  in (u'sectiontableentry1', u'sectiontableentry2'):
+                tds = [td for td in tr.getiterator(u'td')]
+                id = tds[0].text
+                name = tds[2].find(u'a').text
+                start = tds[3].text
+                end = tds[4].text
+                contest = Contest(id, name, start, end, dayfirst=False, yearfirst=True)
+                contests.append(contest)
+
+        return contests
+
+    def _get_recent_contest(self):
+        contests = sorted(self._get_contests(u'past'))
+        if contests:
+            return contests[-1]
+        return None
+
+    def _get_running_contest(self):
+        contests = sorted(self._get_contests(u'running'))
+        if contests:
+            return contests[0]
+        return None
+
+    def _get_next_contest(self):
+        contests = sorted(self._get_contests(u'coming'))
+        if contests:
+            return contests[-1]
+        return None
+
+    def _get_running_or_next_or_recent_contest(self):
+        return self._get_running_contest() or self._get_next_contest() \
+                or self._get_recent_contest()
+
+    def _get_running_or_recent_contest(self):
+        return self._get_running_contest() or self._get_recent_contest()
+
+    @match(r'^(?:(past|running|coming|all|previous|next)\s+)?uva\s+contests?$')
+    def get_contests(self, event, type):
+        if not type:
+            type = u'all'
+        if type == u'previous':
+            contests = [self._get_recent_contest()]
+        elif type == u'next':
+            contests = [self._get_next_contest()]
+        else:
+            contests = self._get_contests(type)
+        if type == u'all':
+            type = u''
+        else:
+            type = '%s ' % type
+        if contests and contests[0]:
+            event.addresponse(u'%(type)sUVa %(contest_s)s: %(contests)s', {
+                u'type': type.title(),
+                u'contest_s': plural(len(contests), u'contest', u'contests'),
+                u'contests': human_join(map(unicode, contests)),
+            })
+        else:
+            event.addresponse(u'No %(type)sUVa %(contest_s)s', {
+                u'type': type,
+                u'contest_s': plural((type not in (u'previous', 'next')) * 2,
+                        u'contest', u'contests'),
+            })
+
+    def _get_scores(self, event, contest_id):
+        url = self.scores_url % contest_id
+        etree = get_html_parse_tree(url, treetype=u'etree')
+
+        teams = {}
+        for team in event.session.query(UVATeam).all():
+            teams[team.name] = u'%(name)s (%(members)s)' % {
+                u'name': team.team.name,
+                u'members': human_join(m.name for m in team.team.members),
+            }
+
+        scores = {}
+        header = 0
+        for tr in etree.getiterator(u'tr'):
+            tds = [t for t in tr.getiterator(u'td')]
+            if header == 0:
+                header += 1
+                continue
+            if header == 1:
+                problems = [t.text.strip() for t in tds[2:-2]]
+                header += 1
+                continue
+            team = tds[1].text
+            if team in teams.keys():
+                team_scores = {}
+                for i, problem in enumerate(problems):
+                    matches = re.search(r'(\d+):(\d+):(\d+)\s*\((\d+)\)', tds[i+2].text)
+                    penalty_time = (int(matches.group(1)) * 60 + \
+                            int(matches.group(2))) * 60 + int(matches.group(3))
+                    team_scores[problem] = ACMProblemScore(penalty_time > 0,
+                            int(matches.group(4)) + int(penalty_time > 0), penalty_time)
+                scores[teams[team]] = ACMScore(team_scores)
+        return (problems, scores)
+
+    @match(r'^uva\s+(remaining\s+time|time\s+remaining|countdown)(?:\s+(\d+))?$')
+    def get_remaining_time(self, event, phrase, contest_id):
+        if contest_id is None:
+            if u'remaining' in phrase:
+                contest_id = self._get_running_or_recent_contest().id
+            else:
+                contest_id = self._get_running_or_next_or_recent_contest().id
+        url = u'http://uva.onlinejudge.org/index2.php?option=com_onlinejudge&' \
+                u'Itemid=12&page=show_contest_statistics&contest=%s&fullscreen=1' \
+                % contest_id
+        etree = get_html_parse_tree(url, treetype='etree')
+        time_elapsed = [h for h in etree.findall(
+                u'body/table/tbody/tr/td/div/h1')][0].text.strip()
+        time_remaining = [h for h in etree.findall(
+                u'body/table/tbody/tr/td/div/h1')][2].text.strip()
+        time_remaining = re.sub(r'\b(\d)\b', r'0\1', time_remaining)
+        if '-' in time_elapsed:
+            event.addresponse(u'%s until contest begins',
+                    time_elapsed.replace(u'-', u''))
+        elif time_remaining == '00:00:00':
+            event.addresponse(u'The contest is over')
+        else:
+            event.addresponse(u'%s time remaining', time_remaining)
+
+    @match(r'^uva\s+scoreboard(?:\s+(\d+))?$')
+    def get_scoreboard(self, event, contest_id):
+        if contest_id is None:
+            contest_id = self._get_running_or_recent_contest().id
+        problems, scores = self._get_scores(event, contest_id)
+        response = []
+
+        for position, (team, score) in enumerate(sorted(
+                scores.iteritems(), key=lambda (k,v): (v,k))):
+            response.append(u'%(position)d. %(team)s: %(score)s' % {
+                u'position': position+1,
+                u'team': team,
+                u'score': str(score),
+            })
+
+        response.append(u'Full scoreboard: %s' % (self.scores_url % contest_id))
+        event.addresponse(u'\n'.join(response), conflate=False)
+
+    @periodic(config_key='uva_monitor_period', initial_delay=5)
+    def monitor(self, event):
+        for source, channel in self.monitors:
+            contest = self._get_running_contest()
+            if contest is None:
+                self.scores = {}
+                continue
+            problems, scores = self._get_scores(event, contest.id)
+            response = []
+            for team in scores.keys():
+                if not self.scores.has_key(team):
+                    score = {}
+                    for id, problem in len(scores[team][0]):
+                        score[problem] = ACMProblemScore(False, 0, 0)
+                    self.scores[team] = ACMScore(score)
+                for problem in sorted(problems):
+                    if scores[team].problem_scores[problem].correct and \
+                            not self.scores[team].problem_scores[problem].correct:
+                        prev_ranking = ranking(self.scores, team)
+                        new_ranking = ranking(scores, team)
+                        if prev_ranking == new_ranking:
+                            ranking_change = u'remaining in %s' % \
+                                    human_ranking(new_ranking)
+                        else:
+                            ranking_change = u'moving from %(prev)s to %(new)s' % {
+                                u'prev': human_ranking(prev_ranking),
+                                u'new': human_ranking(new_ranking),
+                            }
+                        response.append(u'%(team)s has solved problem %(problem)s, '
+                                u'%(ranking_change)s with %(points)d problems in '
+                                u'%(time_penalty)s' % {
+                            u'team': team,
+                            u'problem': problem,
+                            u'ranking_change': ranking_change,
+                            u'points': scores[team].points(),
+                            u'time_penalty': time_penalty_str(scores[team].time_penalty()),
+                        })
+                    elif not scores[team].problem_scores[problem].correct and \
+                            self.scores[team].problem_scores[problem].correct:
+                        response.append(u"%(team)s's previously correct submission "
+                                u"for problem %(problem)s has been rejudged as incorrect!" % {
+                            u'team': team,
+                            u'problem': problem,
+                        })
+                    elif scores[team].problem_scores[problem].submissions > \
+                            self.scores[team].problem_scores[problem].submissions:
+                        num = scores[team].problem_scores[problem].submissions - \
+                                self.scores[team].problem_scores[problem].submissions
+                        total_wrong = scores[team].problem_scores[problem].submissions
+                        if num > 1:
+                            number = str(num)
+                        else:
+                            number = u'a'
+                        if total_wrong == num:
+                            overall = u'their first incorrect %s for the problem' % \
+                                    plural(num, u'submission', u'submissions')
+                        else:
+                            overall = u'bringing them to %(total_wrong)d incorrect ' \
+                                    '%(plural)s for the problem' % {
+                                u'total_wrong': total_wrong,
+                                u'plural': plural(total_wrong, u'submission', u'submissions'),
+                            }
+                        response.append(u'%(team)s has submitted %(number)s new incorrect '
+                                u'%(plural)s for problem %(problem)s, %(overall)s' % {
+                            u'team': team,
+                            u'problem': problem,
+                            u'number': number,
+                            u'plural': plural(num, u'submission', u'submissions'),
+                            u'overall': overall,
+                        })
+            self.scores = scores
+            if response:
+                event.addresponse(u'\n'.join(response), conflate=False,
+                        source=source, target=channel)
+
+    @match(r'^(?:monitor\s+uva|uva\s+monitor)$')
+    def start_monitor(self, event):
+        contest = self._get_running_contest()
+        if contest is None:
+            self.scores = {}
+        else:
+            problems, self.scores = self._get_scores(event, contest.id)
+        if (event.source, event.channel) in self.monitors:
+            event.addresponse(u"Sorry, I'm already monitoring the scoreboard")
+            return
+        self.monitors.append((event.source, event.channel))
+        event.addresponse(u"Okay, I'll monitor the scoreboard for you")
+        if self.monitor.lock.acquire(0):
+            self.monitor(event)
+            self.monitor.lock.release()
+
+    @match(r'^(?:stop\s+monitoring\s+uva|uva\s+stop\s+monitor)$')
+    def stop_monitor(self, event):
+        if (event.source, event.channel) not in self.monitors:
+            event.addresponse(u'I never even started monitoring the scoreboard')
+            return
+        self.monitors.remove((event.source, event.channel))
+        event.addresponse(u'Okay, no longer monitoring the scoreboard')
+
 
 # vi: set et sta sw=4 ts=4: