Make `pokedex status` a bit more useful. #180

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

diff --git a/pokedex/__init__.py b/pokedex/__init__.py
index 249eafb..810783f 100644 (file)
--- a/pokedex/__init__.py
+++ b/pokedex/__init__.py
@@ -6,6 +6,7 @@ import sys
 
 import pokedex.db
 import pokedex.db.load
 
 import pokedex.db
 import pokedex.db.load

+import pokedex.db.tables

 import pokedex.lookup
 
 def main():
 import pokedex.lookup
 
 def main():


@@ -30,7 +31,7 @@ def main():
 
 def get_parser(verbose=True):
     """Returns an OptionParser prepopulated with the global options.
 
 def get_parser(verbose=True):
     """Returns an OptionParser prepopulated with the global options.

-    
+

     `verbose` is whether or not the options should be verbose by default.
     """
     parser = OptionParser()
     `verbose` is whether or not the options should be verbose by default.
     """
     parser = OptionParser()


@@ -67,11 +68,7 @@ def get_session(options):
 def get_lookup(options, session=None, recreate=False):
     """Given a parsed options object, opens the whoosh index and returns a
     PokedexLookup object.
 def get_lookup(options, session=None, recreate=False):
     """Given a parsed options object, opens the whoosh index and returns a
     PokedexLookup object.

-
-    Unlike `get_session`, this function can actually do population as a side
-    effect!  This is fallout from how PokedexLookup works.

     """
     """

-    # TODO fix the above

 
     if recreate and not session:
         raise ValueError("get_lookup() needs an explicit session to regen the index")
 
     if recreate and not session:
         raise ValueError("get_lookup() needs an explicit session to regen the index")


@@ -93,13 +90,15 @@ def get_lookup(options, session=None, recreate=False):
         print "Opened lookup index {index_dir} (from {got_from})" \
             .format(index_dir=index_dir, got_from=got_from)
 
         print "Opened lookup index {index_dir} (from {got_from})" \
             .format(index_dir=index_dir, got_from=got_from)
 

-    lookup = pokedex.lookup.PokedexLookup(index_dir, session=session,
-                                                     recreate=recreate)
+    lookup = pokedex.lookup.PokedexLookup(index_dir, session=session)
+
+    if recreate:
+        lookup.rebuild_index()

 
     return lookup
 
 
     return lookup
 

-def print_csv_directory(options):
-    """Just prints the csv directory we're about to use."""
+def get_csv_directory(options):
+    """Prints and returns the csv directory we're about to use."""

 
     if not options.verbose:
         return
 
     if not options.verbose:
         return


@@ -115,6 +114,8 @@ def print_csv_directory(options):
     print "Using CSV directory {csvdir} (from {got_from})" \
         .format(csvdir=csvdir, got_from=got_from)
 
     print "Using CSV directory {csvdir} (from {got_from})" \
         .format(csvdir=csvdir, got_from=got_from)
 

+    return csvdir
+

 
 ### Plumbing commands
 
 
 ### Plumbing commands
 


@@ -124,7 +125,7 @@ def command_dump(*args):
     options, tables = parser.parse_args(list(args))
 
     session = get_session(options)
     options, tables = parser.parse_args(list(args))
 
     session = get_session(options)

-    print_csv_directory(options)
+    get_csv_directory(options)

 
     pokedex.db.load.dump(session, directory=options.directory,
                                   tables=tables,
 
     pokedex.db.load.dump(session, directory=options.directory,
                                   tables=tables,


@@ -144,7 +145,7 @@ def command_load(*args):
         print
 
     session = get_session(options)
         print
 
     session = get_session(options)

-    print_csv_directory(options)
+    get_csv_directory(options)

 
     pokedex.db.load.load(session, directory=options.directory,
                                   drop_tables=options.drop_tables,
 
     pokedex.db.load.load(session, directory=options.directory,
                                   drop_tables=options.drop_tables,


@@ -168,7 +169,7 @@ def command_setup(*args):
     options.directory = None
 
     session = get_session(options)
     options.directory = None
 
     session = get_session(options)

-    print_csv_directory(options)
+    get_csv_directory(options)

     pokedex.db.load.load(session, directory=None, drop_tables=True,
                                   verbose=options.verbose)
 
     pokedex.db.load.load(session, directory=None, drop_tables=True,
                                   verbose=options.verbose)
 


@@ -183,9 +184,39 @@ def command_status(*args):
     options.verbose = True
     options.directory = None
 
     options.verbose = True
     options.directory = None
 

+    # Database, and a lame check for whether it's been inited at least once

     session = get_session(options)
     session = get_session(options)

-    print_csv_directory(options)
+    print "  - OK!  Connected successfully."
+
+    if pokedex.db.tables.Pokemon.__table__.exists(session.bind):
+        print "  - OK!  Database seems to contain some data."
+    else:
+        print "  - WARNING: Database appears to be empty."
+
+    # CSV; simple checks that the dir exists
+    csvdir = get_csv_directory(options)
+    if not os.path.exists(csvdir):
+        print "  - ERROR: No such directory!"
+    elif not os.path.isdir(csvdir):
+        print "  - ERROR: Not a directory!"
+    else:
+        print "  - OK!  Directory exists."
+
+        if os.access(csvdir, os.R_OK):
+            print "  - OK!  Can read from directory."
+        else:
+            print "  - ERROR: Can't read from directory!"
+
+        if os.access(csvdir, os.W_OK):
+            print "  - OK!  Can write to directory."
+        else:
+            print "  - WARNING: Can't write to directory!  " \
+                "`dump` will not work.  You may need to sudo."
+
+    # Index; the PokedexLookup constructor covers most tests and will
+    # cheerfully bomb if they fail

     lookup = get_lookup(options, recreate=False)
     lookup = get_lookup(options, recreate=False)

+    print "  - OK!  Opened successfully."

 
 
 ### User-facing commands
 
 
 ### User-facing commands


@@ -247,16 +278,16 @@ Global options:
                         the pokedex install directory.  Use this option (or a
                         POKEDEX_INDEX_DIR environment variable) to specify an
                         alternate loction.
                         the pokedex install directory.  Use this option (or a
                         POKEDEX_INDEX_DIR environment variable) to specify an
                         alternate loction.

+    -q|--quiet          Don't print system output.  This is the default for
+                        non-system commands and setup.
+    -v|--verbose        Print system output.  This is the default for system
+                        commands, except setup.

 
 System options:
 
 System options:

-    -d|--directory      By default, load and dump will use the CSV files in the
+    -d|--directory=DIR  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.
                         pokedex install directory.  Use this option to specify
                         a different directory.
     -D|--drop-tables    With load, drop all tables before loading data.

-    -q|--quiet          Don't print system output.  This is the default for
-                        non-system commands and setup.
-    -v|--verbose        Print system output.  This is the default for system
-                        commands, except setup.

 
     Additionally, load and dump accept a list of table names (possibly with
     wildcards) and/or csv fileames as an argument list.
 
     Additionally, load and dump accept a list of table names (possibly with
     wildcards) and/or csv fileames as an argument list.