Remove special lookup logic for forms.

[zzz-pokedex.git] / pokedex / __init__.py

diff --git a/pokedex/__init__.py b/pokedex/__init__.py
index 6b788f7..499d8d2 100644 (file)
--- a/pokedex/__init__.py
+++ b/pokedex/__init__.py
@@ -4,7 +4,7 @@ import sys
 
 from .db import connect, metadata
 import pokedex.db.load
 
 from .db import connect, metadata
 import pokedex.db.load

-from pokedex.lookup import lookup as pokedex_lookup
+import pokedex.lookup

 
 def main():
     if len(sys.argv) <= 1:
 
 def main():
     if len(sys.argv) <= 1:


@@ -13,6 +13,11 @@ def main():
     command = sys.argv[1]
     args = sys.argv[2:]
 
     command = sys.argv[1]
     args = sys.argv[2:]
 

+    # XXX there must be a better way to get Unicode argv
+    # XXX this doesn't work on Windows durp
+    enc = sys.stdin.encoding or 'utf8'
+    args = [_.decode(enc) for _ in args]
+

     # Find the command as a function in this file
     func = globals().get("command_%s" % command, None)
     if func:
     # Find the command as a function in this file
     func = globals().get("command_%s" % command, None)
     if func:


@@ -46,19 +51,32 @@ def command_load(*args):
                                   drop_tables=options.drop_tables,
                                   verbose=options.verbose)
 
                                   drop_tables=options.drop_tables,
                                   verbose=options.verbose)
 

+def command_setup(*args):
+    session = connect()
+    pokedex.db.load.load(session, verbose=False, drop_tables=True)
+    pokedex.lookup.PokedexLookup(session=session, recreate=True)

 
 

-def command_lookup(engine_uri, name):
-    # XXX don't require uri!  somehow
-    session = connect(engine_uri)

 
 

-    results, exact = pokedex_lookup(session, name)
-    if exact:
+def command_lookup(name):
+    results = pokedex.lookup.PokedexLookup().lookup(name)
+    if not results:
+        print "No matches."
+    elif results[0].exact:

         print "Matched:"
     else:
         print "Fuzzy-matched:"
 
         print "Matched:"
     else:
         print "Fuzzy-matched:"
 

-    for object in results:
-        print object.__tablename__, object.name
+    for result in results:
+        if hasattr(result.object, 'full_name'):
+            name = result.object.full_name
+        else:
+            name = result.object.name
+
+        print "%s: %s" % (result.object.__tablename__, name),
+        if result.language:
+            print "(%s in %s)" % (result.name, result.language)
+        else:
+            print

 
 
 def command_help():
 
 
 def command_help():


@@ -73,6 +91,9 @@ Commands:
 System commands:
     load                Load Pokédex data into a database from CSV files.
     dump                Dump Pokédex data from a database into CSV files.
 System commands:
     load                Load Pokédex data into a database from CSV files.
     dump                Dump Pokédex data from a database into CSV files.

+    setup               Loads Pokédex data into the right place and creates a
+                        lookup index in the right place.  No options or output.
+                        This will blow away the default database and index!

 
 Options:
     -d|--directory      By default, load and dump will use the CSV files in the
 
 Options:
     -d|--directory      By default, load and dump will use the CSV files in the