X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/cca6737b7e79efb4d0fd28798b883e63f793ff03..b08b064e9f013e8233b207360d68305a6b9652f2:/pokedex/__init__.py?ds=sidebyside

diff --git a/pokedex/__init__.py b/pokedex/__init__.py
index 6ac7344..6954149 100644
--- a/pokedex/__init__.py
+++ b/pokedex/__init__.py
@@ -1,9 +1,11 @@
 # encoding: utf8
 import sys
 
+from sqlalchemy.exc import IntegrityError
 import sqlalchemy.types
 
 from .db import connect, metadata, tables as tables_module
+from pokedex.lookup import lookup as pokedex_lookup
 
 def main():
     if len(sys.argv) <= 1:
@@ -13,19 +15,20 @@ 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
 
-    session = connect(engine_uri)
+    # Use autocommit in case rows fail due to foreign key incest
+    session = connect(engine_uri, autocommit=True, autoflush=False)
 
     metadata.create_all()
 
@@ -59,6 +62,7 @@ def csvimport(engine_uri, directory='.'):
 
         # Print the table name but leave the cursor in a fixed column
         print table_name + '...', ' ' * (40 - len(table_name)),
+        sys.stdout.flush()
 
         try:
             csvfile = open("%s/%s.csv" % (directory, table_name), 'rb')
@@ -70,6 +74,12 @@ def csvimport(engine_uri, directory='.'):
         reader = csv.reader(csvfile, lineterminator='\n')
         column_names = [unicode(column) for column in reader.next()]
 
+        # Self-referential tables may contain rows with foreign keys of
+        # other rows in the same table that do not yet exist.  We'll keep
+        # a running list of these and try inserting them again after the
+        # rest are done
+        failed_rows = []
+
         for csvs in reader:
             row = table_class()
 
@@ -91,13 +101,35 @@ def csvimport(engine_uri, directory='.'):
 
                 setattr(row, column_name, value)
 
-            session.add(row)
-
-        session.commit()
-        print 'loaded'
-
-
-def csvexport(engine_uri, directory='.'):
+            try:
+                session.add(row)
+                session.flush()
+            except IntegrityError as e:
+                failed_rows.append(row)
+
+        # Loop over the failed rows and keep trying to insert them.  If a loop
+        # doesn't manage to insert any rows, bail.
+        do_another_loop = True
+        while failed_rows and do_another_loop:
+            do_another_loop = False
+
+            for i, row in enumerate(failed_rows):
+                try:
+                    session.add(row)
+                    session.flush()
+
+                    # Success!
+                    del failed_rows[i]
+                    do_another_loop = True
+                except IntegrityError as e:
+                    pass
+
+        if failed_rows:
+            print len(failed_rows), "rows failed"
+        else:
+            print 'loaded'
+
+def command_csvexport(engine_uri, directory='.'):
     import csv
     session = connect(engine_uri)
 
@@ -128,11 +160,25 @@ def csvexport(engine_uri, directory='.'):
 
             writer.writerow(csvs)
 
+def command_lookup(engine_uri, name):
+    # XXX don't require uri!  somehow
+    session = connect(engine_uri)
+
+    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.
+    lookup {uri} [name]         Look up something in the Pokédex.
 
   These commands are only useful for developers:
     csvimport {uri} [dir]       Import data from a set of CSVs to the database