X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/91df48e83cec5ac8a8cdcf1b2b1961420d579d6b..217d61aa29beaa5503618af52e2c17cd9e8acc1b:/pokedex/__init__.py

diff --git a/pokedex/__init__.py b/pokedex/__init__.py
index 3908d8d..e142ae6 100644
--- a/pokedex/__init__.py
+++ b/pokedex/__init__.py
@@ -15,14 +15,14 @@ def main():
     args = sys.argv[2:]
 
     # Find the command as a function in this file
-    func = globals().get(command, None)
-    if func and callable(func) and command != 'main':
+    func = globals().get("command_%s" % command, None)
+    if func:
         func(*args)
     else:
-        help()
+        command_help()
 
 
-def csvimport(engine_uri, directory='.'):
+def command_csvimport(engine_uri, directory='.'):
     import csv
 
     from sqlalchemy.orm.attributes import instrumentation_registry
@@ -104,7 +104,7 @@ def csvimport(engine_uri, directory='.'):
             try:
                 session.add(row)
                 session.flush()
-            except IntegrityError as e:
+            except IntegrityError, e:
                 failed_rows.append(row)
 
         # Loop over the failed rows and keep trying to insert them.  If a loop
@@ -121,7 +121,7 @@ def csvimport(engine_uri, directory='.'):
                     # Success!
                     del failed_rows[i]
                     do_another_loop = True
-                except IntegrityError as e:
+                except IntegrityError, e:
                     pass
 
         if failed_rows:
@@ -129,7 +129,7 @@ def csvimport(engine_uri, directory='.'):
         else:
             print 'loaded'
 
-def csvexport(engine_uri, directory='.'):
+def command_csvexport(engine_uri, directory='.'):
     import csv
     session = connect(engine_uri)
 
@@ -142,7 +142,8 @@ def csvexport(engine_uri, directory='.'):
         columns = [col.name for col in table.columns]
         writer.writerow(columns)
 
-        for row in session.query(table).all():
+        primary_key = table.primary_key
+        for row in session.query(table).order_by(*primary_key).all():
             csvs = []
             for col in columns:
                 # Convert Pythony values to something more universal
@@ -160,17 +161,21 @@ def csvexport(engine_uri, directory='.'):
 
             writer.writerow(csvs)
 
-def lookup(engine_uri, name):
+def command_lookup(engine_uri, name):
     # XXX don't require uri!  somehow
     session = connect(engine_uri)
 
-    results = pokedex_lookup(session, name)
-    print "Matched:"
-    for object, matchiness in results:
-        print object.__tablename__, object.name, "(%.03f)" % matchiness
+    results, exact = pokedex_lookup(session, name)
+    if exact:
+        print "Matched:"
+    else:
+        print "Fuzzy-matched:"
+
+    for object in results:
+        print object.__tablename__, object.name
 
 
-def help():
+def command_help():
     print u"""pokedex -- a command-line Pokédex interface
 
     help                        Displays this message.
@@ -182,6 +187,6 @@ def help():
     csvexport {uri} [dir]       Export data from the database given by the URI
                                   to a set of CSVs.
                                 Directory defaults to cwd.
-"""
+""".encode(sys.getdefaultencoding(), 'replace')
 
     sys.exit(0)