Added a short_effect column to the items table.

[zzz-pokedex.git] / pokedex / db / load.py

diff --git a/pokedex/db/load.py b/pokedex/db/load.py
index 0425dea..df0d0f1 100644 (file)
--- a/pokedex/db/load.py
+++ b/pokedex/db/load.py
@@ -1,8 +1,7 @@
 """CSV to database or vice versa."""
 import csv
 """CSV to database or vice versa."""
 import csv

+import fnmatch

 import os.path
 import os.path

-import pkg_resources
-import re

 import sys
 
 from sqlalchemy.orm.attributes import instrumentation_registry
 import sys
 
 from sqlalchemy.orm.attributes import instrumentation_registry


@@ -11,71 +10,89 @@ import sqlalchemy.types
 
 from pokedex.db import metadata
 import pokedex.db.tables as tables
 
 from pokedex.db import metadata
 import pokedex.db.tables as tables

+from pokedex.defaults import get_default_csv_dir

 
 
 
 

-def _wildcard_char_to_regex(char):
-    """Converts a single wildcard character to the regex equivalent."""
-
-    if char == '?':
-        return '.?'
-    elif char == '*':
-        return '.*'
+def _get_table_names(metadata, patterns):
+    """Returns a list of table names from the given metadata.  If `patterns`
+    exists, only tables matching one of the patterns will be returned.
+    """
+    if patterns:
+        table_names = set()
+        for pattern in patterns:
+            if '.' in pattern or '/' in pattern:
+                # If it looks like a filename, pull out just the table name
+                _, filename = os.path.split(pattern)
+                table_name, _ = os.path.splitext(filename)
+                pattern = table_name
+
+            table_names.update(fnmatch.filter(metadata.tables.keys(), pattern))

     else:
     else:

-        return re.escape(char)
-
-def _wildcard_glob_to_regex(glob):
-    """Converts a single wildcard glob to a regex STRING."""
-
-    # If it looks like a filename, make it not one
-    if '.' in glob or '/' in glob:
-        _, filename = os.path.split(glob)
-        table_name, _ = os.path.splitext(filename)
-        glob = table_name
+        table_names = metadata.tables.keys()

 
 

-    return u''.join(map(_wildcard_char_to_regex, glob))
+    return list(table_names)

 
 

-def _wildcards_to_regex(strings):
-    """Converts a list of wildcard globs to a single regex object."""
+def _get_verbose_prints(verbose):
+    """If `verbose` is true, returns three functions: one for printing a
+    starting message, one for printing an interim status update, and one for
+    printing a success or failure message when finished.

 
 

-    regex_parts = map(_wildcard_glob_to_regex, strings)
+    If `verbose` is false, returns no-op functions.
+    """

 
 

-    regex = '^(?:' + '|'.join(regex_parts) + ')$'
+    if not verbose:
+        # Return dummies
+        def dummy(*args, **kwargs):
+            pass

 
 

-    return re.compile(regex)
+        return dummy, dummy, dummy

 
 

+    ### Okay, verbose == True; print stuff

 
 

-def _get_verbose_prints(verbose):
-    """If `verbose` is true, returns two functions: one for printing a starting
-    message, and the other for printing a success or failure message when
-    finished.
+    def print_start(thing):
+        # Truncate to 66 characters, leaving 10 characters for a success
+        # or failure message
+        truncated_thing = thing[0:66]

 
 

-    If `verbose` is false, returns two no-op functions.
-    """
+        # Also, space-pad to keep the cursor in a known column
+        num_spaces = 66 - len(truncated_thing)

 
 

-    if verbose:
-        import sys
-        def print_start(thing):
-            # Truncate to 66 characters, leaving 10 characters for a success
-            # or failure message
-            truncated_thing = thing[0:66]
+        print "%s...%s" % (truncated_thing, ' ' * num_spaces),
+        sys.stdout.flush()

 
 

-            # Also, space-pad to keep the cursor in a known column
-            num_spaces = 66 - len(truncated_thing)
+    if sys.stdout.isatty():
+        # stdout is a terminal; stupid backspace tricks are OK.
+        # Don't use print, because it always adds magical spaces, which
+        # makes backspace accounting harder

 
 

-            print "%s...%s" % (truncated_thing, ' ' * num_spaces),
+        backspaces = [0]
+        def print_status(msg):
+            # Overwrite any status text with spaces before printing
+            sys.stdout.write('\b' * backspaces[0])
+            sys.stdout.write(' ' * backspaces[0])
+            sys.stdout.write('\b' * backspaces[0])
+            sys.stdout.write(msg)

             sys.stdout.flush()
             sys.stdout.flush()

+            backspaces[0] = len(msg)

 
         def print_done(msg='ok'):
 
         def print_done(msg='ok'):

-            print msg
+            # Overwrite any status text with spaces before printing
+            sys.stdout.write('\b' * backspaces[0])
+            sys.stdout.write(' ' * backspaces[0])
+            sys.stdout.write('\b' * backspaces[0])
+            sys.stdout.write(msg + "\n")

             sys.stdout.flush()
             sys.stdout.flush()

+            backspaces[0] = 0

 
 

-        return print_start, print_done
+    else:
+        # stdout is a file (or something); don't bother with status at all
+        def print_status(msg):
+            pass

 
 

-    # Not verbose; return dummies
-    def dummy(*args, **kwargs):
-        pass
+        def print_done(msg='ok'):
+            print msg

 
 

-    return dummy, dummy
+    return print_start, print_status, print_done

 
 
 def load(session, tables=[], directory=None, drop_tables=False, verbose=False):
 
 
 def load(session, tables=[], directory=None, drop_tables=False, verbose=False):


@@ -101,18 +118,13 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False):
     """
 
     # First take care of verbosity
     """
 
     # First take care of verbosity

-    print_start, print_done = _get_verbose_prints(verbose)
-
+    print_start, print_status, print_done = _get_verbose_prints(verbose)

 
 

-    if not directory:
-        directory = pkg_resources.resource_filename('pokedex', 'data/csv')

 
 

-    if tables:
-        regex = _wildcards_to_regex(tables)
-        table_names = filter(regex.match, metadata.tables.keys())
-    else:
-        table_names = metadata.tables.keys()
+    if directory is None:
+        directory = get_default_csv_dir()

 
 

+    table_names = _get_table_names(metadata, tables)

     table_objs = [metadata.tables[name] for name in table_names]
     table_objs = sqlalchemy.sql.util.sort_tables(table_objs)
 
     table_objs = [metadata.tables[name] for name in table_names]
     table_objs = sqlalchemy.sql.util.sort_tables(table_objs)
 


@@ -136,12 +148,15 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False):
         print_start(table_name)
 
         try:
         print_start(table_name)
 
         try:

-            csvfile = open("%s/%s.csv" % (directory, table_name), 'rb')
+            csvpath = "%s/%s.csv" % (directory, table_name)
+            csvfile = open(csvpath, 'rb')

         except IOError:
             # File doesn't exist; don't load anything!
             print_done('missing?')
             continue
 
         except IOError:
             # File doesn't exist; don't load anything!
             print_done('missing?')
             continue
 

+        csvsize = os.stat(csvpath).st_size
+

         reader = csv.reader(csvfile, lineterminator='\n')
         column_names = [unicode(column) for column in reader.next()]
 
         reader = csv.reader(csvfile, lineterminator='\n')
         column_names = [unicode(column) for column in reader.next()]
 


@@ -164,6 +179,9 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False):
             session.commit()
             new_rows[:] = []
 
             session.commit()
             new_rows[:] = []
 

+            progress = "%d%%" % (100 * csvfile.tell() // csvsize)
+            print_status(progress)
+

         for csvs in reader:
             row_data = {}
 
         for csvs in reader:
             row_data = {}
 


@@ -254,18 +272,13 @@ def dump(session, tables=[], directory=None, verbose=False):
     """
 
     # First take care of verbosity
     """
 
     # First take care of verbosity

-    print_start, print_done = _get_verbose_prints(verbose)
+    print_start, print_status, print_done = _get_verbose_prints(verbose)

 
 
     if not directory:
 
 
     if not directory:

-        directory = pkg_resources.resource_filename('pokedex', 'data/csv')
-
-    if tables:
-        regex = _wildcards_to_regex(tables)
-        table_names = filter(regex.match, metadata.tables.keys())
-    else:
-        table_names = metadata.tables.keys()
+        directory = get_default_csv_dir()

 
 

+    table_names = _get_table_names(metadata, tables)

     table_names.sort()
 
 
     table_names.sort()