projects
/
zzz-dywypi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pokedex plugin now labels fuzzy-matched foreign names.
[zzz-dywypi.git]
/
plugins
/
Pokedex
/
plugin.py
diff --git
a/plugins/Pokedex/plugin.py
b/plugins/Pokedex/plugin.py
index
77de7d9
..
14574d0
100644
(file)
--- a/
plugins/Pokedex/plugin.py
+++ b/
plugins/Pokedex/plugin.py
@@
-29,6
+29,7
@@
###
###
+import supybot.conf as conf
import supybot.utils as utils
from supybot.commands import *
import supybot.plugins as plugins
import supybot.utils as utils
from supybot.commands import *
import supybot.plugins as plugins
@@
-46,18
+47,31
@@
class Pokedex(callbacks.Plugin):
self.__parent = super(Pokedex, self)
self.__parent.__init__(irc)
self.db = pokedex.db.connect(self.registryValue('databaseURL'))
self.__parent = super(Pokedex, self)
self.__parent.__init__(irc)
self.db = pokedex.db.connect(self.registryValue('databaseURL'))
+ self.indices = pokedex.lookup.open_index(
+ directory=conf.supybot.directories.data.dirize('pokedex-index'),
+ session=self.db,
+ )
def pokedex(self, irc, msg, args, thing):
"""<thing...>
Looks up <thing> in the veekun Pokédex."""
def pokedex(self, irc, msg, args, thing):
"""<thing...>
Looks up <thing> in the veekun Pokédex."""
+ # Fix encoding. Sigh.
+ if not isinstance(thing, unicode):
+ ascii_thing = thing
+ try:
+ thing = ascii_thing.decode('utf8')
+ except UnicodeDecodeError:
+ thing = ascii_thing.decode('latin1')
+
# Similar logic to the site, here.
# Similar logic to the site, here.
- results = pokedex.lookup.lookup(thing, session=self.db)
+ results = pokedex.lookup.lookup(thing, session=self.db,
+ indices=self.indices)
# Nothing found
if len(results) == 0:
# Nothing found
if len(results) == 0:
-
irc.reply(
"I don't know what that is.")
+
self._reply(irc,
"I don't know what that is.")
return
# Multiple matches; propose them all
return
# Multiple matches; propose them all
@@
-75,56
+89,71
@@
class Pokedex(callbacks.Plugin):
result_strings = []
for result in results:
result_strings = []
for result in results:
- result_string = result.name
+ result_string = result.object.name
+
+ # Prepend, e.g., pokemon: if necessary
if use_prefixes:
# Table classes know their singular names
prefix = result.object.__singlename__
result_string = prefix + ':' + result_string
if use_prefixes:
# Table classes know their singular names
prefix = result.object.__singlename__
result_string = prefix + ':' + result_string
+
+ # Identify foreign language names
+ if result.language:
+ result_string += u""" ({0}: {1})""".format(
+ result.iso3166, result.name)
+
result_strings.append(result_string)
result_strings.append(result_string)
-
irc.reply(
"{0}: {1}?".format(reply, '; '.join(result_strings)))
+
self._reply(irc, u
"{0}: {1}?".format(reply, '; '.join(result_strings)))
return
# If we got here, there's an exact match; hurrah!
result = results[0]
if isinstance(result.object, tables.Pokemon):
return
# If we got here, there's an exact match; hurrah!
result = results[0]
if isinstance(result.object, tables.Pokemon):
-
irc.reply(
"""{name}, {type}-type Pokémon.""".format(
+
self._reply(irc, u
"""{name}, {type}-type Pokémon.""".format(
name=result.object.name,
type='/'.join(_.name for _ in result.object.types),
)
)
elif isinstance(result.object, tables.Move):
name=result.object.name,
type='/'.join(_.name for _ in result.object.types),
)
)
elif isinstance(result.object, tables.Move):
-
irc.reply(
"""{name}, {type}-type move.""".format(
+
self._reply(irc, u
"""{name}, {type}-type move.""".format(
name=result.object.name,
type=result.object.type.name,
)
)
elif isinstance(result.object, tables.Type):
name=result.object.name,
type=result.object.type.name,
)
)
elif isinstance(result.object, tables.Type):
-
irc.reply(
"""{name}, a type.""".format(
+
self._reply(irc, u
"""{name}, a type.""".format(
name=result.object.name,
)
)
elif isinstance(result.object, tables.Item):
name=result.object.name,
)
)
elif isinstance(result.object, tables.Item):
-
irc.reply(
"""{name}, an item.""".format(
+
self._reply(irc, u
"""{name}, an item.""".format(
name=result.object.name,
)
)
elif isinstance(result.object, tables.Ability):
name=result.object.name,
)
)
elif isinstance(result.object, tables.Ability):
-
irc.reply(
"""{name}, an ability.""".format(
+
self._reply(irc, u
"""{name}, an ability.""".format(
name=result.object.name,
)
)
else:
# This can only happen if lookup.py is upgraded and we are not
name=result.object.name,
)
)
else:
# This can only happen if lookup.py is upgraded and we are not
-
irc.reply(
"Uhh.. I found that, but I don't know what it is. :(")
+
self._reply(irc,
"Uhh.. I found that, but I don't know what it is. :(")
pokedex = wrap(pokedex, [rest('something')])
pokedex = wrap(pokedex, [rest('something')])
+ def _reply(self, irc, response):
+ """Wraps irc.reply() to do some Unicode decoding."""
+ if isinstance(response, str):
+ irc.reply(response)
+ else:
+ irc.reply(response.encode('utf8'))
+
Class = Pokedex
Class = Pokedex