open_index was returning an index instead of a SpellChecker. #15

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

diff --git a/pokedex/__init__.py b/pokedex/__init__.py
index d60224e..1c28b06 100644 (file)
--- a/pokedex/__init__.py
+++ b/pokedex/__init__.py
@@ -1,125 +1,93 @@
 # encoding: utf8
 # encoding: utf8

+from optparse import OptionParser

 import sys
 
 import sys
 

-import sqlalchemy.types
-

 from .db import connect, metadata
 from .db import connect, metadata

+import pokedex.db.load
+import pokedex.lookup

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

-        help()
+        command_help()

 
     command = sys.argv[1]
     args = sys.argv[2:]
 
     # Find the command as a function in this file
 
     command = sys.argv[1]
     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:
         func(*args)
     else:

-        help()
-
-
-def csvimport(engine_uri, dir='.'):
-    import csv
-
-    from sqlalchemy.orm.attributes import instrumentation_registry
-
-    session = connect(engine_uri)
-
-    metadata.create_all()
-
-    # Oh, mysql-chan.
-    # TODO try to insert data in preorder so we don't need this hack and won't
-    #      break similarly on other engines
-    if 'mysql' in engine_uri:
-        session.execute('SET FOREIGN_KEY_CHECKS = 0')
-
-    # This is a secret attribute on a secret singleton of a secret class that
-    # appears to hopefully contain all registered classes as keys.
-    # There is no other way to accomplish this, as far as I can tell.
-    # Fuck.
-    for table in sorted(instrumentation_registry.manager_finders.keys(),
-                        key=lambda self: self.__table__.name):
-        table_name = table.__table__.name
-        print table_name
+        command_help()

 
 

-        reader = csv.reader(open("%s/%s.csv" % (dir, table_name), 'rb'), lineterminator='\n')
-        column_names = [unicode(column) for column in reader.next()]

 
 

-        for csvs in reader:
-            row = table()
+def command_dump(*args):
+    parser = OptionParser()
+    parser.add_option('-e', '--engine', dest='engine_uri', default=None)
+    parser.add_option('-d', '--directory', dest='directory', default=None)
+    parser.add_option('-q', '--quiet', dest='verbose', default=True, action='store_false')
+    options, _ = parser.parse_args(list(args))

 
 

-            for column_name, value in zip(column_names, csvs):
-                column = table.__table__.c[column_name]
-                if column.nullable and value == '':
-                    # Empty string in a nullable column really means NULL
-                    value = None
-                elif isinstance(column.type, sqlalchemy.types.Boolean):
-                    # Boolean values are stored as string values 0/1, but both
-                    # of those evaluate as true; SQLA wants True/False
-                    if value == '0':
-                        value = False
-                    else:
-                        value = True
-                else:
-                    # Otherwise, unflatten from bytes
-                    value = value.decode('utf-8')
+    session = connect(options.engine_uri)
+    pokedex.db.load.dump(session, directory=options.directory,
+                                  verbose=options.verbose)

 
 

-                setattr(row, column_name, value)
+def command_load(*args):
+    parser = OptionParser()
+    parser.add_option('-e', '--engine', dest='engine_uri', default=None)
+    parser.add_option('-d', '--directory', dest='directory', default=None)
+    parser.add_option('-D', '--drop-tables', dest='drop_tables', default=False, action='store_true')
+    parser.add_option('-q', '--quiet', dest='verbose', default=True, action='store_false')
+    options, _ = parser.parse_args(list(args))

 
 

-            session.add(row)
+    session = connect(options.engine_uri)

 
 

-        session.commit()
+    pokedex.db.load.load(session, directory=options.directory,
+                                  drop_tables=options.drop_tables,
+                                  verbose=options.verbose)

 
 

-    # 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
-    if 'mysql' in engine_uri:
-        session.execute('SET FOREIGN_KEY_CHECKS = 1')
+def command_setup(*args):
+    session = connect()
+    pokedex.db.load.load(session, verbose=False, drop_tables=True)
+    pokedex.lookup.open_index(session=session, recreate=True)

 
 
 
 

-def csvexport(engine_uri, dir='.'):
-    import csv
-    session = connect(engine_uri)
-
-    for table_name in sorted(metadata.tables.keys()):
-        print table_name
-        table = metadata.tables[table_name]
-
-        writer = csv.writer(open("%s/%s.csv" % (dir, table_name), 'wb'), lineterminator='\n')
-        columns = [col.name for col in table.columns]
-        writer.writerow(columns)
-
-        for row in session.query(table).all():
-            csvs = []
-            for col in columns:
-                # Convert Pythony values to something more universal
-                val = getattr(row, col)
-                if val == None:
-                    val = ''
-                elif val == True:
-                    val = '1'
-                elif val == False:
-                    val = '0'
-                else:
-                    val = unicode(val).encode('utf-8')
-
-                csvs.append(val)
+def command_lookup(name):
+    results, exact = pokedex.lookup.lookup(name)
+    if exact:
+        print "Matched:"
+    else:
+        print "Fuzzy-matched:"

 
 

-            writer.writerow(csvs)
+    for object in results:
+        print object.__tablename__, object.name

 
 
 
 

-def help():
+def command_help():

     print u"""pokedex -- a command-line Pokédex interface
     print u"""pokedex -- a command-line Pokédex interface

-
-    help                        Displays this message.
-
-  These commands are only useful for developers:
-    csvimport {uri} [dir]       Import data from a set of CSVs to the database
-                                  given by the URI.
-    csvexport {uri} [dir]       Export data from the database given by the URI
-                                  to a set of CSVs.
-                                Directory defaults to cwd.
-"""
+usage: pokedex {command} [options...]
+Run `pokedex setup` first, or nothing will work!
+
+Commands:
+    help                Displays this message.
+    lookup [thing]      Look up something in the Pokédex.
+
+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
+                        pokedex install directory.  Use this option to specify
+                        a different directory.
+    -D|--drop-tables    With load, drop all tables before loading data.
+    -e|--engine=URI     By default, all commands try to use a SQLite database
+                        in the pokedex install directory.  Use this option to
+                        specify an alternate database.
+    -q|--quiet          Turn off any unnecessary status output from dump/load.
+""".encode(sys.getdefaultencoding(), 'replace')

 
     sys.exit(0)
 
     sys.exit(0)