From: Eevee <git@veekun.com>
Date: Fri, 1 May 2009 13:24:09 +0000 (-0700)
Subject: Made csvimport somewhat tolerant of load errors.
X-Git-Tag: veekun-promotions/2010050901~271
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/830d38a5620c676f9369e7acadbd972464e57984?ds=inline

Made csvimport somewhat tolerant of load errors.

It used to abruptly abort if a csv file were missing, which wasn't very
nice when I'd just added a new table definition and was trying to reload
everything else.

Now it prints a status per table while loading, and will declare missing
tables to be...  missing.
---

diff --git a/pokedex/__init__.py b/pokedex/__init__.py
index d60224e..38c0487 100644
--- a/pokedex/__init__.py
+++ b/pokedex/__init__.py
@@ -42,9 +42,17 @@ def csvimport(engine_uri, dir='.'):
     for table in sorted(instrumentation_registry.manager_finders.keys(),
                         key=lambda self: self.__table__.name):
         table_name = table.__table__.name
-        print table_name
+        # Print the table name but leave the cursor in a fixed column
+        print table_name + '...', ' ' * (40 - len(table_name)),
+
+        try:
+            csvfile = open("%s/%s.csv" % (dir, table_name), 'rb')
+        except IOError:
+            # File doesn't exist; don't load anything!
+            print 'no data!'
+            continue
 
-        reader = csv.reader(open("%s/%s.csv" % (dir, table_name), 'rb'), lineterminator='\n')
+        reader = csv.reader(csvfile, lineterminator='\n')
         column_names = [unicode(column) for column in reader.next()]
 
         for csvs in reader:
@@ -71,6 +79,7 @@ def csvimport(engine_uri, dir='.'):
             session.add(row)
 
         session.commit()
+        print 'loaded'
 
     # Shouldn't matter since this is usually the end of the program and thus
     # the connection too, but let's change this back just in case